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 @@ jsoup test + + org.slf4j + jcl-over-slf4j + test + 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 @@ ${springVersion} ${redbackVersion} ${derbyVersion} + ${commons-poolVersion} + ${httpclientCoreVersion} @@ -217,7 +219,7 @@ org.apache.httpcomponents httpcore - ${httpclient.core.version} + ${httpclientCoreVersion} commons-logging 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 @@ org.jsoup jsoup - 1.7.1 + 1.7.2