You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ace.apache.org by to...@apache.org on 2010/10/04 15:08:40 UTC
svn commit: r1004226 - in /incubator/ace/trunk: ace-client-repository-impl/
ace-client-repository-useradmin/
ace-integrationtests/src/test/java/org/apache/ace/it/server/
ace-managementagent/ pom/
Author: tonit
Date: Mon Oct 4 13:08:40 2010
New Revision: 1004226
URL: http://svn.apache.org/viewvc?rev=1004226&view=rev
Log:
ACE-93 fixed. Happened due to the fact that group=xstream was not resolved properly
Modified:
incubator/ace/trunk/ace-client-repository-impl/osgi.bnd
incubator/ace/trunk/ace-client-repository-impl/pom.xml
incubator/ace/trunk/ace-client-repository-useradmin/pom.xml
incubator/ace/trunk/ace-integrationtests/src/test/java/org/apache/ace/it/server/MinimalGatewayTest.java
incubator/ace/trunk/ace-managementagent/pom.xml
incubator/ace/trunk/pom/pom.xml
Modified: incubator/ace/trunk/ace-client-repository-impl/osgi.bnd
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-client-repository-impl/osgi.bnd?rev=1004226&r1=1004225&r2=1004226&view=diff
==============================================================================
--- incubator/ace/trunk/ace-client-repository-impl/osgi.bnd (original)
+++ incubator/ace/trunk/ace-client-repository-impl/osgi.bnd Mon Oct 4 13:08:40 2010
@@ -45,5 +45,6 @@ Import-Package: \
*
Embed-Dependency:\
- xstream, xpp3
+ xstream,\
+ xpp3
\ No newline at end of file
Modified: incubator/ace/trunk/ace-client-repository-impl/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-client-repository-impl/pom.xml?rev=1004226&r1=1004225&r2=1004226&view=diff
==============================================================================
--- incubator/ace/trunk/ace-client-repository-impl/pom.xml (original)
+++ incubator/ace/trunk/ace-client-repository-impl/pom.xml Mon Oct 4 13:08:40 2010
@@ -98,8 +98,9 @@
<artifactId>org.apache.felix.dependencymanager</artifactId>
</dependency>
<dependency>
- <groupId>xstream</groupId>
+ <groupId>com.thoughtworks.xstream</groupId>
<artifactId>xstream</artifactId>
+ <scope>compile</scope>
</dependency>
<dependency>
<groupId>xpp3</groupId>
Modified: incubator/ace/trunk/ace-client-repository-useradmin/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-client-repository-useradmin/pom.xml?rev=1004226&r1=1004225&r2=1004226&view=diff
==============================================================================
--- incubator/ace/trunk/ace-client-repository-useradmin/pom.xml (original)
+++ incubator/ace/trunk/ace-client-repository-useradmin/pom.xml Mon Oct 4 13:08:40 2010
@@ -92,7 +92,7 @@
<artifactId>org.apache.felix.dependencymanager</artifactId>
</dependency>
<dependency>
- <groupId>xstream</groupId>
+ <groupId>com.thoughtworks.xstream</groupId>
<artifactId>xstream</artifactId>
</dependency>
<dependency>
Modified: incubator/ace/trunk/ace-integrationtests/src/test/java/org/apache/ace/it/server/MinimalGatewayTest.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-integrationtests/src/test/java/org/apache/ace/it/server/MinimalGatewayTest.java?rev=1004226&r1=1004225&r2=1004226&view=diff
==============================================================================
--- incubator/ace/trunk/ace-integrationtests/src/test/java/org/apache/ace/it/server/MinimalGatewayTest.java (original)
+++ incubator/ace/trunk/ace-integrationtests/src/test/java/org/apache/ace/it/server/MinimalGatewayTest.java Mon Oct 4 13:08:40 2010
@@ -49,7 +49,7 @@ public class MinimalGatewayTest
return combine(
options(
- felix().version( "2.0.1" )
+ felix().version( "3.0.2" )
),
AssemblyConfigure.get( "ace-gateway", "mvn:org.apache.ace/ace-target-devgateway/0.8.0-SNAPSHOT/zip/distribution" )
Modified: incubator/ace/trunk/ace-managementagent/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-managementagent/pom.xml?rev=1004226&r1=1004225&r2=1004226&view=diff
==============================================================================
--- incubator/ace/trunk/ace-managementagent/pom.xml (original)
+++ incubator/ace/trunk/ace-managementagent/pom.xml Mon Oct 4 13:08:40 2010
@@ -25,7 +25,7 @@
<groupId>org.apache.ace</groupId>
<artifactId>ace-pom</artifactId>
<version>0.8.0-SNAPSHOT</version>
- <relativePath>../pom/</relativePath>
+ <relativePath>../pom/</relativePath>
</parent>
<groupId>org.apache.ace</groupId>
@@ -61,107 +61,107 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.configadmin</artifactId>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.eventadmin</artifactId>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.dependencymanager</artifactId>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.deploymentadmin</artifactId>
- </dependency>
+ </dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>ace-log-listener</artifactId>
<version>${project.version}</version>
- </dependency>
+ </dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>ace-gateway-log</artifactId>
<version>${project.version}</version>
- </dependency>
+ </dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>ace-gateway-log-store</artifactId>
<version>${project.version}</version>
- </dependency>
+ </dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>ace-range-api</artifactId>
<version>${project.version}</version>
- </dependency>
+ </dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>ace-log</artifactId>
<version>${project.version}</version>
- </dependency>
+ </dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>ace-discovery-api</artifactId>
<version>${project.version}</version>
- </dependency>
+ </dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>ace-discovery-property</artifactId>
<version>${project.version}</version>
- </dependency>
+ </dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>ace-identification-api</artifactId>
<version>${project.version}</version>
- </dependency>
+ </dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>ace-identification-property</artifactId>
<version>${project.version}</version>
- </dependency>
+ </dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>ace-scheduler</artifactId>
<version>${project.version}</version>
- </dependency>
+ </dependency>
- <!--
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>ace-configurator</artifactId>
- <version>${project.version}</version>
- </dependency>
--->
+ <!--
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>ace-configurator</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ -->
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>ace-deployment-api</artifactId>
<version>${project.version}</version>
- </dependency>
+ </dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>ace-deployment-deploymentadmin</artifactId>
<version>${project.version}</version>
- </dependency>
+ </dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>ace-deployment-task</artifactId>
<version>${project.version}</version>
- </dependency>
+ </dependency>
</dependencies>
</project>
\ No newline at end of file
Modified: incubator/ace/trunk/pom/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/pom/pom.xml?rev=1004226&r1=1004225&r2=1004226&view=diff
==============================================================================
--- incubator/ace/trunk/pom/pom.xml (original)
+++ incubator/ace/trunk/pom/pom.xml Mon Oct 4 13:08:40 2010
@@ -233,7 +233,7 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>xstream</groupId>
+ <groupId>com.thoughtworks.xstream</groupId>
<artifactId>xstream</artifactId>
<version>1.2.2</version>
<scope>provided</scope>