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 2022/03/16 14:37:13 UTC
[maven] branch maven-transport-http updated (41134a2 -> 5a983d0)
This is an automated email from the ASF dual-hosted git repository.
cstamas pushed a change to branch maven-transport-http
in repository https://gitbox.apache.org/repos/asf/maven.git.
omit 41134a2 Merge remote-tracking branch 'origin/master' into maven-transport-http
omit c376df6 Merge remote-tracking branch 'origin/master' into maven-transport-http
omit b7f179a Merge remote-tracking branch 'origin/master' into maven-transport-http
omit bf8e7ae Merge remote-tracking branch 'origin/master' into maven-transport-http
omit 1465d72 Do not use shaded wagon, client is here
omit e1d4081 Merge remote-tracking branch 'origin/master' into maven-transport-http
omit 35757c3 Maven w/ transport-http
new 5a983d0 Maven w/ transport-http
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (41134a2)
\
N -- N -- N refs/heads/maven-transport-http (5a983d0)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
[maven] 01/01: Maven w/ transport-http
Posted by cs...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
cstamas pushed a commit to branch maven-transport-http
in repository https://gitbox.apache.org/repos/asf/maven.git
commit 5a983d071869f66e32b683c51076b467faa5cede
Author: Tamas Cservenak <ta...@cservenak.net>
AuthorDate: Wed Dec 15 12:02:11 2021 +0100
Maven w/ transport-http
---
.../plexus-utils/3.3.0/plexus-utils-3.3.0.jar.sha1 | 1 +
.../plexus-utils/3.3.0/plexus-utils-3.3.0.jar.sha1 | 1 +
apache-maven/pom.xml | 27 ++++-----------------
maven-compat/pom.xml | 25 +++++++++++++++----
maven-resolver-provider/pom.xml | 6 ++---
pom.xml | 28 +++++++---------------
6 files changed, 38 insertions(+), 50 deletions(-)
diff --git a/.mvn/checksums-bad/org/codehaus/plexus/plexus-utils/3.3.0/plexus-utils-3.3.0.jar.sha1 b/.mvn/checksums-bad/org/codehaus/plexus/plexus-utils/3.3.0/plexus-utils-3.3.0.jar.sha1
new file mode 100644
index 0000000..7b3a785
--- /dev/null
+++ b/.mvn/checksums-bad/org/codehaus/plexus/plexus-utils/3.3.0/plexus-utils-3.3.0.jar.sha1
@@ -0,0 +1 @@
+BAD
diff --git a/.mvn/checksums-good/org/codehaus/plexus/plexus-utils/3.3.0/plexus-utils-3.3.0.jar.sha1 b/.mvn/checksums-good/org/codehaus/plexus/plexus-utils/3.3.0/plexus-utils-3.3.0.jar.sha1
new file mode 100644
index 0000000..b1d9808
--- /dev/null
+++ b/.mvn/checksums-good/org/codehaus/plexus/plexus-utils/3.3.0/plexus-utils-3.3.0.jar.sha1
@@ -0,0 +1 @@
+cf43b5391de623b36fe066a21127baef82c64022
\ No newline at end of file
diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml
index 5fc5528..15cc6a5 100644
--- a/apache-maven/pom.xml
+++ b/apache-maven/pom.xml
@@ -61,41 +61,22 @@ under the License.
<artifactId>commons-cli</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.maven.wagon</groupId>
- <artifactId>wagon-http</artifactId>
- <classifier>shaded</classifier>
- <exclusions>
- <exclusion>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpcore</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.maven.wagon</groupId>
- <artifactId>wagon-http-shared</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
<version>${slf4jVersion}</version>
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>org.apache.maven.wagon</groupId>
- <artifactId>wagon-file</artifactId>
+ <groupId>org.apache.maven.resolver</groupId>
+ <artifactId>maven-resolver-connector-basic</artifactId>
</dependency>
<dependency>
<groupId>org.apache.maven.resolver</groupId>
- <artifactId>maven-resolver-connector-basic</artifactId>
+ <artifactId>maven-resolver-transport-file</artifactId>
</dependency>
<dependency>
<groupId>org.apache.maven.resolver</groupId>
- <artifactId>maven-resolver-transport-wagon</artifactId>
+ <artifactId>maven-resolver-transport-http</artifactId>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
diff --git a/maven-compat/pom.xml b/maven-compat/pom.xml
index 7f8d4a3..8f4bc3b 100644
--- a/maven-compat/pom.xml
+++ b/maven-compat/pom.xml
@@ -33,6 +33,10 @@ under the License.
<name>Maven Compat</name>
<description>Maven2 classes maintained as compatibility layer.</description>
+ <properties>
+ <wagonVersion>3.5.1</wagonVersion>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
@@ -98,9 +102,22 @@ under the License.
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-component-annotations</artifactId>
</dependency>
+
+ <!-- Wagon -->
<dependency>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-provider-api</artifactId>
+ <version>${wagonVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-http</artifactId>
+ <version>${wagonVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-file</artifactId>
+ <version>${wagonVersion}</version>
</dependency>
<dependency>
@@ -114,18 +131,18 @@ under the License.
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.maven.wagon</groupId>
- <artifactId>wagon-file</artifactId>
+ <groupId>org.apache.maven.resolver</groupId>
+ <artifactId>maven-resolver-connector-basic</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.maven.resolver</groupId>
- <artifactId>maven-resolver-connector-basic</artifactId>
+ <artifactId>maven-resolver-transport-file</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.maven.resolver</groupId>
- <artifactId>maven-resolver-transport-wagon</artifactId>
+ <artifactId>maven-resolver-transport-http</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/maven-resolver-provider/pom.xml b/maven-resolver-provider/pom.xml
index 0027e34..5b416a4 100644
--- a/maven-resolver-provider/pom.xml
+++ b/maven-resolver-provider/pom.xml
@@ -117,12 +117,12 @@ under the License.
</dependency>
<dependency>
<groupId>org.apache.maven.resolver</groupId>
- <artifactId>maven-resolver-transport-wagon</artifactId>
+ <artifactId>maven-resolver-transport-file</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.maven.wagon</groupId>
- <artifactId>wagon-file</artifactId>
+ <groupId>org.apache.maven.resolver</groupId>
+ <artifactId>maven-resolver-transport-http</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/pom.xml b/pom.xml
index c42deb4..7f9e5d5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -60,12 +60,11 @@ under the License.
<guavaVersion>30.1-jre</guavaVersion>
<guavafailureaccessVersion>1.0.1</guavafailureaccessVersion>
<sisuVersion>0.3.5</sisuVersion>
- <wagonVersion>3.5.1</wagonVersion>
<securityDispatcherVersion>2.0</securityDispatcherVersion>
<cipherVersion>2.0</cipherVersion>
<modelloVersion>1.11</modelloVersion>
<jxpathVersion>1.3</jxpathVersion>
- <resolverVersion>1.7.2</resolverVersion>
+ <resolverVersion>1.8.0-SNAPSHOT</resolverVersion>
<slf4jVersion>1.7.32</slf4jVersion>
<xmlunitVersion>2.6.4</xmlunitVersion>
<maven.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile>
@@ -325,23 +324,6 @@ under the License.
<version>1.2.1</version>
<optional>true</optional>
</dependency>
- <!-- Wagon -->
- <dependency>
- <groupId>org.apache.maven.wagon</groupId>
- <artifactId>wagon-provider-api</artifactId>
- <version>${wagonVersion}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.wagon</groupId>
- <artifactId>wagon-file</artifactId>
- <version>${wagonVersion}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.wagon</groupId>
- <artifactId>wagon-http</artifactId>
- <version>${wagonVersion}</version>
- <classifier>shaded</classifier>
- </dependency>
<!-- Repository -->
<dependency>
<groupId>org.apache.maven.resolver</groupId>
@@ -370,7 +352,12 @@ under the License.
</dependency>
<dependency>
<groupId>org.apache.maven.resolver</groupId>
- <artifactId>maven-resolver-transport-wagon</artifactId>
+ <artifactId>maven-resolver-transport-file</artifactId>
+ <version>${resolverVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.resolver</groupId>
+ <artifactId>maven-resolver-transport-http</artifactId>
<version>${resolverVersion}</version>
</dependency>
<!-- Commons -->
@@ -564,6 +551,7 @@ under the License.
<configuration>
<excludes>
<exclude>.asf.yaml</exclude>
+ <exclude>.mvn/</exclude>
<exclude>src/test/resources*/**</exclude>
<exclude>src/test/projects/**</exclude>
<exclude>src/test/remote-repo/**</exclude>