Skip to content
This repository was archived by the owner on May 12, 2021. It is now read-only.

Commit ecee06b

Browse files
committed
Merge branch 'Migrate_Junit5' into develop
# Conflicts: # dependencies.gradle
2 parents 1adfa57 + 5354d83 commit ecee06b

490 files changed

Lines changed: 6079 additions & 6993 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
-29.6 KB
Binary file not shown.
-31.5 KB
Binary file not shown.
-31.3 KB
Binary file not shown.
-30 KB
Binary file not shown.

artwork/logo-flag.svg

Lines changed: 0 additions & 1 deletion
Loading

artwork/logo.svg

Lines changed: 0 additions & 1 deletion
Loading

artwork/pb-polygene.svg

Lines changed: 0 additions & 1 deletion
Loading

buildSrc/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ dependencies {
3333
compile 'org.hibernate.build.gradle:gradle-maven-publish-auth:2.0.1'
3434
compile 'org.apache.httpcomponents:httpclient:4.5.2'
3535
compile 'org.apache.httpcomponents:httpmime:4.5.2'
36-
compile 'com.bmuschko:gradle-docker-plugin:3.0.7'
36+
compile 'com.bmuschko:gradle-docker-plugin:3.2.6'
3737
compile 'com.moowork.gradle:gradle-node-plugin:1.1.1'
3838

3939
testCompile 'junit:junit:4.12'

buildSrc/src/main/groovy/org/apache/polygene/gradle/code/CodePlugin.groovy

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,8 @@ class CodePlugin implements Plugin<Project>
8282
}
8383
}
8484
}
85+
def junitEngine = declaration.libraries.get("junit_engine")
86+
project.dependencies.add "testRuntime", junitEngine
8587
}
8688

8789
private static void configureTest( Project project )
@@ -104,6 +106,7 @@ class CodePlugin implements Plugin<Project>
104106
def workDir = new File( testDir, 'work' )
105107
def tmpDir = new File( testDir, 'tmp' )
106108
def homeDir = new File( testDir, 'home' )
109+
testTask.useJUnitPlatform()
107110
testTask.workingDir = workDir
108111
testTask.systemProperties << ( [
109112
'user.dir' : workDir.absolutePath,

buildSrc/src/main/groovy/org/apache/polygene/gradle/dependencies/DependenciesPlugin.groovy

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ class DependenciesPlugin implements Plugin<Project>
4848

4949
private static void applyRepositories( Project project, DependenciesDeclarationExtension declaration )
5050
{
51+
project.repositories.jcenter()
5152
declaration.repositoriesUrls.each { name, url ->
5253
project.repositories.maven { MavenArtifactRepository repo ->
5354
repo.name = name

0 commit comments

Comments
 (0)