consumer with an empty looks to build now

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1583989 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/pom.xml
index 094ff6905a02202267ba591b72638578a0163f5d..8a448ac0b4294005360d4e5f7e126bb2d6bbce48 100644 (file)
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/pom.xml
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/pom.xml
@@ -116,6 +116,11 @@
       <artifactId>jsoup</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>jcl-over-slf4j</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
   <build>
     <resources>

diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resourcesstatic/archetype-resources/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resourcesstatic/archetype-resources/pom.xml
index 6e7411dbdcdcfdbdc5de30653ba522e7b356a605..81d7d33ba43a743cb62b9b3edbdeba1fe9be5024 100644 (file)
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resourcesstatic/archetype-resources/pom.xml
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resourcesstatic/archetype-resources/pom.xml
@@ -40,6 +40,8 @@
     <spring.version>${springVersion}</spring.version>
     <redback.version>${redbackVersion}</redback.version>
     <derbyVersion>${derbyVersion}</derbyVersion>
+    <commons-pool.version>${commons-poolVersion}</commons-pool.version>
+    <httpclientCoreVersion>${httpclientCoreVersion}</httpclientCoreVersion>
   </properties>
   <dependencies>
     <dependency>
@@ -217,7 +219,7 @@
     <dependency>
       <groupId>org.apache.httpcomponents</groupId>
       <artifactId>httpcore</artifactId>
-      <version>${httpclient.core.version}</version>
+      <version>${httpclientCoreVersion}</version>
       <exclusions>
         <exclusion>
           <groupId>commons-logging</groupId>

diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/test/resources/projects/compile/archetype.properties b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/test/resources/projects/compile/archetype.properties
index 9f87473504893826f1398fec858442dd1a835029..8741937efc15fc68093a69cb7eeae4cefcbb101e 100644 (file)
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/test/resources/projects/compile/archetype.properties
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/test/resources/projects/compile/archetype.properties
@@ -29,6 +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}
+httpclientCoreVersion=${httpclient.core.version}
+commons-poolVersion=${commons-pool.version}
 

diff --git a/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/DefaultCassandraArchivaManager.java b/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/DefaultCassandraArchivaManager.java
index 0c6a967eb52f29c114807c7e6313f12043f32ff4..e7445e1989531e96a439ca9f42b7d682294b9b96 100644 (file)
--- a/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/DefaultCassandraArchivaManager.java
+++ b/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/DefaultCassandraArchivaManager.java
@@ -128,6 +128,7 @@ public class DefaultCassandraArchivaManager
         final CassandraHostConfigurator configurator =
             new CassandraHostConfigurator( cassandraHost + ":" + cassandraPort );
         configurator.setMaxActive( maxActive );
+        //configurator.setCassandraThriftSocketTimeout(  );
 
         cluster = HFactory.getOrCreateCluster( clusterName, configurator );
 

diff --git a/pom.xml b/pom.xml
index 70ce36dfac48bb3872c8f4986505fd6a06b36ef5..0c9922986466c04c84751cc60c3a28e8a3588f01 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -1528,7 +1528,7 @@
       <dependency>
         <groupId>org.jsoup</groupId>
         <artifactId>jsoup</artifactId>
-        <version>1.7.1</version>
+        <version>1.7.2</version>
       </dependency>
     </dependencies>
   </dependencyManagement>