From aa49fcd96efb93ad995b3a5dd3ec53cdd6b962e2 Mon Sep 17 00:00:00 2001 From: chewiebug Date: Tue, 13 Jul 2021 15:54:10 +0200 Subject: [PATCH] introduce openjdk17 compile compatibility --- .travis.yml | 5 +- README.md | 2 +- pom.xml | 55 ++++++++++++------- .../tagtraum/perf/gcviewer/GCViewerTest.java | 2 +- .../ctrl/impl/GCModelLoaderFactoryTest.java | 10 ++-- .../ctrl/impl/GcSeriesLoaderTest.java | 2 +- .../gcviewer/imp/TestDataReaderFacade.java | 15 ++++- 7 files changed, 57 insertions(+), 34 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8407ef6b..3e4d1eb6 100644 --- 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 index 637fc91e..ff6ace87 100644 --- 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 index d288a03f..60c13dae 100644 --- a/pom.xml +++ b/pom.xml @@ -198,13 +198,13 @@ UTF-8 - 4.13.1 - 1.3 - 1.10.19 + 4.13.2 + 2.2 + 4.3.1 1.8 1.8 1.4 - 0.8.6 + 0.8.7 3.0.1 3.0.1 1.6 @@ -219,7 +219,7 @@ 1.10.0 2.8.2 - 3.1.1 + 3.1.2 1.6.8 @@ -239,13 +239,13 @@ org.hamcrest - hamcrest-library + hamcrest ${hamcrest.version} test org.mockito - mockito-all + mockito-core ${mockito.version} test @@ -432,22 +432,22 @@ maven-site-plugin 3.7.1 + + maven-jdeps-plugin + ${maven.jdeps.plugin.version} + + + + jdkinternals + test-jdkinternals + + + + - - maven-jdeps-plugin - ${maven.jdeps.plugin.version} - - - - jdkinternals - test-jdkinternals - - - - org.codehaus.mojo buildnumber-maven-plugin @@ -557,6 +557,23 @@ + + jdk9plus-build + + [9,17] + + + + + maven-jdeps-plugin + + base + + + + + + diff --git a/src/test/java/com/tagtraum/perf/gcviewer/GCViewerTest.java b/src/test/java/com/tagtraum/perf/gcviewer/GCViewerTest.java index 89bf6f02..ecae3505 100644 --- 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 index 8b484efc..eb09053a 100644 --- 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,5 +1,9 @@ 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; @@ -7,11 +11,7 @@ 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 index a95280ca..000f5a86 100644 --- 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 index d4fb0395..d265e511 100644 --- 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]); + } + }