Upgrade parent 63 and Java 1.8 (mojohaus#461)

* parent 63 and java 1.8 Signed-off-by: olivier lamy <olamy@apache.org> * fix javadoc: Signed-off-by: olivier lamy <olamy@apache.org> * Update pom.xml Co-authored-by: Benjamin Marwell <bmarwell@apache.org> * cleanup not anymore needed plugin configuration because of parent upgrade Signed-off-by: olivier lamy <olamy@apache.org> * no need to run with some many jdks Signed-off-by: olivier lamy <olamy@apache.org> * Update .github/workflows/maven.yml Co-authored-by: Benjamin Marwell <bmarwell@apache.org> * Update .github/workflows/maven.yml Co-authored-by: Benjamin Marwell <bmarwell@apache.org> Co-authored-by: Benjamin Marwell <bmarwell@apache.org>
obfischer · Jun 25, 2021 · 6b4cbb2 · 6b4cbb2
1 parent a82f8df
commit 6b4cbb2
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 26 deletions.
diff --git 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
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.codehaus.mojo</groupId>
     <artifactId>mojo-parent</artifactId>
-    <version>50</version>
+    <version>63</version>
   </parent>
 
   <artifactId>versions-maven-plugin</artifactId>
@@ -107,7 +107,8 @@
   </issueManagement>
 
   <properties>
-    <mojo.java.target>1.7</mojo.java.target>
+    <mojo.java.target>1.8</mojo.java.target>
+    <maven.compiler.source>${mojo.java.target}</maven.compiler.source>
 
     <mavenVersion>2.2.1</mavenVersion>
     <wagonVersion>3.4.0</wagonVersion>
@@ -268,29 +269,12 @@
           <artifactId>modello-maven-plugin</artifactId>
           <version>1.11</version>
         </plugin>
-        <!-- TODO remove when upgrading parent to 60 -->
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-jar-plugin</artifactId>
-          <version>3.2.0</version>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-source-plugin</artifactId>
-          <version>3.2.1</version>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-assembly-plugin</artifactId>
-          <version>3.2.0</version>
-        </plugin>
       </plugins>
     </pluginManagement>
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-plugin-plugin</artifactId>
-        <version>3.5.1</version>
         <configuration>
           <skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
         </configuration>
@@ -308,15 +292,15 @@
         <artifactId>animal-sniffer-maven-plugin</artifactId>
         <executions>
           <execution>
-            <id>check-java17</id>
+            <id>check-java18</id>
             <phase>test</phase>
             <goals>
               <goal>check</goal>
             </goals>
             <configuration>
               <signature>
                 <groupId>org.codehaus.mojo.signature</groupId>
-                <artifactId>java17</artifactId>
+                <artifactId>java18</artifactId>
                 <version>1.0</version>
               </signature>
             </configuration>
@@ -390,7 +374,6 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-invoker-plugin</artifactId>
-        <version>3.2.2</version>
         <configuration>
           <projectsDirectory>src/it</projectsDirectory>
           <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
@@ -429,7 +412,6 @@
 
   <reporting>
     <plugins>
-
       <plugin>
         <artifactId>maven-javadoc-plugin</artifactId>
         <configuration>

diff --git 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 <tt>enumType</tt> or <tt>name</tt> is null
+     * @throws NullPointerException if <code>name</code> is null
      */
     public static UpdateScope valueOf( String name )
     {