[MJAR-288] Upgrade Parent to 36

- fix failed bsh script due to reflection on internal jdk casses - jdk 11
apache · May 13, 2022 · 3fe2100 · 3fe2100
1 parent bc6a6be
commit 3fe2100
Show file tree

Hide file tree

Showing 12 changed files with 31 additions and 19 deletions.
diff --git a/pom.xml b/pom.xml
@@ -25,8 +25,8 @@
   <parent>
     <artifactId>maven-plugins</artifactId>
     <groupId>org.apache.maven.plugins</groupId>
-    <version>34</version>
-    <relativePath>../../pom/maven/maven-plugins/pom.xml</relativePath>
+    <version>36</version>
+    <relativePath/>
   </parent>
 
   <artifactId>maven-jar-plugin</artifactId>
@@ -65,7 +65,7 @@
   </issueManagement>
   <ciManagement>
     <system>Jenkins</system>
-    <url>https://ci-builds.apache.org/job/Maven/job/maven-box/job/maven-jar-plugin/</url>
+    <url>https://ci-maven.apache.org/job/Maven/job/maven-box/job/maven-jar-plugin/</url>
   </ciManagement>
   <distributionManagement>
     <site>
@@ -78,6 +78,9 @@
     <mavenFileManagementVersion>3.0.0</mavenFileManagementVersion>
     <mavenArchiverVersion>3.5.2</mavenArchiverVersion>
     <mavenVersion>3.1.0</mavenVersion>
+    <!-- TODO remove with Maven APi upgrade -->
+    <!-- the same version as in Maven 3.1.0 -->
+    <sisuVersion>0.0.0.M2a</sisuVersion>
     <javaVersion>7</javaVersion>
     <project.build.outputTimestamp>2022-01-08T21:19:21Z</project.build.outputTimestamp>
   </properties>
@@ -87,16 +90,25 @@
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-plugin-api</artifactId>
       <version>${mavenVersion}</version>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-core</artifactId>
       <version>${mavenVersion}</version>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-artifact</artifactId>
       <version>${mavenVersion}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-model</artifactId>
+      <version>${mavenVersion}</version>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.maven.shared</groupId>

diff --git a/src/it/MJAR-30-excludes/verify.bsh → src/it/MJAR-30-excludes/verify.groovy b/src/it/MJAR-30-excludes/verify.bsh → src/it/MJAR-30-excludes/verify.groovy
@@ -41,9 +41,9 @@ try
         return false;
     }
 
-    String[] artifactNames = new String[] { "default-configuration.properties", "META-INF/MANIFEST.MF",
+    String[] artifactNames = [ "default-configuration.properties", "META-INF/MANIFEST.MF",
             "META-INF/maven/org.apache.maven.plugins/maven-jar-plugin-test-mjar-30-03/pom.properties",
-            "META-INF/maven/org.apache.maven.plugins/maven-jar-plugin-test-mjar-30-03/pom.xml" };
+            "META-INF/maven/org.apache.maven.plugins/maven-jar-plugin-test-mjar-30-03/pom.xml" ];
 
     Set contents = new HashSet();
 

diff --git a/src/it/MJAR-30-fullcontent/verify.bsh → src/it/MJAR-30-fullcontent/verify.groovy b/src/it/MJAR-30-fullcontent/verify.bsh → src/it/MJAR-30-fullcontent/verify.groovy
@@ -41,10 +41,10 @@ try
         return false;
     }
 
-    String[] artifactNames = new String[] { "default-configuration.properties",
+    String[] artifactNames = [ "default-configuration.properties",
             "foo/project001/App.class", "META-INF/MANIFEST.MF",
             "META-INF/maven/org.apache.maven.plugins/maven-jar-plugin-test-mjar-30-01/pom.properties",
-            "META-INF/maven/org.apache.maven.plugins/maven-jar-plugin-test-mjar-30-01/pom.xml" };
+            "META-INF/maven/org.apache.maven.plugins/maven-jar-plugin-test-mjar-30-01/pom.xml" ];
 
     Set contents = new HashSet();
 

diff --git a/src/it/MJAR-30-include/verify.bsh → src/it/MJAR-30-include/verify.groovy b/src/it/MJAR-30-include/verify.bsh → src/it/MJAR-30-include/verify.groovy
@@ -41,9 +41,9 @@ try
         return false;
     }
 
-    String[] artifactNames = new String[] { "service/TestInterface.class", "META-INF/MANIFEST.MF",
+    String[] artifactNames = [ "service/TestInterface.class", "META-INF/MANIFEST.MF",
             "META-INF/maven/org.apache.maven.plugins/maven-jar-plugin-test-mjar-30-02/pom.properties",
-            "META-INF/maven/org.apache.maven.plugins/maven-jar-plugin-test-mjar-30-02/pom.xml" };
+            "META-INF/maven/org.apache.maven.plugins/maven-jar-plugin-test-mjar-30-02/pom.xml" ];
 
     Set contents = new HashSet();
 

diff --git a/src/it/MJAR-60/verify.bsh → src/it/MJAR-60/verify.groovy b/src/it/MJAR-60/verify.bsh → src/it/MJAR-60/verify.groovy
diff --git a/src/it/MJAR-80-exclude/verify.bsh → src/it/MJAR-80-exclude/verify.groovy b/src/it/MJAR-80-exclude/verify.bsh → src/it/MJAR-80-exclude/verify.groovy
@@ -48,10 +48,10 @@ try
         return false;
     }
 
-    String[] artifactNames = new String[] { "test-default-configuration.properties",
+    String[] artifactNames = [ "test-default-configuration.properties",
             "foo/project003/AppTest.class", "foo/project003/AppIntegrationTest.class", "META-INF/MANIFEST.MF",
             "META-INF/maven/org.apache.maven.plugins/maven-jar-plugin-test-mjar-80-03/pom.properties",
-            "META-INF/maven/org.apache.maven.plugins/maven-jar-plugin-test-mjar-80-03/pom.xml" };
+            "META-INF/maven/org.apache.maven.plugins/maven-jar-plugin-test-mjar-80-03/pom.xml" ];
 
     Set contents = new HashSet();
 

diff --git a/src/it/MJAR-80-fullcontent/verify.bsh → src/it/MJAR-80-fullcontent/verify.groovy b/src/it/MJAR-80-fullcontent/verify.bsh → src/it/MJAR-80-fullcontent/verify.groovy
@@ -48,10 +48,10 @@ try
         return false;
     }
 
-    String[] artifactNames =  new String[] { "test-default-configuration.properties",
+    String[] artifactNames = [ "test-default-configuration.properties",
             "foo/project003/AppTest.class", "foo/project003/AppIntegrationTest.class", "META-INF/MANIFEST.MF",
             "META-INF/maven/org.apache.maven.plugins/maven-jar-plugin-test-mjar-80-01/pom.properties",
-            "META-INF/maven/org.apache.maven.plugins/maven-jar-plugin-test-mjar-80-01/pom.xml" };
+            "META-INF/maven/org.apache.maven.plugins/maven-jar-plugin-test-mjar-80-01/pom.xml" ];
 
     Set contents = new HashSet();
 

diff --git a/src/it/MJAR-80-include/verify.bsh → src/it/MJAR-80-include/verify.groovy b/src/it/MJAR-80-include/verify.bsh → src/it/MJAR-80-include/verify.groovy
@@ -48,10 +48,10 @@ try
         return false;
     }
 
-    String[] artifactNames =  new String[] { "foo/project003/AppIntegrationTest.class",
+    String[] artifactNames =  [ "foo/project003/AppIntegrationTest.class",
             "META-INF/MANIFEST.MF",
             "META-INF/maven/org.apache.maven.plugins/maven-jar-plugin-test-mjar-80-02/pom.properties",
-            "META-INF/maven/org.apache.maven.plugins/maven-jar-plugin-test-mjar-80-02/pom.xml" };
+            "META-INF/maven/org.apache.maven.plugins/maven-jar-plugin-test-mjar-80-02/pom.xml" ];
 
     Set contents = new HashSet();
 

diff --git a/src/it/manifest-content/verify.bsh → src/it/manifest-content/verify.grovy b/src/it/manifest-content/verify.bsh → src/it/manifest-content/verify.grovy
diff --git a/src/it/mjar-71-01/verify.bsh → src/it/mjar-71-01/verify.groovy b/src/it/mjar-71-01/verify.bsh → src/it/mjar-71-01/verify.groovy
diff --git a/src/it/mjar-71-02/verify.bsh → src/it/mjar-71-02/verify.groovy b/src/it/mjar-71-02/verify.bsh → src/it/mjar-71-02/verify.groovy
diff --git a/src/it/project-004/verify.bsh → src/it/project-004/verify.groovy b/src/it/project-004/verify.bsh → src/it/project-004/verify.groovy
@@ -41,10 +41,10 @@ try
         return false;
     }
 
-    String[] artifactNames = new String[] { "service/TestInterface.class",
+    String[] artifactNames = [ "service/TestInterface.class",
             "service/impl/TestImplementation.class", "TestCompile1.class", "notIncluded.xml", "META-INF/MANIFEST.MF",
             "META-INF/maven/org.apache.maven.plugins/maven-jar-plugin-test-project-004/pom.properties",
-            "META-INF/maven/org.apache.maven.plugins/maven-jar-plugin-test-project-004/pom.xml" };
+            "META-INF/maven/org.apache.maven.plugins/maven-jar-plugin-test-project-004/pom.xml"  ];
 
     Set contents = new HashSet();
 
@@ -84,10 +84,10 @@ try
         return false;
     }
 
-    artifactNames =  new String[] { "service/TestInterface.class",
+    artifactNames =  [ "service/TestInterface.class",
             "META-INF/MANIFEST.MF",
             "META-INF/maven/org.apache.maven.plugins/maven-jar-plugin-test-project-004/pom.properties",
-            "META-INF/maven/org.apache.maven.plugins/maven-jar-plugin-test-project-004/pom.xml" };
+            "META-INF/maven/org.apache.maven.plugins/maven-jar-plugin-test-project-004/pom.xml" ];
 
     contents = new HashSet();