You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by ej...@apache.org on 2012/02/03 23:54:05 UTC
svn commit: r1240381 - in /aries/trunk: application/application-api/
application/application-converters/
application/application-deployment-management/
application/application-itests/
application/application-itests/src/test/java/org/apache/aries/applic...
Author: ejiang
Date: Fri Feb 3 22:54:04 2012
New Revision: 1240381
URL: http://svn.apache.org/viewvc?rev=1240381&view=rev
Log:
ARIES-820: aries.util package version correction
Modified:
aries/trunk/application/application-api/pom.xml
aries/trunk/application/application-converters/pom.xml
aries/trunk/application/application-deployment-management/pom.xml
aries/trunk/application/application-itests/pom.xml
aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRResolverAdvancedTest.java
aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRResolverTest.java
aries/trunk/application/application-modeller/pom.xml
aries/trunk/application/application-resolve-transform-cm-itests/pom.xml
aries/trunk/application/application-tooling-repository-generator/pom.xml
aries/trunk/application/application-utils/pom.xml
aries/trunk/blueprint/blueprint-core/pom.xml
aries/trunk/blueprint/blueprint-itests/pom.xml
aries/trunk/blueprint/blueprint-testquiescebundle/pom.xml
aries/trunk/ejb/ejb-modeller-itest/pom.xml
aries/trunk/ejb/ejb-modeller/pom.xml
aries/trunk/ejb/openejb-extender-itest/pom.xml
aries/trunk/ejb/openejb-extender/pom.xml
aries/trunk/jmx/jmx-core/pom.xml
aries/trunk/jmx/jmx-itests/pom.xml
aries/trunk/jndi/jndi-url-itest/pom.xml
aries/trunk/jpa/jpa-container-context/pom.xml
aries/trunk/jpa/jpa-container/pom.xml
aries/trunk/proxy/proxy-api/pom.xml
aries/trunk/proxy/proxy-bundle/pom.xml
aries/trunk/proxy/proxy-impl/pom.xml
aries/trunk/proxy/proxy-itests/pom.xml
aries/trunk/quiesce/quiesce-manager-itest/pom.xml
aries/trunk/quiesce/quiesce-manager/pom.xml
aries/trunk/samples/blog/blog-itests/pom.xml
aries/trunk/transaction/transaction-blueprint/pom.xml
aries/trunk/transaction/transaction-itests/pom.xml
aries/trunk/transaction/transaction-manager/pom.xml
aries/trunk/transaction/transaction-wrappers/pom.xml
aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/packageinfo
aries/trunk/util/util/src/main/java/org/apache/aries/util/packageinfo
aries/trunk/web/web-itests/pom.xml
Modified: aries/trunk/application/application-api/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/application/application-api/pom.xml?rev=1240381&r1=1240380&r2=1240381&view=diff
==============================================================================
--- aries/trunk/application/application-api/pom.xml (original)
+++ aries/trunk/application/application-api/pom.xml Fri Feb 3 22:54:04 2012
@@ -69,7 +69,7 @@
<dependency>
<groupId>org.apache.aries</groupId>
<artifactId>org.apache.aries.util</artifactId>
- <version>0.4</version>
+ <version>0.5-SNAPSHOT</version>
</dependency>
</dependencies>
Modified: aries/trunk/application/application-converters/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/application/application-converters/pom.xml?rev=1240381&r1=1240380&r2=1240381&view=diff
==============================================================================
--- aries/trunk/application/application-converters/pom.xml (original)
+++ aries/trunk/application/application-converters/pom.xml Fri Feb 3 22:54:04 2012
@@ -73,7 +73,7 @@
<groupId>org.apache.aries.web</groupId>
<artifactId>org.apache.aries.web.urlhandler</artifactId>
<scope>provided</scope>
- <version>0.3</version>
+ <version>0.3.1-SNAPSHOT</version>
</dependency>
<!--External dependencies. Versions may be specified in default parent -->
<dependency>
Modified: aries/trunk/application/application-deployment-management/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/application/application-deployment-management/pom.xml?rev=1240381&r1=1240380&r2=1240381&view=diff
==============================================================================
--- aries/trunk/application/application-deployment-management/pom.xml (original)
+++ aries/trunk/application/application-deployment-management/pom.xml Fri Feb 3 22:54:04 2012
@@ -62,7 +62,7 @@
<dependency>
<groupId>org.apache.aries</groupId>
<artifactId>org.apache.aries.util</artifactId>
- <version>0.4</version>
+ <version>0.5-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.aries.testsupport</groupId>
Modified: aries/trunk/application/application-itests/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/application/application-itests/pom.xml?rev=1240381&r1=1240380&r2=1240381&view=diff
==============================================================================
--- aries/trunk/application/application-itests/pom.xml (original)
+++ aries/trunk/application/application-itests/pom.xml Fri Feb 3 22:54:04 2012
@@ -65,7 +65,7 @@
<dependency>
<groupId>org.apache.aries</groupId>
<artifactId>org.apache.aries.util</artifactId>
- <version>0.4</version>
+ <version>0.5-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRResolverAdvancedTest.java
URL: http://svn.apache.org/viewvc/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRResolverAdvancedTest.java?rev=1240381&r1=1240380&r2=1240381&view=diff
==============================================================================
--- aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRResolverAdvancedTest.java (original)
+++ aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRResolverAdvancedTest.java Fri Feb 3 22:54:04 2012
@@ -19,9 +19,11 @@
package org.apache.aries.application.runtime.itests;
import static junit.framework.Assert.assertEquals;
+import static org.apache.aries.itest.ExtraOptions.mavenBundle;
+import static org.apache.aries.itest.ExtraOptions.paxLogging;
+import static org.apache.aries.itest.ExtraOptions.testOptions;
import static org.junit.Assert.assertTrue;
import static org.ops4j.pax.exam.CoreOptions.equinox;
-import static org.apache.aries.itest.ExtraOptions.*;
import java.io.BufferedReader;
import java.io.File;
@@ -266,10 +268,18 @@ public class OBRResolverAdvancedTest ext
@Test(expected=ModellerException.class)
public void testModellerException() throws Exception
{
- //aa.jar does not exist
- generateOBRRepoXML(false, "aa.jar");
+
+ ZipFixture bundle = ArchiveFixture.newJar().manifest()
+ .attribute(Constants.BUNDLE_SYMBOLICNAME, CORE_BUNDLE_BY_VALUE)
+ .attribute(Constants.BUNDLE_MANIFESTVERSION, "2")
+ .attribute(Constants.IMPORT_PACKAGE, "a.b.c, p.q.r, x.y.z, javax.naming")
+ .attribute(Constants.BUNDLE_VERSION, "1.0.0").end();
+ FileOutputStream fout = new FileOutputStream("delete.jar");
+ bundle.writeOut(fout);
+ fout.close();
+ generateOBRRepoXML(false, "delete.jar");
}
-
+
@Test
public void testDemoApp() throws Exception
{
@@ -499,6 +509,9 @@ public class OBRResolverAdvancedTest ext
if (!!!nullURI) {
uri = bundleFile.toURI().toString();
}
+ if ("delete.jar".equals(fileName)) {
+ jarDir = null;
+ }
mrs.add(modelledResourceManager.getModelledResource(uri, jarDir));
}
repositoryGenerator.generateRepository("Test repo description", mrs, fout);
Modified: aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRResolverTest.java
URL: http://svn.apache.org/viewvc/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRResolverTest.java?rev=1240381&r1=1240380&r2=1240381&view=diff
==============================================================================
--- aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRResolverTest.java (original)
+++ aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRResolverTest.java Fri Feb 3 22:54:04 2012
@@ -18,10 +18,17 @@
*/
package org.apache.aries.application.runtime.itests;
+import static org.apache.aries.itest.ExtraOptions.mavenBundle;
+import static org.apache.aries.itest.ExtraOptions.paxLogging;
+import static org.apache.aries.itest.ExtraOptions.testOptions;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.ops4j.pax.exam.CoreOptions.equinox;
-import static org.apache.aries.itest.ExtraOptions.*;
+import static org.osgi.framework.Constants.BUNDLE_MANIFESTVERSION;
+import static org.osgi.framework.Constants.BUNDLE_SYMBOLICNAME;
+import static org.osgi.framework.Constants.BUNDLE_VERSION;
+import static org.osgi.framework.Constants.EXPORT_PACKAGE;
+import static org.osgi.framework.Constants.IMPORT_PACKAGE;
import java.io.File;
import java.io.FileInputStream;
@@ -60,11 +67,6 @@ import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.JUnit4TestRunner;
import org.osgi.framework.Bundle;
-import static org.osgi.framework.Constants.BUNDLE_SYMBOLICNAME;
-import static org.osgi.framework.Constants.BUNDLE_MANIFESTVERSION;
-import static org.osgi.framework.Constants.IMPORT_PACKAGE;
-import static org.osgi.framework.Constants.EXPORT_PACKAGE;
-import static org.osgi.framework.Constants.BUNDLE_VERSION;
@RunWith(JUnit4TestRunner.class)
public class OBRResolverTest extends AbstractIntegrationTest
@@ -272,7 +274,7 @@ public class OBRResolverTest extends Abs
List<DeploymentContent> provision = depMeta.getApplicationProvisionBundles();
- assertEquals(provision.toString(), 4, provision.size());
+ assertEquals(provision.toString(), 3, provision.size());
List<String> bundleSymbolicNames = new ArrayList<String>();
Modified: aries/trunk/application/application-modeller/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/application/application-modeller/pom.xml?rev=1240381&r1=1240380&r2=1240381&view=diff
==============================================================================
--- aries/trunk/application/application-modeller/pom.xml (original)
+++ aries/trunk/application/application-modeller/pom.xml Fri Feb 3 22:54:04 2012
@@ -69,7 +69,7 @@
<dependency>
<groupId>org.apache.aries</groupId>
<artifactId>org.apache.aries.util</artifactId>
- <version>0.4</version>
+ <version>0.5-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.aries.testsupport</groupId>
@@ -88,13 +88,8 @@
with generics -->
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
- <artifactId>org.apache.aries.blueprint.api</artifactId>
- <version>0.3.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.core</artifactId>
- <version>0.4</version>
+ <version>0.4.1-SNAPSHOT</version>
</dependency>
Modified: aries/trunk/application/application-resolve-transform-cm-itests/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/application/application-resolve-transform-cm-itests/pom.xml?rev=1240381&r1=1240380&r2=1240381&view=diff
==============================================================================
--- aries/trunk/application/application-resolve-transform-cm-itests/pom.xml (original)
+++ aries/trunk/application/application-resolve-transform-cm-itests/pom.xml Fri Feb 3 22:54:04 2012
@@ -68,13 +68,13 @@
<dependency>
<groupId>org.apache.aries</groupId>
<artifactId>org.apache.aries.util</artifactId>
- <version>0.4</version>
+ <version>0.5-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint</artifactId>
- <version>0.4</version>
+ <version>0.4.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: aries/trunk/application/application-tooling-repository-generator/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/application/application-tooling-repository-generator/pom.xml?rev=1240381&r1=1240380&r2=1240381&view=diff
==============================================================================
--- aries/trunk/application/application-tooling-repository-generator/pom.xml (original)
+++ aries/trunk/application/application-tooling-repository-generator/pom.xml Fri Feb 3 22:54:04 2012
@@ -94,7 +94,7 @@
<dependency>
<groupId>org.apache.aries</groupId>
<artifactId>org.apache.aries.util</artifactId>
- <version>0.4</version>
+ <version>0.5-SNAPSHOT</version>
</dependency>
<dependency>
Modified: aries/trunk/application/application-utils/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/application/application-utils/pom.xml?rev=1240381&r1=1240380&r2=1240381&view=diff
==============================================================================
--- aries/trunk/application/application-utils/pom.xml (original)
+++ aries/trunk/application/application-utils/pom.xml Fri Feb 3 22:54:04 2012
@@ -75,7 +75,7 @@
<dependency>
<groupId>org.apache.aries</groupId>
<artifactId>org.apache.aries.util</artifactId>
- <version>0.4</version>
+ <version>0.5-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.aries.testsupport</groupId>
Modified: aries/trunk/blueprint/blueprint-core/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-core/pom.xml?rev=1240381&r1=1240380&r2=1240381&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-core/pom.xml (original)
+++ aries/trunk/blueprint/blueprint-core/pom.xml Fri Feb 3 22:54:04 2012
@@ -95,10 +95,10 @@
<blueprint.annotation.api.version>0.3</blueprint.annotation.api.version>
<blueprint.api.version>0.3</blueprint.api.version>
<blueprint.parser.version>0.4.1-SNAPSHOT</blueprint.parser.version>
- <proxy.api.version>0.4</proxy.api.version>
- <proxy.impl.version>0.4</proxy.impl.version>
+ <proxy.api.version>0.4.1-SNAPSHOT</proxy.api.version>
+ <proxy.impl.version>0.4.1-SNAPSHOT</proxy.impl.version>
<quiesce.api.version>0.3</quiesce.api.version>
- <util.version>0.4</util.version>
+ <util.version>0.5-SNAPSHOT</util.version>
</properties>
<profiles>
Modified: aries/trunk/blueprint/blueprint-itests/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-itests/pom.xml?rev=1240381&r1=1240380&r2=1240381&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-itests/pom.xml (original)
+++ aries/trunk/blueprint/blueprint-itests/pom.xml Fri Feb 3 22:54:04 2012
@@ -72,7 +72,7 @@
<groupId>org.apache.aries</groupId>
<artifactId>org.apache.aries.util</artifactId>
<scope>test</scope>
- <version>0.4</version>
+ <version>0.5-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
Modified: aries/trunk/blueprint/blueprint-testquiescebundle/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-testquiescebundle/pom.xml?rev=1240381&r1=1240380&r2=1240381&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-testquiescebundle/pom.xml (original)
+++ aries/trunk/blueprint/blueprint-testquiescebundle/pom.xml Fri Feb 3 22:54:04 2012
@@ -59,7 +59,7 @@
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.core</artifactId>
- <version>0.4</version>
+ <version>0.4.1-SNAPSHOT</version>
</dependency>
</dependencies>
Modified: aries/trunk/ejb/ejb-modeller-itest/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/ejb/ejb-modeller-itest/pom.xml?rev=1240381&r1=1240380&r2=1240381&view=diff
==============================================================================
--- aries/trunk/ejb/ejb-modeller-itest/pom.xml (original)
+++ aries/trunk/ejb/ejb-modeller-itest/pom.xml Fri Feb 3 22:54:04 2012
@@ -82,7 +82,7 @@
<dependency>
<groupId>org.apache.aries</groupId>
<artifactId>org.apache.aries.util</artifactId>
- <version>0.4</version>
+ <version>0.5-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -100,7 +100,7 @@
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint</artifactId>
- <version>0.4</version>
+ <version>0.4.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: aries/trunk/ejb/ejb-modeller/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/ejb/ejb-modeller/pom.xml?rev=1240381&r1=1240380&r2=1240381&view=diff
==============================================================================
--- aries/trunk/ejb/ejb-modeller/pom.xml (original)
+++ aries/trunk/ejb/ejb-modeller/pom.xml Fri Feb 3 22:54:04 2012
@@ -60,7 +60,7 @@
<dependency>
<groupId>org.apache.aries</groupId>
<artifactId>org.apache.aries.util</artifactId>
- <version>0.4</version>
+ <version>0.5-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
Modified: aries/trunk/ejb/openejb-extender-itest/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/ejb/openejb-extender-itest/pom.xml?rev=1240381&r1=1240380&r2=1240381&view=diff
==============================================================================
--- aries/trunk/ejb/openejb-extender-itest/pom.xml (original)
+++ aries/trunk/ejb/openejb-extender-itest/pom.xml Fri Feb 3 22:54:04 2012
@@ -88,7 +88,7 @@
<dependency>
<groupId>org.apache.aries</groupId>
<artifactId>org.apache.aries.util</artifactId>
- <version>0.4</version>
+ <version>0.5-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -106,7 +106,7 @@
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint</artifactId>
- <version>0.4</version>
+ <version>0.4.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: aries/trunk/ejb/openejb-extender/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/ejb/openejb-extender/pom.xml?rev=1240381&r1=1240380&r2=1240381&view=diff
==============================================================================
--- aries/trunk/ejb/openejb-extender/pom.xml (original)
+++ aries/trunk/ejb/openejb-extender/pom.xml Fri Feb 3 22:54:04 2012
@@ -55,7 +55,7 @@
<dependency>
<groupId>org.apache.aries</groupId>
<artifactId>org.apache.aries.util</artifactId>
- <version>0.4</version>
+ <version>0.5-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
Modified: aries/trunk/jmx/jmx-core/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jmx/jmx-core/pom.xml?rev=1240381&r1=1240380&r2=1240381&view=diff
==============================================================================
--- aries/trunk/jmx/jmx-core/pom.xml (original)
+++ aries/trunk/jmx/jmx-core/pom.xml Fri Feb 3 22:54:04 2012
@@ -91,7 +91,7 @@
<dependency>
<groupId>org.apache.aries</groupId>
<artifactId>org.apache.aries.util</artifactId>
- <version>0.4</version>
+ <version>0.5-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
Modified: aries/trunk/jmx/jmx-itests/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jmx/jmx-itests/pom.xml?rev=1240381&r1=1240380&r2=1240381&view=diff
==============================================================================
--- aries/trunk/jmx/jmx-itests/pom.xml (original)
+++ aries/trunk/jmx/jmx-itests/pom.xml Fri Feb 3 22:54:04 2012
@@ -113,13 +113,13 @@
<dependency>
<groupId>org.apache.aries</groupId>
<artifactId>org.apache.aries.util</artifactId>
- <version>0.4</version>
+ <version>0.5-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint</artifactId>
- <version>0.4</version>
+ <version>0.4.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: aries/trunk/jndi/jndi-url-itest/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jndi/jndi-url-itest/pom.xml?rev=1240381&r1=1240380&r2=1240381&view=diff
==============================================================================
--- aries/trunk/jndi/jndi-url-itest/pom.xml (original)
+++ aries/trunk/jndi/jndi-url-itest/pom.xml Fri Feb 3 22:54:04 2012
@@ -69,7 +69,7 @@
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.core</artifactId>
<scope>test</scope>
- <version>0.4</version>
+ <version>0.4.1-SNAPSHOT</version>
</dependency>
<dependency>
Modified: aries/trunk/jpa/jpa-container-context/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-container-context/pom.xml?rev=1240381&r1=1240380&r2=1240381&view=diff
==============================================================================
--- aries/trunk/jpa/jpa-container-context/pom.xml (original)
+++ aries/trunk/jpa/jpa-container-context/pom.xml Fri Feb 3 22:54:04 2012
@@ -84,13 +84,13 @@
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint</artifactId>
- <version>0.4</version>
+ <version>0.4.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.aries</groupId>
<artifactId>org.apache.aries.util</artifactId>
- <version>0.4</version>
+ <version>0.5-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
Modified: aries/trunk/jpa/jpa-container/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-container/pom.xml?rev=1240381&r1=1240380&r2=1240381&view=diff
==============================================================================
--- aries/trunk/jpa/jpa-container/pom.xml (original)
+++ aries/trunk/jpa/jpa-container/pom.xml Fri Feb 3 22:54:04 2012
@@ -95,7 +95,7 @@
<dependency>
<artifactId>org.apache.aries.util</artifactId>
<groupId>org.apache.aries</groupId>
- <version>0.4</version>
+ <version>0.5-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
Modified: aries/trunk/proxy/proxy-api/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/proxy/proxy-api/pom.xml?rev=1240381&r1=1240380&r2=1240381&view=diff
==============================================================================
--- aries/trunk/proxy/proxy-api/pom.xml (original)
+++ aries/trunk/proxy/proxy-api/pom.xml Fri Feb 3 22:54:04 2012
@@ -69,7 +69,7 @@
<dependency>
<groupId>org.apache.aries</groupId>
<artifactId>org.apache.aries.util</artifactId>
- <version>0.4</version>
+ <version>0.5-SNAPSHOT</version>
</dependency>
</dependencies>
</project>
Modified: aries/trunk/proxy/proxy-bundle/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/proxy/proxy-bundle/pom.xml?rev=1240381&r1=1240380&r2=1240381&view=diff
==============================================================================
--- aries/trunk/proxy/proxy-bundle/pom.xml (original)
+++ aries/trunk/proxy/proxy-bundle/pom.xml Fri Feb 3 22:54:04 2012
@@ -68,7 +68,7 @@
<dependency>
<groupId>org.apache.aries.proxy</groupId>
<artifactId>org.apache.aries.proxy.api</artifactId>
- <version>0.4</version>
+ <version>0.4.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
Modified: aries/trunk/proxy/proxy-impl/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/proxy/proxy-impl/pom.xml?rev=1240381&r1=1240380&r2=1240381&view=diff
==============================================================================
--- aries/trunk/proxy/proxy-impl/pom.xml (original)
+++ aries/trunk/proxy/proxy-impl/pom.xml Fri Feb 3 22:54:04 2012
@@ -107,7 +107,7 @@
<dependency>
<groupId>org.apache.aries.proxy</groupId>
<artifactId>org.apache.aries.proxy.api</artifactId>
- <version>0.4</version>
+ <version>0.4.1-SNAPSHOT</version>
</dependency>
</dependencies>
Modified: aries/trunk/proxy/proxy-itests/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/proxy/proxy-itests/pom.xml?rev=1240381&r1=1240380&r2=1240381&view=diff
==============================================================================
--- aries/trunk/proxy/proxy-itests/pom.xml (original)
+++ aries/trunk/proxy/proxy-itests/pom.xml Fri Feb 3 22:54:04 2012
@@ -72,7 +72,7 @@
<groupId>org.apache.aries</groupId>
<artifactId>org.apache.aries.util</artifactId>
<scope>test</scope>
- <version>0.4</version>
+ <version>0.5-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.aries.testsupport</groupId>
Modified: aries/trunk/quiesce/quiesce-manager-itest/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/quiesce/quiesce-manager-itest/pom.xml?rev=1240381&r1=1240380&r2=1240381&view=diff
==============================================================================
--- aries/trunk/quiesce/quiesce-manager-itest/pom.xml (original)
+++ aries/trunk/quiesce/quiesce-manager-itest/pom.xml Fri Feb 3 22:54:04 2012
@@ -47,7 +47,7 @@
<dependency>
<groupId>org.apache.aries.quiesce</groupId>
<artifactId>org.apache.aries.quiesce.manager</artifactId>
- <version>0.3.1</version>
+ <version>0.3.2-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -100,7 +100,7 @@
<groupId>org.apache.aries</groupId>
<artifactId>org.apache.aries.util</artifactId>
<scope>test</scope>
- <version>0.4</version>
+ <version>0.5-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
Modified: aries/trunk/quiesce/quiesce-manager/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/quiesce/quiesce-manager/pom.xml?rev=1240381&r1=1240380&r2=1240381&view=diff
==============================================================================
--- aries/trunk/quiesce/quiesce-manager/pom.xml (original)
+++ aries/trunk/quiesce/quiesce-manager/pom.xml Fri Feb 3 22:54:04 2012
@@ -77,7 +77,7 @@
<dependency>
<groupId>org.apache.aries</groupId>
<artifactId>org.apache.aries.util</artifactId>
- <version>0.4</version>
+ <version>0.5-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
Modified: aries/trunk/samples/blog/blog-itests/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/samples/blog/blog-itests/pom.xml?rev=1240381&r1=1240380&r2=1240381&view=diff
==============================================================================
--- aries/trunk/samples/blog/blog-itests/pom.xml (original)
+++ aries/trunk/samples/blog/blog-itests/pom.xml Fri Feb 3 22:54:04 2012
@@ -399,6 +399,7 @@
<dependency>
<groupId>org.apache.aries.quiesce</groupId>
<artifactId>org.apache.aries.quiesce.manager</artifactId>
+ <version>0.3.2-SNAPSHOT</version>
<scope>test</scope>
</dependency>
Modified: aries/trunk/transaction/transaction-blueprint/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/transaction/transaction-blueprint/pom.xml?rev=1240381&r1=1240380&r2=1240381&view=diff
==============================================================================
--- aries/trunk/transaction/transaction-blueprint/pom.xml (original)
+++ aries/trunk/transaction/transaction-blueprint/pom.xml Fri Feb 3 22:54:04 2012
@@ -71,7 +71,7 @@
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.core</artifactId>
- <version>0.4</version>
+ <version>0.4.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
Modified: aries/trunk/transaction/transaction-itests/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/transaction/transaction-itests/pom.xml?rev=1240381&r1=1240380&r2=1240381&view=diff
==============================================================================
--- aries/trunk/transaction/transaction-itests/pom.xml (original)
+++ aries/trunk/transaction/transaction-itests/pom.xml Fri Feb 3 22:54:04 2012
@@ -90,7 +90,7 @@
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint</artifactId>
<scope>test</scope>
- <version>0.4</version>
+ <version>0.4.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.aries.proxy</groupId>
Modified: aries/trunk/transaction/transaction-manager/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/transaction/transaction-manager/pom.xml?rev=1240381&r1=1240380&r2=1240381&view=diff
==============================================================================
--- aries/trunk/transaction/transaction-manager/pom.xml (original)
+++ aries/trunk/transaction/transaction-manager/pom.xml Fri Feb 3 22:54:04 2012
@@ -77,7 +77,7 @@
<groupId>org.apache.aries</groupId>
<artifactId>org.apache.aries.util</artifactId>
<scope>provided</scope>
- <version>0.4</version>
+ <version>0.5-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
Modified: aries/trunk/transaction/transaction-wrappers/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/transaction/transaction-wrappers/pom.xml?rev=1240381&r1=1240380&r2=1240381&view=diff
==============================================================================
--- aries/trunk/transaction/transaction-wrappers/pom.xml (original)
+++ aries/trunk/transaction/transaction-wrappers/pom.xml Fri Feb 3 22:54:04 2012
@@ -58,12 +58,12 @@
<dependency>
<groupId>org.apache.aries.transaction</groupId>
<artifactId>org.apache.aries.transaction.manager</artifactId>
- <version>0.3</version>
+ <version>0.3.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.aries</groupId>
<artifactId>org.apache.aries.util</artifactId>
- <version>0.4</version>
+ <version>0.5-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
Modified: aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/packageinfo
URL: http://svn.apache.org/viewvc/aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/packageinfo?rev=1240381&r1=1240380&r2=1240381&view=diff
==============================================================================
--- aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/packageinfo (original)
+++ aries/trunk/util/util-r42/src/main/java/org/apache/aries/util/packageinfo Fri Feb 3 22:54:04 2012
@@ -16,4 +16,4 @@
# specific language governing permissions and limitations
# under the License.
#
-version 0.4
+version 0.5
Modified: aries/trunk/util/util/src/main/java/org/apache/aries/util/packageinfo
URL: http://svn.apache.org/viewvc/aries/trunk/util/util/src/main/java/org/apache/aries/util/packageinfo?rev=1240381&r1=1240380&r2=1240381&view=diff
==============================================================================
--- aries/trunk/util/util/src/main/java/org/apache/aries/util/packageinfo (original)
+++ aries/trunk/util/util/src/main/java/org/apache/aries/util/packageinfo Fri Feb 3 22:54:04 2012
@@ -16,4 +16,4 @@
# specific language governing permissions and limitations
# under the License.
#
-version 0.4
+version 0.5
Modified: aries/trunk/web/web-itests/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/web/web-itests/pom.xml?rev=1240381&r1=1240380&r2=1240381&view=diff
==============================================================================
--- aries/trunk/web/web-itests/pom.xml (original)
+++ aries/trunk/web/web-itests/pom.xml Fri Feb 3 22:54:04 2012
@@ -82,12 +82,13 @@
</exclusion>
</exclusions>
</dependency>
+
<dependency>
<groupId>org.apache.aries</groupId>
<artifactId>org.apache.aries.util</artifactId>
<scope>test</scope>
- <version>0.4</version>
- </dependency>
+ <version>0.5-SNAPSHOT</version>
+ </dependency>
<dependency>
<groupId>org.apache.aries.proxy</groupId>
<artifactId>org.apache.aries.proxy</artifactId>
@@ -98,7 +99,7 @@
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint</artifactId>
<scope>test</scope>
- <version>0.4</version>
+ <version>0.4.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.ops4j.pax.logging</groupId>