update dependencies,

move to min src 11, drop mr jar, update build plugins, fix build-time warnings Signed-off-by: Lukas Jungmann <lukas.jungmann@oracle.com>
eclipse-ee4j · Jan 28, 2022 · 4ee8a19 · 4ee8a19
1 parent e90b1f8
commit 4ee8a19
Show file tree

Hide file tree

Showing 28 changed files with 244 additions and 461 deletions.
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -23,7 +23,7 @@ jobs:
 
     strategy:
       matrix:
-        java_version: [ 11, 17-ea ]
+        java_version: [ 11, 17 ]
 
     steps:
     - name: Checkout for build
@@ -35,5 +35,8 @@ jobs:
       with:
         distribution: 'zulu'
         java-version: ${{ matrix.java_version }}
+        cache: maven
     - name: Verify
-      run: cd istack-commons && mvn -B -V -U -C -Pstaging,oss-release clean install org.glassfish.copyright:glassfish-copyright-maven-plugin:check -Dgpg.skip=true -Dittest=true
+      run: |
+        cd istack-commons
+        mvn -B -V -U -C -Pstaging,oss-release clean install org.glassfish.copyright:glassfish-copyright-maven-plugin:check -Dgpg.skip=true -Dittest=true -Dcopyright.ignoreyear=true
diff --git a/istack-commons/buildtools/src/main/java/com/sun/istack/build/ResourceGenTask.java b/istack-commons/buildtools/src/main/java/com/sun/istack/build/ResourceGenTask.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2021 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2022 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Distribution License v. 1.0, which is available at
@@ -81,7 +81,6 @@ public void setDestDir(File dir) {
     }
 
     /**
-     * @param license
      * @since 2.12
      */
     public void setLicense(File license) {
@@ -93,7 +92,6 @@ public void setEncoding(String encoding) {
     }
 
     /**
-     * @param localizationUtilitiesPkgName
      * @since 2.12
      */
     public void setLocalizationUtilitiesPkgName(String localizationUtilitiesPkgName) {
@@ -296,7 +294,6 @@ public static class LicenseCodeWriter extends FilterCodeWriter {
          *      LicenseCodeWriter simply decorates this underlying CodeWriter by
          *      adding prolog comments.
          * @param license license File
-         * @param encoding
          */
         public LicenseCodeWriter(CodeWriter core, File license, String encoding) {
             super(core);

diff --git a/istack-commons/import-properties-plugin/pom.xml b/istack-commons/import-properties-plugin/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2013, 2021 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2013, 2022 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Distribution License v. 1.0, which is available at
@@ -37,10 +37,12 @@
         <dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-plugin-api</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-core</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.codehaus.plexus</groupId>
@@ -49,6 +51,7 @@
         <dependency>
             <groupId>org.apache.maven.plugin-tools</groupId>
             <artifactId>maven-plugin-annotations</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.maven.resolver</groupId>
@@ -57,21 +60,13 @@
         <dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-model</artifactId>
+            <scope>provided</scope>
         </dependency>
     </dependencies>
 
     <build>
         <pluginManagement>
             <plugins>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-plugin-plugin</artifactId>
-                    <configuration>
-                        <extractors>
-                            <extractor>java-annotations</extractor>
-                        </extractors>
-                    </configuration>
-                </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-surefire-plugin</artifactId>

diff --git a/istack-commons/maven-plugin/pom.xml b/istack-commons/maven-plugin/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2010, 2021 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2010, 2022 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Distribution License v. 1.0, which is available at
@@ -28,6 +28,7 @@
         <dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-plugin-api</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.maven.resolver</groupId>
@@ -40,10 +41,12 @@
         <dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-artifact</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.maven.plugin-tools</groupId>
             <artifactId>maven-plugin-annotations</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>junit</groupId>
@@ -52,6 +55,7 @@
         <dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-core</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.glassfish.jaxb</groupId>
@@ -149,11 +153,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-plugin-plugin</artifactId>
-                <configuration>
-                    <extractors>
-                        <extractor>java-annotations</extractor>
-                    </extractors>
-                </configuration>
                 <executions>
                     <execution>
                         <id>descriptors</id>

diff --git a/...-commons/maven-plugin/src/main/java/com/sun/istack/maven/MetainfServicesCompilerMojo.java b/...-commons/maven-plugin/src/main/java/com/sun/istack/maven/MetainfServicesCompilerMojo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2022 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Distribution License v. 1.0, which is available at
@@ -89,8 +89,8 @@ public class MetainfServicesCompilerMojo extends AbstractMojo {
     /**
      * The current repository/network configuration of Maven.
      *
-     * @parameter default-value="${repositorySystemSession}"
-     * @readonly
+     * parameter default-value="${repositorySystemSession}"
+     * readonly
      */
     private RepositorySystemSession repoSession;