Skip to content

Commit

Permalink
[MGPG-104] Update to 3.9.6, drop the cruft, minimum baseline remains …
Browse files Browse the repository at this point in the history 
…3.2.5 (#68)

Upgrade to 3.9.6 (keep baseline to 3.2.5) and enable "show deprecation" on compiler. Remove stuff that is not needed and/or unused.

---

https://issues.apache.org/jira/browse/MGPG-104
  • Loading branch information
@cstamas
cstamas committed Mar 3, 2024
1 parent 49bc0dd commit 4d0f422
Show file tree
Hide file tree
Showing 7 changed files with 23 additions and 218 deletions.
13 changes: 4 additions & 9 deletions pgp-keys-map.list
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
# specific language governing permissions and limitations
# under the License.

commons-io:commons-io = 0xCD5464315F0B98C77E6E8ECD9DAADC1C9FCC82D0
commons-io:commons-io = 0x2DB4F1EF0FA761ECC4EA935C86FDC7E2A11262CB
org.apiguardian:apiguardian-api = 0xFF6E2C001948C5F2F38B0CC385911F425EC61B51
org.junit.jupiter:junit-jupiter-api = 0xFF6E2C001948C5F2F38B0CC385911F425EC61B51
org.junit.jupiter:junit-jupiter-engine = 0xFF6E2C001948C5F2F38B0CC385911F425EC61B51
Expand All @@ -31,15 +31,10 @@ org.apache.maven.shared:maven-artifact-transfer = 0x6A814B1F869C2BBEAB7CB7271A2A
org.apache.maven.shared:maven-common-artifact-filters = 0xB02137D875D833D9B23392ECAE5A7FB608A0221C
org.apache.maven.shared:maven-invoker = 0x84789D24DF77A32433CE1F079EB80E92EB2135B1
org.apache.maven.shared:maven-shared-utils = 0x82C9EC0E52C47A936A849E0113D979595E6D01E1
org.codehaus.plexus:plexus-classworlds = 0xFB11D4BB7B244678337AAD8BC7BF26D0BB617866
org.codehaus.plexus:plexus-component-annotations = 0xBA926F64CA647B6D853A38672E2010F8A7FF4A41
org.codehaus.plexus:plexus-utils = 0xEA23DB1360D9029481E7F2EFECDFEA3CB4493B94
org.codehaus.plexus:plexus-xml = 0xFA77DCFEF2EE6EB2DEBEDD2C012579464D01C06A
org.eclipse.aether:aether-api = 0xBA926F64CA647B6D853A38672E2010F8A7FF4A41
org.eclipse.aether:aether-util = 0xFB11D4BB7B244678337AAD8BC7BF26D0BB617866
org.codehaus.plexus:plexus-classworlds = 0xB91AB7D2121DC6B0A61AA182D7742D58455ECC7C
org.codehaus.plexus:plexus-component-annotations = 0xFA77DCFEF2EE6EB2DEBEDD2C012579464D01C06A
org.codehaus.plexus:plexus-utils = 0xF254B35617DC255D9344BCFA873A8E86B4372146
org.hamcrest:hamcrest = 0xE3A9F95079E84CE201F7CF60BEDE11EAF1164480
org.hamcrest:hamcrest-core = 0xE3A9F95079E84CE201F7CF60BEDE11EAF1164480
org.slf4j:slf4j-api = 0x475F3B8E59E6E63AA78067482C7B12F2A511E325
org.sonatype.plexus:plexus-cipher = 0x9FFED7A118D45A44E4A1E47130E6F80434A72A7F
org.sonatype.plexus:plexus-sec-dispatcher = 0x2BCBDD0F23EA1CAFCC11D4860374CF2E8DD1BDFD
org.sonatype.sisu = 0xBA926F64CA647B6D853A38672E2010F8A7FF4A41
84 changes: 18 additions & 66 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ under the License.
<description>Signs the project artifacts with GnuPG.</description>

<prerequisites>
<maven>${mavenVersion}</maven>
<maven>3.2.5</maven>
</prerequisites>

<scm>
Expand All @@ -60,9 +60,8 @@ under the License.
</distributionManagement>

<properties>
<mavenVersion>3.2.5</mavenVersion>
<mavenVersion>3.9.6</mavenVersion>
<javaVersion>8</javaVersion>
<surefire.version>3.1.2</surefire.version>
<project.build.outputTimestamp>2023-05-03T01:33:44Z</project.build.outputTimestamp>
<resource.delimiter>@</resource.delimiter>
</properties>
Expand All @@ -76,11 +75,6 @@ under the License.
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
<version>4.0.0</version>
</dependency>
</dependencies>
</dependencyManagement>

Expand Down Expand Up @@ -131,33 +125,10 @@ under the License.
<artifactId>maven-artifact-transfer</artifactId>
<version>0.13.1</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.eclipse.aether.util.artifact.SubArtifact -->
<groupId>org.eclipse.aether</groupId>
<artifactId>aether-util</artifactId>
<version>1.1.0</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-xml</artifactId>
<version>3.0.0</version>
</dependency>
<dependency>
<groupId>org.sonatype.plexus</groupId>
<artifactId>plexus-sec-dispatcher</artifactId>
<version>1.4</version>
<version>3.5.1</version>
</dependency>

<dependency>
Expand All @@ -182,6 +153,12 @@ under the License.
<version>3.2.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.15.1</version>
<scope>test</scope>
</dependency>
</dependencies>

<build>
Expand All @@ -205,13 +182,21 @@ under the License.

<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<proc>none</proc>
<showDeprecation>true</showDeprecation>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
<configuration>
<excludes combine.children="append">
<!-- rat check errors seen on ASF Jenkins instance, but not on local machine... -->
<exclude>src/test/resources/gnupg/*</exclude>
<exclude>src/test/resources/gnupg/**</exclude>
</excludes>
</configuration>
</plugin>
Expand All @@ -231,39 +216,6 @@ under the License.
</plugins>
</pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<executions>
<execution>
<goals>
<goal>shade</goal>
</goals>
<configuration>
<artifactSet>
<includes>
<include>org.apache.maven.resolver:maven-resolver-util</include>
<include>org.eclipse.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.eclipse.aether:aether-util</artifact>
<includes>
<include>org/sonatype/aether/util/artifact/SubArtifact.class</include>
</includes>
</filter>
</filters>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.simplify4u.plugins</groupId>
<artifactId>pgpverify-maven-plugin</artifactId>
Expand Down
33 changes: 0 additions & 33 deletions src/it/settings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,39 +23,6 @@ under the License.
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd">

<profiles>
<profile>
<id>it-repo</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
<repositories>
<repository>
<id>local.central</id>
<url>@localRepositoryUrl@</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>local.central</id>
<url>@localRepositoryUrl@</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
</pluginRepository>
</pluginRepositories>
</profile>
</profiles>

<servers>
<server>
<id>gpg.passphrase</id>
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/apache/maven/plugins/gpg/AbstractGpgMojo.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ public abstract class AbstractGpgMojo extends AbstractMojo {
*
* @since 1.6
*/
@Component(hint = "mng-4384")
@Component
private SecDispatcher securityDispatcher;

AbstractGpgSigner newSigner(MavenProject project) throws MojoExecutionException, MojoFailureException {
Expand Down
43 changes: 0 additions & 43 deletions src/main/resources/META-INF/plexus/components.xml
View file

This file was deleted.

33 changes: 0 additions & 33 deletions src/test/resources/it/settings-with-passphrase.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,39 +23,6 @@ under the License.
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd">

<profiles>
<profile>
<id>it-repo</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
<repositories>
<repository>
<id>local.central</id>
<url>file://@settings.localRepository@</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>local.central</id>
<url>file://@settings.localRepository@</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
</pluginRepository>
</pluginRepositories>
</profile>
</profiles>

<servers>
<server>
<id>gpg.passphrase</id>
Expand Down
33 changes: 0 additions & 33 deletions src/test/resources/it/settings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,37 +23,4 @@ under the License.
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd">

<profiles>
<profile>
<id>it-repo</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
<repositories>
<repository>
<id>local.central</id>
<url>file://@settings.localRepository@</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>local.central</id>
<url>file://@settings.localRepository@</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
</pluginRepository>
</pluginRepositories>
</profile>
</profiles>

</settings>

0 comments on commit 4d0f422

Please sign in to comment.