You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2017/01/31 20:54:06 UTC
[1/2] maven git commit: [MNG-6136] Upgrade Maven Wagon to 2.12
Repository: maven
Updated Branches:
refs/heads/master 2678388ea -> 23b5fcffa
[MNG-6136] Upgrade Maven Wagon to 2.12
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/ce93bb42
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/ce93bb42
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/ce93bb42
Branch: refs/heads/master
Commit: ce93bb42b95c097ce7671576ae9e780b5a2bc653
Parents: 2678388
Author: Michael Osipov <mi...@apache.org>
Authored: Tue Jan 31 15:35:57 2017 +0100
Committer: Michael Osipov <mi...@apache.org>
Committed: Tue Jan 31 15:35:57 2017 +0100
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/ce93bb42/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 5d1f57f..b61e0af 100644
--- a/pom.xml
+++ b/pom.xml
@@ -60,7 +60,7 @@ under the License.
<guavaVersion>18.0</guavaVersion>
<guiceVersion>4.0</guiceVersion>
<sisuInjectVersion>0.3.2</sisuInjectVersion>
- <wagonVersion>2.10</wagonVersion>
+ <wagonVersion>2.12</wagonVersion>
<securityDispatcherVersion>1.3</securityDispatcherVersion>
<cipherVersion>1.7</cipherVersion>
<modelloVersion>1.8.3</modelloVersion>
[2/2] maven git commit: [MNG-6137] Clean up duplicate dependencies
caused by incomplete Wagon HTTP Provider exclusions
Posted by mi...@apache.org.
[MNG-6137] Clean up duplicate dependencies caused by incomplete Wagon HTTP Provider exclusions
JCL over SLF4J has been added also as a runtime dependency because the
bundled HttpClient still uses Commons Logging and we want our version
of SLF4J enforced.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/23b5fcff
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/23b5fcff
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/23b5fcff
Branch: refs/heads/master
Commit: 23b5fcffa75b89e5c3141be5269840d6cd70fe12
Parents: ce93bb4
Author: Michael Osipov <mi...@apache.org>
Authored: Tue Jan 31 16:14:31 2017 +0100
Committer: Michael Osipov <mi...@apache.org>
Committed: Tue Jan 31 16:14:31 2017 +0100
----------------------------------------------------------------------
apache-maven/pom.xml | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/23b5fcff/apache-maven/pom.xml
----------------------------------------------------------------------
diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml
index ba7fda3..e7d5608 100644
--- a/apache-maven/pom.xml
+++ b/apache-maven/pom.xml
@@ -66,10 +66,6 @@ under the License.
<classifier>shaded</classifier>
<exclusions>
<exclusion>
- <groupId>org.apache.maven.wagon</groupId>
- <artifactId>wagon-http-shared4</artifactId>
- </exclusion>
- <exclusion>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
</exclusion>
@@ -77,9 +73,19 @@ under the License.
<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>
</dependency>