Repository: polygene-java Updated Branches: refs/heads/Migrate_Junit5 f2fcd58db -> 5354d8380
Checking whether JOOQ has fixed the Type generation problem for String or not. They have not. :-( Project: http://git-wip-us.apache.org/repos/asf/polygene-java/repo Commit: http://git-wip-us.apache.org/repos/asf/polygene-java/commit/ee295523 Tree: http://git-wip-us.apache.org/repos/asf/polygene-java/tree/ee295523 Diff: http://git-wip-us.apache.org/repos/asf/polygene-java/diff/ee295523 Branch: refs/heads/Migrate_Junit5 Commit: ee295523759ae8aea37b07ab683ca6941344d0b5 Parents: f2fcd58 Author: niclas <nic...@hedhman.org> Authored: Wed Apr 18 10:56:17 2018 +0800 Committer: niclas <nic...@hedhman.org> Committed: Wed Apr 18 10:56:17 2018 +0800 ---------------------------------------------------------------------- buildSrc/build.gradle | 2 +- .../gradle/dependencies/DependenciesPlugin.groovy | 1 + .../structure/internals/InternalDockerPlugin.groovy | 11 +++++------ dependencies.gradle | 1 + .../entitystore/mongodb/MongoDBEntityStoreTest.java | 2 +- .../entitystore/mongodb/MongoDBEntityStoreTestSuite.java | 2 +- .../mongodb/MongoDBEntityStoreWithCacheTest.java | 2 +- .../polygene/entitystore/sql/MariaDbEntityStoreTest.java | 10 ++++++---- .../entitystore/sql/MariaDbEntityStoreTestSuite.java | 3 ++- .../entitystore/sqlkv/MariaDbEntityStoreTest.java | 3 ++- .../entitystore/sqlkv/MariaDbEntityStoreTestSuite.java | 3 ++- 11 files changed, 23 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/polygene-java/blob/ee295523/buildSrc/build.gradle ---------------------------------------------------------------------- diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle index 5e870a5..8967b88 100644 --- a/buildSrc/build.gradle +++ b/buildSrc/build.gradle @@ -33,7 +33,7 @@ dependencies { compile 'org.hibernate.build.gradle:gradle-maven-publish-auth:2.0.1' compile 'org.apache.httpcomponents:httpclient:4.5.2' compile 'org.apache.httpcomponents:httpmime:4.5.2' - compile 'com.bmuschko:gradle-docker-plugin:3.0.7' + compile 'com.bmuschko:gradle-docker-plugin:3.2.6' compile 'com.moowork.gradle:gradle-node-plugin:1.1.1' testCompile 'junit:junit:4.12' http://git-wip-us.apache.org/repos/asf/polygene-java/blob/ee295523/buildSrc/src/main/groovy/org/apache/polygene/gradle/dependencies/DependenciesPlugin.groovy ---------------------------------------------------------------------- diff --git a/buildSrc/src/main/groovy/org/apache/polygene/gradle/dependencies/DependenciesPlugin.groovy b/buildSrc/src/main/groovy/org/apache/polygene/gradle/dependencies/DependenciesPlugin.groovy index dc6efcf..6fc2acd 100644 --- a/buildSrc/src/main/groovy/org/apache/polygene/gradle/dependencies/DependenciesPlugin.groovy +++ b/buildSrc/src/main/groovy/org/apache/polygene/gradle/dependencies/DependenciesPlugin.groovy @@ -48,6 +48,7 @@ class DependenciesPlugin implements Plugin<Project> private static void applyRepositories( Project project, DependenciesDeclarationExtension declaration ) { + project.repositories.jcenter() declaration.repositoriesUrls.each { name, url -> project.repositories.maven { MavenArtifactRepository repo -> repo.name = name http://git-wip-us.apache.org/repos/asf/polygene-java/blob/ee295523/buildSrc/src/main/groovy/org/apache/polygene/gradle/structure/internals/InternalDockerPlugin.groovy ---------------------------------------------------------------------- diff --git a/buildSrc/src/main/groovy/org/apache/polygene/gradle/structure/internals/InternalDockerPlugin.groovy b/buildSrc/src/main/groovy/org/apache/polygene/gradle/structure/internals/InternalDockerPlugin.groovy index 42565a7..2a9af6f 100644 --- a/buildSrc/src/main/groovy/org/apache/polygene/gradle/structure/internals/InternalDockerPlugin.groovy +++ b/buildSrc/src/main/groovy/org/apache/polygene/gradle/structure/internals/InternalDockerPlugin.groovy @@ -34,7 +34,6 @@ import org.gradle.api.Project import org.gradle.api.Task import org.gradle.api.file.CopySpec import org.gradle.api.logging.LogLevel -import org.gradle.api.logging.Logger @CompileStatic class InternalDockerPlugin implements Plugin<Project> @@ -69,7 +68,7 @@ class InternalDockerPlugin implements Plugin<Project> } } - private void applyDockerSwitch( Project project ) + private static void applyDockerSwitch( Project project ) { project.tasks.create( TaskNames.CHECK_DOCKER_CONNECTIVITY, DockerVersion, { DockerVersion task -> task.onError = { ex -> @@ -109,7 +108,7 @@ class InternalDockerPlugin implements Plugin<Project> dockers.eachDir { File dockerDir -> def dockerName = dockerDir.name def buildDockerfileTaskName = "build${ dockerName.capitalize() }Dockerfile" - def buildImageTaskName = "build${ dockerName.capitalize() }DockerImage" + String buildImageTaskName = "build${ dockerName.capitalize() }DockerImage" def tmpDir = project.file "${ project.buildDir }/tmp/docker/${ dockerName }" tmpDir.mkdirs() def buildDockerfileTask = project.tasks.create( buildDockerfileTaskName ) { Task task -> @@ -134,9 +133,9 @@ class InternalDockerPlugin implements Plugin<Project> def buildImageTask = project.tasks.create( buildImageTaskName, DockerBuildImage, { DockerBuildImage task -> task.description = "Build $dockerName Docker image" task.inputDir = tmpDir - task.dockerFile = new File( tmpDir, 'Dockerfile' ) - task.tag = "org.apache.polygene:${ PublishNaming.publishedNameFor ":internals:docker-$dockerName" }" - } as Action<DockerBuildImage> ) + task.dockerFile = new File(tmpDir, 'Dockerfile') + task.tag = "org.apache.polygene:${PublishNaming.publishedNameFor ":internals:docker-$dockerName"}" + } as Action<DockerBuildImage>) [ buildDockerfileTask, buildImageTask ].each { Task task -> task.group = 'docker' task.dependsOn TaskNames.CHECK_DOCKER_CONNECTIVITY http://git-wip-us.apache.org/repos/asf/polygene-java/blob/ee295523/dependencies.gradle ---------------------------------------------------------------------- diff --git a/dependencies.gradle b/dependencies.gradle index e12df5c..6b2e5bd 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -285,6 +285,7 @@ dependencies.dockerImagesVersions << [ memcached: 'memcached:1.4.39-alpine', mariadb : 'mariadb:10.1.21', mongo : 'mongo:3.5.10', + mysql : 'mysql:5.5.9', postgres : 'postgres:9.6.3-alpine', redis : 'redis:4.0.0-alpine', riak : 'basho/riak-kv:ubuntu-2.2.3', http://git-wip-us.apache.org/repos/asf/polygene-java/blob/ee295523/extensions/entitystore-mongodb/src/test/java/org/apache/polygene/entitystore/mongodb/MongoDBEntityStoreTest.java ---------------------------------------------------------------------- diff --git a/extensions/entitystore-mongodb/src/test/java/org/apache/polygene/entitystore/mongodb/MongoDBEntityStoreTest.java b/extensions/entitystore-mongodb/src/test/java/org/apache/polygene/entitystore/mongodb/MongoDBEntityStoreTest.java index 6dfb295..103ec57 100644 --- a/extensions/entitystore-mongodb/src/test/java/org/apache/polygene/entitystore/mongodb/MongoDBEntityStoreTest.java +++ b/extensions/entitystore-mongodb/src/test/java/org/apache/polygene/entitystore/mongodb/MongoDBEntityStoreTest.java @@ -35,7 +35,7 @@ import org.junit.jupiter.api.BeforeEach; /** * Test the MongoDBEntityStoreService. */ -@Docker( image = "mongo", +@Docker( image = "org.apache.polygene:org.apache.polygene.internal.docker-mongo", ports = @Port( exposed = 8801, inner = 27017), newForEachCase = false ) http://git-wip-us.apache.org/repos/asf/polygene-java/blob/ee295523/extensions/entitystore-mongodb/src/test/java/org/apache/polygene/entitystore/mongodb/MongoDBEntityStoreTestSuite.java ---------------------------------------------------------------------- diff --git a/extensions/entitystore-mongodb/src/test/java/org/apache/polygene/entitystore/mongodb/MongoDBEntityStoreTestSuite.java b/extensions/entitystore-mongodb/src/test/java/org/apache/polygene/entitystore/mongodb/MongoDBEntityStoreTestSuite.java index efe0547..c9fe8b3 100644 --- a/extensions/entitystore-mongodb/src/test/java/org/apache/polygene/entitystore/mongodb/MongoDBEntityStoreTestSuite.java +++ b/extensions/entitystore-mongodb/src/test/java/org/apache/polygene/entitystore/mongodb/MongoDBEntityStoreTestSuite.java @@ -34,7 +34,7 @@ import org.junit.jupiter.api.BeforeEach; /** * Test the MongoDBEntityStoreService. */ -@Docker( image = "mongo", +@Docker( image = "org.apache.polygene:org.apache.polygene.internal.docker-mongo", ports = @Port( exposed = 8801, inner = 27017), waitFor = @WaitFor( value = "MongoDB starting", timeoutInMillis = 30000), newForEachCase = false http://git-wip-us.apache.org/repos/asf/polygene-java/blob/ee295523/extensions/entitystore-mongodb/src/test/java/org/apache/polygene/entitystore/mongodb/MongoDBEntityStoreWithCacheTest.java ---------------------------------------------------------------------- diff --git a/extensions/entitystore-mongodb/src/test/java/org/apache/polygene/entitystore/mongodb/MongoDBEntityStoreWithCacheTest.java b/extensions/entitystore-mongodb/src/test/java/org/apache/polygene/entitystore/mongodb/MongoDBEntityStoreWithCacheTest.java index 3a257ef..fb3c850 100644 --- a/extensions/entitystore-mongodb/src/test/java/org/apache/polygene/entitystore/mongodb/MongoDBEntityStoreWithCacheTest.java +++ b/extensions/entitystore-mongodb/src/test/java/org/apache/polygene/entitystore/mongodb/MongoDBEntityStoreWithCacheTest.java @@ -34,7 +34,7 @@ import org.junit.jupiter.api.BeforeEach; /** * Test the MongoDBEntityStoreService usage with a CachePool. */ -@Docker( image = "mongo", +@Docker( image = "org.apache.polygene:org.apache.polygene.internal.docker-mongo", ports = @Port( exposed = 8801, inner = 27017), newForEachCase = false ) http://git-wip-us.apache.org/repos/asf/polygene-java/blob/ee295523/extensions/entitystore-sql/src/test/java/org/apache/polygene/entitystore/sql/MariaDbEntityStoreTest.java ---------------------------------------------------------------------- diff --git a/extensions/entitystore-sql/src/test/java/org/apache/polygene/entitystore/sql/MariaDbEntityStoreTest.java b/extensions/entitystore-sql/src/test/java/org/apache/polygene/entitystore/sql/MariaDbEntityStoreTest.java index 76fd950..259bdf9 100644 --- a/extensions/entitystore-sql/src/test/java/org/apache/polygene/entitystore/sql/MariaDbEntityStoreTest.java +++ b/extensions/entitystore-sql/src/test/java/org/apache/polygene/entitystore/sql/MariaDbEntityStoreTest.java @@ -37,12 +37,12 @@ import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Disabled; @Disabled( "Waiting response from JOOQ to fix SQL generation. VARCHAR instead of CHAR") -@Docker( image = "mariadb", ports = @Port( exposed = 8801, inner = 3306 ), +@Docker( image = "mariadb", + ports = @Port( exposed = 8801, inner = 3306 ), environments = { @Environment( key = "MYSQL_ROOT_PASSWORD", value = "" ), @Environment( key = "MYSQL_ALLOW_EMPTY_PASSWORD", value = "yes" ), - @Environment( key = "MYSQL_DATABASE", value = "jdbc_test_db" ), - @Environment( key = "MYSQL_ROOT_HOST", value = "172.17.0.1" ), + @Environment( key = "MYSQL_DATABASE", value = "jdbc_test_db" ) }, waitFor = @WaitFor( value = "mysqld: ready for connections", timeoutInMillis = 30000 ), newForEachCase = false @@ -92,6 +92,8 @@ public class MariaDbEntityStoreTest + "&nullCatalogMeansCurrent=true&nullNamePatternMatchesAll=true" ); defaults.driver().set( "com.mysql.jdbc.Driver" ); defaults.enabled().set( true ); + defaults.username().set("root"); + defaults.password().set( "" ); // START SNIPPET: assembly } // END SNIPPET: assembly @@ -100,7 +102,7 @@ public class MariaDbEntityStoreTest { try { - Thread.sleep( 500 ); + Thread.sleep( 11500 ); } catch( InterruptedException e ) { http://git-wip-us.apache.org/repos/asf/polygene-java/blob/ee295523/extensions/entitystore-sql/src/test/java/org/apache/polygene/entitystore/sql/MariaDbEntityStoreTestSuite.java ---------------------------------------------------------------------- diff --git a/extensions/entitystore-sql/src/test/java/org/apache/polygene/entitystore/sql/MariaDbEntityStoreTestSuite.java b/extensions/entitystore-sql/src/test/java/org/apache/polygene/entitystore/sql/MariaDbEntityStoreTestSuite.java index 2bd63b6..e180fa4 100644 --- a/extensions/entitystore-sql/src/test/java/org/apache/polygene/entitystore/sql/MariaDbEntityStoreTestSuite.java +++ b/extensions/entitystore-sql/src/test/java/org/apache/polygene/entitystore/sql/MariaDbEntityStoreTestSuite.java @@ -35,7 +35,8 @@ import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Disabled; @Disabled( "Waiting response from JOOQ to fix SQL generation. VARCHAR instead of CHAR") -@Docker( image = "mariadb", ports = @Port( exposed = 8801, inner = 3306), +@Docker( image = "org.apache.polygene:org.apache.polygene.internal.docker-mariadb", + ports = @Port( exposed = 8801, inner = 3306), environments = { @Environment( key = "MYSQL_ROOT_PASSWORD", value = ""), @Environment(key = "MYSQL_ALLOW_EMPTY_PASSWORD", value = "yes"), http://git-wip-us.apache.org/repos/asf/polygene-java/blob/ee295523/extensions/entitystore-sqlkv/src/test/java/org/apache/polygene/entitystore/sqlkv/MariaDbEntityStoreTest.java ---------------------------------------------------------------------- diff --git a/extensions/entitystore-sqlkv/src/test/java/org/apache/polygene/entitystore/sqlkv/MariaDbEntityStoreTest.java b/extensions/entitystore-sqlkv/src/test/java/org/apache/polygene/entitystore/sqlkv/MariaDbEntityStoreTest.java index 1f0582a..d26699c 100644 --- a/extensions/entitystore-sqlkv/src/test/java/org/apache/polygene/entitystore/sqlkv/MariaDbEntityStoreTest.java +++ b/extensions/entitystore-sqlkv/src/test/java/org/apache/polygene/entitystore/sqlkv/MariaDbEntityStoreTest.java @@ -37,7 +37,8 @@ import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Disabled; @Disabled( "Waiting response from JOOQ to fix SQL generation. VARCHAR instead of CHAR") -@Docker( image = "mariadb", ports = @Port( exposed = 8801, inner = 3306), +@Docker( image = "org.apache.polygene:org.apache.polygene.internal.docker-mariadb", + ports = @Port( exposed = 8801, inner = 3306), environments = { @Environment( key = "MYSQL_ROOT_PASSWORD", value = ""), @Environment(key = "MYSQL_ALLOW_EMPTY_PASSWORD", value = "yes"), http://git-wip-us.apache.org/repos/asf/polygene-java/blob/ee295523/extensions/entitystore-sqlkv/src/test/java/org/apache/polygene/entitystore/sqlkv/MariaDbEntityStoreTestSuite.java ---------------------------------------------------------------------- diff --git a/extensions/entitystore-sqlkv/src/test/java/org/apache/polygene/entitystore/sqlkv/MariaDbEntityStoreTestSuite.java b/extensions/entitystore-sqlkv/src/test/java/org/apache/polygene/entitystore/sqlkv/MariaDbEntityStoreTestSuite.java index 54cc22d..10d7ff2 100644 --- a/extensions/entitystore-sqlkv/src/test/java/org/apache/polygene/entitystore/sqlkv/MariaDbEntityStoreTestSuite.java +++ b/extensions/entitystore-sqlkv/src/test/java/org/apache/polygene/entitystore/sqlkv/MariaDbEntityStoreTestSuite.java @@ -35,7 +35,8 @@ import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Disabled; @Disabled( "Waiting response from JOOQ to fix SQL generation. VARCHAR instead of CHAR") -@Docker( image = "mariadb", ports = @Port( exposed = 8801, inner = 3306), +@Docker( image = "org.apache.polygene:org.apache.polygene.internal.docker-mariadb", + ports = @Port( exposed = 8801, inner = 3306), environments = { @Environment( key = "MYSQL_ROOT_PASSWORD", value = ""), @Environment(key = "MYSQL_ALLOW_EMPTY_PASSWORD", value = "yes"),
