http://git-wip-us.apache.org/repos/asf/polygene-java/blob/6ae17138/dependencies.gradle
----------------------------------------------------------------------
diff --git a/dependencies.gradle b/dependencies.gradle
index b4a8c86..8e977ca 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -17,17 +17,17 @@
  */
 import org.apache.polygene.gradle.dependencies.DependenciesDeclarationExtension
 
-def dependencies = extensions.getByType( DependenciesDeclarationExtension )
+def dependencies = extensions.getByType(DependenciesDeclarationExtension)
 
 // Gradle version
 dependencies.gradleVersion = '4.2.1'
 
 // Remote repositories
 dependencies.repositoriesUrls << [
-  mavenCentral: "https://repo1.maven.org/maven2/";,
-  restlet     : 'https://maven.restlet.com/',
-  clojars     : "https://clojars.org/repo/";,
-  oracle      : "http://download.oracle.com/maven/";
+        mavenCentral: "https://repo1.maven.org/maven2/";,
+        restlet     : 'https://maven.restlet.com/',
+        clojars     : "https://clojars.org/repo/";,
+        oracle      : "http://download.oracle.com/maven/";
 ]
 
 // Core dependencies
@@ -35,11 +35,11 @@ def asmVersion = '5.2'
 def javaxJsonVersion = '1.1'
 def osgiVersion = '4.3.1'
 dependencies.libraries << [
-  asm        : "org.ow2.asm:asm:$asmVersion",
-  asm_commons: "org.ow2.asm:asm-commons:$asmVersion",
-  asm_util   : "org.ow2.asm:asm-util:$asmVersion",
-  javax_json : "javax.json:javax.json-api:$javaxJsonVersion",
-  osgi_core  : "org.osgi:org.osgi.core:$osgiVersion",
+        asm        : "org.ow2.asm:asm:$asmVersion",
+        asm_commons: "org.ow2.asm:asm-commons:$asmVersion",
+        asm_util   : "org.ow2.asm:asm-util:$asmVersion",
+        javax_json : "javax.json:javax.json-api:$javaxJsonVersion",
+        osgi_core  : "org.osgi:org.osgi.core:$osgiVersion",
 ]
 
 // Extensions, Libraries and Tools dependencies
@@ -83,92 +83,92 @@ def springVersion = '4.3.9.RELEASE'
 def spymemcachedVersion = '2.12.3'
 def velocityVersion = '1.7'
 dependencies.libraries << [
-  bdb_je              : "com.sleepycat:je:$bdbjeVersion",
-  bonecp              : "com.jolbox:bonecp:$bonecpVersion",
-  bouncy_castle       : [
-          "org.bouncycastle:bcprov-jdk15on:$bouncyVersion",
-          "org.bouncycastle:bcpkix-jdk15on:$bouncyVersion",
-          "org.bouncycastle:bctls-jdk15on:$bouncyVersion"
-  ],
-  cassandra_client    : 
"com.datastax.cassandra:cassandra-driver-core:$cassandraClientVersion",
-  codahale_metrics    : [ 
"io.dropwizard.metrics:metrics-core:$codahaleMetricsVersion",
-                          
"io.dropwizard.metrics:metrics-healthchecks:$codahaleMetricsVersion" ],
-  commons_dbcp        : "org.apache.commons:commons-dbcp2:$commonsDbcpVersion",
-  commons_lang        : "org.apache.commons:commons-lang3:$commonsLangVersion",
-  commons_validator   : 
"commons-validator:commons-validator:$commonsValidatorVersion",
-  ehcache             : "org.ehcache:ehcache:$ehcacheVersion",
-  elasticsearch       : [ 
"org.elasticsearch:elasticsearch:$elasticsearchVersion",
-                          
"org.elasticsearch.client:transport:$elasticsearchVersion",
-                          // Elasticsearch 5.0 do not work with log4j 2.7
-                          "org.apache.logging.log4j:log4j-api:2.8.2",
-                          "org.apache.logging.log4j:log4j-core:2.8.2" ],
-  freemarker          : "org.freemarker:freemarker:$freemarkerVersion",
-  geode               : "org.apache.geode:geode-core:$geodeVersion",
-  groovy              : "org.codehaus.groovy:groovy-all:$groovyVersion",
-  hazelcast           : "com.hazelcast:hazelcast:$hazelcastVersion",
-  http_client         : 
"org.apache.httpcomponents:httpclient:$httpClientVersion",
-  jackson_mapper      : 
"com.fasterxml.jackson.core:jackson-databind:$jacksonVersion",
-  jaxb_api            : "javax.xml.bind:jaxb-api:$jaxbApiVersion",
-  jclouds_core        : "org.apache.jclouds:jclouds-core:$jcloudsVersion",
-  jclouds_blobstore   : 
"org.apache.jclouds:jclouds-allblobstore:$jcloudsVersion",
-  jclouds_filesystem  : "org.apache.jclouds.api:filesystem:$jcloudsVersion",
-  jetty_server        : "org.eclipse.jetty:jetty-server:$jettyVersion",
-  jetty_webapp        : "org.eclipse.jetty:jetty-webapp:$jettyVersion",
-  jetty_servlet       : "org.eclipse.jetty:jetty-servlet:$jettyVersion",
-  jetty_http          : "org.eclipse.jetty:jetty-http:$jettyVersion",
-  jetty_io            : "org.eclipse.jetty:jetty-io:$jettyVersion",
-  jetty_jmx           : "org.eclipse.jetty:jetty-jmx:$jettyVersion",
-  jetty_security      : "org.eclipse.jetty:jetty-security:$jettyVersion",
-  jetty_jsp           : "org.eclipse.jetty:jetty-jsp:$jettyVersion",
-  jetty_util          : "org.eclipse.jetty:jetty-util:$jettyVersion",
-  jetty_continuation  : "org.eclipse.jetty:jetty-continuation:$jettyVersion",
-  jetty_client        : "org.eclipse.jetty:jetty-client:$jettyVersion",
-  jetty_xml           : "org.eclipse.jetty:jetty-xml:$jettyVersion",
-  johnzon             : "org.apache.johnzon:johnzon-core:$johnzonVersion",
-  jooq                : "org.jooq:jooq:$jooqVersion",
-  jdbm                : "jdbm:jdbm:$jdbmVersion",
-  jedis               : "redis.clients:jedis:$jedisVersion",
-  leveldb_api         : "org.iq80.leveldb:leveldb-api:$leveldbVersion",
-  leveldb_java        : "org.iq80.leveldb:leveldb:$leveldbVersion",
-  leveldb_jni_all     : 
"org.fusesource.leveldbjni:leveldbjni-all:$leveldbJniVersion",
-  liquibase           : "org.liquibase:liquibase-core:$liquibaseVersion",
-  mongodb             : "org.mongodb:mongo-java-driver:$mongodbVersion",
-  msgpack             : "org.msgpack:msgpack-core:$msgpackVersion",
-  osgi_compendium     : "org.osgi:org.osgi.compendium:$osgiVersion",
-  osgi_enterprise     : "org.osgi:org.osgi.enterprise:$osgiVersion",
-  restlet             : [ "org.restlet.jee:org.restlet:$restletVersion",
-                          
"org.restlet.jee:org.restlet.ext.atom:$restletVersion",
-                          
"org.restlet.jee:org.restlet.ext.servlet:$restletVersion",
-                          
"org.restlet.jee:org.restlet.ext.slf4j:$restletVersion" ],
-  restlet_xml         : "org.restlet.jee:org.restlet.ext.xml:$restletVersion",
-  riak                : "com.basho.riak:riak-client:$riakVersion",
-  servlet_api         : "javax.servlet:javax.servlet-api:$servletVersion",
-  sesame              : [ "org.openrdf.sesame:sesame-model:$rdfVersion",
-                          
"org.openrdf.sesame:sesame-queryparser-sparql:$rdfVersion",
-                          
"org.openrdf.sesame:sesame-repository-dataset:$rdfVersion",
-                          
"org.openrdf.sesame:sesame-repository-http:$rdfVersion",
-                          "org.openrdf.sesame:sesame-rio-api:$rdfVersion",
-                          "org.openrdf.sesame:sesame-rio-n3:$rdfVersion",
-                          "org.openrdf.sesame:sesame-rio-ntriples:$rdfVersion",
-                          "org.openrdf.sesame:sesame-rio-rdfxml:$rdfVersion",
-                          "org.openrdf.sesame:sesame-rio-trig:$rdfVersion",
-                          "org.openrdf.sesame:sesame-rio-trix:$rdfVersion",
-                          "org.openrdf.sesame:sesame-rio-turtle:$rdfVersion",
-                          "org.openrdf.sesame:sesame-sail-api:$rdfVersion",
-                          "org.openrdf.sesame:sesame-sail-memory:$rdfVersion",
-                          
"org.openrdf.sesame:sesame-sail-nativerdf:$rdfVersion",
-                          "org.openrdf.sesame:sesame-sail-rdbms:$rdfVersion" ],
-  shiro               : "org.apache.shiro:shiro-core:$shiroVersion",
-  shiro_web           : "org.apache.shiro:shiro-web:$shiroVersion",
-  slf4j_api           : "org.slf4j:slf4j-api:$slf4jVersion",
-  solr                : [ "org.apache.solr:solr-core:$solrVersion",
-                          "org.apache.solr:solr-solrj:$solrVersion" ],
-  sparql              : [ 
"org.openrdf.sesame:sesame-queryresultio-sparqlxml:$rdfVersion",
-                          
"org.openrdf.sesame:sesame-queryresultio-sparqljson:$rdfVersion" ],
-  spring_core         : [ "org.springframework:spring-beans:$springVersion",
-                          "org.springframework:spring-context:$springVersion" 
],
-  spymemcached        : "net.spy:spymemcached:$spymemcachedVersion",
-  velocity            : "org.apache.velocity:velocity:$velocityVersion",
+        bdb_je            : "com.sleepycat:je:$bdbjeVersion",
+        bonecp            : "com.jolbox:bonecp:$bonecpVersion",
+        bouncy_castle     : [
+                "org.bouncycastle:bcprov-jdk15on:$bouncyVersion",
+                "org.bouncycastle:bcpkix-jdk15on:$bouncyVersion",
+                "org.bouncycastle:bctls-jdk15on:$bouncyVersion"
+        ],
+        cassandra_client  : 
"com.datastax.cassandra:cassandra-driver-core:$cassandraClientVersion",
+        codahale_metrics  : 
["io.dropwizard.metrics:metrics-core:$codahaleMetricsVersion",
+                             
"io.dropwizard.metrics:metrics-healthchecks:$codahaleMetricsVersion"],
+        commons_dbcp      : 
"org.apache.commons:commons-dbcp2:$commonsDbcpVersion",
+        commons_lang      : 
"org.apache.commons:commons-lang3:$commonsLangVersion",
+        commons_validator : 
"commons-validator:commons-validator:$commonsValidatorVersion",
+        ehcache           : "org.ehcache:ehcache:$ehcacheVersion",
+        elasticsearch     : 
["org.elasticsearch:elasticsearch:$elasticsearchVersion",
+                             
"org.elasticsearch.client:transport:$elasticsearchVersion",
+                             // Elasticsearch 5.0 do not work with log4j 2.7
+                             "org.apache.logging.log4j:log4j-api:2.8.2",
+                             "org.apache.logging.log4j:log4j-core:2.8.2"],
+        freemarker        : "org.freemarker:freemarker:$freemarkerVersion",
+        geode             : "org.apache.geode:geode-core:$geodeVersion",
+        groovy            : "org.codehaus.groovy:groovy-all:$groovyVersion",
+        hazelcast         : "com.hazelcast:hazelcast:$hazelcastVersion",
+        http_client       : 
"org.apache.httpcomponents:httpclient:$httpClientVersion",
+        jackson_mapper    : 
"com.fasterxml.jackson.core:jackson-databind:$jacksonVersion",
+        jaxb_api          : "javax.xml.bind:jaxb-api:$jaxbApiVersion",
+        jclouds_core      : "org.apache.jclouds:jclouds-core:$jcloudsVersion",
+        jclouds_blobstore : 
"org.apache.jclouds:jclouds-allblobstore:$jcloudsVersion",
+        jclouds_filesystem: 
"org.apache.jclouds.api:filesystem:$jcloudsVersion",
+        jetty_server      : "org.eclipse.jetty:jetty-server:$jettyVersion",
+        jetty_webapp      : "org.eclipse.jetty:jetty-webapp:$jettyVersion",
+        jetty_servlet     : "org.eclipse.jetty:jetty-servlet:$jettyVersion",
+        jetty_http        : "org.eclipse.jetty:jetty-http:$jettyVersion",
+        jetty_io          : "org.eclipse.jetty:jetty-io:$jettyVersion",
+        jetty_jmx         : "org.eclipse.jetty:jetty-jmx:$jettyVersion",
+        jetty_security    : "org.eclipse.jetty:jetty-security:$jettyVersion",
+        jetty_jsp         : "org.eclipse.jetty:jetty-jsp:$jettyVersion",
+        jetty_util        : "org.eclipse.jetty:jetty-util:$jettyVersion",
+        jetty_continuation: 
"org.eclipse.jetty:jetty-continuation:$jettyVersion",
+        jetty_client      : "org.eclipse.jetty:jetty-client:$jettyVersion",
+        jetty_xml         : "org.eclipse.jetty:jetty-xml:$jettyVersion",
+        johnzon           : "org.apache.johnzon:johnzon-core:$johnzonVersion",
+        jooq              : "org.jooq:jooq:$jooqVersion",
+        jdbm              : "jdbm:jdbm:$jdbmVersion",
+        jedis             : "redis.clients:jedis:$jedisVersion",
+        leveldb_api       : "org.iq80.leveldb:leveldb-api:$leveldbVersion",
+        leveldb_java      : "org.iq80.leveldb:leveldb:$leveldbVersion",
+        leveldb_jni_all   : 
"org.fusesource.leveldbjni:leveldbjni-all:$leveldbJniVersion",
+        liquibase         : "org.liquibase:liquibase-core:$liquibaseVersion",
+        mongodb           : "org.mongodb:mongo-java-driver:$mongodbVersion",
+        msgpack           : "org.msgpack:msgpack-core:$msgpackVersion",
+        osgi_compendium   : "org.osgi:org.osgi.compendium:$osgiVersion",
+        osgi_enterprise   : "org.osgi:org.osgi.enterprise:$osgiVersion",
+        restlet           : ["org.restlet.jee:org.restlet:$restletVersion",
+                             
"org.restlet.jee:org.restlet.ext.atom:$restletVersion",
+                             
"org.restlet.jee:org.restlet.ext.servlet:$restletVersion",
+                             
"org.restlet.jee:org.restlet.ext.slf4j:$restletVersion"],
+        restlet_xml       : 
"org.restlet.jee:org.restlet.ext.xml:$restletVersion",
+        riak              : "com.basho.riak:riak-client:$riakVersion",
+        servlet_api       : "javax.servlet:javax.servlet-api:$servletVersion",
+        sesame            : ["org.openrdf.sesame:sesame-model:$rdfVersion",
+                             
"org.openrdf.sesame:sesame-queryparser-sparql:$rdfVersion",
+                             
"org.openrdf.sesame:sesame-repository-dataset:$rdfVersion",
+                             
"org.openrdf.sesame:sesame-repository-http:$rdfVersion",
+                             "org.openrdf.sesame:sesame-rio-api:$rdfVersion",
+                             "org.openrdf.sesame:sesame-rio-n3:$rdfVersion",
+                             
"org.openrdf.sesame:sesame-rio-ntriples:$rdfVersion",
+                             
"org.openrdf.sesame:sesame-rio-rdfxml:$rdfVersion",
+                             "org.openrdf.sesame:sesame-rio-trig:$rdfVersion",
+                             "org.openrdf.sesame:sesame-rio-trix:$rdfVersion",
+                             
"org.openrdf.sesame:sesame-rio-turtle:$rdfVersion",
+                             "org.openrdf.sesame:sesame-sail-api:$rdfVersion",
+                             
"org.openrdf.sesame:sesame-sail-memory:$rdfVersion",
+                             
"org.openrdf.sesame:sesame-sail-nativerdf:$rdfVersion",
+                             
"org.openrdf.sesame:sesame-sail-rdbms:$rdfVersion"],
+        shiro             : "org.apache.shiro:shiro-core:$shiroVersion",
+        shiro_web         : "org.apache.shiro:shiro-web:$shiroVersion",
+        slf4j_api         : "org.slf4j:slf4j-api:$slf4jVersion",
+        solr              : ["org.apache.solr:solr-core:$solrVersion",
+                             "org.apache.solr:solr-solrj:$solrVersion"],
+        sparql            : 
["org.openrdf.sesame:sesame-queryresultio-sparqlxml:$rdfVersion",
+                             
"org.openrdf.sesame:sesame-queryresultio-sparqljson:$rdfVersion"],
+        spring_core       : ["org.springframework:spring-beans:$springVersion",
+                             
"org.springframework:spring-context:$springVersion"],
+        spymemcached      : "net.spy:spymemcached:$spymemcachedVersion",
+        velocity          : "org.apache.velocity:velocity:$velocityVersion",
 ]
 
 // Tools dependencies
@@ -176,9 +176,9 @@ def jgoodiesLooksVersion = '2.7.0'
 def pdfboxVersion = '2.0.6'
 def prefuseVersion = '1.0.1'
 dependencies.libraries << [
-  jgoodies_looks: "com.jgoodies:jgoodies-looks:$jgoodiesLooksVersion",
-  pdfbox        : "org.apache.pdfbox:pdfbox:$pdfboxVersion",
-  prefuse       : "de.sciss:prefuse-core:$prefuseVersion",
+        jgoodies_looks: "com.jgoodies:jgoodies-looks:$jgoodiesLooksVersion",
+        pdfbox        : "org.apache.pdfbox:pdfbox:$pdfboxVersion",
+        prefuse       : "de.sciss:prefuse-core:$prefuseVersion",
 ]
 
 // Runtime, Test and Samples dependencies
@@ -189,7 +189,7 @@ def easyMockVersion = '3.4'
 def h2Version = '1.4.196'
 def hamcrestVersion = '1.3'
 def jaxRsApiVersion = '2.0.1'
-def junitVersion = '4.12'
+def junitVersion = '5.1.1'
 def logbackVersion = '1.2.3' // TODO Replace with Apache Log4j 2
 def mockitoVersion = '2.8.47'
 def mysqlVersion = '6.0.6'
@@ -197,93 +197,89 @@ def postgresqlVersion = '42.1.4'
 def sqliteVersion = '3.19.3'
 def xmlUnitVersion = '2.3.0'
 dependencies.libraries << [
-  awaitility        : "org.awaitility:awaitility:$awaitilityVersion",
-  derby             : "org.apache.derby:derby:$derbyVersion",
-  dnsjava           : "dnsjava:dnsjava:$dnsJavaVersion",
-  docker_junit      : 
"com.github.tdomzal:junit-docker-rule:$dockerJUnitVersion",
-  easymock          : "org.easymock:easymock:$easyMockVersion",
-  h2                : "com.h2database:h2:$h2Version",
-  hamcrest          : [ "org.hamcrest:hamcrest-core:$hamcrestVersion",
-                        "org.hamcrest:hamcrest-library:$hamcrestVersion" ],
-  junit             : "junit:junit:$junitVersion",
-  logback           : "ch.qos.logback:logback-classic:$logbackVersion",
-  mockito           : "org.mockito:mockito-core:$mockitoVersion",
-  mysql_connector   : "mysql:mysql-connector-java:$mysqlVersion",
-  postgres          : "org.postgresql:postgresql:$postgresqlVersion",
-  spring_testsupport: "org.springframework:spring-test:$springVersion",
-  sqlite            : "org.xerial:sqlite-jdbc:$sqliteVersion",
-  xmlunit           : "org.xmlunit:xmlunit-matchers:$xmlUnitVersion",
+        awaitility        : "org.awaitility:awaitility:$awaitilityVersion",
+        derby             : "org.apache.derby:derby:$derbyVersion",
+        dnsjava           : "dnsjava:dnsjava:$dnsJavaVersion",
+        docker_junit      : 
"com.github.tdomzal:junit-docker-rule:$dockerJUnitVersion",
+        easymock          : "org.easymock:easymock:$easyMockVersion",
+        h2                : "com.h2database:h2:$h2Version",
+        hamcrest          : ["org.hamcrest:hamcrest-core:$hamcrestVersion",
+                             "org.hamcrest:hamcrest-library:$hamcrestVersion"],
+        junit             : 
["org.junit.jupiter:junit-jupiter-api:$junitVersion",
+                             
"org.junit.jupiter:junit-jupiter-params:$junitVersion"
+        ],
+        junit_vintage     : 
"org.junit.vintage:junit-vintage-engine:$junitVersion",
+
+        logback           : "ch.qos.logback:logback-classic:$logbackVersion",
+        mockito           : "org.mockito:mockito-core:$mockitoVersion",
+        mysql_connector   : "mysql:mysql-connector-java:$mysqlVersion",
+        postgres          : "org.postgresql:postgresql:$postgresqlVersion",
+        spring_testsupport: "org.springframework:spring-test:$springVersion",
+        sqlite            : "org.xerial:sqlite-jdbc:$sqliteVersion",
+        xmlunit           : "org.xmlunit:xmlunit-matchers:$xmlUnitVersion",
 ]
 
 // Default dependencies
 dependencies.defaultDependencies << [
-  testImplementation: [ dependencies.libraries.junit, 
dependencies.libraries.hamcrest ]
+        testImplementation: [dependencies.libraries.junit, 
dependencies.libraries.hamcrest]
 ]
 
 // Resolution rules
 dependencies.dependencySubstitutionSpec = { DependencySubstitution 
substitution, ModuleComponentSelector dep ->
-  // Always resolve ASM to the same version
-  if( dep.group == 'org.ow2.asm' )
-  {
-    substitution.useTarget group: dep.group, name: dep.module, version: 
asmVersion
-  }
-  // Always resolve OSGi to the same version
-  else if( dep.group == 'org.osgi' )
-  {
-    substitution.useTarget group: dep.group, name: dep.module, version: 
osgiVersion
-  }
-  // Always resolve SLF4J to the same version
-  else if( dep.group == 'org.slf4j' )
-  {
-    substitution.useTarget group: dep.group, name: dep.module, version: 
slf4jVersion
-  }
-  // Always resolve Jackson to the same version
-  else if( dep.group.startsWith( 'com.fasterxml.jackson' ) && dep.module != 
'jackson-parent' )
-  {
-    substitution.useTarget group: dep.group, name: dep.module, version: 
jacksonVersion
-  }
-  // Always resolve JAX-RS API to the same version
-  else if( [ 'jaxrs-api', 'jsr311-api', 'javax.ws.rs-api' ].contains( 
dep.module ) )
-  {
-    substitution.useTarget group: 'javax.ws.rs', name: 'javax.ws.rs-api', 
version: jaxRsApiVersion
-  }
-  // woodstox:wstx-asl is broken (no pom), use org.codehaus.woodstox:wstx-asl 
instead
-  else if( dep.group == 'woodstox' && dep.module == 'wstx-asl' )
-  {
-    substitution.useTarget group: 'org.codehaus.woodstox', name: 'wstx-asl', 
version: dep.version
-  }
-  // some bad citizens have SNAPSHOT parents ...
-  else if( dep.module == 'commons-sandbox-parent' && dep.version == 
'3-SNAPSHOT' )
-  {
-    substitution.useTarget group: dep.group, name: dep.module, version: '3'
-  }
-  // Findbugs Annotation is LGPL, use 
https://github.com/stephenc/findbugs-annotations which is
-  // Apache 2 licensed instead
-  else if( dep.group == 'net.sourceforge.findbugs' && dep.module == 
'annotations' )
-  {
-    substitution.useTarget group: 'com.github.stephenc.findbugs', name: 
'findbugs-annotations', version: '1.3.9-1'
-  }
+    // Always resolve ASM to the same version
+    if (dep.group == 'org.ow2.asm') {
+        substitution.useTarget group: dep.group, name: dep.module, version: 
asmVersion
+    }
+    // Always resolve OSGi to the same version
+    else if (dep.group == 'org.osgi') {
+        substitution.useTarget group: dep.group, name: dep.module, version: 
osgiVersion
+    }
+    // Always resolve SLF4J to the same version
+    else if (dep.group == 'org.slf4j') {
+        substitution.useTarget group: dep.group, name: dep.module, version: 
slf4jVersion
+    }
+    // Always resolve Jackson to the same version
+    else if (dep.group.startsWith('com.fasterxml.jackson') && dep.module != 
'jackson-parent') {
+        substitution.useTarget group: dep.group, name: dep.module, version: 
jacksonVersion
+    }
+    // Always resolve JAX-RS API to the same version
+    else if (['jaxrs-api', 'jsr311-api', 
'javax.ws.rs-api'].contains(dep.module)) {
+        substitution.useTarget group: 'javax.ws.rs', name: 'javax.ws.rs-api', 
version: jaxRsApiVersion
+    }
+    // woodstox:wstx-asl is broken (no pom), use 
org.codehaus.woodstox:wstx-asl instead
+    else if (dep.group == 'woodstox' && dep.module == 'wstx-asl') {
+        substitution.useTarget group: 'org.codehaus.woodstox', name: 
'wstx-asl', version: dep.version
+    }
+    // some bad citizens have SNAPSHOT parents ...
+    else if (dep.module == 'commons-sandbox-parent' && dep.version == 
'3-SNAPSHOT') {
+        substitution.useTarget group: dep.group, name: dep.module, version: '3'
+    }
+    // Findbugs Annotation is LGPL, use 
https://github.com/stephenc/findbugs-annotations which is
+    // Apache 2 licensed instead
+    else if (dep.group == 'net.sourceforge.findbugs' && dep.module == 
'annotations') {
+        substitution.useTarget group: 'com.github.stephenc.findbugs', name: 
'findbugs-annotations', version: '1.3.9-1'
+    }
 }
 
 // NodeJS
 dependencies.nodeVersions << [
-    node: '6.10.2',
-    npm: '4.4.4'
+        node: '6.10.2',
+        npm : '4.4.4'
 ]
 
 // Build Tools
 dependencies.buildToolsVersions << [
-  jacoco: '0.7.9'
+        jacoco: '0.7.9'
 ]
 
 // Docker Images
 dependencies.dockerImagesVersions << [
-  cassandra: 'cassandra:3.10',
-  memcached: 'memcached:1.4.39-alpine',
-  mariadb  : 'mariadb:10.1.21',
-  mongo    : 'mongo:3.5.10',
-  postgres : 'postgres:9.6.3-alpine',
-  redis    : 'redis:4.0.0-alpine',
-  riak     : 'basho/riak-kv:ubuntu-2.2.3',
-  s3server : 'scality/s3server:mem-bb2a38c0'
+        cassandra: 'cassandra:3.10',
+        memcached: 'memcached:1.4.39-alpine',
+        mariadb  : 'mariadb:10.1.21',
+        mongo    : 'mongo:3.5.10',
+        postgres : 'postgres:9.6.3-alpine',
+        redis    : 'redis:4.0.0-alpine',
+        riak     : 'basho/riak-kv:ubuntu-2.2.3',
+        s3server : 'scality/s3server:mem-bb2a38c0'
 ]

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/6ae17138/etc/codestyle-idea.jar
----------------------------------------------------------------------
diff --git a/etc/codestyle-idea.jar b/etc/codestyle-idea.jar
deleted file mode 100644
index 2211df1..0000000
Binary files a/etc/codestyle-idea.jar and /dev/null differ

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/6ae17138/extensions/cache-ehcache/build.gradle
----------------------------------------------------------------------
diff --git a/extensions/cache-ehcache/build.gradle 
b/extensions/cache-ehcache/build.gradle
index c61a790..02d6266 100644
--- a/extensions/cache-ehcache/build.gradle
+++ b/extensions/cache-ehcache/build.gradle
@@ -34,6 +34,7 @@ dependencies {
   runtimeOnly polygene.core.runtime
 
   testImplementation polygene.core.testsupport
+  testImplementation libraries.junit_vintage
 
   testRuntimeOnly libraries.logback
 }

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/6ae17138/extensions/entitystore-berkeleydb/build.gradle
----------------------------------------------------------------------
diff --git a/extensions/entitystore-berkeleydb/build.gradle 
b/extensions/entitystore-berkeleydb/build.gradle
index ea14aef..5b03d21 100644
--- a/extensions/entitystore-berkeleydb/build.gradle
+++ b/extensions/entitystore-berkeleydb/build.gradle
@@ -36,6 +36,7 @@ dependencies {
     runtimeOnly polygene.core.runtime
 
     testImplementation polygene.internals.testsupport
+    testImplementation libraries.junit_vintage
 
     testRuntimeOnly libraries.logback
 }

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/6ae17138/extensions/entitystore-file/build.gradle
----------------------------------------------------------------------
diff --git a/extensions/entitystore-file/build.gradle 
b/extensions/entitystore-file/build.gradle
index b430e7d..eee1277 100644
--- a/extensions/entitystore-file/build.gradle
+++ b/extensions/entitystore-file/build.gradle
@@ -31,6 +31,7 @@ dependencies {
 
   runtimeOnly polygene.core.runtime
   testImplementation polygene.core.testsupport
+  testImplementation libraries.junit_vintage
 
   testRuntimeOnly libraries.logback
 }

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/6ae17138/extensions/entitystore-hazelcast/src/test/java/org/apache/polygene/entitystore/hazelcast/HazelcastEntityStoreTest.java
----------------------------------------------------------------------
diff --git 
a/extensions/entitystore-hazelcast/src/test/java/org/apache/polygene/entitystore/hazelcast/HazelcastEntityStoreTest.java
 
b/extensions/entitystore-hazelcast/src/test/java/org/apache/polygene/entitystore/hazelcast/HazelcastEntityStoreTest.java
index c159995..15215a3 100644
--- 
a/extensions/entitystore-hazelcast/src/test/java/org/apache/polygene/entitystore/hazelcast/HazelcastEntityStoreTest.java
+++ 
b/extensions/entitystore-hazelcast/src/test/java/org/apache/polygene/entitystore/hazelcast/HazelcastEntityStoreTest.java
@@ -26,8 +26,8 @@ import org.apache.polygene.bootstrap.ModuleAssembly;
 import 
org.apache.polygene.entitystore.hazelcast.assembly.HazelcastEntityStoreAssembler;
 import org.apache.polygene.test.EntityTestAssembler;
 import org.apache.polygene.test.entity.AbstractEntityStoreTest;
-import org.junit.After;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
 
 public class HazelcastEntityStoreTest
     extends AbstractEntityStoreTest
@@ -55,7 +55,7 @@ public class HazelcastEntityStoreTest
         
super.givenConcurrentUnitOfWorksWhenUoWCompletesThenCheckConcurrentModification();
     }
 
-    @After
+    @AfterEach
     @Override
     public void tearDown()
     {

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/6ae17138/extensions/entitystore-hazelcast/src/test/java/org/apache/polygene/entitystore/hazelcast/HazelcastEntityStoreTestSuite.java
----------------------------------------------------------------------
diff --git 
a/extensions/entitystore-hazelcast/src/test/java/org/apache/polygene/entitystore/hazelcast/HazelcastEntityStoreTestSuite.java
 
b/extensions/entitystore-hazelcast/src/test/java/org/apache/polygene/entitystore/hazelcast/HazelcastEntityStoreTestSuite.java
index e1334b1..20eb50c 100644
--- 
a/extensions/entitystore-hazelcast/src/test/java/org/apache/polygene/entitystore/hazelcast/HazelcastEntityStoreTestSuite.java
+++ 
b/extensions/entitystore-hazelcast/src/test/java/org/apache/polygene/entitystore/hazelcast/HazelcastEntityStoreTestSuite.java
@@ -23,7 +23,7 @@ import org.apache.polygene.api.common.Visibility;
 import org.apache.polygene.bootstrap.ModuleAssembly;
 import 
org.apache.polygene.entitystore.hazelcast.assembly.HazelcastEntityStoreAssembler;
 import org.apache.polygene.test.entity.model.EntityStoreTestSuite;
-import org.junit.After;
+import org.junit.jupiter.api.AfterEach;
 
 public class HazelcastEntityStoreTestSuite extends EntityStoreTestSuite
 {
@@ -37,7 +37,7 @@ public class HazelcastEntityStoreTestSuite extends 
EntityStoreTestSuite
             .assemble( module );
     }
 
-    @After
+    @AfterEach
     @Override
     public void tearDown()
     {

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/6ae17138/extensions/entitystore-jclouds/build.gradle
----------------------------------------------------------------------
diff --git a/extensions/entitystore-jclouds/build.gradle 
b/extensions/entitystore-jclouds/build.gradle
index 8db7d5c..4436c4b 100644
--- a/extensions/entitystore-jclouds/build.gradle
+++ b/extensions/entitystore-jclouds/build.gradle
@@ -38,6 +38,7 @@ dependencies {
 
   testImplementation polygene.internals.testsupport
   testImplementation libraries.jclouds_filesystem
+  testImplementation libraries.junit_vintage
 
   testRuntimeOnly libraries.logback
 }

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/6ae17138/extensions/entitystore-jdbm/build.gradle
----------------------------------------------------------------------
diff --git a/extensions/entitystore-jdbm/build.gradle 
b/extensions/entitystore-jdbm/build.gradle
index c195e0c..8776f8d 100644
--- a/extensions/entitystore-jdbm/build.gradle
+++ b/extensions/entitystore-jdbm/build.gradle
@@ -34,6 +34,7 @@ dependencies {
   runtimeOnly polygene.core.runtime
 
   testImplementation polygene.core.testsupport
+  testImplementation libraries.junit_vintage
 
   testRuntimeOnly libraries.logback
 }

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/6ae17138/extensions/entitystore-leveldb/build.gradle
----------------------------------------------------------------------
diff --git a/extensions/entitystore-leveldb/build.gradle 
b/extensions/entitystore-leveldb/build.gradle
index 98b8460..c6fd615 100644
--- a/extensions/entitystore-leveldb/build.gradle
+++ b/extensions/entitystore-leveldb/build.gradle
@@ -36,6 +36,7 @@ dependencies {
   runtimeOnly libraries.leveldb_jni_all
 
   testImplementation polygene.core.testsupport
+  testImplementation libraries.junit_vintage
 
   testRuntimeOnly libraries.logback
 }

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/6ae17138/extensions/entitystore-preferences/build.gradle
----------------------------------------------------------------------
diff --git a/extensions/entitystore-preferences/build.gradle 
b/extensions/entitystore-preferences/build.gradle
index f875219..b60e354 100644
--- a/extensions/entitystore-preferences/build.gradle
+++ b/extensions/entitystore-preferences/build.gradle
@@ -30,6 +30,7 @@ dependencies {
   runtimeOnly polygene.core.runtime
 
   testImplementation polygene.core.testsupport
+  testImplementation libraries.junit_vintage
 
   testRuntimeOnly libraries.logback
 }

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/6ae17138/extensions/entitystore-sql/build.gradle
----------------------------------------------------------------------
diff --git a/extensions/entitystore-sql/build.gradle 
b/extensions/entitystore-sql/build.gradle
index cd94f15..a39f75d 100644
--- a/extensions/entitystore-sql/build.gradle
+++ b/extensions/entitystore-sql/build.gradle
@@ -34,8 +34,9 @@ dependencies {
   testImplementation polygene.internals.testsupport
   testImplementation polygene.library( 'sql-dbcp' )
   testImplementation polygene.library( 'sql-bonecp' )
-  testImplementation libraries.docker_junit
+  testImplementation (libraries.docker_junit ) { exclude group: "junit", 
module: "junit" }
   testImplementation libraries.h2
+  testImplementation libraries.junit_vintage
 
   testRuntimeOnly libraries.logback
   testRuntimeOnly libraries.derby

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/6ae17138/extensions/entitystore-sqlkv/build.gradle
----------------------------------------------------------------------
diff --git a/extensions/entitystore-sqlkv/build.gradle 
b/extensions/entitystore-sqlkv/build.gradle
index f86274c..5a6bec2 100644
--- a/extensions/entitystore-sqlkv/build.gradle
+++ b/extensions/entitystore-sqlkv/build.gradle
@@ -33,7 +33,7 @@ dependencies {
 
   testImplementation polygene.internals.testsupport
   testImplementation polygene.library( 'sql-dbcp' )
-  testImplementation libraries.docker_junit
+  testImplementation (libraries.docker_junit ) { exclude group: "junit", 
module: "junit" }
 
   testRuntimeOnly libraries.logback
   testRuntimeOnly libraries.derby

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/6ae17138/extensions/indexing-elasticsearch/build.gradle
----------------------------------------------------------------------
diff --git a/extensions/indexing-elasticsearch/build.gradle 
b/extensions/indexing-elasticsearch/build.gradle
index fac6eec..671b48e 100644
--- a/extensions/indexing-elasticsearch/build.gradle
+++ b/extensions/indexing-elasticsearch/build.gradle
@@ -34,6 +34,6 @@ dependencies {
   runtimeOnly polygene.core.runtime
 
   testImplementation polygene.core.testsupport
-
+  testImplementation libraries.junit_vintage
   testRuntimeOnly libraries.logback
 }

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/6ae17138/extensions/indexing-elasticsearch/src/test/java/org/apache/polygene/index/elasticsearch/ElasticSearchQueryTest.java
----------------------------------------------------------------------
diff --git 
a/extensions/indexing-elasticsearch/src/test/java/org/apache/polygene/index/elasticsearch/ElasticSearchQueryTest.java
 
b/extensions/indexing-elasticsearch/src/test/java/org/apache/polygene/index/elasticsearch/ElasticSearchQueryTest.java
index 7843c26..4763257 100644
--- 
a/extensions/indexing-elasticsearch/src/test/java/org/apache/polygene/index/elasticsearch/ElasticSearchQueryTest.java
+++ 
b/extensions/indexing-elasticsearch/src/test/java/org/apache/polygene/index/elasticsearch/ElasticSearchQueryTest.java
@@ -33,7 +33,7 @@ import org.apache.polygene.test.util.NotYetImplemented;
 import org.junit.BeforeClass;
 import org.junit.ClassRule;
 import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.junit.rules.TemporaryFolder;
 import org.junit.rules.TestName;
 

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/6ae17138/extensions/indexing-elasticsearch/src/test/java/org/apache/polygene/index/elasticsearch/ElasticSearchTest.java
----------------------------------------------------------------------
diff --git 
a/extensions/indexing-elasticsearch/src/test/java/org/apache/polygene/index/elasticsearch/ElasticSearchTest.java
 
b/extensions/indexing-elasticsearch/src/test/java/org/apache/polygene/index/elasticsearch/ElasticSearchTest.java
index c6578f0..6935ff2 100644
--- 
a/extensions/indexing-elasticsearch/src/test/java/org/apache/polygene/index/elasticsearch/ElasticSearchTest.java
+++ 
b/extensions/indexing-elasticsearch/src/test/java/org/apache/polygene/index/elasticsearch/ElasticSearchTest.java
@@ -41,7 +41,7 @@ import org.apache.polygene.test.EntityTestAssembler;
 import org.junit.BeforeClass;
 import org.junit.ClassRule;
 import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.junit.rules.TemporaryFolder;
 import org.junit.rules.TestName;
 
@@ -50,8 +50,9 @@ import static 
org.apache.polygene.api.query.QueryExpressions.ne;
 import static org.apache.polygene.api.query.QueryExpressions.not;
 import static org.apache.polygene.api.query.QueryExpressions.templateFor;
 import static org.apache.polygene.test.util.Assume.assumeNoIbmJdk;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.core.IsEqual.equalTo;
+import static org.hamcrest.core.IsNull.notNullValue;
 
 public class ElasticSearchTest
     extends AbstractPolygeneTest
@@ -202,47 +203,47 @@ public class ElasticSearchTest
 
         QueryBuilder<Post> queryBuilder = queryBuilderFactory.newQueryBuilder( 
Post.class );
         Query<Post> query = uow.newQuery( queryBuilder );
-        assertEquals( 1, query.count() );
+        assertThat( query.count(), equalTo( 1 ) );
         post = query.find();
-        assertNotNull( post );
-        assertEquals( title, post.title().get() );
+        assertThat( post, notNullValue() );
+        assertThat( post.title().get(), equalTo( title ) );
 
         post = templateFor( Post.class );
         queryBuilder = queryBuilderFactory.newQueryBuilder( Post.class 
).where( eq( post.title(), title ) );
         query = uow.newQuery( queryBuilder );
-        assertEquals( 1, query.count() );
+        assertThat( query.count(), equalTo( 1 ) );
         post = query.find();
-        assertNotNull( post );
-        assertEquals( title, post.title().get() );
+        assertThat( post, notNullValue() );
+        assertThat( post.title().get(), equalTo( title ) );
 
         post = templateFor( Post.class );
         queryBuilder = queryBuilderFactory.newQueryBuilder( Post.class )
                                           .where( eq( post.title(), "Not 
available" ) );
         query = uow.newQuery( queryBuilder );
-        assertEquals( 0, query.count() );
+        assertThat( query.count(), equalTo( 0 ) );
 
         post = templateFor( Post.class );
         queryBuilder = queryBuilderFactory.newQueryBuilder( Post.class )
                                           .where( ne( post.title(), "Not 
available" ) );
         query = uow.newQuery( queryBuilder );
-        assertEquals( 1, query.count() );
+        assertThat( query.count(), equalTo( 1 ) );
 
         post = templateFor( Post.class );
         queryBuilder = queryBuilderFactory.newQueryBuilder( Post.class )
                                           .where( not( eq( post.title(), "Not 
available" ) ) );
         query = uow.newQuery( queryBuilder );
         post = query.find();
-        assertNotNull( post );
-        assertEquals( title, post.title().get() );
+        assertThat( post, notNullValue() );
+        assertThat( post.title().get(), equalTo( title ) );
 
         post = templateFor( Post.class );
         queryBuilder = queryBuilderFactory.newQueryBuilder( Post.class )
                                           .where( eq( 
post.author().get().nickname(), "eskatos" ) );
         query = uow.newQuery( queryBuilder );
-        assertEquals( 1, query.count() );
+        assertThat( query.count(), equalTo( 1 ) );
         post = query.find();
-        assertNotNull( post );
-        assertEquals( title, post.title().get() );
+        assertThat( post, notNullValue() );
+        assertThat( post.title().get(), equalTo( title ) );
 
         uow.discard();
     }

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/6ae17138/extensions/indexing-elasticsearch/src/test/java/org/apache/polygene/index/elasticsearch/ImmenseTermTest.java
----------------------------------------------------------------------
diff --git 
a/extensions/indexing-elasticsearch/src/test/java/org/apache/polygene/index/elasticsearch/ImmenseTermTest.java
 
b/extensions/indexing-elasticsearch/src/test/java/org/apache/polygene/index/elasticsearch/ImmenseTermTest.java
index 8e48aeb..b7adaed 100644
--- 
a/extensions/indexing-elasticsearch/src/test/java/org/apache/polygene/index/elasticsearch/ImmenseTermTest.java
+++ 
b/extensions/indexing-elasticsearch/src/test/java/org/apache/polygene/index/elasticsearch/ImmenseTermTest.java
@@ -38,15 +38,15 @@ import org.apache.polygene.test.EntityTestAssembler;
 import org.junit.BeforeClass;
 import org.junit.ClassRule;
 import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.junit.rules.TemporaryFolder;
 import org.junit.rules.TestName;
 
 import static org.apache.polygene.api.query.QueryExpressions.eq;
 import static org.apache.polygene.api.query.QueryExpressions.templateFor;
 import static org.apache.polygene.test.util.Assume.assumeNoIbmJdk;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
-import static org.junit.Assert.assertThat;
 
 /**
  * ImmenseTermTest.

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/6ae17138/extensions/indexing-rdf/build.gradle
----------------------------------------------------------------------
diff --git a/extensions/indexing-rdf/build.gradle 
b/extensions/indexing-rdf/build.gradle
index 73ebf31..9c127c8 100644
--- a/extensions/indexing-rdf/build.gradle
+++ b/extensions/indexing-rdf/build.gradle
@@ -35,6 +35,7 @@ dependencies {
   testImplementation polygene.core.testsupport
   testImplementation polygene.extension( 'entitystore-preferences' )
   testImplementation polygene.extension( 'entitystore-jdbm' )
+  testImplementation libraries.junit_vintage
 
   testRuntimeOnly libraries.logback
 }

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/6ae17138/extensions/indexing-rdf/src/test/java/org/apache/polygene/index/rdf/ContainsAllTest.java
----------------------------------------------------------------------
diff --git 
a/extensions/indexing-rdf/src/test/java/org/apache/polygene/index/rdf/ContainsAllTest.java
 
b/extensions/indexing-rdf/src/test/java/org/apache/polygene/index/rdf/ContainsAllTest.java
index 3d7fb36..dbd7e8c 100644
--- 
a/extensions/indexing-rdf/src/test/java/org/apache/polygene/index/rdf/ContainsAllTest.java
+++ 
b/extensions/indexing-rdf/src/test/java/org/apache/polygene/index/rdf/ContainsAllTest.java
@@ -42,11 +42,13 @@ import 
org.apache.polygene.library.fileconfig.FileConfigurationOverride;
 import org.apache.polygene.library.rdf.repository.NativeConfiguration;
 import org.apache.polygene.test.AbstractPolygeneTest;
 import org.apache.polygene.test.EntityTestAssembler;
-import org.junit.Assert;
 import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.junit.rules.TemporaryFolder;
 
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.core.Is.is;
+
 // A test to verify that containsAll QueryExpression works properly.
 public class ContainsAllTest
     extends AbstractPolygeneTest
@@ -159,7 +161,7 @@ public class ContainsAllTest
             setOf( TEST_STRING_1, TEST_STRING_2 )
         );
 
-        Assert.assertTrue( "The entity must have been found.", result != null 
);
+        assertThat( "The entity must have been found.", result != null, is( 
true ) );
     }
 
     @Test
@@ -171,7 +173,7 @@ public class ContainsAllTest
             setOf( TEST_STRING_1, TEST_STRING_2, TEST_STRING_3 )
         );
 
-        Assert.assertTrue( "The entity must have been found.", result != null 
);
+        assertThat( "The entity must have been found.", result != null, is( 
true ) );
     }
 
     @Test
@@ -183,7 +185,7 @@ public class ContainsAllTest
             setOf( TEST_STRING_1, TEST_STRING_2, TEST_STRING_3, TEST_STRING_4 )
         );
 
-        Assert.assertTrue( "The entity must not have been found.", result == 
null );
+        assertThat( "The entity must not have been found.", result == null, 
is( true ) );
     }
 
     @Test
@@ -195,7 +197,7 @@ public class ContainsAllTest
             setOf( TEST_STRING_1, null, TEST_STRING_2 )
         );
 
-        Assert.assertTrue( "The entity must have been found.", result != null 
);
+        assertThat( "The entity must have been found.", result != null, is( 
true ) );
     }
 
     @Test
@@ -207,7 +209,7 @@ public class ContainsAllTest
             setOf()
         );
 
-        Assert.assertTrue( "The entity must have been found.", result != null 
);
+        assertThat( "The entity must have been found.", result != null, is( 
true ) );
     }
 
     @Test
@@ -219,7 +221,7 @@ public class ContainsAllTest
             setOf( TEST_STRING_1 )
         );
 
-        Assert.assertTrue( "The entity must have been found.", result != null 
);
+        assertThat( "The entity must have been found.", result != null, is( 
true ) );
     }
 
     @Test
@@ -231,7 +233,7 @@ public class ContainsAllTest
             setOf( TEST_STRING_1, TEST_STRING_2 )
         );
 
-        Assert.assertTrue( "The entity must have been found", result != null );
+        assertThat( "The entity must have been found", result != null, is( 
true ) );
     }
 
     @Test
@@ -243,7 +245,7 @@ public class ContainsAllTest
             setOf( TEST_STRING_1, TEST_STRING_2, TEST_STRING_3 )
         );
 
-        Assert.assertTrue( "The entity must not have been found.", result == 
null );
+        assertThat( "The entity must not have been found.", result == null, 
is( true ) );
     }
 
     @Test
@@ -255,7 +257,7 @@ public class ContainsAllTest
             setOf()
         );
 
-        Assert.assertTrue( "The entity must have been found.", result != null 
);
+        assertThat( "The entity must have been found.", result != null, is( 
true ) );
     }
 
     private ExampleEntity findEntity( String... strings )

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/6ae17138/extensions/indexing-rdf/src/test/java/org/apache/polygene/index/rdf/ContainsTest.java
----------------------------------------------------------------------
diff --git 
a/extensions/indexing-rdf/src/test/java/org/apache/polygene/index/rdf/ContainsTest.java
 
b/extensions/indexing-rdf/src/test/java/org/apache/polygene/index/rdf/ContainsTest.java
index cf33cca..78fcaea 100644
--- 
a/extensions/indexing-rdf/src/test/java/org/apache/polygene/index/rdf/ContainsTest.java
+++ 
b/extensions/indexing-rdf/src/test/java/org/apache/polygene/index/rdf/ContainsTest.java
@@ -38,9 +38,8 @@ import 
org.apache.polygene.library.fileconfig.FileConfigurationOverride;
 import org.apache.polygene.library.rdf.repository.NativeConfiguration;
 import org.apache.polygene.test.AbstractPolygeneTest;
 import org.apache.polygene.test.EntityTestAssembler;
-import org.junit.Assert;
 import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.junit.rules.TemporaryFolder;
 
 import static org.apache.polygene.index.rdf.ContainsAllTest.TEST_STRING_1;
@@ -48,6 +47,9 @@ import static 
org.apache.polygene.index.rdf.ContainsAllTest.TEST_STRING_2;
 import static org.apache.polygene.index.rdf.ContainsAllTest.TEST_STRING_3;
 import static org.apache.polygene.index.rdf.ContainsAllTest.TEST_STRING_4;
 import static org.apache.polygene.index.rdf.ContainsAllTest.setOf;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.core.Is.is;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 public class ContainsTest extends AbstractPolygeneTest
 {
@@ -55,7 +57,8 @@ public class ContainsTest extends AbstractPolygeneTest
     public TemporaryFolder tmpDir = new TemporaryFolder();
 
     @Override
-    public void assemble( ModuleAssembly module ) throws AssemblyException
+    public void assemble( ModuleAssembly module )
+        throws AssemblyException
     {
         new FileConfigurationAssembler()
             .withOverride( new 
FileConfigurationOverride().withConventionalRoot( tmpDir.getRoot() ) )
@@ -63,7 +66,7 @@ public class ContainsTest extends AbstractPolygeneTest
         ModuleAssembly prefModule = module.layer().module( "PrefModule" );
         prefModule.entities( NativeConfiguration.class ).visibleIn( 
Visibility.application );
         prefModule.forMixin( NativeConfiguration.class ).declareDefaults()
-                  .dataDirectory().set( new File( tmpDir.getRoot(), "rdf-data" 
).getAbsolutePath() );
+            .dataDirectory().set( new File( tmpDir.getRoot(), "rdf-data" 
).getAbsolutePath() );
         new EntityTestAssembler().assemble( prefModule );
 
         module.entities( ExampleEntity.class );
@@ -77,56 +80,60 @@ public class ContainsTest extends AbstractPolygeneTest
     }
 
     @Test
-    public void simpleContainsSuccessTest() throws Exception
+    public void simpleContainsSuccessTest()
+        throws Exception
     {
         ExampleEntity result = this.performContainsStringTest(
             setOf( TEST_STRING_1, TEST_STRING_2, TEST_STRING_3 ),
             TEST_STRING_3
         );
 
-        Assert.assertTrue( "The entity must have been found", result != null );
+        assertThat( "The entity must have been found", result != null, is( 
true ) );
     }
 
     @Test
-    public void simpleContainsSuccessFailTest() throws Exception
+    public void simpleContainsSuccessFailTest()
+        throws Exception
     {
         ExampleEntity result = this.performContainsStringTest(
             setOf( TEST_STRING_1, TEST_STRING_2, TEST_STRING_3 ),
             TEST_STRING_4
         );
 
-        Assert.assertTrue( "The entity must not have been found", result == 
null );
+        assertThat( "The entity must not have been found", result == null, is( 
true ) );
     }
 
-    @Test( expected = NullPointerException.class )
-    public void simpleContainsNullTest() throws Exception
+    @Test
+    public void simpleContainsNullTest()
+        throws Exception
     {
-        this.performContainsStringTest(
-            setOf( TEST_STRING_1, TEST_STRING_2, TEST_STRING_3 ),
-            null
+        assertThrows( NullPointerException.class, () ->
+            this.performContainsStringTest( setOf( TEST_STRING_1, 
TEST_STRING_2, TEST_STRING_3 ), null )
         );
     }
 
     @Test
-    public void simpleContainsStringValueSuccessTest() throws Exception
+    public void simpleContainsStringValueSuccessTest()
+        throws Exception
     {
         ExampleEntity result = this.performContainsStringValueTest(
             setOf( TEST_STRING_1, TEST_STRING_2, TEST_STRING_3 ),
             TEST_STRING_3
         );
 
-        Assert.assertTrue( "The entity must have been found", result != null );
+        assertThat( "The entity must have been found", result != null, is( 
true ) );
     }
 
     @Test
-    public void simpleContainsStringValueFailTest() throws Exception
+    public void simpleContainsStringValueFailTest()
+        throws Exception
     {
         ExampleEntity result = this.performContainsStringTest(
             setOf( TEST_STRING_1, TEST_STRING_2, TEST_STRING_3 ),
             TEST_STRING_4
         );
 
-        Assert.assertTrue( "The entity must not have been found", result == 
null );
+        assertThat( "The entity must not have been found", result == null, is( 
true ) );
     }
 
     private ExampleEntity findEntity( String string )

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/6ae17138/extensions/indexing-rdf/src/test/java/org/apache/polygene/index/rdf/RDFPerformanceTest.java
----------------------------------------------------------------------
diff --git 
a/extensions/indexing-rdf/src/test/java/org/apache/polygene/index/rdf/RDFPerformanceTest.java
 
b/extensions/indexing-rdf/src/test/java/org/apache/polygene/index/rdf/RDFPerformanceTest.java
index 86bd8e3..27a1285 100644
--- 
a/extensions/indexing-rdf/src/test/java/org/apache/polygene/index/rdf/RDFPerformanceTest.java
+++ 
b/extensions/indexing-rdf/src/test/java/org/apache/polygene/index/rdf/RDFPerformanceTest.java
@@ -52,7 +52,7 @@ import org.apache.polygene.test.AbstractPolygeneTest;
 import org.apache.polygene.test.EntityTestAssembler;
 import org.junit.Ignore;
 import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.junit.rules.TemporaryFolder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/6ae17138/extensions/indexing-rdf/src/test/java/org/apache/polygene/index/rdf/RdfQueryTest.java
----------------------------------------------------------------------
diff --git 
a/extensions/indexing-rdf/src/test/java/org/apache/polygene/index/rdf/RdfQueryTest.java
 
b/extensions/indexing-rdf/src/test/java/org/apache/polygene/index/rdf/RdfQueryTest.java
index da3c4d8..6b9bb7e 100644
--- 
a/extensions/indexing-rdf/src/test/java/org/apache/polygene/index/rdf/RdfQueryTest.java
+++ 
b/extensions/indexing-rdf/src/test/java/org/apache/polygene/index/rdf/RdfQueryTest.java
@@ -28,7 +28,7 @@ import org.apache.polygene.test.EntityTestAssembler;
 import org.apache.polygene.test.indexing.AbstractQueryTest;
 import org.junit.Ignore;
 import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.junit.rules.TemporaryFolder;
 
 public class RdfQueryTest

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/6ae17138/extensions/indexing-rdf/src/test/java/org/apache/polygene/index/rdf/qi173/Qi173IssueTest.java
----------------------------------------------------------------------
diff --git 
a/extensions/indexing-rdf/src/test/java/org/apache/polygene/index/rdf/qi173/Qi173IssueTest.java
 
b/extensions/indexing-rdf/src/test/java/org/apache/polygene/index/rdf/qi173/Qi173IssueTest.java
index 9e87d92..2ea96e3 100644
--- 
a/extensions/indexing-rdf/src/test/java/org/apache/polygene/index/rdf/qi173/Qi173IssueTest.java
+++ 
b/extensions/indexing-rdf/src/test/java/org/apache/polygene/index/rdf/qi173/Qi173IssueTest.java
@@ -19,11 +19,10 @@
  */
 package org.apache.polygene.index.rdf.qi173;
 
-import org.apache.polygene.api.identity.Identity;
-import org.junit.Assert;
-import org.junit.Test;
+import java.util.Iterator;
 import org.apache.polygene.api.entity.EntityBuilder;
 import org.apache.polygene.api.entity.EntityComposite;
+import org.apache.polygene.api.identity.Identity;
 import org.apache.polygene.api.property.Property;
 import org.apache.polygene.api.query.Query;
 import org.apache.polygene.api.query.QueryBuilder;
@@ -36,10 +35,13 @@ import org.apache.polygene.bootstrap.ModuleAssembly;
 import org.apache.polygene.index.rdf.assembly.RdfMemoryStoreAssembler;
 import org.apache.polygene.test.AbstractPolygeneTest;
 import org.apache.polygene.test.EntityTestAssembler;
-
-import java.util.Iterator;
+import org.junit.Assert;
+import org.junit.jupiter.api.Test;
 
 import static org.apache.polygene.api.query.QueryExpressions.orderBy;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.core.Is.is;
+import static org.hamcrest.core.IsEqual.equalTo;
 
 public class Qi173IssueTest
     extends AbstractPolygeneTest
@@ -84,19 +86,19 @@ public class Qi173IssueTest
         Query<Car> query = uow.newQuery( qb );
         query.orderBy( orderBy( template.manufacturer() ), orderBy( 
template.model() ) );
         Iterator<Car> cars = query.iterator();
-        Assert.assertTrue( cars.hasNext() );
+        Assert.assertThat( cars.hasNext(), is( true ) );
         Car car1 = cars.next();
-        Assert.assertEquals( car1.manufacturer().get(), "Ford" );
-        Assert.assertEquals( car1.model().get(), "Mustang" );
-        Assert.assertEquals( (int) car1.year().get(), 2007 );
+        assertThat( "Ford", equalTo( car1.manufacturer().get() ) );
+        assertThat( "Mustang", equalTo( car1.model().get() ) );
+        assertThat( 2007, equalTo( (int) car1.year().get() ) );
         Car car2 = cars.next();
-        Assert.assertEquals( car2.manufacturer().get(), "Ford" );
-        Assert.assertEquals( car2.model().get(), "Transit" );
-        Assert.assertEquals( (int) car2.year().get(), 2007 );
+        assertThat( "Ford", equalTo( car2.manufacturer().get() ) );
+        assertThat( "Transit", equalTo( car2.model().get() ) );
+        assertThat( 2007, equalTo( (int) car2.year().get() ) );
         Car car3 = cars.next();
-        Assert.assertEquals( car3.manufacturer().get(), "Volvo" );
-        Assert.assertEquals( car3.model().get(), "S80" );
-        Assert.assertEquals( (int) car3.year().get(), 2007 );
+        assertThat( "Volvo", equalTo( car3.manufacturer().get() ) );
+        assertThat( "S80", equalTo( car3.model().get() ) );
+        assertThat( 2007, equalTo( (int) car3.year().get() ) );
         for( Car car : query )
         {
             System.out.println( car.manufacturer().get() + " " + 
car.model().get() + ", " + car.year().get() );

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/6ae17138/extensions/indexing-rdf/src/test/java/org/apache/polygene/index/rdf/qi64/withPropagationMandatory/IssueTest.java
----------------------------------------------------------------------
diff --git 
a/extensions/indexing-rdf/src/test/java/org/apache/polygene/index/rdf/qi64/withPropagationMandatory/IssueTest.java
 
b/extensions/indexing-rdf/src/test/java/org/apache/polygene/index/rdf/qi64/withPropagationMandatory/IssueTest.java
index 3a9928d..0f96be2 100644
--- 
a/extensions/indexing-rdf/src/test/java/org/apache/polygene/index/rdf/qi64/withPropagationMandatory/IssueTest.java
+++ 
b/extensions/indexing-rdf/src/test/java/org/apache/polygene/index/rdf/qi64/withPropagationMandatory/IssueTest.java
@@ -20,19 +20,20 @@
 package org.apache.polygene.index.rdf.qi64.withPropagationMandatory;
 
 import org.apache.polygene.api.identity.Identity;
-import org.junit.Before;
-import org.junit.Test;
 import org.apache.polygene.api.unitofwork.UnitOfWork;
 import org.apache.polygene.bootstrap.AssemblyException;
 import org.apache.polygene.bootstrap.ModuleAssembly;
 import org.apache.polygene.index.rdf.qi64.AbstractIssueTest;
 import org.apache.polygene.index.rdf.qi64.AccountComposite;
+import org.junit.Before;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.core.Is.is;
+import static org.hamcrest.core.IsEqual.equalTo;
+import static org.hamcrest.core.IsNull.notNullValue;
+import static org.hamcrest.core.IsNull.nullValue;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 public final class IssueTest
     extends AbstractIssueTest
@@ -49,17 +50,19 @@ public final class IssueTest
         accountService = serviceFinder.findService( AccountService.class 
).get();
     }
 
-    @Test( expected = IllegalStateException.class )
+    @Test
     public final void testUnitOfWorkWithUnitOfWorkNotInitialized()
         throws Throwable
     {
-        // Bootstrap the account
-        Identity id = newPolygeneAccount();
+        assertThrows( IllegalStateException.class, () -> {
+            // Bootstrap the account
+            Identity id = newPolygeneAccount();
 
-        // Make sure there's no unit of work
-        assertNull( unitOfWorkFactory.currentUnitOfWork() );
+            // Make sure there's no unit of work
+            assertThat( unitOfWorkFactory.currentUnitOfWork(), nullValue() );
 
-        accountService.getAccountById( id );
+            accountService.getAccountById( id );
+        } );
     }
 
     @Test
@@ -70,17 +73,17 @@ public final class IssueTest
         Identity id = newPolygeneAccount();
 
         // Make sure there's no unit of work
-        assertFalse( unitOfWorkFactory.isUnitOfWorkActive() );
+        assertThat( unitOfWorkFactory.isUnitOfWorkActive(), is( false ) );
 
         UnitOfWork parentUnitOfWork = unitOfWorkFactory.newUnitOfWork();
 
         AccountComposite account = accountService.getAccountById( id );
-        assertNotNull( account );
+        assertThat( account, notNullValue() );
 
         UnitOfWork currentUnitOfWork = unitOfWorkFactory.currentUnitOfWork();
-        assertEquals( parentUnitOfWork, currentUnitOfWork );
+        assertThat( currentUnitOfWork, equalTo( parentUnitOfWork ) );
 
-        assertTrue( currentUnitOfWork.isOpen() );
+        assertThat( currentUnitOfWork.isOpen(), is( true ) );
 
         // Close the parent unit of work
         parentUnitOfWork.complete();

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/6ae17138/extensions/indexing-rdf/src/test/java/org/apache/polygene/index/rdf/qi64/withPropagationRequired/IssueTest.java
----------------------------------------------------------------------
diff --git 
a/extensions/indexing-rdf/src/test/java/org/apache/polygene/index/rdf/qi64/withPropagationRequired/IssueTest.java
 
b/extensions/indexing-rdf/src/test/java/org/apache/polygene/index/rdf/qi64/withPropagationRequired/IssueTest.java
index 08b79e1..00ac1f6 100644
--- 
a/extensions/indexing-rdf/src/test/java/org/apache/polygene/index/rdf/qi64/withPropagationRequired/IssueTest.java
+++ 
b/extensions/indexing-rdf/src/test/java/org/apache/polygene/index/rdf/qi64/withPropagationRequired/IssueTest.java
@@ -20,15 +20,18 @@
 package org.apache.polygene.index.rdf.qi64.withPropagationRequired;
 
 import org.apache.polygene.api.identity.Identity;
-import org.junit.Before;
-import org.junit.Test;
 import org.apache.polygene.api.unitofwork.UnitOfWork;
 import org.apache.polygene.bootstrap.AssemblyException;
 import org.apache.polygene.bootstrap.ModuleAssembly;
 import org.apache.polygene.index.rdf.qi64.AbstractIssueTest;
 import org.apache.polygene.index.rdf.qi64.AccountComposite;
+import org.junit.Before;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.*;
+import static org.hamcrest.core.Is.is;
+import static org.hamcrest.core.IsEqual.equalTo;
+import static org.hamcrest.core.IsNull.notNullValue;
+import static org.junit.Assert.assertThat;
 
 public final class IssueTest
     extends AbstractIssueTest
@@ -53,12 +56,12 @@ public final class IssueTest
         Identity id = newPolygeneAccount();
 
         // Make sure there's no unit of work
-        assertFalse( unitOfWorkFactory.isUnitOfWorkActive() );
+        assertThat( unitOfWorkFactory.isUnitOfWorkActive(), is( false ) );
 
         AccountComposite account = accountService.getAccountById( id );
-        assertNotNull( account );
+        assertThat( account, notNullValue() );
 
-        assertFalse( unitOfWorkFactory.isUnitOfWorkActive() );
+        assertThat( unitOfWorkFactory.isUnitOfWorkActive(), is( false ) );
     }
 
     @Test
@@ -69,17 +72,17 @@ public final class IssueTest
         Identity id = newPolygeneAccount();
 
         // Make sure there's no unit of work
-        assertFalse( unitOfWorkFactory.isUnitOfWorkActive() );
+        assertThat( unitOfWorkFactory.isUnitOfWorkActive(), is( false ) );
 
         UnitOfWork parentUnitOfWork = unitOfWorkFactory.newUnitOfWork();
 
         AccountComposite account = accountService.getAccountById( id );
-        assertNotNull( account );
+        assertThat( account, notNullValue() );
 
         UnitOfWork currentUnitOfWork = unitOfWorkFactory.currentUnitOfWork();
-        assertEquals( parentUnitOfWork, currentUnitOfWork );
+        assertThat( currentUnitOfWork, equalTo( parentUnitOfWork ) );
 
-        assertTrue( currentUnitOfWork.isOpen() );
+        assertThat( currentUnitOfWork.isOpen(), is( true ) );
 
         // Close the parent unit of work
         parentUnitOfWork.complete();

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/6ae17138/extensions/indexing-rdf/src/test/java/org/apache/polygene/index/rdf/qi64/withPropagationRequiresNew/IssueTest.java
----------------------------------------------------------------------
diff --git 
a/extensions/indexing-rdf/src/test/java/org/apache/polygene/index/rdf/qi64/withPropagationRequiresNew/IssueTest.java
 
b/extensions/indexing-rdf/src/test/java/org/apache/polygene/index/rdf/qi64/withPropagationRequiresNew/IssueTest.java
index ef2de77..953ec5f 100644
--- 
a/extensions/indexing-rdf/src/test/java/org/apache/polygene/index/rdf/qi64/withPropagationRequiresNew/IssueTest.java
+++ 
b/extensions/indexing-rdf/src/test/java/org/apache/polygene/index/rdf/qi64/withPropagationRequiresNew/IssueTest.java
@@ -21,15 +21,18 @@
 package org.apache.polygene.index.rdf.qi64.withPropagationRequiresNew;
 
 import org.apache.polygene.api.identity.Identity;
-import org.junit.Before;
-import org.junit.Test;
 import org.apache.polygene.api.unitofwork.UnitOfWork;
 import org.apache.polygene.bootstrap.AssemblyException;
 import org.apache.polygene.bootstrap.ModuleAssembly;
 import org.apache.polygene.index.rdf.qi64.AbstractIssueTest;
 import org.apache.polygene.index.rdf.qi64.AccountComposite;
+import org.junit.Before;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.*;
+import static org.hamcrest.core.Is.is;
+import static org.hamcrest.core.IsEqual.equalTo;
+import static org.hamcrest.core.IsNull.notNullValue;
+import static org.junit.Assert.assertThat;
 
 public class IssueTest
     extends AbstractIssueTest
@@ -54,12 +57,12 @@ public class IssueTest
         Identity id = newPolygeneAccount();
 
         // Make sure there's no unit of work
-        assertFalse( unitOfWorkFactory.isUnitOfWorkActive() );
+        assertThat( unitOfWorkFactory.isUnitOfWorkActive(), is( false ) );
 
         AccountComposite account = accountService.getAccountById( id );
-        assertNotNull( account );
+        assertThat( account, notNullValue() );
 
-        assertFalse( unitOfWorkFactory.isUnitOfWorkActive() );
+        assertThat( unitOfWorkFactory.isUnitOfWorkActive(), is( false ) );
     }
 
     @Test
@@ -70,17 +73,17 @@ public class IssueTest
         Identity id = newPolygeneAccount();
 
         // Make sure there's no unit of work
-        assertFalse( unitOfWorkFactory.isUnitOfWorkActive() );
+        assertThat( unitOfWorkFactory.isUnitOfWorkActive(), is( false ) );
 
         UnitOfWork parentUnitOfWork = unitOfWorkFactory.newUnitOfWork();
 
         AccountComposite account = accountService.getAccountById( id );
-        assertNotNull( account );
+        assertThat( account, notNullValue() );
 
         UnitOfWork currentUnitOfWork = unitOfWorkFactory.currentUnitOfWork();
-        assertEquals( parentUnitOfWork, currentUnitOfWork );
+        assertThat( currentUnitOfWork, equalTo( parentUnitOfWork ) );
 
-        assertTrue( currentUnitOfWork.isOpen() );
+        assertThat( currentUnitOfWork.isOpen(), is( true ) );
 
         // Close the parent unit of work
         parentUnitOfWork.complete();

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/6ae17138/extensions/indexing-rdf/src/test/java/org/apache/polygene/index/rdf/qi66/Qi66IssueTest.java
----------------------------------------------------------------------
diff --git 
a/extensions/indexing-rdf/src/test/java/org/apache/polygene/index/rdf/qi66/Qi66IssueTest.java
 
b/extensions/indexing-rdf/src/test/java/org/apache/polygene/index/rdf/qi66/Qi66IssueTest.java
index d5a385c..e709aca 100644
--- 
a/extensions/indexing-rdf/src/test/java/org/apache/polygene/index/rdf/qi66/Qi66IssueTest.java
+++ 
b/extensions/indexing-rdf/src/test/java/org/apache/polygene/index/rdf/qi66/Qi66IssueTest.java
@@ -32,10 +32,11 @@ import 
org.apache.polygene.library.rdf.entity.EntityTypeSerializer;
 import org.apache.polygene.library.rdf.repository.MemoryRepositoryService;
 import org.apache.polygene.test.AbstractPolygeneTest;
 import org.apache.polygene.test.EntityTestAssembler;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.fail;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.core.IsNull.notNullValue;
+import static org.junit.jupiter.api.Assertions.fail;
 
 /**
  * Test for Qi-66
@@ -53,7 +54,7 @@ public class Qi66IssueTest
 
         UnitOfWork work = unitOfWorkFactory.newUnitOfWork();
         AccountComposite account = work.get( AccountComposite.class, 
accountIdentity );
-        assertNotNull( account );
+        assertThat( account, notNullValue() );
 
         try
         {

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/6ae17138/extensions/indexing-rdf/src/test/java/org/apache/polygene/index/rdf/qi95/Qi95IssueTest.java
----------------------------------------------------------------------
diff --git 
a/extensions/indexing-rdf/src/test/java/org/apache/polygene/index/rdf/qi95/Qi95IssueTest.java
 
b/extensions/indexing-rdf/src/test/java/org/apache/polygene/index/rdf/qi95/Qi95IssueTest.java
index 9e9bd14..520fb7f 100644
--- 
a/extensions/indexing-rdf/src/test/java/org/apache/polygene/index/rdf/qi95/Qi95IssueTest.java
+++ 
b/extensions/indexing-rdf/src/test/java/org/apache/polygene/index/rdf/qi95/Qi95IssueTest.java
@@ -45,9 +45,11 @@ import 
org.apache.polygene.index.rdf.assembly.RdfNativeSesameStoreAssembler;
 import org.apache.polygene.library.rdf.repository.NativeConfiguration;
 import org.apache.polygene.test.EntityTestAssembler;
 import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.junit.rules.TemporaryFolder;
 
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.core.Is.is;
 import static org.junit.Assert.assertTrue;
 
 public class Qi95IssueTest
@@ -144,9 +146,9 @@ public class Qi95IssueTest
         QueryBuilder<ItemType> qb = queryBuilderFactory.newQueryBuilder( 
ItemType.class );
         Iterable<ItemType> initialList = copyOf( uow.newQuery( qb ) );
 
-        assertTrue( "Band is not in the initial list", hasItemTypeNamed( 
"Band", initialList ) );
-        assertTrue( "Bracelet is not in the initial list", hasItemTypeNamed( 
"Bracelet", initialList ) );
-        assertTrue( "Necklace is not in the initial list", hasItemTypeNamed( 
"Necklace", initialList ) );
+        assertThat( "Band is not in the initial list", hasItemTypeNamed( 
"Band", initialList ), is( true ) );
+        assertThat( "Bracelet is not in the initial list", hasItemTypeNamed( 
"Bracelet", initialList ), is( true ) );
+        assertThat( "Necklace is not in the initial list", hasItemTypeNamed( 
"Necklace", initialList ), is( true ) );
 
         newItemType( uow, "Watch" );
         uow.complete();
@@ -169,11 +171,11 @@ public class Qi95IssueTest
 
         uow = unitOfWorkFactory.newUnitOfWork();
         Iterable<ItemType> finalList = copyOf( uow.newQuery( qb ) );
-        assertTrue( "Band is not in the final list", hasItemTypeNamed( "Band", 
finalList ) );
-        assertTrue( "Bracelet is not in the final list", hasItemTypeNamed( 
"Bracelet", finalList ) );
-        assertTrue( "Necklace is not in the final list", hasItemTypeNamed( 
"Necklace", finalList ) );
-        assertTrue( "Watch is not in the final list", hasItemTypeNamed( 
"Watch", finalList ) );
-        assertTrue( "Ear ring is not in the final list", hasItemTypeNamed( 
"Ear ring", finalList ) );
+        assertThat( "Band is not in the final list", hasItemTypeNamed( "Band", 
finalList ), is( true ) );
+        assertThat( "Bracelet is not in the final list", hasItemTypeNamed( 
"Bracelet", finalList ), is( true ) );
+        assertThat( "Necklace is not in the final list", hasItemTypeNamed( 
"Necklace", finalList ), is( true ) );
+        assertThat( "Watch is not in the final list", hasItemTypeNamed( 
"Watch", finalList ), is( true ) );
+        assertThat( "Ear ring is not in the final list", hasItemTypeNamed( 
"Ear ring", finalList ), is( true ) );
         uow.complete();
     }
 

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/6ae17138/extensions/indexing-solr/build.gradle
----------------------------------------------------------------------
diff --git a/extensions/indexing-solr/build.gradle 
b/extensions/indexing-solr/build.gradle
index df06bc6..b3a1bca 100644
--- a/extensions/indexing-solr/build.gradle
+++ b/extensions/indexing-solr/build.gradle
@@ -34,6 +34,7 @@ dependencies {
   runtimeOnly polygene.core.runtime
 
   testImplementation polygene.core.testsupport
+  testImplementation libraries.junit_vintage
 
   testRuntimeOnly libraries.logback
   testRuntimeOnly libraries.servlet_api

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/6ae17138/extensions/indexing-solr/src/test/java/org/apache/polygene/index/solr/SolrQueryServiceTest.java
----------------------------------------------------------------------
diff --git 
a/extensions/indexing-solr/src/test/java/org/apache/polygene/index/solr/SolrQueryServiceTest.java
 
b/extensions/indexing-solr/src/test/java/org/apache/polygene/index/solr/SolrQueryServiceTest.java
index 01d3440..ca06e10 100644
--- 
a/extensions/indexing-solr/src/test/java/org/apache/polygene/index/solr/SolrQueryServiceTest.java
+++ 
b/extensions/indexing-solr/src/test/java/org/apache/polygene/index/solr/SolrQueryServiceTest.java
@@ -21,10 +21,6 @@ package org.apache.polygene.index.solr;
 
 import java.util.ArrayList;
 import java.util.List;
-import org.apache.polygene.index.solr.assembly.SolrIndexingAssembler;
-import org.apache.solr.client.solrj.SolrServerException;
-import org.apache.solr.common.SolrDocument;
-import org.apache.solr.common.SolrDocumentList;
 import org.apache.polygene.api.common.UseDefaults;
 import org.apache.polygene.api.entity.EntityComposite;
 import org.apache.polygene.api.property.Property;
@@ -34,17 +30,21 @@ import org.apache.polygene.api.unitofwork.UnitOfWork;
 import org.apache.polygene.api.unitofwork.UnitOfWorkCompletionException;
 import org.apache.polygene.bootstrap.AssemblyException;
 import org.apache.polygene.bootstrap.ModuleAssembly;
+import org.apache.polygene.index.solr.assembly.SolrIndexingAssembler;
 import org.apache.polygene.library.fileconfig.FileConfigurationAssembler;
 import org.apache.polygene.library.fileconfig.FileConfigurationOverride;
 import org.apache.polygene.test.AbstractPolygeneTest;
 import org.apache.polygene.test.EntityTestAssembler;
-import org.junit.Assert;
+import org.apache.solr.client.solrj.SolrServerException;
+import org.apache.solr.common.SolrDocument;
+import org.apache.solr.common.SolrDocumentList;
 import org.junit.Before;
 import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.junit.rules.TemporaryFolder;
 
-import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.core.IsEqual.equalTo;
 
 public class SolrQueryServiceTest
     extends AbstractPolygeneTest
@@ -93,7 +93,7 @@ public class SolrQueryServiceTest
                                                                        .where( 
SolrExpressions.search( "hello" ) ) );
 
             TestEntity test = query.find();
-            Assert.assertThat( test.name().get(), equalTo( "Hello World" ) );
+            assertThat( test.name().get(), equalTo( "Hello World" ) );
         }
     }
 
@@ -112,7 +112,7 @@ public class SolrQueryServiceTest
             lookAhead.add( result.getFieldValue( "name" ).toString() );
         }
 
-        Assert.assertThat( lookAhead.toString(), equalTo( "[Hello World]" ) );
+        assertThat( lookAhead.toString(), equalTo( "[Hello World]" ) );
     }
 
     public interface TestEntity

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/6ae17138/extensions/indexing-sql/src/test/java/org/apache/polygene/index/sql/postgresql/PostgreSQLDBIntegrityTest.java
----------------------------------------------------------------------
diff --git 
a/extensions/indexing-sql/src/test/java/org/apache/polygene/index/sql/postgresql/PostgreSQLDBIntegrityTest.java
 
b/extensions/indexing-sql/src/test/java/org/apache/polygene/index/sql/postgresql/PostgreSQLDBIntegrityTest.java
index 887d2d1..7d7ccfe 100644
--- 
a/extensions/indexing-sql/src/test/java/org/apache/polygene/index/sql/postgresql/PostgreSQLDBIntegrityTest.java
+++ 
b/extensions/indexing-sql/src/test/java/org/apache/polygene/index/sql/postgresql/PostgreSQLDBIntegrityTest.java
@@ -39,7 +39,7 @@ import org.apache.polygene.test.AbstractPolygeneTest;
 import org.apache.polygene.test.docker.DockerRule;
 import org.junit.Assert;
 import org.junit.ClassRule;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class PostgreSQLDBIntegrityTest
     extends AbstractPolygeneTest

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/6ae17138/extensions/indexing-sql/src/test/java/org/apache/polygene/index/sql/postgresql/PostgreSQLQueryTest.java
----------------------------------------------------------------------
diff --git 
a/extensions/indexing-sql/src/test/java/org/apache/polygene/index/sql/postgresql/PostgreSQLQueryTest.java
 
b/extensions/indexing-sql/src/test/java/org/apache/polygene/index/sql/postgresql/PostgreSQLQueryTest.java
index d919be4..8e92d16 100644
--- 
a/extensions/indexing-sql/src/test/java/org/apache/polygene/index/sql/postgresql/PostgreSQLQueryTest.java
+++ 
b/extensions/indexing-sql/src/test/java/org/apache/polygene/index/sql/postgresql/PostgreSQLQueryTest.java
@@ -25,7 +25,7 @@ import org.apache.polygene.test.docker.DockerRule;
 import org.apache.polygene.test.indexing.AbstractQueryTest;
 import org.junit.ClassRule;
 import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * PostgreSQL Query Tests.

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/6ae17138/extensions/metrics-codahale/src/test/java/org/apache/polygene/metrics/codahale/CodahaleMetricsTest.java
----------------------------------------------------------------------
diff --git 
a/extensions/metrics-codahale/src/test/java/org/apache/polygene/metrics/codahale/CodahaleMetricsTest.java
 
b/extensions/metrics-codahale/src/test/java/org/apache/polygene/metrics/codahale/CodahaleMetricsTest.java
index 35fa19b..37ea896 100644
--- 
a/extensions/metrics-codahale/src/test/java/org/apache/polygene/metrics/codahale/CodahaleMetricsTest.java
+++ 
b/extensions/metrics-codahale/src/test/java/org/apache/polygene/metrics/codahale/CodahaleMetricsTest.java
@@ -18,6 +18,7 @@
 package org.apache.polygene.metrics.codahale;
 
 import com.codahale.metrics.MetricRegistry;
+import java.util.Collection;
 import org.apache.polygene.api.activation.ActivationException;
 import org.apache.polygene.api.activation.PassivationException;
 import org.apache.polygene.api.structure.Module;
@@ -25,11 +26,8 @@ import org.apache.polygene.bootstrap.Assembler;
 import org.apache.polygene.bootstrap.Assemblers;
 import org.apache.polygene.metrics.codahale.assembly.CodahaleMetricsAssembler;
 import org.apache.polygene.test.metrics.AbstractPolygeneMetricsTest;
-
 import org.apache.polygene.test.metrics.MetricValuesProvider;
-import org.junit.Test;
-
-import java.util.Collection;
+import org.junit.jupiter.api.Test;
 
 public class CodahaleMetricsTest extends AbstractPolygeneMetricsTest
 {

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/6ae17138/extensions/migration/src/test/java/org/apache/polygene/migration/MigrationTest.java
----------------------------------------------------------------------
diff --git 
a/extensions/migration/src/test/java/org/apache/polygene/migration/MigrationTest.java
 
b/extensions/migration/src/test/java/org/apache/polygene/migration/MigrationTest.java
index b47656c..8eee89e 100644
--- 
a/extensions/migration/src/test/java/org/apache/polygene/migration/MigrationTest.java
+++ 
b/extensions/migration/src/test/java/org/apache/polygene/migration/MigrationTest.java
@@ -40,11 +40,11 @@ import org.apache.polygene.spi.entitystore.helpers.JSONKeys;
 import org.apache.polygene.spi.entitystore.helpers.StateStore;
 import org.apache.polygene.test.AbstractPolygeneTest;
 import org.apache.polygene.test.EntityTestAssembler;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static java.util.stream.Collectors.toList;
 import static org.hamcrest.CoreMatchers.equalTo;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 /**
  * JAVADOC

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/6ae17138/extensions/reindexer/build.gradle
----------------------------------------------------------------------
diff --git a/extensions/reindexer/build.gradle 
b/extensions/reindexer/build.gradle
index f956f60..7c69670 100644
--- a/extensions/reindexer/build.gradle
+++ b/extensions/reindexer/build.gradle
@@ -32,6 +32,7 @@ dependencies {
   testImplementation polygene.core.testsupport
   testImplementation polygene.extension( 'entitystore-jdbm' )
   testImplementation polygene.extension( 'indexing-rdf' )
+  testImplementation libraries.junit_vintage
 
   testRuntimeOnly libraries.logback
 }

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/6ae17138/extensions/reindexer/src/test/java/org/apache/polygene/index/reindexer/ReindexerTest.java
----------------------------------------------------------------------
diff --git 
a/extensions/reindexer/src/test/java/org/apache/polygene/index/reindexer/ReindexerTest.java
 
b/extensions/reindexer/src/test/java/org/apache/polygene/index/reindexer/ReindexerTest.java
index 858cfc7..0c527a9 100644
--- 
a/extensions/reindexer/src/test/java/org/apache/polygene/index/reindexer/ReindexerTest.java
+++ 
b/extensions/reindexer/src/test/java/org/apache/polygene/index/reindexer/ReindexerTest.java
@@ -41,12 +41,13 @@ import 
org.apache.polygene.library.rdf.repository.NativeConfiguration;
 import org.apache.polygene.test.AbstractPolygeneTest;
 import org.apache.polygene.test.EntityTestAssembler;
 import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.junit.rules.TemporaryFolder;
 
 import static org.apache.polygene.api.query.QueryExpressions.eq;
 import static org.apache.polygene.api.query.QueryExpressions.templateFor;
-import static org.junit.Assert.assertEquals;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.core.IsEqual.equalTo;
 
 public class ReindexerTest
     extends AbstractPolygeneTest
@@ -130,8 +131,8 @@ public class ReindexerTest
         qBuilder = qBuilder.where( eq( templateFor( MyEntity.class ).name(), 
TEST_NAME ) );
         Query<MyEntity> q = uow.newQuery( qBuilder );
 
-        assertEquals( 1, q.count() );
-        assertEquals( TEST_NAME, q.iterator().next().name().get() );
+        assertThat( q.count(), equalTo( 1 ) );
+        assertThat( q.iterator().next().name().get(), equalTo( TEST_NAME ) );
 
         uow.complete();
     }

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/6ae17138/extensions/serialization-javaxjson/src/test/java/org/apache/polygene/serialization/javaxjson/CustomJsonAdapterTest.java
----------------------------------------------------------------------
diff --git 
a/extensions/serialization-javaxjson/src/test/java/org/apache/polygene/serialization/javaxjson/CustomJsonAdapterTest.java
 
b/extensions/serialization-javaxjson/src/test/java/org/apache/polygene/serialization/javaxjson/CustomJsonAdapterTest.java
index a4c9ae7..0ee58e6 100644
--- 
a/extensions/serialization-javaxjson/src/test/java/org/apache/polygene/serialization/javaxjson/CustomJsonAdapterTest.java
+++ 
b/extensions/serialization-javaxjson/src/test/java/org/apache/polygene/serialization/javaxjson/CustomJsonAdapterTest.java
@@ -32,11 +32,11 @@ import org.apache.polygene.api.value.ValueBuilder;
 import org.apache.polygene.bootstrap.ModuleAssembly;
 import 
org.apache.polygene.serialization.javaxjson.assembly.JavaxJsonSerializationAssembler;
 import org.apache.polygene.test.AbstractPolygeneTest;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.is;
-import static org.junit.Assert.assertThat;
 
 public class CustomJsonAdapterTest extends AbstractPolygeneTest
 {

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/6ae17138/extensions/serialization-javaxjson/src/test/java/org/apache/polygene/serialization/javaxjson/HandCraftedJsonTest.java
----------------------------------------------------------------------
diff --git 
a/extensions/serialization-javaxjson/src/test/java/org/apache/polygene/serialization/javaxjson/HandCraftedJsonTest.java
 
b/extensions/serialization-javaxjson/src/test/java/org/apache/polygene/serialization/javaxjson/HandCraftedJsonTest.java
index e26d15d..ebe33e5 100644
--- 
a/extensions/serialization-javaxjson/src/test/java/org/apache/polygene/serialization/javaxjson/HandCraftedJsonTest.java
+++ 
b/extensions/serialization-javaxjson/src/test/java/org/apache/polygene/serialization/javaxjson/HandCraftedJsonTest.java
@@ -23,10 +23,10 @@ import org.apache.polygene.api.serialization.Deserializer;
 import org.apache.polygene.bootstrap.ModuleAssembly;
 import 
org.apache.polygene.serialization.javaxjson.assembly.JavaxJsonSerializationAssembler;
 import org.apache.polygene.test.AbstractPolygeneTest;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.equalTo;
-import static org.junit.Assert.assertThat;
 
 public class HandCraftedJsonTest extends AbstractPolygeneTest
 {

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/6ae17138/extensions/serialization-javaxjson/src/test/java/org/apache/polygene/serialization/javaxjson/JavaxJsonCollectionSerializationTest.java
----------------------------------------------------------------------
diff --git 
a/extensions/serialization-javaxjson/src/test/java/org/apache/polygene/serialization/javaxjson/JavaxJsonCollectionSerializationTest.java
 
b/extensions/serialization-javaxjson/src/test/java/org/apache/polygene/serialization/javaxjson/JavaxJsonCollectionSerializationTest.java
index e6beebd..c7ad31b 100644
--- 
a/extensions/serialization-javaxjson/src/test/java/org/apache/polygene/serialization/javaxjson/JavaxJsonCollectionSerializationTest.java
+++ 
b/extensions/serialization-javaxjson/src/test/java/org/apache/polygene/serialization/javaxjson/JavaxJsonCollectionSerializationTest.java
@@ -36,12 +36,12 @@ import org.apache.polygene.bootstrap.ModuleAssembly;
 import 
org.apache.polygene.serialization.javaxjson.assembly.JavaxJsonSerializationAssembler;
 import org.apache.polygene.spi.serialization.JsonSerialization;
 import 
org.apache.polygene.test.serialization.AbstractCollectionSerializationTest;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.is;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.fail;
 
 public class JavaxJsonCollectionSerializationTest extends 
AbstractCollectionSerializationTest
 {

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/6ae17138/extensions/serialization-javaxjson/src/test/java/org/apache/polygene/serialization/javaxjson/JavaxJsonValueCompositeSerializationTest.java
----------------------------------------------------------------------
diff --git 
a/extensions/serialization-javaxjson/src/test/java/org/apache/polygene/serialization/javaxjson/JavaxJsonValueCompositeSerializationTest.java
 
b/extensions/serialization-javaxjson/src/test/java/org/apache/polygene/serialization/javaxjson/JavaxJsonValueCompositeSerializationTest.java
index d628cb2..f010a44 100644
--- 
a/extensions/serialization-javaxjson/src/test/java/org/apache/polygene/serialization/javaxjson/JavaxJsonValueCompositeSerializationTest.java
+++ 
b/extensions/serialization-javaxjson/src/test/java/org/apache/polygene/serialization/javaxjson/JavaxJsonValueCompositeSerializationTest.java
@@ -27,10 +27,10 @@ import org.apache.polygene.bootstrap.ModuleAssembly;
 import 
org.apache.polygene.serialization.javaxjson.assembly.JavaxJsonSerializationAssembler;
 import org.apache.polygene.spi.serialization.JsonSerialization;
 import 
org.apache.polygene.test.serialization.AbstractValueCompositeSerializationTest;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.hamcrest.CoreMatchers.equalTo;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 public class JavaxJsonValueCompositeSerializationTest extends 
AbstractValueCompositeSerializationTest
 {

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/6ae17138/extensions/serialization-javaxxml/src/test/java/org/apache/polygene/serialization/javaxxml/HandCraftedXmlTest.java
----------------------------------------------------------------------
diff --git 
a/extensions/serialization-javaxxml/src/test/java/org/apache/polygene/serialization/javaxxml/HandCraftedXmlTest.java
 
b/extensions/serialization-javaxxml/src/test/java/org/apache/polygene/serialization/javaxxml/HandCraftedXmlTest.java
index 18f251a..1a774d6 100644
--- 
a/extensions/serialization-javaxxml/src/test/java/org/apache/polygene/serialization/javaxxml/HandCraftedXmlTest.java
+++ 
b/extensions/serialization-javaxxml/src/test/java/org/apache/polygene/serialization/javaxxml/HandCraftedXmlTest.java
@@ -24,11 +24,11 @@ import org.apache.polygene.api.serialization.Deserializer;
 import org.apache.polygene.bootstrap.ModuleAssembly;
 import 
org.apache.polygene.serialization.javaxxml.assembly.JavaxXmlSerializationAssembler;
 import org.apache.polygene.test.AbstractPolygeneTest;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.nullValue;
-import static org.junit.Assert.assertThat;
 
 public class HandCraftedXmlTest extends AbstractPolygeneTest
 {

Reply via email to