You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2014/04/02 12:41:06 UTC
svn commit: r1583961 - in /archiva/trunk: ./
archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/
archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resourcesstatic/archetype-resources/
archiva-modu...
Author: olamy
Date: Wed Apr 2 10:41:06 2014
New Revision: 1583961
URL: http://svn.apache.org/r1583961
Log:
an other try to fix consumer archetype build
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/pom.xml
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resourcesstatic/archetype-resources/pom.xml
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/test/resources/projects/compile/archetype.properties
archiva/trunk/pom.xml
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/pom.xml?rev=1583961&r1=1583960&r2=1583961&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/pom.xml Wed Apr 2 10:41:06 2014
@@ -76,6 +76,16 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcore</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-http-lightweight</artifactId>
<scope>test</scope>
@@ -96,6 +106,16 @@
<version>1.4</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>commons-pool</groupId>
+ <artifactId>commons-pool</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jsoup</groupId>
+ <artifactId>jsoup</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
<resources>
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resourcesstatic/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resourcesstatic/archetype-resources/pom.xml?rev=1583961&r1=1583960&r2=1583961&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resourcesstatic/archetype-resources/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resourcesstatic/archetype-resources/pom.xml Wed Apr 2 10:41:06 2014
@@ -85,6 +85,11 @@
<artifactId>slf4j-api</artifactId>
<version>${slf4jVersion}</version>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <version>${slf4jVersion}</version>
+ </dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
@@ -210,6 +215,17 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcore</artifactId>
+ <version>${httpclient.core.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-http-lightweight</artifactId>
<version>${wagonVersion}</version>
@@ -231,6 +247,12 @@
<version>1.4</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>commons-pool</groupId>
+ <artifactId>commons-pool</artifactId>
+ <scope>test</scope>
+ <version>${commons-pool.version}</version>
+ </dependency>
</dependencies>
<build>
<pluginManagement>
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/test/resources/projects/compile/archetype.properties
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/test/resources/projects/compile/archetype.properties?rev=1583961&r1=1583960&r2=1583961&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/test/resources/projects/compile/archetype.properties (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/test/resources/projects/compile/archetype.properties Wed Apr 2 10:41:06 2014
@@ -29,3 +29,6 @@ jackrabbitVersion=${jackrabbit.version}
springVersion=${spring.version}
redbackVersion=${redback.version}
derbyVersion=${derbyVersion}
+httpclient.core.version=${httpclient.core.version}
+commons-pool.version=${commons-pool.version}
+
Modified: archiva/trunk/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/pom.xml?rev=1583961&r1=1583960&r2=1583961&view=diff
==============================================================================
--- archiva/trunk/pom.xml (original)
+++ archiva/trunk/pom.xml Wed Apr 2 10:41:06 2014
@@ -59,6 +59,7 @@
<commons-fileupload.version>1.2.2</commons-fileupload.version>
<commons-io.version>2.4</commons-io.version>
<commons-lang.version>2.6</commons-lang.version>
+ <commons-pool.version>1.6</commons-pool.version>
<maven3x.version>3.0.5</maven3x.version>
<maven.version>2.0.8</maven.version>
@@ -687,7 +688,7 @@
<dependency>
<groupId>commons-pool</groupId>
<artifactId>commons-pool</artifactId>
- <version>1.6</version>
+ <version>${commons-pool.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>