Author: [email protected]
Date: Fri May 25 11:42:20 2012
New Revision: 2405
Log:
upgrade to 1.0.0-RC2
Modified:
trunk/amdatu-release-demo/pom.xml
trunk/amdatu-release-demo/src/main/assembly/auth-components.xml
trunk/amdatu-release-demo/src/main/assembly/cassandra-components.xml
trunk/amdatu-release-demo/src/main/assembly/opensocial-components.xml
Modified: trunk/amdatu-release-demo/pom.xml
==============================================================================
--- trunk/amdatu-release-demo/pom.xml (original)
+++ trunk/amdatu-release-demo/pom.xml Fri May 25 11:42:20 2012
@@ -41,7 +41,7 @@
<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.tenant.version>1.0.0-RC1</org.amdatu.tenant.version>
+ <org.amdatu.tenant.version>1.0.0-RC2</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>
@@ -61,12 +61,11 @@
<org.apache.felix.http.jetty.version>2.0.4</org.apache.felix.http.jetty.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-r1308923</org.apache.ace.managementagent.version>
+
<org.apache.ace.managementagent.version>0.8.1-r1341428</org.apache.ace.managementagent.version>
<org.apache.felix.eventadmin.version>1.2.2</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>
<org.apache.felix.deployment.rp.autoconf.version>0.1.1-r1244118</org.apache.felix.deployment.rp.autoconf.version>
- <pax.useradmin.version>0.0.1-amdatu3</pax.useradmin.version>
</properties>
<repositories>
@@ -154,6 +153,12 @@
<artifactId>org.apache.ace.managementagent</artifactId>
<version>${org.apache.ace.managementagent.version}</version>
<scope>compile</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.deploymentadmin</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.amdatu.tenant</groupId>
@@ -661,9 +666,9 @@
<appendAssemblyId>true</appendAssemblyId>
<descriptors>
<descriptor>src/main/assembly/auth.xml</descriptor>
-
<!--<descriptor>src/main/assembly/opensocial.xml</descriptor>
- <descriptor>src/main/assembly/cassandra.xml</descriptor>-->
-
<descriptor>src/main/assembly/ams-populator.xml</descriptor>
+ <descriptor>src/main/assembly/opensocial.xml</descriptor>
+ <descriptor>src/main/assembly/cassandra.xml</descriptor>
+
<!--<descriptor>src/main/assembly/ams-populator.xml</descriptor>-->
</descriptors>
</configuration>
</execution>
Modified: trunk/amdatu-release-demo/src/main/assembly/auth-components.xml
==============================================================================
--- trunk/amdatu-release-demo/src/main/assembly/auth-components.xml
(original)
+++ trunk/amdatu-release-demo/src/main/assembly/auth-components.xml Fri May
25 11:42:20 2012
@@ -104,6 +104,9 @@
<directory>src/main/resources/bin</directory>
<outputDirectory></outputDirectory>
<filtered>true</filtered>
+ <excludes>
+ <exclude>populate.bat</exclude>
+ </excludes>
</fileSet>
<fileSet>
<directory>src/main/resources/conf</directory>
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 May 25 11:42:20 2012
@@ -107,6 +107,9 @@
<directory>src/main/resources/bin</directory>
<outputDirectory></outputDirectory>
<filtered>true</filtered>
+ <excludes>
+ <exclude>populate.bat</exclude>
+ </excludes>
</fileSet>
<fileSet>
<directory>src/main/resources/conf</directory>
Modified: trunk/amdatu-release-demo/src/main/assembly/opensocial-components.xml
==============================================================================
--- trunk/amdatu-release-demo/src/main/assembly/opensocial-components.xml
(original)
+++ trunk/amdatu-release-demo/src/main/assembly/opensocial-components.xml
Fri May 25 11:42:20 2012
@@ -105,6 +105,9 @@
<directory>src/main/resources/bin</directory>
<outputDirectory></outputDirectory>
<filtered>true</filtered>
+ <excludes>
+ <exclude>populate.bat</exclude>
+ </excludes>
</fileSet>
<fileSet>
<directory>src/main/resources/conf</directory>
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits
