You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sl...@apache.org on 2023/10/03 10:06:15 UTC
[maven-wagon] 01/02: [WAGON-634] Bump parent pom to 40
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch WAGON-634
in repository https://gitbox.apache.org/repos/asf/maven-wagon.git
commit 73d352082f8d05ab539f99027dd2ce83725cefd2
Author: Sylwester Lachiewicz <sl...@gmail.com>
AuthorDate: Tue Oct 3 11:28:39 2023 +0200
[WAGON-634] Bump parent pom to 40
---
pom.xml | 102 +++++++-----------------
wagon-providers/pom.xml | 1 -
wagon-providers/wagon-file/pom.xml | 4 +-
wagon-providers/wagon-ftp/pom.xml | 4 +-
wagon-providers/wagon-http-lightweight/pom.xml | 4 +-
wagon-providers/wagon-http-shared/pom.xml | 6 +-
wagon-providers/wagon-http/pom.xml | 10 +--
wagon-providers/wagon-scm/pom.xml | 7 +-
wagon-providers/wagon-ssh-external/pom.xml | 4 +-
wagon-providers/wagon-webdav-jackrabbit/pom.xml | 11 ++-
10 files changed, 47 insertions(+), 106 deletions(-)
diff --git a/pom.xml b/pom.xml
index 94569858..8f7020d4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@ under the License.
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven-parent</artifactId>
- <version>34</version>
+ <version>40</version>
</parent>
<groupId>org.apache.maven.wagon</groupId>
@@ -36,14 +36,6 @@ under the License.
<url>https://maven.apache.org/wagon</url>
<inceptionYear>2003</inceptionYear>
- <properties>
- <maven.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile>
- <slf4jVersion>1.7.36</slf4jVersion>
- <maven.site.path>wagon-archives/wagon-LATEST</maven.site.path>
- <javaVersion>7</javaVersion>
- <project.build.outputTimestamp>2022-12-18T21:06:44Z</project.build.outputTimestamp>
- </properties>
-
<contributors>
<contributor>
<name>James William Dumay</name>
@@ -162,9 +154,9 @@ under the License.
<mailingList>
<name>LEGACY Wagon User List (deprecated)</name>
- <post>wagon-users@maven.apache.org</post>
<subscribe>wagon-users-subscribe@maven.apache.org</subscribe>
<unsubscribe>wagon-users-unsubscribe@maven.apache.org</unsubscribe>
+ <post>wagon-users@maven.apache.org</post>
<archive>http://mail-archives.apache.org/mod_mbox/maven-wagon-users/</archive>
<otherArchives>
<otherArchive>http://www.mail-archive.com/wagon-users@maven.apache.org</otherArchive>
@@ -174,9 +166,9 @@ under the License.
</mailingList>
<mailingList>
<name>LEGACY Wagon Developer List (deprecated)</name>
- <post>wagon-dev@maven.apache.org</post>
<subscribe>wagon-dev-subscribe@maven.apache.org</subscribe>
<unsubscribe>wagon-dev-unsubscribe@maven.apache.org</unsubscribe>
+ <post>wagon-dev@maven.apache.org</post>
<archive>http://mail-archives.apache.org/mod_mbox/maven-wagon-dev/</archive>
<otherArchives>
<otherArchive>http://www.mail-archive.com/wagon-dev@maven.apache.org</otherArchive>
@@ -195,11 +187,18 @@ under the License.
</mailingList>
</mailingLists>
+ <modules>
+ <module>wagon-provider-api</module>
+ <module>wagon-providers</module>
+ <module>wagon-provider-test</module>
+ <module>wagon-tcks</module>
+ </modules>
+
<scm>
<connection>scm:git:https://gitbox.apache.org/repos/asf/maven-wagon.git</connection>
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/maven-wagon.git</developerConnection>
- <url>https://github.com/apache/maven-wagon/tree/${project.scm.tag}</url>
<tag>wagon-4.0.0-M1</tag>
+ <url>https://github.com/apache/maven-wagon/tree/${project.scm.tag}</url>
</scm>
<issueManagement>
@@ -218,12 +217,12 @@ under the License.
</site>
</distributionManagement>
- <modules>
- <module>wagon-provider-api</module>
- <module>wagon-providers</module>
- <module>wagon-provider-test</module>
- <module>wagon-tcks</module>
- </modules>
+ <properties>
+ <maven.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile>
+ <slf4jVersion>1.7.36</slf4jVersion>
+ <maven.site.path>wagon-archives/wagon-LATEST</maven.site.path>
+ <project.build.outputTimestamp>2022-12-18T21:06:44Z</project.build.outputTimestamp>
+ </properties>
<dependencyManagement>
<dependencies>
@@ -321,22 +320,16 @@ under the License.
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>3.1.0</version>
- </dependency>
+ </dependency>
</dependencies>
</dependencyManagement>
<build>
<pluginManagement>
<plugins>
- <plugin><!-- TODO remove when parent POM upgraded to 35 -->
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-shade-plugin</artifactId>
- <version>3.2.3</version>
- </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.22.2</version>
<configuration>
<forkedProcessTimeoutInSeconds>800</forkedProcessTimeoutInSeconds>
<systemPropertyVariables>
@@ -357,13 +350,16 @@ under the License.
<configuration>
<excludes combine.children="append">
<exclude>.checkstyle</exclude>
+ <exclude>.gitattributes</exclude>
<exclude>**/*.odg</exclude>
<exclude>src/test/resources/**</exclude>
<exclude>src/main/resources/default-server-root/**</exclude>
<exclude>src/main/resources/ssh-keys/**</exclude>
<exclude>src/test/ssh-keys/**</exclude>
- <exclude>.repository/**</exclude><!-- for CI -->
- <exclude>out/**</exclude> <!-- for intellij -->
+ <!-- for CI -->
+ <exclude>.repository/**</exclude>
+ <!-- for intellij -->
+ <exclude>out/**</exclude>
</excludes>
</configuration>
</plugin>
@@ -392,6 +388,11 @@ under the License.
</lifecycleMappingMetadata>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-component-metadata</artifactId>
+ <version>2.1.1</version>
+ </plugin>
</plugins>
</pluginManagement>
<plugins>
@@ -407,47 +408,6 @@ under the License.
</execution>
</executions>
</plugin>
-
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>animal-sniffer-maven-plugin</artifactId>
- <version>1.15</version>
- <configuration>
- <signature>
- <groupId>org.codehaus.mojo.signature</groupId>
- <artifactId>java17</artifactId>
- <version>1.0</version>
- </signature>
- </configuration>
- <executions>
- <execution>
- <id>check-java-1.7-compat</id>
- <phase>process-classes</phase>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <version>3.0.0-M2</version>
- <executions>
- <execution>
- <goals>
- <goal>enforce</goal>
- </goals>
- <configuration>
- <rules>
- <requireJavaVersion>
- <version>1.7.0</version>
- </requireJavaVersion>
- </rules>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
@@ -525,10 +485,10 @@ under the License.
</reportSet>
<reportSet>
<id>aggregate</id>
- <inherited>false</inherited>
<reports>
<report>aggregate</report>
</reports>
+ <inherited>false</inherited>
</reportSet>
</reportSets>
</plugin>
@@ -545,10 +505,10 @@ under the License.
</reportSet>
<reportSet>
<id>aggregate</id>
- <inherited>false</inherited>
<reports>
<report>aggregate</report>
</reports>
+ <inherited>false</inherited>
</reportSet>
</reportSets>
</plugin>
@@ -564,10 +524,10 @@ under the License.
</reportSet>
<reportSet>
<id>aggregate</id>
- <inherited>false</inherited>
<reports>
<report>checkstyle-aggregate</report>
</reports>
+ <inherited>false</inherited>
</reportSet>
</reportSets>
</plugin>
diff --git a/wagon-providers/pom.xml b/wagon-providers/pom.xml
index 29a36ad5..638f43a5 100644
--- a/wagon-providers/pom.xml
+++ b/wagon-providers/pom.xml
@@ -73,7 +73,6 @@ under the License.
</dependencies>
</dependencyManagement>
-
<dependencies>
<dependency>
<groupId>org.apache.maven.wagon</groupId>
diff --git a/wagon-providers/wagon-file/pom.xml b/wagon-providers/wagon-file/pom.xml
index 90759063..a076a89d 100644
--- a/wagon-providers/wagon-file/pom.xml
+++ b/wagon-providers/wagon-file/pom.xml
@@ -29,9 +29,7 @@ under the License.
<artifactId>wagon-file</artifactId>
<name>Apache Maven Wagon :: Providers :: File Provider</name>
- <description>
- Wagon provider that gets and puts artifacts using file system protocol
- </description>
+ <description>Wagon provider that gets and puts artifacts using file system protocol</description>
<dependencies>
<dependency>
diff --git a/wagon-providers/wagon-ftp/pom.xml b/wagon-providers/wagon-ftp/pom.xml
index f4e54fdb..1b692ada 100644
--- a/wagon-providers/wagon-ftp/pom.xml
+++ b/wagon-providers/wagon-ftp/pom.xml
@@ -29,9 +29,7 @@ under the License.
<artifactId>wagon-ftp</artifactId>
<name>Apache Maven Wagon :: Providers :: FTP Provider</name>
- <description>
- Wagon provider that gets and puts artifacts from and to remote server using FTP protocol
- </description>
+ <description>Wagon provider that gets and puts artifacts from and to remote server using FTP protocol</description>
<dependencies>
<dependency>
diff --git a/wagon-providers/wagon-http-lightweight/pom.xml b/wagon-providers/wagon-http-lightweight/pom.xml
index 88334f2e..bca99bbd 100644
--- a/wagon-providers/wagon-http-lightweight/pom.xml
+++ b/wagon-providers/wagon-http-lightweight/pom.xml
@@ -29,9 +29,7 @@ under the License.
<artifactId>wagon-http-lightweight</artifactId>
<name>Apache Maven Wagon :: Providers :: Lightweight HTTP Provider</name>
- <description>
- Wagon provider that gets and puts artifacts through http using standard Java library
- </description>
+ <description>Wagon provider that gets and puts artifacts through http using standard Java library</description>
<dependencies>
<dependency>
diff --git a/wagon-providers/wagon-http-shared/pom.xml b/wagon-providers/wagon-http-shared/pom.xml
index aea071d9..7e86dcb4 100644
--- a/wagon-providers/wagon-http-shared/pom.xml
+++ b/wagon-providers/wagon-http-shared/pom.xml
@@ -29,9 +29,7 @@ under the License.
<artifactId>wagon-http-shared</artifactId>
<name>Apache Maven Wagon :: Providers :: HTTP Shared Library</name>
- <description>
- Shared Library for wagon providers supporting HTTP.
- </description>
+ <description>Shared Library for wagon providers supporting HTTP.</description>
<dependencies>
<dependency>
@@ -39,8 +37,8 @@ under the License.
<artifactId>httpclient</artifactId>
<exclusions>
<exclusion>
- <artifactId>commons-logging</artifactId>
<groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
</exclusion>
</exclusions>
</dependency>
diff --git a/wagon-providers/wagon-http/pom.xml b/wagon-providers/wagon-http/pom.xml
index ba6462fb..ea7841fe 100644
--- a/wagon-providers/wagon-http/pom.xml
+++ b/wagon-providers/wagon-http/pom.xml
@@ -29,10 +29,7 @@ under the License.
<artifactId>wagon-http</artifactId>
<name>Apache Maven Wagon :: Providers :: HTTP Provider</name>
- <description>
- Wagon provider that gets and puts artifacts through HTTP(S) using Apache HttpClient-4.x.
- </description>
-
+ <description>Wagon provider that gets and puts artifacts through HTTP(S) using Apache HttpClient-4.x.</description>
<dependencies>
<dependency>
@@ -45,8 +42,8 @@ under the License.
<artifactId>httpclient</artifactId>
<exclusions>
<exclusion>
- <artifactId>commons-logging</artifactId>
<groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -95,7 +92,6 @@ under the License.
</dependencies>
-
<build>
<plugins>
<plugin>
@@ -103,10 +99,10 @@ under the License.
<artifactId>maven-shade-plugin</artifactId>
<executions>
<execution>
- <phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
+ <phase>package</phase>
<configuration>
<shadedArtifactAttached>true</shadedArtifactAttached>
<shadedClassifierName>shaded</shadedClassifierName>
diff --git a/wagon-providers/wagon-scm/pom.xml b/wagon-providers/wagon-scm/pom.xml
index 8645a744..b62be3a7 100644
--- a/wagon-providers/wagon-scm/pom.xml
+++ b/wagon-providers/wagon-scm/pom.xml
@@ -29,9 +29,7 @@ under the License.
<artifactId>wagon-scm</artifactId>
<name>Apache Maven Wagon :: Providers :: SCM Provider</name>
- <description>
- Wagon provider that gets and puts artifacts using a Source Control Management system
- </description>
+ <description>Wagon provider that gets and puts artifacts using a Source Control Management system</description>
<properties>
<mavenScmVersion>1.11.1</mavenScmVersion>
@@ -88,8 +86,7 @@ under the License.
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <excludes>
- </excludes>
+ <excludes />
</configuration>
</plugin>
</plugins>
diff --git a/wagon-providers/wagon-ssh-external/pom.xml b/wagon-providers/wagon-ssh-external/pom.xml
index 16eb7c16..c833bc1a 100644
--- a/wagon-providers/wagon-ssh-external/pom.xml
+++ b/wagon-providers/wagon-ssh-external/pom.xml
@@ -29,9 +29,7 @@ under the License.
<artifactId>wagon-ssh-external</artifactId>
<name>Apache Maven Wagon :: Providers :: SSH External Provider</name>
- <description>
- Wagon provider that gets and puts artifacts using SSH protocol with a preinstalled SSH client
- </description>
+ <description>Wagon provider that gets and puts artifacts using SSH protocol with a preinstalled SSH client</description>
<properties>
<sshd.stopImmediatly>false</sshd.stopImmediatly>
diff --git a/wagon-providers/wagon-webdav-jackrabbit/pom.xml b/wagon-providers/wagon-webdav-jackrabbit/pom.xml
index 44410d91..5f8bdd56 100644
--- a/wagon-providers/wagon-webdav-jackrabbit/pom.xml
+++ b/wagon-providers/wagon-webdav-jackrabbit/pom.xml
@@ -29,9 +29,7 @@ under the License.
<artifactId>wagon-webdav-jackrabbit</artifactId>
<name>Apache Maven Wagon :: Providers :: WebDAV Provider</name>
- <description>
- Wagon provider that gets and puts artifacts through WebDAV protocol
- </description>
+ <description>Wagon provider that gets and puts artifacts through WebDAV protocol</description>
<contributors>
<contributor>
@@ -57,8 +55,8 @@ under the License.
<version>2.14.4</version>
<exclusions>
<exclusion>
- <artifactId>commons-logging</artifactId>
<groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
</exclusion>
<exclusion>
<groupId>commons-httpclient</groupId>
@@ -75,7 +73,8 @@ under the License.
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
- <dependency> <!-- required for org.apache.httpcomponents:httpclient -->
+ <dependency>
+ <!-- required for org.apache.httpcomponents:httpclient -->
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
<scope>runtime</scope>
@@ -86,8 +85,8 @@ under the License.
<artifactId>httpclient</artifactId>
<exclusions>
<exclusion>
- <artifactId>commons-logging</artifactId>
<groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
</exclusion>
</exclusions>
</dependency>