Author: [email protected]
Date: Wed May 30 15:02:24 2012
New Revision: 2416
Log:
updated versions and removed fileinstall and ace mgmtagent from ams assembly
Modified:
trunk/amdatu-release-demo/pom.xml
trunk/amdatu-release-demo/src/main/assembly/ams-components.xml
Modified: trunk/amdatu-release-demo/pom.xml
==============================================================================
--- trunk/amdatu-release-demo/pom.xml (original)
+++ trunk/amdatu-release-demo/pom.xml Wed May 30 15:02:24 2012
@@ -55,15 +55,14 @@
<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.0</org.apache.felix.log.version>
-
<org.apache.felix.file.install.version>3.1.10</org.apache.felix.file.install.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.metatype.version>1.0.5-r1244118</org.apache.felix.metatype.version>
-
<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-r1341428</org.apache.ace.managementagent.version>
<org.apache.ace.processlauncher.version>0.8.1-r1341428</org.apache.ace.processlauncher.version>
-
<org.apache.felix.eventadmin.version>1.2.2</org.apache.felix.eventadmin.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>
<org.apache.felix.deployment.rp.autoconf.version>0.1.1-r1244118</org.apache.felix.deployment.rp.autoconf.version>
@@ -133,12 +132,6 @@
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.http.jetty</artifactId>
- <version>${org.apache.felix.http.jetty.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.shell.tui</artifactId>
<version>${org.apache.felix.shell.tui.version}</version>
<scope>compile</scope>
@@ -672,10 +665,10 @@
<finalName>demo</finalName>
<appendAssemblyId>true</appendAssemblyId>
<descriptors>
- <!--<descriptor>src/main/assembly/auth.xml</descriptor>-->
+ <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/cassandra.xml</descriptor>
+
<descriptor>src/main/assembly/ams-populator.xml</descriptor>
</descriptors>
</configuration>
</execution>
Modified: trunk/amdatu-release-demo/src/main/assembly/ams-components.xml
==============================================================================
--- trunk/amdatu-release-demo/src/main/assembly/ams-components.xml
(original)
+++ trunk/amdatu-release-demo/src/main/assembly/ams-components.xml Wed May
30 15:02:24 2012
@@ -27,13 +27,10 @@
<include>org.apache.felix:org.apache.felix.log</include>
<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.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>
<include>org.amdatu.tenant:org.amdatu.tenant.factory</include>
-
<include>org.amdatu.fileinstall:org.amdatu.fileinstall.autoconf</include>
-
<include>org.amdatu.fileinstall:org.amdatu.fileinstall.tenantconf</include>
<include>org.amdatu.deployment:org.amdatu.deployment.autoconf</include>
<include>org.amdatu.configadmin:org.amdatu.multitenant.org.apache.felix.configadmin</include>
<include>org.amdatu.eventadmin:org.amdatu.multitenant.org.apache.felix.eventadmin</include>
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits
