Merge branch 'master' into sigstore

apache · Apr 25, 2023 · 2db8cd1 · 2db8cd1
2 parents 5617348 + 0498a82
commit 2db8cd1
Show file tree

Hide file tree

Showing 41 changed files with 1,241 additions and 1,720 deletions.
diff --git a/.asf.yaml b/.asf.yaml
@@ -24,3 +24,14 @@ github:
     - maven-plugins
     - maven-gpg-plugin
     - maven
+  enabled_merge_buttons:
+    squash: true
+    merge: false
+    rebase: true
+  autolink_jira:
+    - MGPG
+notifications:
+  commits: commits@maven.apache.org
+  issues: issues@maven.apache.org
+  pullrequests: issues@maven.apache.org
+  jira_options: link label comment
diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
@@ -0,0 +1,21 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+# Change maven code style
+955ea0ed5c2a7a3189159158e1fcb10e1ed2964e
diff --git a/pom.xml b/pom.xml
@@ -1,5 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
-
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 Licensed to the Apache Software Foundation (ASF) under one
 or more contributor license agreements.  See the NOTICE file
@@ -18,14 +17,13 @@ KIND, either express or implied.  See the License for the
 specific language governing permissions and limitations
 under the License.
 -->
-
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <artifactId>maven-plugins</artifactId>
     <groupId>org.apache.maven.plugins</groupId>
-    <version>36</version>
+    <artifactId>maven-plugins</artifactId>
+    <version>39</version>
     <relativePath />
   </parent>
 
@@ -43,8 +41,8 @@ under the License.
   <scm>
     <connection>scm:git:https://gitbox.apache.org/repos/asf/maven-gpg-plugin.git</connection>
     <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/maven-gpg-plugin.git</developerConnection>
-    <url>https://github.com/apache/maven-gpg-plugin/tree/${project.scm.tag}</url>
     <tag>HEAD</tag>
+    <url>https://github.com/apache/maven-gpg-plugin/tree/${project.scm.tag}</url>
   </scm>
   <issueManagement>
     <system>jira</system>
@@ -151,7 +149,7 @@ under the License.
       <artifactId>plexus-sec-dispatcher</artifactId>
       <version>1.4</version>
     </dependency>
-    
+
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
@@ -175,8 +173,8 @@ under the License.
   <build>
     <testResources>
       <testResource>
-        <directory>${basedir}/src/test/resources</directory>
         <filtering>true</filtering>
+        <directory>${basedir}/src/test/resources</directory>
         <includes>
           <include>**/pom.xml</include>
           <include>**/settings.xml</include>
@@ -203,6 +201,11 @@ under the License.
             </excludes>
           </configuration>
         </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-invoker-plugin</artifactId>
+          <version>3.5.1</version>
+        </plugin>
       </plugins>
     </pluginManagement>
     <plugins>
@@ -250,14 +253,6 @@ under the License.
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-failsafe-plugin</artifactId>
-            <executions>
-              <execution>
-                <goals>
-                  <goal>integration-test</goal>
-                  <goal>verify</goal>
-                </goals>
-              </execution>
-            </executions>
             <configuration>
               <environmentVariables>
                 <JENKINS_MAVEN_AGENT_DISABLED>true</JENKINS_MAVEN_AGENT_DISABLED>
@@ -270,6 +265,14 @@ under the License.
                 <settingsFile>/it/settings.xml</settingsFile>
               </systemPropertyVariables>
             </configuration>
+            <executions>
+              <execution>
+                <goals>
+                  <goal>integration-test</goal>
+                  <goal>verify</goal>
+                </goals>
+              </execution>
+            </executions>
           </plugin>
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
@@ -280,7 +283,8 @@ under the License.
                 <pomInclude>*</pomInclude>
               </pomIncludes>
               <pomExcludes>
-                <pomExclude>alternative-secret-keyring</pomExclude> <!-- not supported with gpg 2.1+ -->
+                <!-- not supported with gpg 2.1+ -->
+                <pomExclude>alternative-secret-keyring</pomExclude>
               </pomExcludes>
               <goals>
                 <goal>clean</goal>

diff --git a/src/it/alternative-secret-keyring/verify.groovy b/src/it/alternative-secret-keyring/verify.groovy
@@ -0,0 +1,37 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+def artifactDir = new File(localRepositoryPath, "org/apache/maven/its/gpg/nma/test/1.0")
+
+def expectedFiles = [
+        "test-1.0.pom",
+        "test-1.0.pom.asc",
+        "test-1.0-jdk15.jar",
+        "test-1.0-jdk15.jar.asc"
+]
+
+expectedFiles.each { expectedFile ->
+    def file = new File(artifactDir, expectedFile)
+
+    println "Checking for existence of $file"
+
+    if (!file.isFile()) {
+        throw new Exception("Missing file $file")
+    }
+}
+
diff --git a/...n-and-deploy-not-jar-packaging/verify.bsh → src/it/no-main-artifact/verify.groovy b/...n-and-deploy-not-jar-packaging/verify.bsh → src/it/no-main-artifact/verify.groovy
@@ -1,4 +1,3 @@
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,23 +17,22 @@
  * under the License.
  */
 
-import java.io.*;
-
-File artifactDir = new File( basedir, "target/repo/org/apache/maven/its/gpg/sadnjp/test/1.0" );
+def artifactDir = new File(localRepositoryPath, "org/apache/maven/its/gpg/nma/test/1.0")
 
-String[] expectedFiles = {
-    "test-1.0-javadoc.jar",
-    "test-1.0-javadoc.jar.asc",
-};
+def expectedFiles = [
+        "test-1.0.pom",
+        "test-1.0.pom.asc",
+        "test-1.0-jdk15.jar",
+        "test-1.0-jdk15.jar.asc"
+]
 
-for ( String expectedFile : expectedFiles )
-{
-    File file = new File( artifactDir, expectedFile );
+for (String expectedFile : expectedFiles) {
+    def file = new File(artifactDir, expectedFile)
 
-    System.out.println( "Checking for existence of " + file );
+    println "Checking for existence of $file"
 
-    if ( !file.isFile() )
-    {
-        throw new Exception( "Missing file " + file );
+    if (!file.isFile()) {
+        throw new Exception("Missing file $file")
     }
 }
+
diff --git a/...ign-and-deploy-file-without-pom/setup.bsh → ...-and-deploy-file-with-extras/setup.groovy b/...ign-and-deploy-file-without-pom/setup.bsh → ...-and-deploy-file-with-extras/setup.groovy
@@ -1,4 +1,3 @@
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,7 +17,6 @@
  * under the License.
  */
 
-import java.io.*;
-import org.codehaus.plexus.util.*;
+import org.codehaus.plexus.util.FileUtils
 
-FileUtils.deleteDirectory( new File( basedir, "target" ) );
+FileUtils.deleteDirectory(new File(basedir, "target"))
diff --git a/src/it/sign-and-deploy-file-with-extras/verify.bsh b/src/it/sign-and-deploy-file-with-extras/verify.bsh
diff --git a/src/it/sign-and-deploy-file-with-extras/verify.groovy b/src/it/sign-and-deploy-file-with-extras/verify.groovy
@@ -0,0 +1,42 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+def artifactDir = new File(basedir, "target/repo/org/apache/maven/its/gpg/sadfwe/test/1.0")
+
+var expectedFiles = [
+        "test-1.0.jar",
+        "test-1.0.jar.asc",
+        "test-1.0-sources.jar",
+        "test-1.0-sources.jar.asc",
+        "test-1.0-javadoc.jar",
+        "test-1.0-javadoc.jar.asc",
+        "test-1.0.pom",
+        "test-1.0.pom.asc"
+]
+
+for (String expectedFile : expectedFiles) {
+    var file = new File(artifactDir, expectedFile)
+
+    println "Checking for existence of $file"
+
+    if (!file.isFile()) {
+        throw new Exception("Missing file $file")
+    }
+}
+
diff --git a/src/it/sign-and-deploy-files/setup.bsh → ...ign-and-deploy-file-with-pom/setup.groovy b/src/it/sign-and-deploy-files/setup.bsh → ...ign-and-deploy-file-with-pom/setup.groovy
@@ -1,4 +1,3 @@
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,7 +17,7 @@
  * under the License.
  */
 
-import java.io.*;
-import org.codehaus.plexus.util.*;
 
-FileUtils.deleteDirectory( new File( basedir, "target" ) );
+import org.codehaus.plexus.util.FileUtils
+
+FileUtils.deleteDirectory(new File(basedir, "target"))
diff --git a/.../sign-and-deploy-file-with-pom/verify.bsh → ...gn-and-deploy-file-with-pom/verify.groovy b/.../sign-and-deploy-file-with-pom/verify.bsh → ...gn-and-deploy-file-with-pom/verify.groovy
@@ -1,4 +1,3 @@
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -17,26 +16,21 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+var artifactDir = new File(basedir, "target/repo/org/apache/maven/its/gpg/sadfwp/test/1.0")
 
-import java.io.*;
-
-File artifactDir = new File( basedir, "target/repo/org/apache/maven/its/gpg/sadfwp/test/1.0" );
-
-String[] expectedFiles = {
+var expectedFiles = [
     "test-1.0.jar",
     "test-1.0.jar.asc",
     "test-1.0.pom",
-    "test-1.0.pom.asc",
-};
+    "test-1.0.pom.asc"
+]
 
-for ( String expectedFile : expectedFiles )
-{
-    File file = new File( artifactDir, expectedFile );
+for (String expectedFile : expectedFiles) {
+    var file = new File(artifactDir, expectedFile)
 
-    System.out.println( "Checking for existence of " + file );
+    println "Checking for existence of $file"
 
-    if ( !file.isFile() )
-    {
-        throw new Exception( "Missing file " + file );
+    if (!file.isFile()) {
+        throw new Exception("Missing file $file")
     }
 }
diff --git a/...ign-and-deploy-file-with-extras/setup.bsh → ...-and-deploy-file-without-pom/setup.groovy b/...ign-and-deploy-file-with-extras/setup.bsh → ...-and-deploy-file-without-pom/setup.groovy
@@ -1,4 +1,3 @@
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -17,8 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+import org.codehaus.plexus.util.FileUtils
 
-import java.io.*;
-import org.codehaus.plexus.util.*;
-
-FileUtils.deleteDirectory( new File( basedir, "target" ) );
+FileUtils.deleteDirectory(new File(basedir, "target"))