You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by rf...@apache.org on 2019/12/01 13:21:51 UTC
[maven-gpg-plugin] 02/03: [MGPG-69] Drop Maven 2 support
This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a commit to branch MGPG-69
in repository https://gitbox.apache.org/repos/asf/maven-gpg-plugin.git
commit a5474b493b0f305be6d75a6987c107be91b48142
Author: rfscholte <rf...@apache.org>
AuthorDate: Sun Dec 1 14:20:30 2019 +0100
[MGPG-69] Drop Maven 2 support
---
pom.xml | 54 +++++++++++++++++++++-
.../{plugin => plugins}/gpg/AbstractGpgMojo.java | 2 +-
.../{plugin => plugins}/gpg/AbstractGpgSigner.java | 2 +-
.../gpg/AscArtifactMetadata.java | 2 +-
.../gpg/AttachedSignedArtifact.java | 2 +-
.../gpg/GpgSignAttachedMojo.java | 2 +-
.../maven/{plugin => plugins}/gpg/GpgSigner.java | 2 +-
.../maven/{plugin => plugins}/gpg/GpgVersion.java | 2 +-
.../{plugin => plugins}/gpg/GpgVersionParser.java | 2 +-
.../gpg/SignAndDeployFileMojo.java | 2 +-
.../{plugin => plugins}/gpg/SigningBundle.java | 2 +-
.../gpg/GpgVersionConsumerTest.java | 4 +-
.../{plugin => plugins}/gpg/GpgVersionTest.java | 3 +-
13 files changed, 66 insertions(+), 15 deletions(-)
diff --git a/pom.xml b/pom.xml
index cfddea8..7e01980 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,7 @@ under the License.
</parent>
<artifactId>maven-gpg-plugin</artifactId>
- <version>1.7-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
<packaging>maven-plugin</packaging>
<name>Apache Maven GPG Plugin</name>
@@ -105,7 +105,21 @@ under the License.
<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-artifact-transfer</artifactId>
- <version>0.11.1-SNAPSHOT</version>
+ <version>0.12.0</version>
+ </dependency>
+ <dependency>
+ <!-- org.eclipse.aether.util.artifact.SubArtifact -->
+ <groupId>org.apache.maven.resolver</groupId>
+ <artifactId>maven-resolver-util</artifactId>
+ <version>1.4.1</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <!-- org.sonatype.aether.util.artifact.SubArtifact -->
+ <groupId>org.sonatype.aether</groupId>
+ <artifactId>aether-util</artifactId>
+ <version>1.7</version>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
@@ -147,6 +161,42 @@ under the License.
</plugin>
</plugins>
</pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <version>3.2.1</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>shade</goal>
+ </goals>
+ <configuration>
+ <artifactSet>
+ <includes>
+ <include>org.apache.maven.resolver:maven-resolver-util</include>
+ <include>org.sonatype.aether:aether-util</include>
+ </includes>
+ </artifactSet>
+ <filters>
+ <filter>
+ <artifact>org.apache.maven.resolver:maven-resolver-util</artifact>
+ <includes>
+ <include>org/eclipse/aether/util/artifact/SubArtifact.class</include>
+ </includes>
+ </filter>
+ <filter>
+ <artifact>org.sonatype.aether:aether-util</artifact>
+ <includes>
+ <include>org/sonatype/aether/util/artifact/SubArtifact.class</include>
+ </includes>
+ </filter>
+ </filters>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
</build>
<profiles>
diff --git a/src/main/java/org/apache/maven/plugin/gpg/AbstractGpgMojo.java b/src/main/java/org/apache/maven/plugins/gpg/AbstractGpgMojo.java
similarity index 99%
rename from src/main/java/org/apache/maven/plugin/gpg/AbstractGpgMojo.java
rename to src/main/java/org/apache/maven/plugins/gpg/AbstractGpgMojo.java
index 61fa02f..fdf33d5 100644
--- a/src/main/java/org/apache/maven/plugin/gpg/AbstractGpgMojo.java
+++ b/src/main/java/org/apache/maven/plugins/gpg/AbstractGpgMojo.java
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.gpg;
+package org.apache.maven.plugins.gpg;
/*
* Licensed to the Apache Software Foundation (ASF) under one
diff --git a/src/main/java/org/apache/maven/plugin/gpg/AbstractGpgSigner.java b/src/main/java/org/apache/maven/plugins/gpg/AbstractGpgSigner.java
similarity index 99%
rename from src/main/java/org/apache/maven/plugin/gpg/AbstractGpgSigner.java
rename to src/main/java/org/apache/maven/plugins/gpg/AbstractGpgSigner.java
index 68c5ba7..2de3d32 100644
--- a/src/main/java/org/apache/maven/plugin/gpg/AbstractGpgSigner.java
+++ b/src/main/java/org/apache/maven/plugins/gpg/AbstractGpgSigner.java
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.gpg;
+package org.apache.maven.plugins.gpg;
/*
* Licensed to the Apache Software Foundation (ASF) under one
diff --git a/src/main/java/org/apache/maven/plugin/gpg/AscArtifactMetadata.java b/src/main/java/org/apache/maven/plugins/gpg/AscArtifactMetadata.java
similarity index 99%
rename from src/main/java/org/apache/maven/plugin/gpg/AscArtifactMetadata.java
rename to src/main/java/org/apache/maven/plugins/gpg/AscArtifactMetadata.java
index 118b58c..e3cbbca 100644
--- a/src/main/java/org/apache/maven/plugin/gpg/AscArtifactMetadata.java
+++ b/src/main/java/org/apache/maven/plugins/gpg/AscArtifactMetadata.java
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.gpg;
+package org.apache.maven.plugins.gpg;
/*
* Licensed to the Apache Software Foundation (ASF) under one
diff --git a/src/main/java/org/apache/maven/plugin/gpg/AttachedSignedArtifact.java b/src/main/java/org/apache/maven/plugins/gpg/AttachedSignedArtifact.java
similarity index 99%
rename from src/main/java/org/apache/maven/plugin/gpg/AttachedSignedArtifact.java
rename to src/main/java/org/apache/maven/plugins/gpg/AttachedSignedArtifact.java
index 072bf2a..ff1243b 100644
--- a/src/main/java/org/apache/maven/plugin/gpg/AttachedSignedArtifact.java
+++ b/src/main/java/org/apache/maven/plugins/gpg/AttachedSignedArtifact.java
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.gpg;
+package org.apache.maven.plugins.gpg;
/*
* Licensed to the Apache Software Foundation (ASF) under one
diff --git a/src/main/java/org/apache/maven/plugin/gpg/GpgSignAttachedMojo.java b/src/main/java/org/apache/maven/plugins/gpg/GpgSignAttachedMojo.java
similarity index 99%
rename from src/main/java/org/apache/maven/plugin/gpg/GpgSignAttachedMojo.java
rename to src/main/java/org/apache/maven/plugins/gpg/GpgSignAttachedMojo.java
index b631eba..706d658 100644
--- a/src/main/java/org/apache/maven/plugin/gpg/GpgSignAttachedMojo.java
+++ b/src/main/java/org/apache/maven/plugins/gpg/GpgSignAttachedMojo.java
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.gpg;
+package org.apache.maven.plugins.gpg;
/*
* Licensed to the Apache Software Foundation (ASF) under one
diff --git a/src/main/java/org/apache/maven/plugin/gpg/GpgSigner.java b/src/main/java/org/apache/maven/plugins/gpg/GpgSigner.java
similarity index 99%
rename from src/main/java/org/apache/maven/plugin/gpg/GpgSigner.java
rename to src/main/java/org/apache/maven/plugins/gpg/GpgSigner.java
index a46bc2c..65dd396 100644
--- a/src/main/java/org/apache/maven/plugin/gpg/GpgSigner.java
+++ b/src/main/java/org/apache/maven/plugins/gpg/GpgSigner.java
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.gpg;
+package org.apache.maven.plugins.gpg;
/*
* Licensed to the Apache Software Foundation (ASF) under one
diff --git a/src/main/java/org/apache/maven/plugin/gpg/GpgVersion.java b/src/main/java/org/apache/maven/plugins/gpg/GpgVersion.java
similarity index 99%
rename from src/main/java/org/apache/maven/plugin/gpg/GpgVersion.java
rename to src/main/java/org/apache/maven/plugins/gpg/GpgVersion.java
index b1da2cf..6e64577 100644
--- a/src/main/java/org/apache/maven/plugin/gpg/GpgVersion.java
+++ b/src/main/java/org/apache/maven/plugins/gpg/GpgVersion.java
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.gpg;
+package org.apache.maven.plugins.gpg;
/*
* Licensed to the Apache Software Foundation (ASF) under one
diff --git a/src/main/java/org/apache/maven/plugin/gpg/GpgVersionParser.java b/src/main/java/org/apache/maven/plugins/gpg/GpgVersionParser.java
similarity index 98%
rename from src/main/java/org/apache/maven/plugin/gpg/GpgVersionParser.java
rename to src/main/java/org/apache/maven/plugins/gpg/GpgVersionParser.java
index 56b3084..12adb71 100644
--- a/src/main/java/org/apache/maven/plugin/gpg/GpgVersionParser.java
+++ b/src/main/java/org/apache/maven/plugins/gpg/GpgVersionParser.java
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.gpg;
+package org.apache.maven.plugins.gpg;
/*
* Licensed to the Apache Software Foundation (ASF) under one
diff --git a/src/main/java/org/apache/maven/plugin/gpg/SignAndDeployFileMojo.java b/src/main/java/org/apache/maven/plugins/gpg/SignAndDeployFileMojo.java
similarity index 99%
rename from src/main/java/org/apache/maven/plugin/gpg/SignAndDeployFileMojo.java
rename to src/main/java/org/apache/maven/plugins/gpg/SignAndDeployFileMojo.java
index 3d67fd5..37e747d 100644
--- a/src/main/java/org/apache/maven/plugin/gpg/SignAndDeployFileMojo.java
+++ b/src/main/java/org/apache/maven/plugins/gpg/SignAndDeployFileMojo.java
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.gpg;
+package org.apache.maven.plugins.gpg;
/*
* Licensed to the Apache Software Foundation (ASF) under one
diff --git a/src/main/java/org/apache/maven/plugin/gpg/SigningBundle.java b/src/main/java/org/apache/maven/plugins/gpg/SigningBundle.java
similarity index 97%
rename from src/main/java/org/apache/maven/plugin/gpg/SigningBundle.java
rename to src/main/java/org/apache/maven/plugins/gpg/SigningBundle.java
index 97100d2..fd474b1 100644
--- a/src/main/java/org/apache/maven/plugin/gpg/SigningBundle.java
+++ b/src/main/java/org/apache/maven/plugins/gpg/SigningBundle.java
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.gpg;
+package org.apache.maven.plugins.gpg;
/*
* Licensed to the Apache Software Foundation (ASF) under one
diff --git a/src/test/java/org/apache/maven/plugin/gpg/GpgVersionConsumerTest.java b/src/test/java/org/apache/maven/plugins/gpg/GpgVersionConsumerTest.java
similarity index 91%
rename from src/test/java/org/apache/maven/plugin/gpg/GpgVersionConsumerTest.java
rename to src/test/java/org/apache/maven/plugins/gpg/GpgVersionConsumerTest.java
index cae0ea1..b7b2b0f 100644
--- a/src/test/java/org/apache/maven/plugin/gpg/GpgVersionConsumerTest.java
+++ b/src/test/java/org/apache/maven/plugins/gpg/GpgVersionConsumerTest.java
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.gpg;
+package org.apache.maven.plugins.gpg;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -22,7 +22,7 @@ package org.apache.maven.plugin.gpg;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
-import org.apache.maven.plugin.gpg.GpgVersionParser.GpgVersionConsumer;
+import org.apache.maven.plugins.gpg.GpgVersionParser.GpgVersionConsumer;
import org.junit.Test;
public class GpgVersionConsumerTest
diff --git a/src/test/java/org/apache/maven/plugin/gpg/GpgVersionTest.java b/src/test/java/org/apache/maven/plugins/gpg/GpgVersionTest.java
similarity index 93%
rename from src/test/java/org/apache/maven/plugin/gpg/GpgVersionTest.java
rename to src/test/java/org/apache/maven/plugins/gpg/GpgVersionTest.java
index d7d4652..fb6bf47 100644
--- a/src/test/java/org/apache/maven/plugin/gpg/GpgVersionTest.java
+++ b/src/test/java/org/apache/maven/plugins/gpg/GpgVersionTest.java
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.gpg;
+package org.apache.maven.plugins.gpg;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -21,6 +21,7 @@ package org.apache.maven.plugin.gpg;
import static org.junit.Assert.assertTrue;
+import org.apache.maven.plugins.gpg.GpgVersion;
import org.junit.Test;
public class GpgVersionTest