Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[WAGON-641] POM cleanup and upgrade misc deps #135

Merged
merged 1 commit into from
Dec 31, 2024
Merged

[WAGON-641] POM cleanup and upgrade misc deps #135

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
96 changes: 3 additions & 93 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,67 +126,6 @@ under the License.
</contributor>
</contributors>

<mailingLists>
<mailingList>
<name>Maven Developer List</name>
<subscribe>[email protected]</subscribe>
<unsubscribe>[email protected]</unsubscribe>
<post>[email protected]</post>
<archive>http://mail-archives.apache.org/mod_mbox/maven-dev</archive>
<otherArchives>
<otherArchive>http://www.mail-archive.com/[email protected]/</otherArchive>
<otherArchive>http://maven.40175.n5.nabble.com/Maven-Developers-f142166.html</otherArchive>
<otherArchive>http://maven-dev.markmail.org/</otherArchive>
</otherArchives>
</mailingList>
<mailingList>
<name>Maven User List</name>
<subscribe>[email protected]</subscribe>
<unsubscribe>[email protected]</unsubscribe>
<post>[email protected]</post>
<archive>http://mail-archives.apache.org/mod_mbox/maven-users</archive>
<otherArchives>
<otherArchive>http://www.mail-archive.com/[email protected]/</otherArchive>
<otherArchive>http://maven.40175.n5.nabble.com/Maven-Users-f40176.html</otherArchive>
<otherArchive>http://maven-users.markmail.org/</otherArchive>
</otherArchives>
</mailingList>

<mailingList>
<name>LEGACY Wagon User List (deprecated)</name>
<subscribe>[email protected]</subscribe>
<unsubscribe>[email protected]</unsubscribe>
<post>[email protected]</post>
<archive>http://mail-archives.apache.org/mod_mbox/maven-wagon-users/</archive>
<otherArchives>
<otherArchive>http://www.mail-archive.com/[email protected]</otherArchive>
<otherArchive>http://maven.40175.n5.nabble.com/Wagon-Users-f326332.html</otherArchive>
<otherArchive>http://maven-wagon-users.markmail.org/</otherArchive>
</otherArchives>
</mailingList>
<mailingList>
<name>LEGACY Wagon Developer List (deprecated)</name>
<subscribe>[email protected]</subscribe>
<unsubscribe>[email protected]</unsubscribe>
<post>[email protected]</post>
<archive>http://mail-archives.apache.org/mod_mbox/maven-wagon-dev/</archive>
<otherArchives>
<otherArchive>http://www.mail-archive.com/[email protected]</otherArchive>
<otherArchive>http://maven.40175.n5.nabble.com/Wagon-Dev-f326406.html</otherArchive>
<otherArchive>http://maven-wagon-dev.markmail.org/</otherArchive>
</otherArchives>
</mailingList>
<mailingList>
<name>Wagon Commits List</name>
<subscribe>[email protected]</subscribe>
<unsubscribe>[email protected]</unsubscribe>
<archive>http://mail-archives.apache.org/mod_mbox/maven-wagon-commits/</archive>
<otherArchives>
<otherArchive>http://maven-wagon-commits.markmail.org/</otherArchive>
</otherArchives>
</mailingList>
</mailingLists>

<modules>
<module>wagon-provider-api</module>
<module>wagon-providers</module>
Expand Down Expand Up @@ -221,6 +160,8 @@ under the License.
<maven.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile>
<slf4jVersion>1.7.36</slf4jVersion>
<maven.site.path>wagon-archives/wagon-LATEST</maven.site.path>
<version.plexus-utils>3.6.0</version.plexus-utils>
<version.sisu-maven-plugin>0.9.0.M3</version.sisu-maven-plugin>
<project.build.outputTimestamp>2022-12-18T21:06:44Z</project.build.outputTimestamp>
</properties>

Expand Down Expand Up @@ -259,14 +200,8 @@ under the License.
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
<version>2.1.0</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
<version>3.3.1</version>
<version>2.1.1</version>
</dependency>

<!-- for slf4j -->
<dependency>
<groupId>org.slf4j</groupId>
Expand Down Expand Up @@ -349,31 +284,6 @@ under the License.
</excludes>
</configuration>
</plugin>
<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
<plugin>
<groupId>org.eclipse.m2e</groupId>
<artifactId>lifecycle-mapping</artifactId>
<version>1.0.0</version>
<configuration>
<lifecycleMappingMetadata>
<pluginExecutions>
<pluginExecution>
<pluginExecutionFilter>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
<versionRange>[0.11,)</versionRange>
<goals>
<goal>check</goal>
</goals>
</pluginExecutionFilter>
<action>
<ignore />
</action>
</pluginExecution>
</pluginExecutions>
</lifecycleMappingMetadata>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-component-metadata</artifactId>
Expand Down
1 change: 0 additions & 1 deletion wagon-provider-api/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ under the License.
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon</artifactId>
<version>3.5.4-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>wagon-provider-api</artifactId>
Expand Down
1 change: 0 additions & 1 deletion wagon-provider-test/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ under the License.
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon</artifactId>
<version>3.5.4-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>wagon-provider-test</artifactId>
Expand Down
14 changes: 0 additions & 14 deletions wagon-providers/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ under the License.
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon</artifactId>
<version>3.5.4-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>wagon-providers</artifactId>
Expand Down Expand Up @@ -52,24 +51,11 @@ under the License.
<artifactId>httpclient</artifactId>
<version>4.5.14</version>
</dependency>
<!-- Overwrite transitive dependency version of HttpClient -->
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>1.16.1</version>
<scope>runtime</scope>
</dependency>
michael-o marked this conversation as resolved.
Show resolved Hide resolved
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore</artifactId>
<version>4.4.16</version>
</dependency>
<dependency>
<groupId>org.apache.sshd</groupId>
<artifactId>sshd-core</artifactId>
<version>0.8.0</version>
<scope>test</scope>
</dependency>
michael-o marked this conversation as resolved.
Show resolved Hide resolved
</dependencies>
</dependencyManagement>

Expand Down
2 changes: 1 addition & 1 deletion wagon-providers/wagon-file/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ under the License.
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-providers</artifactId>
<version>3.5.4-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>wagon-file</artifactId>
Expand All @@ -39,6 +38,7 @@ under the License.
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
</project>
4 changes: 2 additions & 2 deletions wagon-providers/wagon-ftp/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ under the License.
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-providers</artifactId>
<version>3.5.4-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>wagon-ftp</artifactId>
Expand All @@ -35,7 +34,7 @@ under the License.
<dependency>
<groupId>commons-net</groupId>
<artifactId>commons-net</artifactId>
<version>3.9.0</version>
<version>3.11.1</version>
</dependency>

<dependency>
Expand All @@ -51,6 +50,7 @@ under the License.
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>commons-io</groupId>
Expand Down
6 changes: 5 additions & 1 deletion wagon-providers/wagon-http-lightweight/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ under the License.
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-providers</artifactId>
<version>3.5.4-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>wagon-http-lightweight</artifactId>
Expand All @@ -49,6 +48,10 @@ under the License.
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
Expand All @@ -62,6 +65,7 @@ under the License.
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
</project>
2 changes: 1 addition & 1 deletion wagon-providers/wagon-http-shared/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ under the License.
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-providers</artifactId>
<version>3.5.4-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>wagon-http-shared</artifactId>
Expand Down Expand Up @@ -57,6 +56,7 @@ under the License.
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
Expand Down
10 changes: 9 additions & 1 deletion wagon-providers/wagon-http/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ under the License.
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-providers</artifactId>
<version>3.5.4-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>wagon-http</artifactId>
Expand All @@ -47,6 +46,14 @@ under the License.
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore</artifactId>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
Expand All @@ -60,6 +67,7 @@ under the License.
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
Expand Down
2 changes: 1 addition & 1 deletion wagon-providers/wagon-scm/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ under the License.
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-providers</artifactId>
<version>3.5.4-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>wagon-scm</artifactId>
Expand Down Expand Up @@ -78,6 +77,7 @@ under the License.
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<scope>test</scope>
</dependency>
</dependencies>

Expand Down
8 changes: 2 additions & 6 deletions wagon-providers/wagon-ssh-common-test/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ under the License.
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-providers</artifactId>
<version>3.5.4-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>wagon-ssh-common-test</artifactId>
Expand Down Expand Up @@ -55,6 +54,8 @@ under the License.
<dependency>
<groupId>org.apache.sshd</groupId>
<artifactId>sshd-core</artifactId>
<!-- lots of changes in later versions, we drop SSH provider in 4.x version -->
<version>0.8.0</version>
<scope>compile</scope>
</dependency>
<dependency>
Expand All @@ -63,10 +64,5 @@ under the License.
<version>2.2.4</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>compile</scope>
</dependency>
</dependencies>
</project>
7 changes: 0 additions & 7 deletions wagon-providers/wagon-ssh-common/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ under the License.
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-providers</artifactId>
<version>3.5.4-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>wagon-ssh-common</artifactId>
Expand All @@ -38,12 +37,6 @@ under the License.
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-interactivity-api</artifactId>
<exclusions>
<exclusion>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-component-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>junit</groupId>
Expand Down
2 changes: 1 addition & 1 deletion wagon-providers/wagon-ssh-external/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ under the License.
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-providers</artifactId>
<version>3.5.4-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>wagon-ssh-external</artifactId>
Expand Down Expand Up @@ -52,6 +51,7 @@ under the License.
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>commons-io</groupId>
Expand Down
7 changes: 6 additions & 1 deletion wagon-providers/wagon-ssh/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ under the License.
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-providers</artifactId>
<version>3.5.4-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>wagon-ssh</artifactId>
Expand Down Expand Up @@ -80,12 +79,18 @@ under the License.
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
</dependencies>

<profiles>
Expand Down
Loading
Loading