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 14:12:24 UTC
svn commit: r1583989 - 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 12:12:24 2014
New Revision: 1583989

URL: http://svn.apache.org/r1583989
Log:
consumer with an empty looks to build now

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/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/DefaultCassandraArchivaManager.java
    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=1583989&r1=1583988&r2=1583989&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 12:12:24 2014
@@ -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>

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=1583989&r1=1583988&r2=1583989&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 12:12:24 2014
@@ -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>

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=1583989&r1=1583988&r2=1583989&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 12:12:24 2014
@@ -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}
 

Modified: archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/DefaultCassandraArchivaManager.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/DefaultCassandraArchivaManager.java?rev=1583989&r1=1583988&r2=1583989&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/DefaultCassandraArchivaManager.java (original)
+++ archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/DefaultCassandraArchivaManager.java Wed Apr  2 12:12:24 2014
@@ -128,6 +128,7 @@ public class DefaultCassandraArchivaMana
         final CassandraHostConfigurator configurator =
             new CassandraHostConfigurator( cassandraHost + ":" + cassandraPort );
         configurator.setMaxActive( maxActive );
+        //configurator.setCassandraThriftSocketTimeout(  );
 
         cluster = HFactory.getOrCreateCluster( clusterName, configurator );
 

Modified: archiva/trunk/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/pom.xml?rev=1583989&r1=1583988&r2=1583989&view=diff
==============================================================================
--- archiva/trunk/pom.xml (original)
+++ archiva/trunk/pom.xml Wed Apr  2 12:12:24 2014
@@ -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>