Author: [email protected]
Date: Tue Dec 20 16:51:38 2011
New Revision: 1869
Log:
[AMDATUCASSANDRA-78] moved itest specific dependencies to that pom
Modified:
trunk/amdatu-cassandra/test-integration/pom.xml
trunk/amdatu-cassandra/test-integration/tests/pom.xml
Modified: trunk/amdatu-cassandra/test-integration/pom.xml
==============================================================================
--- trunk/amdatu-cassandra/test-integration/pom.xml (original)
+++ trunk/amdatu-cassandra/test-integration/pom.xml Tue Dec 20 16:51:38 2011
@@ -61,57 +61,6 @@
<scope>compile</scope>
<type>bundle</type>
</dependency>
-
- <dependency>
- <groupId>org.amdatu.auth</groupId>
- <artifactId>org.amdatu.auth.oauth.consumerregistry</artifactId>
- <version>${org.amdatu.auth.version}</version>
- <scope>compile</scope>
- <type>bundle</type>
- </dependency>
- <dependency>
- <groupId>org.amdatu.auth</groupId>
- <artifactId>org.amdatu.auth.oauth.api</artifactId>
- <version>${org.amdatu.auth.version}</version>
- <scope>compile</scope>
- <type>bundle</type>
- </dependency>
- <dependency>
- <groupId>org.amdatu.auth</groupId>
- <artifactId>org.amdatu.auth.oauth.server</artifactId>
- <version>${org.amdatu.auth.version}</version>
- <scope>compile</scope>
- <type>bundle</type>
- </dependency>
- <dependency>
- <groupId>org.amdatu.auth</groupId>
- <artifactId>org.amdatu.auth.tokenprovider</artifactId>
- <version>${org.amdatu.auth.version}</version>
- <scope>compile</scope>
- <type>bundle</type>
- </dependency>
- <dependency>
- <groupId>org.amdatu.auth</groupId>
- <artifactId>org.amdatu.auth.login.service</artifactId>
- <version>${org.amdatu.auth.version}</version>
- <scope>compile</scope>
- <type>bundle</type>
- </dependency>
-
- <dependency>
- <groupId>org.amdatu.web</groupId>
- <artifactId>org.amdatu.web.tenantresolver.hostname</artifactId>
- <version>${org.amdatu.web.version}</version>
- <scope>test</scope>
- <type>bundle</type>
- </dependency>
- <dependency>
- <groupId>org.amdatu.web</groupId>
- <artifactId>org.amdatu.web.tenantresolver.parameter</artifactId>
- <version>${org.amdatu.web.version}</version>
- <scope>test</scope>
- <type>bundle</type>
- </dependency>
</dependencies>
</dependencyManagement>
@@ -129,16 +78,7 @@
<artifactId>org.amdatu.web.itest.base</artifactId>
<type>bundle</type>
</dependency>
- <dependency>
- <groupId>org.amdatu.web</groupId>
- <artifactId>org.amdatu.web.tenantresolver.hostname</artifactId>
- <type>bundle</type>
- </dependency>
- <dependency>
- <groupId>org.amdatu.web</groupId>
- <artifactId>org.amdatu.web.tenantresolver.parameter</artifactId>
- <type>bundle</type>
- </dependency>
+
</dependencies>
</project>
\ No newline at end of file
Modified: trunk/amdatu-cassandra/test-integration/tests/pom.xml
==============================================================================
--- trunk/amdatu-cassandra/test-integration/tests/pom.xml (original)
+++ trunk/amdatu-cassandra/test-integration/tests/pom.xml Tue Dec 20
16:51:38 2011
@@ -48,70 +48,55 @@
<type>bundle</type>
</dependency>
<dependency>
- <groupId>org.amdatu.cassandra</groupId>
- <artifactId>org.amdatu.cassandra.application</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
+ <groupId>org.amdatu.auth</groupId>
+ <artifactId>org.amdatu.auth.oauth.consumerregistry</artifactId>
+ <version>${org.amdatu.auth.version}</version>
+ <scope>compile</scope>
<type>bundle</type>
</dependency>
<dependency>
- <groupId>org.amdatu.cassandra</groupId>
- <artifactId>org.amdatu.cassandra.listener</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
+ <groupId>org.amdatu.auth</groupId>
+ <artifactId>org.amdatu.auth.oauth.api</artifactId>
+ <version>${org.amdatu.auth.version}</version>
+ <scope>compile</scope>
<type>bundle</type>
</dependency>
<dependency>
- <groupId>org.amdatu.cassandra</groupId>
- <artifactId>org.amdatu.cassandra.persistencemanager</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
+ <groupId>org.amdatu.auth</groupId>
+ <artifactId>org.amdatu.auth.oauth.server</artifactId>
+ <version>${org.amdatu.auth.version}</version>
+ <scope>compile</scope>
<type>bundle</type>
</dependency>
<dependency>
- <groupId>org.amdatu.cassandra</groupId>
- <artifactId>org.amdatu.cassandra.persistencemanager.hector</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
+ <groupId>org.amdatu.auth</groupId>
+ <artifactId>org.amdatu.auth.tokenprovider</artifactId>
+ <version>${org.amdatu.auth.version}</version>
+ <scope>compile</scope>
<type>bundle</type>
</dependency>
<dependency>
- <groupId>org.amdatu.cassandra</groupId>
- <artifactId>org.amdatu.cassandra.store.useradmin</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
+ <groupId>org.amdatu.auth</groupId>
+ <artifactId>org.amdatu.auth.login.service</artifactId>
+ <version>${org.amdatu.auth.version}</version>
+ <scope>compile</scope>
<type>bundle</type>
</dependency>
<dependency>
- <groupId>org.amdatu.cassandra</groupId>
- <artifactId>org.amdatu.cassandra.store.consumer</artifactId>
- <version>${project.version}</version>
+ <groupId>org.amdatu.web</groupId>
+ <artifactId>org.amdatu.web.tenantresolver.hostname</artifactId>
+ <version>${org.amdatu.web.version}</version>
<scope>test</scope>
<type>bundle</type>
</dependency>
<dependency>
- <groupId>org.amdatu.cassandra</groupId>
- <artifactId>org.amdatu.cassandra.store.token</artifactId>
- <version>${project.version}</version>
+ <groupId>org.amdatu.web</groupId>
+ <artifactId>org.amdatu.web.tenantresolver.parameter</artifactId>
+ <version>${org.amdatu.web.version}</version>
<scope>test</scope>
<type>bundle</type>
</dependency>
<dependency>
- <groupId>org.amdatu.cassandra</groupId>
- <artifactId>org.amdatu.cassandra.store.tenant</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- <type>bundle</type>
- </dependency>
- <dependency>
- <groupId>org.amdatu.cassandra</groupId>
- <artifactId>org.amdatu.cassandra.store.nonce</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- <type>bundle</type>
- </dependency>
-
- <dependency>
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
<version>3.1</version>
@@ -208,6 +193,17 @@
</dependency>
<dependency>
+ <groupId>org.amdatu.web</groupId>
+ <artifactId>org.amdatu.web.tenantresolver.hostname</artifactId>
+ <type>bundle</type>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.web</groupId>
+ <artifactId>org.amdatu.web.tenantresolver.parameter</artifactId>
+ <type>bundle</type>
+ </dependency>
+
+ <dependency>
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
</dependency>
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits