introduce openjdk17 compile compatibility

chewiebug · Jan 29, 2022 · aa49fcd · aa49fcd
1 parent 44c761e
commit aa49fcd
Show file tree

Hide file tree

Showing 7 changed files with 57 additions and 34 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,13 +1,10 @@
 # more details for build customization see http://docs.travis-ci.com/user/customizing-the-build/
 language: java
 
-# use the container based infrastructure on travis
-sudo: false
-
 jdk:
   - openjdk8
   - openjdk11
-  - openjdk15
+  - openjdk17
 
 # enable cache to stop downloading all maven plugins every time
 cache:

diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 GCViewer 1.36
 =============
 
-[![Build Status](https://travis-ci.com/chewiebug/GCViewer.svg?branch=develop)](https://travis-ci.com/chewiebug/GCViewer)
+[![Build Status](https://app.travis-ci.com/chewiebug/GCViewer.svg?branch=develop)](https://app.travis-ci.com/chewiebug/GCViewer)
 [![codecov.io](https://codecov.io/github/chewiebug/GCViewer/coverage.svg?branch=develop)](https://codecov.io/github/chewiebug/GCViewer?branch=develop)
 
 GCViewer is a little tool that visualizes verbose GC output

diff --git a/pom.xml b/pom.xml
@@ -198,13 +198,13 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <junit.version>4.13.1</junit.version>
-        <hamcrest.version>1.3</hamcrest.version>
-        <mockito.version>1.10.19</mockito.version>
+        <junit.version>4.13.2</junit.version>
+        <hamcrest.version>2.2</hamcrest.version>
+        <mockito.version>4.3.1</mockito.version>
         <jdk.source.version>1.8</jdk.source.version>
         <jdk.target.version>1.8</jdk.target.version>
         <tools.maven.plugin.version>1.4</tools.maven.plugin.version>
-        <jacoco.maven.plugin.version>0.8.6</jacoco.maven.plugin.version>
+        <jacoco.maven.plugin.version>0.8.7</jacoco.maven.plugin.version>
         <maven.source.plugin.version>3.0.1</maven.source.plugin.version>
         <maven.javadoc.plugin.version>3.0.1</maven.javadoc.plugin.version>
         <maven.gpg.plugin.version>1.6</maven.gpg.plugin.version>
@@ -219,7 +219,7 @@
         <!-- https://issues.apache.org/jira/browse/MRELEASE-1013 -->
         <maven.scm.plugin.version>1.10.0</maven.scm.plugin.version>
         <maven.deploy.plugin.version>2.8.2</maven.deploy.plugin.version>
-        <maven.jdeps.plugin.version>3.1.1</maven.jdeps.plugin.version>
+        <maven.jdeps.plugin.version>3.1.2</maven.jdeps.plugin.version>
         <nexus.staging.maven.plugin.version>1.6.8</nexus.staging.maven.plugin.version>
     </properties>
 
@@ -239,13 +239,13 @@
         </dependency>
         <dependency>
             <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest-library</artifactId>
+            <artifactId>hamcrest</artifactId>
             <version>${hamcrest.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
-            <artifactId>mockito-all</artifactId>
+            <artifactId>mockito-core</artifactId>
             <version>${mockito.version}</version>
             <scope>test</scope>
         </dependency>
@@ -432,22 +432,22 @@
                     <artifactId>maven-site-plugin</artifactId>
                     <version>3.7.1</version>
                 </plugin>
+                <plugin>
+                    <artifactId>maven-jdeps-plugin</artifactId>
+                    <version>${maven.jdeps.plugin.version}</version>
+                    <executions>
+                        <execution>
+                            <goals>
+                                <goal>jdkinternals</goal> <!-- verify main classes -->
+                                <goal>test-jdkinternals</goal> <!-- verify test classes -->
+                            </goals>
+                        </execution>
+                    </executions>
+                </plugin>
             </plugins>
         </pluginManagement>
 
         <plugins>
-            <plugin>
-                <artifactId>maven-jdeps-plugin</artifactId>
-                <version>${maven.jdeps.plugin.version}</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>jdkinternals</goal> <!-- verify main classes -->
-                            <goal>test-jdkinternals</goal> <!-- verify test classes -->
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>buildnumber-maven-plugin</artifactId>
@@ -557,6 +557,23 @@
     </build>
 
     <profiles>
+        <profile>
+            <id>jdk9plus-build</id>
+            <activation>
+                <jdk>[9,17]</jdk>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <artifactId>maven-jdeps-plugin</artifactId>
+                        <configuration>
+                            <multiRelease>base</multiRelease>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+
         <profile>
             <!-- Override plugin versions of Sonatype profile. This needs
                 to be done here because profiles are not inherited. -->

diff --git a/src/test/java/com/tagtraum/perf/gcviewer/GCViewerTest.java b/src/test/java/com/tagtraum/perf/gcviewer/GCViewerTest.java
@@ -2,7 +2,7 @@
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.is;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;

diff --git a/src/test/java/com/tagtraum/perf/gcviewer/ctrl/impl/GCModelLoaderFactoryTest.java b/src/test/java/com/tagtraum/perf/gcviewer/ctrl/impl/GCModelLoaderFactoryTest.java
@@ -1,17 +1,17 @@
 package com.tagtraum.perf.gcviewer.ctrl.impl;
 
+import static org.hamcrest.CoreMatchers.instanceOf;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.mockito.Mockito.mock;
+
 import com.tagtraum.perf.gcviewer.model.GCResource;
 import com.tagtraum.perf.gcviewer.model.GcResourceFile;
 import com.tagtraum.perf.gcviewer.model.GcResourceSeries;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 import org.junit.runner.RunWith;
-import org.mockito.runners.MockitoJUnitRunner;
-
-import static org.hamcrest.CoreMatchers.instanceOf;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.mockito.Mockito.mock;
+import org.mockito.junit.MockitoJUnitRunner;
 
 /**
  * @author martin.geldmacher

diff --git a/src/test/java/com/tagtraum/perf/gcviewer/ctrl/impl/GcSeriesLoaderTest.java b/src/test/java/com/tagtraum/perf/gcviewer/ctrl/impl/GcSeriesLoaderTest.java
@@ -32,7 +32,7 @@
 import org.junit.rules.ExpectedException;
 import org.junit.rules.TemporaryFolder;
 import org.junit.runner.RunWith;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 
 @RunWith(MockitoJUnitRunner.class)
 public class GcSeriesLoaderTest {

diff --git a/src/test/java/com/tagtraum/perf/gcviewer/imp/TestDataReaderFacade.java b/src/test/java/com/tagtraum/perf/gcviewer/imp/TestDataReaderFacade.java
@@ -1,6 +1,7 @@
 package com.tagtraum.perf.gcviewer.imp;
 
 import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.Matchers.greaterThanOrEqualTo;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertThat;
@@ -89,9 +90,9 @@ public void loadModelIllegalArgument() throws Exception {
         }
         catch (DataReaderException e) {
             assertNotNull("cause", e.getCause());
-            Class expectedClass;
-            String javaVersion = System.getProperty("java.version");
-            if (javaVersion.startsWith("14") || javaVersion.startsWith("15")) {
+            Class<?> expectedClass;
+            int javaMajorVersion = getJavaMajorVersion();
+            if (javaMajorVersion > 13) {
                 expectedClass = IOException.class;
             } else {
                 expectedClass = IllegalArgumentException.class;
@@ -171,4 +172,12 @@ public void testLoadModelFromSeries() throws IOException, DataReaderException {
         GCModel result = dataReaderFacade.loadModel(series);
         assertThat(result.toString(), is(expectedModel.toString()));
     }
+
+    private int getJavaMajorVersion() {
+        String javaVersion = System.getProperty("java.version");
+        String[] javaVersionParts = javaVersion.split("\\.");
+        assertThat("java version format", javaVersionParts.length, greaterThanOrEqualTo(1));
+        return Integer.parseInt(javaVersionParts[0]);
+    }
+
 }