From 3c6e3a1cb63d384c859132ba21a83585af87b1f7 Mon Sep 17 00:00:00 2001
From: Olivier Lamy <olamy@apache.org>
Date: Wed, 2 Apr 2014 12:12:24 +0000
Subject: [PATCH] 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
---
 .../archiva-consumers/archiva-consumer-archetype/pom.xml     | 5 +++++
 .../src/main/resourcesstatic/archetype-resources/pom.xml     | 4 +++-
 .../src/test/resources/projects/compile/archetype.properties | 4 ++--
 .../repository/cassandra/DefaultCassandraArchivaManager.java | 1 +
 pom.xml                                                      | 2 +-
 5 files changed, 12 insertions(+), 4 deletions(-)

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 094ff6905..8a448ac0b 100644
--- 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 6e7411dbd..81d7d33ba 100644
--- 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 9f8747350..8741937ef 100644
--- 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 0c6a967eb..e7445e198 100644
--- 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 70ce36dfa..0c9922986 100644
--- 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>
-- 
2.39.5