Author: [email protected]
Date: Fri May 6 14:32:58 2011
New Revision: 1108
Log:
[AMDATUCASSANDRA-7] Removed SNAPSHOT dependencies
Modified:
trunk/amdatu-cassandra/pom.xml
trunk/amdatu-cassandra/test-integration/pom.xml
trunk/amdatu-cassandra/test-integration/src/test/java/org/amdatu/cassandra/test/integration/base/IntegrationTestBase.java
trunk/amdatu-cassandra/test-performance/test-bundle/pom.xml
Modified: trunk/amdatu-cassandra/pom.xml
==============================================================================
--- trunk/amdatu-cassandra/pom.xml (original)
+++ trunk/amdatu-cassandra/pom.xml Fri May 6 14:32:58 2011
@@ -20,7 +20,7 @@
<parent>
<groupId>org.amdatu</groupId>
<artifactId>amdatu</artifactId>
- <version>3-SNAPSHOT</version>
+ <version>2</version>
<relativePath>../amdatu-parent/pom.xml</relativePath>
</parent>
<groupId>org.amdatu.cassandra</groupId>
@@ -32,7 +32,7 @@
<properties>
<!-- Version of dependend projects -->
- <amdatu.core.version>0.2.1-SNAPSHOT</amdatu.core.version>
+ <amdatu.core.version>0.2.0</amdatu.core.version>
<amdatu.web.version>0.2.0</amdatu.web.version>
<!-- Version of cassandra itself -->
@@ -163,7 +163,7 @@
</dependency>
<dependency>
<groupId>org.amdatu.core</groupId>
- <artifactId>org.amdatu.core.tenantstore.fs</artifactId>
+ <artifactId>org.amdatu.core.tenantstorefs</artifactId>
<version>${amdatu.core.version}</version>
<scope>provided</scope>
<type>bundle</type>
@@ -299,6 +299,20 @@
</plugin>
</plugins>
</pluginManagement>
+ <!-- This can be removed when using the parent pom version 3 -->
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ </resource>
+ <resource>
+ <directory>.</directory>
+ <targetPath>META-INF</targetPath>
+ <includes>
+ <include>LICENSE*</include>
+ <include>NOTICE*</include>
+ </includes>
+ </resource>
+ </resources>
</build>
<reporting>
Modified: trunk/amdatu-cassandra/test-integration/pom.xml
==============================================================================
--- trunk/amdatu-cassandra/test-integration/pom.xml (original)
+++ trunk/amdatu-cassandra/test-integration/pom.xml Fri May 6 14:32:58 2011
@@ -109,7 +109,7 @@
</dependency>
<dependency>
<groupId>org.amdatu.core</groupId>
- <artifactId>org.amdatu.core.tenantstore.fs</artifactId>
+ <artifactId>org.amdatu.core.tenantstorefs</artifactId>
<scope>test</scope>
<type>bundle</type>
</dependency>
Modified:
trunk/amdatu-cassandra/test-integration/src/test/java/org/amdatu/cassandra/test/integration/base/IntegrationTestBase.java
==============================================================================
---
trunk/amdatu-cassandra/test-integration/src/test/java/org/amdatu/cassandra/test/integration/base/IntegrationTestBase.java
(original)
+++
trunk/amdatu-cassandra/test-integration/src/test/java/org/amdatu/cassandra/test/integration/base/IntegrationTestBase.java
Fri May 6 14:32:58 2011
@@ -1,6 +1,6 @@
/*
* Copyright (c) 2010, 2011 The Amdatu Foundation
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
@@ -133,7 +133,7 @@
* Gets a list of Component objects which should be started before
* the test can start. You can include the test class in this too, so
* you can get the services you depend on injected.
- *
+ *
* Note that you <em>can</em> add components to the dependency manager
directly,
* but the test will only wait for them if you return them in this method.
If you do,
* you should not add them to the dependency manager yourself.
@@ -350,7 +350,7 @@
}
protected static MavenArtifactProvisionOption amdatuTenantStoreFSService()
{
- return getCoreOption("org.amdatu.core.tenantstore.fs");
+ return getCoreOption("org.amdatu.core.tenantstorefs");
}
protected static MavenArtifactProvisionOption amdatuHttpContext() {
Modified: trunk/amdatu-cassandra/test-performance/test-bundle/pom.xml
==============================================================================
--- trunk/amdatu-cassandra/test-performance/test-bundle/pom.xml (original)
+++ trunk/amdatu-cassandra/test-performance/test-bundle/pom.xml Fri May 6
14:32:58 2011
@@ -30,7 +30,7 @@
<org.apache.wink.version>1.1.1-incubating</org.apache.wink.version>
<org.apache.felix.http.version>2.2.0</org.apache.felix.http.version>
- <amdatu.web.version>0.2.1-SNAPSHOT</amdatu.web.version>
+ <amdatu.web.version>0.2.0</amdatu.web.version>
<amdatu.casandra.version>0.2.0-SNAPSHOT</amdatu.casandra.version>
</properties>
@@ -57,8 +57,8 @@
</dependency>
<dependency>
<groupId>org.amdatu.libraries</groupId>
- <artifactId>utilities</artifactId>
- <version>0.2.0-SNAPSHOT</version>
+ <artifactId>org.amdatu.libraries.utilities</artifactId>
+ <version>0.2.0</version>
<scope>compile</scope>
</dependency>
<dependency>
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits
