diff --git a/documentation/documentation.gradle b/documentation/documentation.gradle index 244a176ee1..69e3d20e69 100644 --- a/documentation/documentation.gradle +++ b/documentation/documentation.gradle @@ -85,6 +85,31 @@ dependencies { testRuntime( libraries.mssql ) } } + + // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + // Java 9 ftw! + if ( JavaVersion.current().isJava9Compatible() ) { + // The JDK used to run Gradle is Java 9+, and we assume that that is the same + // JDK for executing tasks + compile( 'com.sun.xml.bind:jaxb-impl:2.2.11' ) + compile( 'org.glassfish.jaxb:jaxb-xjc:2.2.11' ) + compile( 'org.jvnet.jaxb2_commons:jaxb2-basics:0.11.0' ) + compile( 'org.jvnet.jaxb2_commons:jaxb2-basics-ant:0.11.0' ) + compile( 'javax:javaee-api:7.0' ) + + testCompile( 'com.sun.xml.bind:jaxb-impl:2.2.11' ) + testCompile( 'org.glassfish.jaxb:jaxb-xjc:2.2.11' ) + testCompile( 'org.jvnet.jaxb2_commons:jaxb2-basics:0.11.0' ) + testCompile( 'org.jvnet.jaxb2_commons:jaxb2-basics-ant:0.11.0' ) + testCompile( 'javax:javaee-api:7.0' ) + + testRuntime( 'com.sun.xml.bind:jaxb-impl:2.2.11' ) + testRuntime( 'org.glassfish.jaxb:jaxb-xjc:2.2.11' ) + testRuntime( 'org.jvnet.jaxb2_commons:jaxb2-basics:0.11.0' ) + testRuntime( 'org.jvnet.jaxb2_commons:jaxb2-basics-ant:0.11.0' ) + testRuntime( 'javax:javaee-api:7.0' ) + } + // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ } processTestResources.doLast( { diff --git a/hibernate-c3p0/hibernate-c3p0.gradle b/hibernate-c3p0/hibernate-c3p0.gradle index d260fd0c89..c7a387d547 100644 --- a/hibernate-c3p0/hibernate-c3p0.gradle +++ b/hibernate-c3p0/hibernate-c3p0.gradle @@ -17,6 +17,31 @@ dependencies { // EL libraries are provided scope in Validator testRuntime( libraries.expression_language_api ) testRuntime( libraries.expression_language_impl ) + + // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + // Java 9 ftw! + if ( JavaVersion.current().isJava9Compatible() ) { + // The JDK used to run Gradle is Java 9+, and we assume that that is the same + // JDK for executing tasks + compile( 'com.sun.xml.bind:jaxb-impl:2.2.11' ) + compile( 'org.glassfish.jaxb:jaxb-xjc:2.2.11' ) + compile( 'org.jvnet.jaxb2_commons:jaxb2-basics:0.11.0' ) + compile( 'org.jvnet.jaxb2_commons:jaxb2-basics-ant:0.11.0' ) + compile( 'javax:javaee-api:7.0' ) + + testCompile( 'com.sun.xml.bind:jaxb-impl:2.2.11' ) + testCompile( 'org.glassfish.jaxb:jaxb-xjc:2.2.11' ) + testCompile( 'org.jvnet.jaxb2_commons:jaxb2-basics:0.11.0' ) + testCompile( 'org.jvnet.jaxb2_commons:jaxb2-basics-ant:0.11.0' ) + testCompile( 'javax:javaee-api:7.0' ) + + testRuntime( 'com.sun.xml.bind:jaxb-impl:2.2.11' ) + testRuntime( 'org.glassfish.jaxb:jaxb-xjc:2.2.11' ) + testRuntime( 'org.jvnet.jaxb2_commons:jaxb2-basics:0.11.0' ) + testRuntime( 'org.jvnet.jaxb2_commons:jaxb2-basics-ant:0.11.0' ) + testRuntime( 'javax:javaee-api:7.0' ) + } + // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ } mavenPom { diff --git a/hibernate-ehcache/hibernate-ehcache.gradle b/hibernate-ehcache/hibernate-ehcache.gradle index 572af6c397..f0a4a1e293 100644 --- a/hibernate-ehcache/hibernate-ehcache.gradle +++ b/hibernate-ehcache/hibernate-ehcache.gradle @@ -9,6 +9,32 @@ dependencies { compile( libraries.ehcache ) testCompile project( ':hibernate-testing' ) + + + // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + // Java 9 ftw! + if ( JavaVersion.current().isJava9Compatible() ) { + // The JDK used to run Gradle is Java 9+, and we assume that that is the same + // JDK for executing tasks + provided( 'com.sun.xml.bind:jaxb-impl:2.2.11' ) + provided( 'org.glassfish.jaxb:jaxb-xjc:2.2.11' ) + provided( 'org.jvnet.jaxb2_commons:jaxb2-basics:0.11.0' ) + provided( 'org.jvnet.jaxb2_commons:jaxb2-basics-ant:0.11.0' ) + provided( 'javax:javaee-api:7.0' ) + + testCompile( 'com.sun.xml.bind:jaxb-impl:2.2.11' ) + testCompile( 'org.glassfish.jaxb:jaxb-xjc:2.2.11' ) + testCompile( 'org.jvnet.jaxb2_commons:jaxb2-basics:0.11.0' ) + testCompile( 'org.jvnet.jaxb2_commons:jaxb2-basics-ant:0.11.0' ) + testCompile( 'javax:javaee-api:7.0' ) + + testRuntime( 'com.sun.xml.bind:jaxb-impl:2.2.11' ) + testRuntime( 'org.glassfish.jaxb:jaxb-xjc:2.2.11' ) + testRuntime( 'org.jvnet.jaxb2_commons:jaxb2-basics:0.11.0' ) + testRuntime( 'org.jvnet.jaxb2_commons:jaxb2-basics-ant:0.11.0' ) + testRuntime( 'javax:javaee-api:7.0' ) + } + // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ } mavenPom { diff --git a/hibernate-envers/hibernate-envers.gradle b/hibernate-envers/hibernate-envers.gradle index 2a6701ba31..62f35318d2 100644 --- a/hibernate-envers/hibernate-envers.gradle +++ b/hibernate-envers/hibernate-envers.gradle @@ -16,6 +16,31 @@ dependencies { testCompile( project( ':hibernate-testing' ) ) testCompile( project( path: ':hibernate-core', configuration: 'tests' ) ) testRuntime( libraries.javassist ) + + // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + // Java 9 ftw! + if ( JavaVersion.current().isJava9Compatible() ) { + // The JDK used to run Gradle is Java 9+, and we assume that that is the same + // JDK for executing tasks + provided( 'com.sun.xml.bind:jaxb-impl:2.2.11' ) + provided( 'org.glassfish.jaxb:jaxb-xjc:2.2.11' ) + provided( 'org.jvnet.jaxb2_commons:jaxb2-basics:0.11.0' ) + provided( 'org.jvnet.jaxb2_commons:jaxb2-basics-ant:0.11.0' ) + provided( 'javax:javaee-api:7.0' ) + + testCompile( 'com.sun.xml.bind:jaxb-impl:2.2.11' ) + testCompile( 'org.glassfish.jaxb:jaxb-xjc:2.2.11' ) + testCompile( 'org.jvnet.jaxb2_commons:jaxb2-basics:0.11.0' ) + testCompile( 'org.jvnet.jaxb2_commons:jaxb2-basics-ant:0.11.0' ) + testCompile( 'javax:javaee-api:7.0' ) + + testRuntime( 'com.sun.xml.bind:jaxb-impl:2.2.11' ) + testRuntime( 'org.glassfish.jaxb:jaxb-xjc:2.2.11' ) + testRuntime( 'org.jvnet.jaxb2_commons:jaxb2-basics:0.11.0' ) + testRuntime( 'org.jvnet.jaxb2_commons:jaxb2-basics-ant:0.11.0' ) + testRuntime( 'javax:javaee-api:7.0' ) + } + // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ } mavenPom { diff --git a/hibernate-hikaricp/hibernate-hikaricp.gradle b/hibernate-hikaricp/hibernate-hikaricp.gradle index 08b15f3ebb..101cc2c13b 100644 --- a/hibernate-hikaricp/hibernate-hikaricp.gradle +++ b/hibernate-hikaricp/hibernate-hikaricp.gradle @@ -8,6 +8,31 @@ dependencies { compile project( ':hibernate-core' ) compile( libraries.hikaricp ) testCompile project( ':hibernate-testing' ) + + // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + // Java 9 ftw! + if ( JavaVersion.current().isJava9Compatible() ) { + // The JDK used to run Gradle is Java 9+, and we assume that that is the same + // JDK for executing tasks + compile( 'com.sun.xml.bind:jaxb-impl:2.2.11' ) + compile( 'org.glassfish.jaxb:jaxb-xjc:2.2.11' ) + compile( 'org.jvnet.jaxb2_commons:jaxb2-basics:0.11.0' ) + compile( 'org.jvnet.jaxb2_commons:jaxb2-basics-ant:0.11.0' ) + compile( 'javax:javaee-api:7.0' ) + + testCompile( 'com.sun.xml.bind:jaxb-impl:2.2.11' ) + testCompile( 'org.glassfish.jaxb:jaxb-xjc:2.2.11' ) + testCompile( 'org.jvnet.jaxb2_commons:jaxb2-basics:0.11.0' ) + testCompile( 'org.jvnet.jaxb2_commons:jaxb2-basics-ant:0.11.0' ) + testCompile( 'javax:javaee-api:7.0' ) + + testRuntime( 'com.sun.xml.bind:jaxb-impl:2.2.11' ) + testRuntime( 'org.glassfish.jaxb:jaxb-xjc:2.2.11' ) + testRuntime( 'org.jvnet.jaxb2_commons:jaxb2-basics:0.11.0' ) + testRuntime( 'org.jvnet.jaxb2_commons:jaxb2-basics-ant:0.11.0' ) + testRuntime( 'javax:javaee-api:7.0' ) + } + // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ } mavenPom { @@ -18,3 +43,8 @@ mavenPom { def osgiDescription() { return mavenPom.description } + +if ( JavaVersion.current().isJava9Compatible() ) { + // Hikari CP relies on Javassist which we know has issues with Java 9 + test.enabled = false +} diff --git a/hibernate-infinispan/hibernate-infinispan.gradle b/hibernate-infinispan/hibernate-infinispan.gradle index 6966e312bb..353e2c0f86 100644 --- a/hibernate-infinispan/hibernate-infinispan.gradle +++ b/hibernate-infinispan/hibernate-infinispan.gradle @@ -26,6 +26,31 @@ dependencies { testCompile( libraries.jnp_server ) testCompile( libraries.mockito ) testCompile ('mysql:mysql-connector-java:5.1.17') + + // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + // Java 9 ftw! + if ( JavaVersion.current().isJava9Compatible() ) { + // The JDK used to run Gradle is Java 9+, and we assume that that is the same + // JDK for executing tasks + compile( 'com.sun.xml.bind:jaxb-impl:2.2.11' ) + compile( 'org.glassfish.jaxb:jaxb-xjc:2.2.11' ) + compile( 'org.jvnet.jaxb2_commons:jaxb2-basics:0.11.0' ) + compile( 'org.jvnet.jaxb2_commons:jaxb2-basics-ant:0.11.0' ) + compile( 'javax:javaee-api:7.0' ) + + testCompile( 'com.sun.xml.bind:jaxb-impl:2.2.11' ) + testCompile( 'org.glassfish.jaxb:jaxb-xjc:2.2.11' ) + testCompile( 'org.jvnet.jaxb2_commons:jaxb2-basics:0.11.0' ) + testCompile( 'org.jvnet.jaxb2_commons:jaxb2-basics-ant:0.11.0' ) + testCompile( 'javax:javaee-api:7.0' ) + + testRuntime( 'com.sun.xml.bind:jaxb-impl:2.2.11' ) + testRuntime( 'org.glassfish.jaxb:jaxb-xjc:2.2.11' ) + testRuntime( 'org.jvnet.jaxb2_commons:jaxb2-basics:0.11.0' ) + testRuntime( 'org.jvnet.jaxb2_commons:jaxb2-basics-ant:0.11.0' ) + testRuntime( 'javax:javaee-api:7.0' ) + } + // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ } mavenPom { diff --git a/hibernate-jcache/hibernate-jcache.gradle b/hibernate-jcache/hibernate-jcache.gradle index 1c60b311e6..bb775d2722 100644 --- a/hibernate-jcache/hibernate-jcache.gradle +++ b/hibernate-jcache/hibernate-jcache.gradle @@ -5,6 +5,31 @@ dependencies { testCompile project( ':hibernate-testing' ) testCompile( libraries.mockito ) testRuntime( libraries.ehcache3 ) + + // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + // Java 9 ftw! + if ( JavaVersion.current().isJava9Compatible() ) { + // The JDK used to run Gradle is Java 9+, and we assume that that is the same + // JDK for executing tasks + compile( 'com.sun.xml.bind:jaxb-impl:2.2.11' ) + compile( 'org.glassfish.jaxb:jaxb-xjc:2.2.11' ) + compile( 'org.jvnet.jaxb2_commons:jaxb2-basics:0.11.0' ) + compile( 'org.jvnet.jaxb2_commons:jaxb2-basics-ant:0.11.0' ) + compile( 'javax:javaee-api:7.0' ) + + testCompile( 'com.sun.xml.bind:jaxb-impl:2.2.11' ) + testCompile( 'org.glassfish.jaxb:jaxb-xjc:2.2.11' ) + testCompile( 'org.jvnet.jaxb2_commons:jaxb2-basics:0.11.0' ) + testCompile( 'org.jvnet.jaxb2_commons:jaxb2-basics-ant:0.11.0' ) + testCompile( 'javax:javaee-api:7.0' ) + + testRuntime( 'com.sun.xml.bind:jaxb-impl:2.2.11' ) + testRuntime( 'org.glassfish.jaxb:jaxb-xjc:2.2.11' ) + testRuntime( 'org.jvnet.jaxb2_commons:jaxb2-basics:0.11.0' ) + testRuntime( 'org.jvnet.jaxb2_commons:jaxb2-basics-ant:0.11.0' ) + testRuntime( 'javax:javaee-api:7.0' ) + } + // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ } mavenPom { diff --git a/hibernate-osgi/hibernate-osgi.gradle b/hibernate-osgi/hibernate-osgi.gradle index 0bc8929adc..f5c1e774a3 100644 --- a/hibernate-osgi/hibernate-osgi.gradle +++ b/hibernate-osgi/hibernate-osgi.gradle @@ -63,6 +63,31 @@ dependencies { } karafDistro "org.apache.karaf:apache-karaf:${karafVersion}@tar.gz" + + // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + // Java 9 ftw! + if ( JavaVersion.current().isJava9Compatible() ) { + // The JDK used to run Gradle is Java 9+, and we assume that that is the same + // JDK for executing tasks + compile( 'com.sun.xml.bind:jaxb-impl:2.2.11' ) + compile( 'org.glassfish.jaxb:jaxb-xjc:2.2.11' ) + compile( 'org.jvnet.jaxb2_commons:jaxb2-basics:0.11.0' ) + compile( 'org.jvnet.jaxb2_commons:jaxb2-basics-ant:0.11.0' ) + compile( 'javax:javaee-api:7.0' ) + + testCompile( 'com.sun.xml.bind:jaxb-impl:2.2.11' ) + testCompile( 'org.glassfish.jaxb:jaxb-xjc:2.2.11' ) + testCompile( 'org.jvnet.jaxb2_commons:jaxb2-basics:0.11.0' ) + testCompile( 'org.jvnet.jaxb2_commons:jaxb2-basics-ant:0.11.0' ) + testCompile( 'javax:javaee-api:7.0' ) + + testRuntime( 'com.sun.xml.bind:jaxb-impl:2.2.11' ) + testRuntime( 'org.glassfish.jaxb:jaxb-xjc:2.2.11' ) + testRuntime( 'org.jvnet.jaxb2_commons:jaxb2-basics:0.11.0' ) + testRuntime( 'org.jvnet.jaxb2_commons:jaxb2-basics-ant:0.11.0' ) + testRuntime( 'javax:javaee-api:7.0' ) + } + // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ } mavenPom { @@ -373,4 +398,9 @@ publishing { } } } +} + +if ( JavaVersion.current().isJava9Compatible() ) { + // Hikari CP relies on Javassist which we know has issues with Java 9 + test.enabled = false } \ No newline at end of file diff --git a/hibernate-spatial/hibernate-spatial.gradle b/hibernate-spatial/hibernate-spatial.gradle index e7b9362335..422ff6b7a0 100644 --- a/hibernate-spatial/hibernate-spatial.gradle +++ b/hibernate-spatial/hibernate-spatial.gradle @@ -54,6 +54,31 @@ dependencies { testRuntime('jaxen:jaxen:1.1') testRuntime(libraries.javassist) + + // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + // Java 9 ftw! + if ( JavaVersion.current().isJava9Compatible() ) { + // The JDK used to run Gradle is Java 9+, and we assume that that is the same + // JDK for executing tasks + compile( 'com.sun.xml.bind:jaxb-impl:2.2.11' ) + compile( 'org.glassfish.jaxb:jaxb-xjc:2.2.11' ) + compile( 'org.jvnet.jaxb2_commons:jaxb2-basics:0.11.0' ) + compile( 'org.jvnet.jaxb2_commons:jaxb2-basics-ant:0.11.0' ) + compile( 'javax:javaee-api:7.0' ) + + testCompile( 'com.sun.xml.bind:jaxb-impl:2.2.11' ) + testCompile( 'org.glassfish.jaxb:jaxb-xjc:2.2.11' ) + testCompile( 'org.jvnet.jaxb2_commons:jaxb2-basics:0.11.0' ) + testCompile( 'org.jvnet.jaxb2_commons:jaxb2-basics-ant:0.11.0' ) + testCompile( 'javax:javaee-api:7.0' ) + + testRuntime( 'com.sun.xml.bind:jaxb-impl:2.2.11' ) + testRuntime( 'org.glassfish.jaxb:jaxb-xjc:2.2.11' ) + testRuntime( 'org.jvnet.jaxb2_commons:jaxb2-basics:0.11.0' ) + testRuntime( 'org.jvnet.jaxb2_commons:jaxb2-basics-ant:0.11.0' ) + testRuntime( 'javax:javaee-api:7.0' ) + } + // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ } sourceSets.test.resources {