diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index df0d8d5ff..e26bd5472 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -25,8 +25,8 @@ jobs: strategy: matrix: os: [ubuntu-latest, windows-latest, macOS-latest] - java: [8, 11, 14, 15, 16, 17-ea] - jdk: [adopt, zulu] + java: [8, 11, 16] + jdk: ['adopt-openj9', zulu] fail-fast: false runs-on: ${{ matrix.os }} diff --git a/pom.xml b/pom.xml index 923cd9f27..8cbf64231 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.codehaus.mojo mojo-parent - 50 + 63 versions-maven-plugin @@ -107,7 +107,8 @@ - 1.7 + 1.8 + ${mojo.java.target} 2.2.1 3.4.0 @@ -268,29 +269,12 @@ modello-maven-plugin 1.11 - - - org.apache.maven.plugins - maven-jar-plugin - 3.2.0 - - - org.apache.maven.plugins - maven-source-plugin - 3.2.1 - - - org.apache.maven.plugins - maven-assembly-plugin - 3.2.0 - org.apache.maven.plugins maven-plugin-plugin - 3.5.1 true @@ -308,7 +292,7 @@ animal-sniffer-maven-plugin - check-java17 + check-java18 test check @@ -316,7 +300,7 @@ org.codehaus.mojo.signature - java17 + java18 1.0 @@ -390,7 +374,6 @@ org.apache.maven.plugins maven-invoker-plugin - 3.2.2 src/it ${project.build.directory}/it @@ -429,7 +412,6 @@ - maven-javadoc-plugin diff --git a/src/main/java/org/codehaus/mojo/versions/api/UpdateScope.java b/src/main/java/org/codehaus/mojo/versions/api/UpdateScope.java index 053946b7f..371241e00 100644 --- a/src/main/java/org/codehaus/mojo/versions/api/UpdateScope.java +++ b/src/main/java/org/codehaus/mojo/versions/api/UpdateScope.java @@ -405,7 +405,7 @@ public final Class getDeclaringClass() * @return the enum constant of the specified enum type with the specified name * @throws IllegalArgumentException if the specified enum type has no constant with the specified name, or the * specified class object does not represent an enum type - * @throws NullPointerException if enumType or name is null + * @throws NullPointerException if name is null */ public static UpdateScope valueOf( String name ) {