You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by cs...@apache.org on 2025/06/24 18:35:03 UTC

(maven-gpg-plugin) branch master updated: Update parent POM to 45 (#284)

This is an automated email from the ASF dual-hosted git repository.

cstamas pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-gpg-plugin.git


The following commit(s) were added to refs/heads/master by this push:
     new f0e45e0  Update parent POM to 45 (#284)
f0e45e0 is described below

commit f0e45e0a7c3f02a22612b33ff7fcfa8e4540462f
Author: Tamas Cservenak <ta...@cservenak.net>
AuthorDate: Tue Jun 24 20:34:58 2025 +0200

    Update parent POM to 45 (#284)
    
    And related fixes:
    * POM add missing deps
    * move to Maven 3 p-u, drop p-x
    * test: checkstyle fixes
---
 pgp-keys-map.list                                                | 3 +--
 pom.xml                                                          | 9 +++------
 .../java/org/apache/maven/plugins/gpg/it/BcSignArtifactIT.java   | 4 +++-
 .../java/org/apache/maven/plugins/gpg/it/InvokerTestUtils.java   | 2 +-
 4 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/pgp-keys-map.list b/pgp-keys-map.list
index 8e42498..83e65d2 100644
--- a/pgp-keys-map.list
+++ b/pgp-keys-map.list
@@ -30,5 +30,4 @@ org.apache.maven.shared:maven-invoker = 0x84789D24DF77A32433CE1F079EB80E92EB2135
 org.apache.maven.shared:maven-shared-utils = 0x84789D24DF77A32433CE1F079EB80E92EB2135B1
 org.codehaus.plexus:plexus-classworlds = 0xB91AB7D2121DC6B0A61AA182D7742D58455ECC7C
 org.codehaus.plexus:plexus-component-annotations = 0xFA77DCFEF2EE6EB2DEBEDD2C012579464D01C06A
-org.codehaus.plexus:plexus-utils = 0x84789D24DF77A32433CE1F079EB80E92EB2135B1
-org.codehaus.plexus:plexus-xml = 0x84789D24DF77A32433CE1F079EB80E92EB2135B1
+org.codehaus.plexus:plexus-utils = 0x32118CF76C9EC5D918E54967CA80D1F0EB6CA4BA
diff --git a/pom.xml b/pom.xml
index ac44be6..4d360ea 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@ under the License.
   <parent>
     <groupId>org.apache.maven.plugins</groupId>
     <artifactId>maven-plugins</artifactId>
-    <version>43</version>
+    <version>45</version>
     <relativePath />
   </parent>
 
@@ -133,15 +133,13 @@ under the License.
     <dependency>
       <groupId>org.apache.maven.plugin-tools</groupId>
       <artifactId>maven-plugin-annotations</artifactId>
+      <version>${version.maven-plugin-tools}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-utils</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.codehaus.plexus</groupId>
-      <artifactId>plexus-xml</artifactId>
+      <version>3.6.0</version>
     </dependency>
     <dependency>
       <groupId>org.bouncycastle</groupId>
@@ -243,7 +241,6 @@ under the License.
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-invoker-plugin</artifactId>
-          <version>3.9.0</version>
         </plugin>
         <plugin>
           <groupId>org.simplify4u.plugins</groupId>
diff --git a/src/test/java/org/apache/maven/plugins/gpg/it/BcSignArtifactIT.java b/src/test/java/org/apache/maven/plugins/gpg/it/BcSignArtifactIT.java
index 91aef65..c4c5aff 100644
--- a/src/test/java/org/apache/maven/plugins/gpg/it/BcSignArtifactIT.java
+++ b/src/test/java/org/apache/maven/plugins/gpg/it/BcSignArtifactIT.java
@@ -26,7 +26,9 @@ import org.apache.maven.shared.invoker.InvocationRequest;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
 
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class BcSignArtifactIT extends ITSupport {
     public static Collection<Object[]> data() {
diff --git a/src/test/java/org/apache/maven/plugins/gpg/it/InvokerTestUtils.java b/src/test/java/org/apache/maven/plugins/gpg/it/InvokerTestUtils.java
index cdcfde8..71f15a8 100644
--- a/src/test/java/org/apache/maven/plugins/gpg/it/InvokerTestUtils.java
+++ b/src/test/java/org/apache/maven/plugins/gpg/it/InvokerTestUtils.java
@@ -80,7 +80,7 @@ public class InvokerTestUtils {
 
         final File buildLog =
                 new File(request.getBaseDirectory(request.getPomFile().getParentFile()), "build.log");
-        try (final PrintStream buildLogStream = new PrintStream(buildLog)) {
+        try (PrintStream buildLogStream = new PrintStream(buildLog)) {
             final InvocationOutputHandler buildLogOutputHandler = new PrintStreamHandler(buildLogStream, false);
             final InvokerLogger logger = new PrintStreamLogger(buildLogStream, InvokerLogger.DEBUG);