maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From micha...@apache.org
Subject maven-resolver git commit: [MRESOLVER-3] Update dependencies
Date Tue, 16 May 2017 18:17:34 GMT
Repository: maven-resolver
Updated Branches:
  refs/heads/MRESOLVER-3 [created] 98fb57c84


[MRESOLVER-3] Update dependencies


Project: http://git-wip-us.apache.org/repos/asf/maven-resolver/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-resolver/commit/98fb57c8
Tree: http://git-wip-us.apache.org/repos/asf/maven-resolver/tree/98fb57c8
Diff: http://git-wip-us.apache.org/repos/asf/maven-resolver/diff/98fb57c8

Branch: refs/heads/MRESOLVER-3
Commit: 98fb57c84c233d6b474f9a7933d1d59b13e17c54
Parents: e835676
Author: Michael Osipov <michaelo@apache.org>
Authored: Tue May 16 20:16:59 2017 +0200
Committer: Michael Osipov <michaelo@apache.org>
Committed: Tue May 16 20:16:59 2017 +0200

----------------------------------------------------------------------
 maven-resolver-transport-http/pom.xml  | 29 +++++++++++++++++------------
 maven-resolver-transport-wagon/pom.xml | 10 +++-------
 pom.xml                                | 18 ++++++++++--------
 3 files changed, 30 insertions(+), 27 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/98fb57c8/maven-resolver-transport-http/pom.xml
----------------------------------------------------------------------
diff --git a/maven-resolver-transport-http/pom.xml b/maven-resolver-transport-http/pom.xml
index ec491b2..96997c0 100644
--- a/maven-resolver-transport-http/pom.xml
+++ b/maven-resolver-transport-http/pom.xml
@@ -35,6 +35,10 @@
       A transport implementation for repositories using http:// and https:// URLs.
   </description>
 
+  <properties>
+    <jettyVersion>8.1.22.v20160922</jettyVersion>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.maven.resolver</groupId>
@@ -51,7 +55,7 @@
     <dependency>
       <groupId>org.apache.httpcomponents</groupId>
       <artifactId>httpclient</artifactId>
-      <version>4.2.6</version>
+      <version>4.5.3</version>
       <exclusions>
         <exclusion>
           <!-- using jcl-over-slf4j instead -->
@@ -63,12 +67,13 @@
     <dependency>
       <groupId>org.apache.httpcomponents</groupId>
       <artifactId>httpcore</artifactId>
-      <version>4.2.5</version>
+      <version>4.4.6</version>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>jcl-over-slf4j</artifactId>
-      <version>1.6.2</version>
+      <version>${slf4jVersion}</version>
+      <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>javax.inject</groupId>
@@ -100,30 +105,30 @@
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-server</artifactId>
-      <version>7.6.14.v20131031</version>
+      <version>${jettyVersion}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-util</artifactId>
-      <version>7.6.14.v20131031</version>
+      <version>${jettyVersion}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.eclipse.jetty.orbit</groupId>
-      <artifactId>javax.servlet</artifactId>
-      <version>2.5.0.v201103041518</version>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-servlet</artifactId>
+      <version>${jettyVersion}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>ch.qos.logback</groupId>
-      <artifactId>logback-classic</artifactId>
-      <version>1.0.7</version>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-api</artifactId>
+      <artifactId>slf4j-simple</artifactId>
+      <version>${slf4jVersion}</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/98fb57c8/maven-resolver-transport-wagon/pom.xml
----------------------------------------------------------------------
diff --git a/maven-resolver-transport-wagon/pom.xml b/maven-resolver-transport-wagon/pom.xml
index 985539f..d0c7e93 100644
--- a/maven-resolver-transport-wagon/pom.xml
+++ b/maven-resolver-transport-wagon/pom.xml
@@ -35,10 +35,6 @@
     A transport implementation based on Maven Wagon.
   </description>
 
-  <properties>
-    <wagonVersion>1.0</wagonVersion>
-  </properties>
-
   <dependencies>
     <dependency>
       <groupId>org.apache.maven.resolver</groupId>
@@ -55,7 +51,7 @@
     <dependency>
       <groupId>org.apache.maven.wagon</groupId>
       <artifactId>wagon-provider-api</artifactId>
-      <version>${wagonVersion}</version>
+      <version>2.12</version>
     </dependency>
     <dependency>
       <groupId>javax.inject</groupId>
@@ -72,13 +68,13 @@
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-classworlds</artifactId>
-      <version>2.4</version>
+      <version>2.5.2</version>
       <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-utils</artifactId>
-      <version>2.1</version>
+      <version>3.0.24</version>
       <optional>true</optional>
     </dependency>
     <dependency>

http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/98fb57c8/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 14c0b8f..c2386d3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -66,6 +66,8 @@
     <surefire.redirectTestOutputToFile>true</surefire.redirectTestOutputToFile>
     <maven.site.path>resolver-archives/resolver-LATEST</maven.site.path>
     <checkstyle.violation.ignore>UnusedImports,LineLength,InnerAssignment,MagicNumber,AvoidNestedBlocks,ParameterNumber,MethodLength,MemberName</checkstyle.violation.ignore>
+    <sisuVersion>0.3.3</sisuVersion>
+    <slf4jVersion>1.7.25</slf4jVersion>
   </properties>
 
   <modules>
@@ -119,7 +121,7 @@
       <dependency>
         <groupId>junit</groupId>
         <artifactId>junit</artifactId>
-        <version>4.11</version>
+        <version>4.12</version>
         <scope>test</scope>
       </dependency>
       <dependency>
@@ -138,19 +140,19 @@
       <dependency>
         <groupId>org.codehaus.plexus</groupId>
         <artifactId>plexus-component-annotations</artifactId>
-        <version>1.5.5</version>
+        <version>1.7.1</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>org.eclipse.sisu</groupId>
         <artifactId>org.eclipse.sisu.inject</artifactId>
-        <version>0.1.1</version>
+        <version>${sisuVersion}</version>
       </dependency>
       <dependency>
         <groupId>org.eclipse.sisu</groupId>
         <artifactId>org.eclipse.sisu.plexus</artifactId>
-        <version>0.1.1</version>
+        <version>${sisuVersion}</version>
         <exclusions>
           <exclusion>
             <groupId>javax.enterprise</groupId>
@@ -161,7 +163,7 @@
       <dependency>
         <groupId>org.sonatype.sisu</groupId>
         <artifactId>sisu-guice</artifactId>
-        <version>3.1.6</version>
+        <version>3.2.6</version>
         <classifier>no_aop</classifier>
         <exclusions>
           <exclusion>
@@ -178,7 +180,7 @@
       <dependency>
         <groupId>org.slf4j</groupId>
         <artifactId>slf4j-api</artifactId>
-        <version>1.6.2</version>
+        <version>${slf4jVersion}</version>
       </dependency>
     </dependencies>
   </dependencyManagement>
@@ -292,7 +294,7 @@
         <plugin>
           <groupId>org.eclipse.sisu</groupId>
           <artifactId>sisu-maven-plugin</artifactId>
-          <version>0.0.0.M2</version>
+          <version>${sisuVersion}</version>
           <executions>
             <execution>
               <id>generate-index</id>
@@ -398,7 +400,7 @@
                       <pluginExecutionFilter>
                         <groupId>org.eclipse.sisu</groupId>
                         <artifactId>sisu-maven-plugin</artifactId>
-                        <versionRange>[0.0.0.M2,)</versionRange>
+                        <versionRange>[${sisuVersion},)</versionRange>
                         <goals>
                           <goal>test-index</goal>
                           <goal>main-index</goal>


Mime
View raw message