Author: [email protected]
Date: Fri Jun 1 11:08:48 2012
New Revision: 2425
Log:
1.0.0-RC4 upgrade
Modified:
trunk/amdatu-release-demo/pom.xml
trunk/amdatu-release-demo/src/main/assembly/cassandra-components.xml
Modified: trunk/amdatu-release-demo/pom.xml
==============================================================================
--- trunk/amdatu-release-demo/pom.xml (original)
+++ trunk/amdatu-release-demo/pom.xml Fri Jun 1 11:08:48 2012
@@ -40,8 +40,9 @@
<org.amdatu.auth.version>0.3.0-SNAPSHOT</org.amdatu.auth.version>
<org.amdatu.cassandra.version>0.3.0-SNAPSHOT</org.amdatu.cassandra.version>
<org.amdatu.opensocial.version>0.3.0-SNAPSHOT</org.amdatu.opensocial.version>
+
<org.amdatu.processlauncher.version>0.3.0-SNAPSHOT</org.amdatu.processlauncher.version>
- <org.amdatu.tenant.version>1.0.0-RC3</org.amdatu.tenant.version>
+ <org.amdatu.tenant.version>1.0.0-RC4</org.amdatu.tenant.version>
<org.amdatu.fileinstall.version>${org.amdatu.tenant.version}</org.amdatu.fileinstall.version>
<org.amdatu.deployment.version>${org.amdatu.tenant.version}</org.amdatu.deployment.version>
<org.amdatu.eventadmin.version>${org.amdatu.tenant.version}</org.amdatu.eventadmin.version>
@@ -56,12 +57,11 @@
<org.apache.felix.main.version>4.0.2</org.apache.felix.main.version>
<org.apache.felix.scr.version>1.6.0</org.apache.felix.scr.version>
<org.apache.felix.log.version>1.0.1</org.apache.felix.log.version>
-
<org.apache.felix.file.install.version>3.2.0</org.apache.felix.file.install.version>
+
<org.apache.felix.file.install.version>3.1.10</org.apache.felix.file.install.version>
<org.apache.felix.metatype.version>1.0.5-r1244118</org.apache.felix.metatype.version>
<org.apache.felix.shell.tui.version>1.4.1</org.apache.felix.shell.tui.version>
<org.apache.felix.shell.version>1.4.3</org.apache.felix.shell.version>
-
<org.apache.ace.managementagent.version>0.8.1-r1341428</org.apache.ace.managementagent.version>
-
<org.apache.ace.processlauncher.version>0.8.1-r1341428</org.apache.ace.processlauncher.version>
+
<org.apache.ace.managementagent.version>0.8.1-r1344593</org.apache.ace.managementagent.version>
<org.apache.felix.eventadmin.version>1.2.14</org.apache.felix.eventadmin.version>
<org.apache.felix.configadmin.version>1.2.8-amdatu1</org.apache.felix.configadmin.version>
<org.apache.felix.prefs.version>1.0.5-r1299689</org.apache.felix.prefs.version>
@@ -155,9 +155,9 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.ace</groupId>
- <artifactId>org.apache.ace.processlauncher</artifactId>
- <version>${org.apache.ace.processlauncher.version}</version>
+ <groupId>org.amdatu</groupId>
+ <artifactId>org.amdatu.processlauncher</artifactId>
+ <version>${org.amdatu.processlauncher.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -497,19 +497,19 @@
<!-- Add all the Cassandra dependencies -->
<dependency>
<groupId>org.amdatu.cassandra</groupId>
- <artifactId>org.amdatu.cassandra.application</artifactId>
+ <artifactId>org.amdatu.cassandra.client</artifactId>
<version>${org.amdatu.cassandra.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.amdatu.cassandra</groupId>
- <artifactId>org.amdatu.cassandra.client</artifactId>
+ <artifactId>org.amdatu.cassandra.hector</artifactId>
<version>${org.amdatu.cassandra.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.amdatu.cassandra</groupId>
- <artifactId>org.amdatu.cassandra.hector</artifactId>
+ <artifactId>org.amdatu.cassandra.launcher</artifactId>
<version>${org.amdatu.cassandra.version}</version>
<scope>compile</scope>
</dependency>
Modified: trunk/amdatu-release-demo/src/main/assembly/cassandra-components.xml
==============================================================================
--- trunk/amdatu-release-demo/src/main/assembly/cassandra-components.xml
(original)
+++ trunk/amdatu-release-demo/src/main/assembly/cassandra-components.xml
Fri Jun 1 11:08:48 2012
@@ -26,7 +26,6 @@
<include>org.apache.felix:org.apache.felix.shell</include>
<include>org.apache.felix:org.apache.felix.shell.tui</include>
<include>org.apache.ace:org.apache.ace.managementagent</include>
- <include>org.apache.ace:org.apache.ace.processlauncher</include>
<include>org.amdatu.tenant:org.amdatu.tenant.api</include>
<include>org.amdatu.tenant:org.amdatu.tenant.adapter</include>
<include>org.amdatu.tenant:org.amdatu.tenant.conf.rp</include>
@@ -63,6 +62,7 @@
<include>org.amdatu.auth:*</include>
<include>org.amdatu.opensocial:*</include>
<include>org.amdatu.cassandra:*</include>
+ <include>org.amdatu:org.amdatu.processlauncher</include>
</includes>
<excludes>
<exclude>org.amdatu.auth:org.amdatu.auth.config</exclude>
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits
