Author: olamy
Date: Wed May 8 12:53:05 2013
New Revision: 1480258
URL: http://svn.apache.org/r1480258
Log:
fix some dependencies
Modified:
archiva/sandbox/trunk/metadata-store-cassandra/pom.xml
archiva/sandbox/trunk/metadata-store-cassandra/src/test/filtered-resources/META-INF/spring-context.xml
archiva/sandbox/trunk/metadata-store-cassandra/src/test/java/org/apache/archiva/metadata/repository/jpa/RepositoriesNamespaceTest.java
Modified: archiva/sandbox/trunk/metadata-store-cassandra/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/sandbox/trunk/metadata-store-cassandra/pom.xml?rev=1480258&r1=1480257&r2=1480258&view=diff
==============================================================================
--- archiva/sandbox/trunk/metadata-store-cassandra/pom.xml (original)
+++ archiva/sandbox/trunk/metadata-store-cassandra/pom.xml Wed May 8 12:53:05
2013
@@ -66,55 +66,7 @@
<artifactId>geronimo-jpa_2.0_spec</artifactId>
<version>1.1</version>
</dependency>
- <dependency>
- <groupId>info.archinnov</groupId>
- <artifactId>achilles</artifactId>
- <version>1.7</version>
- <exclusions>
- <exclusion>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.persistence</groupId>
- <artifactId>persistence-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.hectorclient</groupId>
- <artifactId>hector-object-mapper</artifactId>
- <version>3.1-08</version>
- <exclusions>
- <exclusion>
- <groupId>javax.persistence</groupId>
- <artifactId>persistence-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.hectorclient</groupId>
- <artifactId>hector-core</artifactId>
- <version>1.1-3</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.cassandra</groupId>
- <artifactId>cassandra-thrift</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <!-- FIXME -->
- <!-- due to some instanceof in kundera it's mandatory -->
- <!-- -->
<dependency>
<groupId>com.impetus.client</groupId>
<artifactId>kundera-cassandra</artifactId>
@@ -128,7 +80,9 @@
<groupId>javax.transaction</groupId>
<artifactId>jta</artifactId>
</exclusion>
- <!-- must be excluded
+ <!-- FIXME -->
+ <!-- due to some instanceof in kundera it's mandatory -->
+ <!-- must be excluded to prevent gpl here
<exclusion>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-core</artifactId>
@@ -171,6 +125,16 @@
<artifactId>disruptor</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-core-asl</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-mapper-asl</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
<testResources>
Modified:
archiva/sandbox/trunk/metadata-store-cassandra/src/test/filtered-resources/META-INF/spring-context.xml
URL:
http://svn.apache.org/viewvc/archiva/sandbox/trunk/metadata-store-cassandra/src/test/filtered-resources/META-INF/spring-context.xml?rev=1480258&r1=1480257&r2=1480258&view=diff
==============================================================================
---
archiva/sandbox/trunk/metadata-store-cassandra/src/test/filtered-resources/META-INF/spring-context.xml
(original)
+++
archiva/sandbox/trunk/metadata-store-cassandra/src/test/filtered-resources/META-INF/spring-context.xml
Wed May 8 12:53:05 2013
@@ -22,13 +22,4 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd";>
- <bean id="achillesEntityManagerFactory"
class="info.archinnov.achilles.integration.spring.ThriftEntityManagerFactoryBean"
- init-method="initialize">
- <property name="entityPackages"
value="org.apache.archiva.metadata.repository.jpa.model"/>
- <property name="cassandraHost" value="localhost:9160"/>
- <property name="clusterName" value="ArchivaCluster"/>
- <property name="keyspaceName" value="ArchivaKeySpace"/>
- <property name="forceColumnFamilyCreation" value="true" />
- </bean>
-
</beans>
\ No newline at end of file
Modified:
archiva/sandbox/trunk/metadata-store-cassandra/src/test/java/org/apache/archiva/metadata/repository/jpa/RepositoriesNamespaceTest.java
URL:
http://svn.apache.org/viewvc/archiva/sandbox/trunk/metadata-store-cassandra/src/test/java/org/apache/archiva/metadata/repository/jpa/RepositoriesNamespaceTest.java?rev=1480258&r1=1480257&r2=1480258&view=diff
==============================================================================
---
archiva/sandbox/trunk/metadata-store-cassandra/src/test/java/org/apache/archiva/metadata/repository/jpa/RepositoriesNamespaceTest.java
(original)
+++
archiva/sandbox/trunk/metadata-store-cassandra/src/test/java/org/apache/archiva/metadata/repository/jpa/RepositoriesNamespaceTest.java
Wed May 8 12:53:05 2013
@@ -1,10 +1,5 @@
package org.apache.archiva.metadata.repository.jpa;
-import me.prettyprint.cassandra.service.CassandraHostConfigurator;
-import me.prettyprint.hector.api.Cluster;
-import me.prettyprint.hector.api.Keyspace;
-import me.prettyprint.hector.api.factory.HFactory;
-import me.prettyprint.hom.EntityManagerImpl;
import org.apache.archiva.metadata.repository.jpa.model.Repository;
import org.apache.archiva.test.utils.ArchivaSpringJUnit4ClassRunner;
import org.fest.assertions.api.Assertions;
@@ -17,7 +12,6 @@ import org.slf4j.LoggerFactory;
import org.springframework.test.context.ContextConfiguration;
import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
import javax.persistence.Persistence;
import javax.persistence.Query;
import java.util.List;
