Add more Java versions to Travis CI build matrix (#2403)

dropwizard · Jul 2, 2018 · e103b26 · e103b26
1 parent f9ff3ff
commit e103b26
Show file tree

Hide file tree

Showing 8 changed files with 69 additions and 50 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,9 +1,14 @@
 dist: trusty
 sudo: false
 language: java
+jdk:
+  - openjdk8
+  - oraclejdk8
+  - openjdk9
+  - openjdk10
+  - openjdk11
 before_install:
   - ulimit -c unlimited -S
-  - 'wget https://raw.githubusercontent.com/sormuras/bach/master/install-jdk.sh'
 script:
   - ./mvnw verify -B -P code-coverage
   - ./mvnw site -pl docs -B
@@ -12,18 +17,6 @@ after_success:
 cache:
   directories:
     - $HOME/.m2
-
-matrix:
-  include:
-    - os: linux
-      jdk: oraclejdk8
-      addons:
-        apt:
-          packages:
-            - oracle-java8-installer
-    - os: linux
-      env: JDK='OpenJDK 10'
-      install: . ./install-jdk.sh -F 10
 deploy:
   provider: script
   script: bash .travis_deploy.sh

diff --git a/dropwizard-archetypes/java-simple/src/main/resources/archetype-resources/pom.xml b/dropwizard-archetypes/java-simple/src/main/resources/archetype-resources/pom.xml
@@ -47,7 +47,7 @@
 #if( $shaded == "true" )
             <plugin>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>2.4.1</version>
+                <version>3.1.1</version>
                 <configuration>
                     <createDependencyReducedPom>true</createDependencyReducedPom>
                     <transformers>
@@ -80,7 +80,7 @@
 #end
             <plugin>
                 <artifactId>maven-jar-plugin</artifactId>
-                <version>3.0.2</version>
+                <version>3.1.0</version>
                 <configuration>
                     <archive>
                         <manifest>
@@ -92,7 +92,7 @@
             </plugin>
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.6.1</version>
+                <version>3.7.0</version>
                 <configuration>
                     <source>1.8</source>
                     <target>1.8</target>
@@ -112,7 +112,7 @@
             </plugin>
             <plugin>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>3.0.0-M1</version>
+                <version>3.0.1</version>
                 <executions>
                     <execution>
                         <id>attach-javadocs</id>
@@ -129,15 +129,15 @@
         <plugins>
             <plugin>
                 <artifactId>maven-project-info-reports-plugin</artifactId>
-                <version>2.8.1</version>
+                <version>3.0.0</version>
                 <configuration>
                     <dependencyLocationsEnabled>false</dependencyLocationsEnabled>
                     <dependencyDetailsEnabled>false</dependencyDetailsEnabled>
                 </configuration>
             </plugin>
             <plugin>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.10.3</version>
+                <version>3.0.1</version>
             </plugin>
         </plugins>
     </reporting>

diff --git a/dropwizard-bom/pom.xml b/dropwizard-bom/pom.xml
@@ -88,6 +88,18 @@
                 <artifactId>javax.servlet-api</artifactId>
                 <version>4.0.0</version>
             </dependency>
+            <dependency>
+                <groupId>javax.xml.bind</groupId>
+                <artifactId>jaxb-api</artifactId>
+                <version>2.3.0</version>
+                <scope>runtime</scope>
+            </dependency>
+            <dependency>
+                <groupId>javax.activation</groupId>
+                <artifactId>javax.activation-api</artifactId>
+                <version>1.2.0</version>
+                <scope>runtime</scope>
+            </dependency>
             <dependency>
                 <groupId>org.apache.httpcomponents</groupId>
                 <artifactId>httpclient</artifactId>
@@ -142,7 +154,7 @@
             <dependency>
                 <groupId>org.javassist</groupId>
                 <artifactId>javassist</artifactId>
-                <version>3.22.0-GA</version>
+                <version>3.23.1-GA</version>
             </dependency>
             <dependency>
                 <groupId>com.fasterxml</groupId>

diff --git a/dropwizard-example/pom.xml b/dropwizard-example/pom.xml
@@ -311,25 +311,39 @@
             </build>
         </profile>
         <profile>
+            <id>jdk9</id>
+            <activation>
+                <jdk>9</jdk>
+            </activation>
+            <properties>
+                <maven.compiler.release>9</maven.compiler.release>
+                <maven.compiler.source>1.9</maven.compiler.source>
+                <maven.compiler.target>1.9</maven.compiler.target>
+            </properties>
+        </profile>
+         <profile>
             <id>jdk10</id>
             <activation>
                 <jdk>10</jdk>
             </activation>
             <properties>
+                <maven.compiler.release>10</maven.compiler.release>
                 <maven.compiler.source>1.10</maven.compiler.source>
                 <maven.compiler.target>1.10</maven.compiler.target>
             </properties>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <argLine>--add-modules java.xml.bind</argLine>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
+        </profile>
+         <profile>
+            <id>jdk11</id>
+            <activation>
+                <jdk>11</jdk>
+            </activation>
+            <properties>
+                <maven.compiler.release>11</maven.compiler.release>
+                <maven.compiler.source>11</maven.compiler.source>
+                <maven.compiler.target>11</maven.compiler.target>
+                <!-- https://github.com/jacoco/jacoco/issues/663 -->
+                <jacoco.skip>true</jacoco.skip>
+            </properties>
         </profile>
     </profiles>
 </project>
diff --git a/dropwizard-http2/pom.xml b/dropwizard-http2/pom.xml
@@ -99,10 +99,10 @@
         <profile>
             <id>jdk10</id>
             <activation>
-                <jdk>10</jdk>
+                <jdk>[9, 11]</jdk>
             </activation>
             <properties>
-                <argLine>-Duser.language=en -Duser.region=US --add-modules java.xml.bind</argLine>
+                <argLine>-Duser.language=en -Duser.region=US</argLine>
             </properties>
             <dependencies>
                 <dependency>

diff --git a/dropwizard-jersey/pom.xml b/dropwizard-jersey/pom.xml
@@ -105,5 +105,13 @@
             <groupId>com.github.ben-manes.caffeine</groupId>
             <artifactId>caffeine</artifactId>
         </dependency>
+        <dependency>
+            <groupId>javax.xml.bind</groupId>
+            <artifactId>jaxb-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>javax.activation</groupId>
+            <artifactId>javax.activation-api</artifactId>
+        </dependency>
     </dependencies>
 </project>
diff --git a/...-migrations/src/test/java/io/dropwizard/migrations/DbMigrateDifferentFileCommandTest.java b/...-migrations/src/test/java/io/dropwizard/migrations/DbMigrateDifferentFileCommandTest.java
@@ -4,6 +4,7 @@
 import net.jcip.annotations.NotThreadSafe;
 import net.sourceforge.argparse4j.inf.Namespace;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.skife.jdbi.v2.DBI;
 import org.skife.jdbi.v2.Handle;
@@ -39,6 +40,7 @@ public void testRun() throws Exception {
     }
 
     @Test
+    @Ignore("Ignored until https://liquibase.jira.com/browse/CORE-3262 has been solved")
     public void testRunForFileFromFilesystem() throws Exception {
         final String migrationsPath = new File(Resources.getResource("migrations.xml").toURI())
             .getAbsolutePath();

diff --git a/pom.xml b/pom.xml
@@ -68,7 +68,7 @@
         <junit.version>4.12</junit.version>
         <junit5.version>5.2.0</junit5.version>
         <assertj.version>3.9.1</assertj.version>
-        <mockito.version>2.15.0</mockito.version>
+        <mockito.version>2.19.0</mockito.version>
     </properties>
 
     <developers>
@@ -380,29 +380,19 @@
             </build>
         </profile>
         <profile>
-            <id>jdk10</id>
+            <id>jdk11</id>
             <activation>
-                <jdk>10</jdk>
+                <jdk>11</jdk>
             </activation>
             <properties>
-                <argLine>-Duser.language=en -Duser.region=US --add-modules java.xml.bind</argLine>
+                <!-- https://github.com/jacoco/jacoco/issues/663 -->
+                <jacoco.skip>true</jacoco.skip>
             </properties>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-compiler-plugin</artifactId>
-                        <configuration>
-                            <debug>true</debug>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
         </profile>
         <profile>
             <id>code-coverage</id>
             <activation>
-                <jdk>10</jdk>
+                <jdk>[9,11)</jdk>
             </activation>
             <build>
                 <plugins>
@@ -508,7 +498,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-javadoc-plugin</artifactId>
-                    <version>3.0.0</version>
+                    <version>3.0.1</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>