You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by cu...@apache.org on 2012/04/04 22:02:18 UTC
svn commit: r1309577 - in /aries/branches/1.0-prototype:
application/application-itests/ application/application-modeller-common-test/
application/application-modeller-standalone/
application/application-modeller/ application/application-resolve-transf...
Author: cumminsh
Date: Wed Apr 4 20:02:17 2012
New Revision: 1309577
URL: http://svn.apache.org/viewvc?rev=1309577&view=rev
Log:
Move blueprint bundles to 1.0.0-SNAPSHOT and update dependencies. I also needed to update a JMX test which was using a back-level version of the blueprint.samples bundle, since otherwise that test will fail whenevr we test using the current snapshots.
Modified:
aries/branches/1.0-prototype/application/application-itests/pom.xml
aries/branches/1.0-prototype/application/application-modeller-common-test/pom.xml
aries/branches/1.0-prototype/application/application-modeller-standalone/pom.xml
aries/branches/1.0-prototype/application/application-modeller/pom.xml
aries/branches/1.0-prototype/application/application-resolve-transform-cm-itests/pom.xml
aries/branches/1.0-prototype/application/application-tooling-repository-generator/pom.xml
aries/branches/1.0-prototype/blueprint/blueprint-annotation-api/pom.xml
aries/branches/1.0-prototype/blueprint/blueprint-annotation-impl/pom.xml
aries/branches/1.0-prototype/blueprint/blueprint-annotation-itest/pom.xml
aries/branches/1.0-prototype/blueprint/blueprint-api/pom.xml
aries/branches/1.0-prototype/blueprint/blueprint-bundle/pom.xml
aries/branches/1.0-prototype/blueprint/blueprint-cm/pom.xml
aries/branches/1.0-prototype/blueprint/blueprint-compatibility/pom.xml
aries/branches/1.0-prototype/blueprint/blueprint-core-compatibility/pom.xml
aries/branches/1.0-prototype/blueprint/blueprint-core/pom.xml
aries/branches/1.0-prototype/blueprint/blueprint-itests/pom.xml
aries/branches/1.0-prototype/blueprint/blueprint-jexl-evaluator/pom.xml
aries/branches/1.0-prototype/blueprint/blueprint-parser/pom.xml
aries/branches/1.0-prototype/blueprint/blueprint-sample-annotation/pom.xml
aries/branches/1.0-prototype/blueprint/blueprint-sample-fragment/pom.xml
aries/branches/1.0-prototype/blueprint/blueprint-sample/pom.xml
aries/branches/1.0-prototype/blueprint/blueprint-testbundlea/pom.xml
aries/branches/1.0-prototype/blueprint/blueprint-testbundleb/pom.xml
aries/branches/1.0-prototype/blueprint/blueprint-testquiescebundle/pom.xml
aries/branches/1.0-prototype/blueprint/pom.xml
aries/branches/1.0-prototype/ejb/ejb-modeller-itest/pom.xml
aries/branches/1.0-prototype/ejb/openejb-extender-itest/pom.xml
aries/branches/1.0-prototype/jmx/jmx-itests/pom.xml
aries/branches/1.0-prototype/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/BlueprintMBeanTest.java
aries/branches/1.0-prototype/jndi/jndi-url-itest/pom.xml
aries/branches/1.0-prototype/jpa/jpa-blueprint-aries/pom.xml
aries/branches/1.0-prototype/jpa/jpa-container-context/pom.xml
aries/branches/1.0-prototype/jpa/jpa-container-itest/pom.xml
aries/branches/1.0-prototype/samples/pom.xml
aries/branches/1.0-prototype/transaction/transaction-blueprint/pom.xml
aries/branches/1.0-prototype/transaction/transaction-itests/pom.xml
aries/branches/1.0-prototype/transaction/transaction-wrappers/pom.xml
aries/branches/1.0-prototype/web/web-itests/pom.xml
Modified: aries/branches/1.0-prototype/application/application-itests/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/1.0-prototype/application/application-itests/pom.xml?rev=1309577&r1=1309576&r2=1309577&view=diff
==============================================================================
--- aries/branches/1.0-prototype/application/application-itests/pom.xml (original)
+++ aries/branches/1.0-prototype/application/application-itests/pom.xml Wed Apr 4 20:02:17 2012
@@ -71,7 +71,7 @@
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint</artifactId>
- <version>0.4.1-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: aries/branches/1.0-prototype/application/application-modeller-common-test/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/1.0-prototype/application/application-modeller-common-test/pom.xml?rev=1309577&r1=1309576&r2=1309577&view=diff
==============================================================================
--- aries/branches/1.0-prototype/application/application-modeller-common-test/pom.xml (original)
+++ aries/branches/1.0-prototype/application/application-modeller-common-test/pom.xml Wed Apr 4 20:02:17 2012
@@ -82,7 +82,7 @@
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.core</artifactId>
- <version>0.4.1-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<exclusions>
<exclusion>
<groupId>org.apache.aries.proxy</groupId>
Modified: aries/branches/1.0-prototype/application/application-modeller-standalone/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/1.0-prototype/application/application-modeller-standalone/pom.xml?rev=1309577&r1=1309576&r2=1309577&view=diff
==============================================================================
--- aries/branches/1.0-prototype/application/application-modeller-standalone/pom.xml (original)
+++ aries/branches/1.0-prototype/application/application-modeller-standalone/pom.xml Wed Apr 4 20:02:17 2012
@@ -70,12 +70,12 @@
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.api</artifactId>
- <version>0.3.1</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>blueprint-parser</artifactId>
- <version>0.4</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.aries.ejb</groupId>
Modified: aries/branches/1.0-prototype/application/application-modeller/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/1.0-prototype/application/application-modeller/pom.xml?rev=1309577&r1=1309576&r2=1309577&view=diff
==============================================================================
--- aries/branches/1.0-prototype/application/application-modeller/pom.xml (original)
+++ aries/branches/1.0-prototype/application/application-modeller/pom.xml Wed Apr 4 20:02:17 2012
@@ -89,7 +89,7 @@
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.core</artifactId>
- <version>0.4.1-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
Modified: aries/branches/1.0-prototype/application/application-resolve-transform-cm-itests/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/1.0-prototype/application/application-resolve-transform-cm-itests/pom.xml?rev=1309577&r1=1309576&r2=1309577&view=diff
==============================================================================
--- aries/branches/1.0-prototype/application/application-resolve-transform-cm-itests/pom.xml (original)
+++ aries/branches/1.0-prototype/application/application-resolve-transform-cm-itests/pom.xml Wed Apr 4 20:02:17 2012
@@ -74,7 +74,7 @@
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint</artifactId>
- <version>0.4.1-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: aries/branches/1.0-prototype/application/application-tooling-repository-generator/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/1.0-prototype/application/application-tooling-repository-generator/pom.xml?rev=1309577&r1=1309576&r2=1309577&view=diff
==============================================================================
--- aries/branches/1.0-prototype/application/application-tooling-repository-generator/pom.xml (original)
+++ aries/branches/1.0-prototype/application/application-tooling-repository-generator/pom.xml Wed Apr 4 20:02:17 2012
@@ -82,7 +82,7 @@
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint</artifactId>
- <version>0.4</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
Modified: aries/branches/1.0-prototype/blueprint/blueprint-annotation-api/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/1.0-prototype/blueprint/blueprint-annotation-api/pom.xml?rev=1309577&r1=1309576&r2=1309577&view=diff
==============================================================================
--- aries/branches/1.0-prototype/blueprint/blueprint-annotation-api/pom.xml (original)
+++ aries/branches/1.0-prototype/blueprint/blueprint-annotation-api/pom.xml Wed Apr 4 20:02:17 2012
@@ -20,14 +20,14 @@
<groupId>org.apache.aries</groupId>
<artifactId>java5-parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
- <relativePath/>
+ <relativePath />
</parent>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.annotation.api</artifactId>
<packaging>bundle</packaging>
<name>Apache Aries Blueprint Annotation API</name>
- <version>0.3.3-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<description>
This bundle contains the blueprint annotation api and the corresponding xml schema.
</description>
@@ -46,7 +46,7 @@
<aries.osgi.import>
*
</aries.osgi.import>
- <aries.osgi.private.pkg/>
+ <aries.osgi.private.pkg />
</properties>
<dependencies>
Modified: aries/branches/1.0-prototype/blueprint/blueprint-annotation-impl/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/1.0-prototype/blueprint/blueprint-annotation-impl/pom.xml?rev=1309577&r1=1309576&r2=1309577&view=diff
==============================================================================
--- aries/branches/1.0-prototype/blueprint/blueprint-annotation-impl/pom.xml (original)
+++ aries/branches/1.0-prototype/blueprint/blueprint-annotation-impl/pom.xml Wed Apr 4 20:02:17 2012
@@ -22,14 +22,14 @@
<groupId>org.apache.aries</groupId>
<artifactId>java6-parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
- <relativePath/>
+ <relativePath />
</parent>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.annotation.impl</artifactId>
<packaging>bundle</packaging>
<name>Apache Aries Blueprint Annotation Impl</name>
- <version>0.3.3-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<description>
This bundle contains an implementation of Blueprint annotation support
</description>
@@ -41,7 +41,7 @@
</scm>
<properties>
- <aries.osgi.export.pkg/>
+ <aries.osgi.export.pkg />
<aries.osgi.activator>
org.apache.aries.blueprint.annotation.impl.Activator
</aries.osgi.activator>
@@ -80,7 +80,7 @@
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.annotation.api</artifactId>
- <version>0.3</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.aries</groupId>
Modified: aries/branches/1.0-prototype/blueprint/blueprint-annotation-itest/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/1.0-prototype/blueprint/blueprint-annotation-itest/pom.xml?rev=1309577&r1=1309576&r2=1309577&view=diff
==============================================================================
--- aries/branches/1.0-prototype/blueprint/blueprint-annotation-itest/pom.xml (original)
+++ aries/branches/1.0-prototype/blueprint/blueprint-annotation-itest/pom.xml Wed Apr 4 20:02:17 2012
@@ -22,13 +22,13 @@
<groupId>org.apache.aries</groupId>
<artifactId>java5-parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
- <relativePath/>
+ <relativePath />
</parent>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.annotation.itests</artifactId>
<name>Apache Aries Blueprint Annotation iTests</name>
- <version>0.3.3-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<description>
Integration tests using the standalone blueprint-bundle for the implementation
and blueprint-sample-annotation for the blueprint application to be tested.
@@ -55,7 +55,7 @@
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint</artifactId>
<scope>test</scope>
- <version>0.4.1-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.aries</groupId>
@@ -71,13 +71,13 @@
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.sample-annotation</artifactId>
- <version>0.3.3-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.sample-fragment</artifactId>
- <version>0.3.3-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -139,12 +139,12 @@
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.annotation.api</artifactId>
- <version>0.3.3-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.annotation.impl</artifactId>
- <version>0.3.3-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.aries.testsupport</groupId>
Modified: aries/branches/1.0-prototype/blueprint/blueprint-api/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/1.0-prototype/blueprint/blueprint-api/pom.xml?rev=1309577&r1=1309576&r2=1309577&view=diff
==============================================================================
--- aries/branches/1.0-prototype/blueprint/blueprint-api/pom.xml (original)
+++ aries/branches/1.0-prototype/blueprint/blueprint-api/pom.xml Wed Apr 4 20:02:17 2012
@@ -20,13 +20,13 @@
<groupId>org.apache.aries</groupId>
<artifactId>java5-parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
- <relativePath/>
+ <relativePath />
</parent>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.api</artifactId>
<packaging>bundle</packaging>
- <version>0.3.2-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<name>Apache Aries Blueprint API</name>
<description>
This bundle contains the blueprint api 1.0.1 and the corresponding xml schema.
@@ -46,7 +46,7 @@
<aries.osgi.import>
*
</aries.osgi.import>
- <aries.osgi.private.pkg/>
+ <aries.osgi.private.pkg />
</properties>
<dependencies>
Modified: aries/branches/1.0-prototype/blueprint/blueprint-bundle/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/1.0-prototype/blueprint/blueprint-bundle/pom.xml?rev=1309577&r1=1309576&r2=1309577&view=diff
==============================================================================
--- aries/branches/1.0-prototype/blueprint/blueprint-bundle/pom.xml (original)
+++ aries/branches/1.0-prototype/blueprint/blueprint-bundle/pom.xml Wed Apr 4 20:02:17 2012
@@ -20,14 +20,14 @@
<groupId>org.apache.aries</groupId>
<artifactId>java5-parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
- <relativePath/>
+ <relativePath />
</parent>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint</artifactId>
<packaging>bundle</packaging>
<name>Apache Aries Blueprint Bundle</name>
- <version>0.4.1-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<description>
This bundle contains the standalone implementation along with the API.
It's composed of the blueprint-api, blueprint-core and blueprint-cm modules.
@@ -114,25 +114,25 @@
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.api</artifactId>
- <version>0.3.2-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.annotation.api</artifactId>
- <version>0.3.3-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.core</artifactId>
- <version>0.4.1-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.cm</artifactId>
- <version>0.3.3-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
Modified: aries/branches/1.0-prototype/blueprint/blueprint-cm/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/1.0-prototype/blueprint/blueprint-cm/pom.xml?rev=1309577&r1=1309576&r2=1309577&view=diff
==============================================================================
--- aries/branches/1.0-prototype/blueprint/blueprint-cm/pom.xml (original)
+++ aries/branches/1.0-prototype/blueprint/blueprint-cm/pom.xml Wed Apr 4 20:02:17 2012
@@ -22,13 +22,13 @@
<groupId>org.apache.aries</groupId>
<artifactId>java5-parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
- <relativePath/>
+ <relativePath />
</parent>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.cm</artifactId>
<packaging>bundle</packaging>
- <version>0.3.3-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<name>Apache Aries Blueprint CM</name>
<description>
This bundle contains the ConfigAdmin namespace for blueprint.
@@ -42,7 +42,7 @@
<properties>
<!-- Export package versions are maintained in packageinfo files -->
- <aries.osgi.export.pkg/>
+ <aries.osgi.export.pkg />
<aries.osgi.import.pkg>
org.apache.aries.*;version="$<range;[==,=+)>",
*
@@ -51,9 +51,9 @@
org.apache.aries.blueprint.compendium.cm
</aries.osgi.private.pkg>
- <blueprint.api.version>0.3</blueprint.api.version>
- <blueprint.core.version>0.4.1-SNAPSHOT</blueprint.core.version>
- <blueprint.parser.version>0.4</blueprint.parser.version>
+ <blueprint.api.version>1.0.0-SNAPSHOT</blueprint.api.version>
+ <blueprint.core.version>1.0.0-SNAPSHOT</blueprint.core.version>
+ <blueprint.parser.version>1.0.0-SNAPSHOT</blueprint.parser.version>
</properties>
<profiles>
Modified: aries/branches/1.0-prototype/blueprint/blueprint-compatibility/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/1.0-prototype/blueprint/blueprint-compatibility/pom.xml?rev=1309577&r1=1309576&r2=1309577&view=diff
==============================================================================
--- aries/branches/1.0-prototype/blueprint/blueprint-compatibility/pom.xml (original)
+++ aries/branches/1.0-prototype/blueprint/blueprint-compatibility/pom.xml Wed Apr 4 20:02:17 2012
@@ -20,14 +20,14 @@
<groupId>org.apache.aries</groupId>
<artifactId>java5-parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
- <relativePath/>
+ <relativePath />
</parent>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.compatibility</artifactId>
<packaging>jar</packaging>
<name>Apache Aries Blueprint Compatiblity Fragment Bundle</name>
- <version>0.4.1-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<description>
This bundle contains extra classes and exports to allow Blueprint to be compatible
with previous versions of Blueprint.
@@ -52,7 +52,7 @@
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint</artifactId>
- <version>0.4.1-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
Modified: aries/branches/1.0-prototype/blueprint/blueprint-core-compatibility/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/1.0-prototype/blueprint/blueprint-core-compatibility/pom.xml?rev=1309577&r1=1309576&r2=1309577&view=diff
==============================================================================
--- aries/branches/1.0-prototype/blueprint/blueprint-core-compatibility/pom.xml (original)
+++ aries/branches/1.0-prototype/blueprint/blueprint-core-compatibility/pom.xml Wed Apr 4 20:02:17 2012
@@ -20,14 +20,14 @@
<groupId>org.apache.aries</groupId>
<artifactId>java5-parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
- <relativePath/>
+ <relativePath />
</parent>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.core.compatibility</artifactId>
<packaging>jar</packaging>
<name>Apache Aries Blueprint Core Compatiblity Fragment Bundle</name>
- <version>0.4.1-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<description>
This bundle contains extra classes and exports to allow Blueprint core to be compatible
with previous versions of Blueprint.
@@ -51,7 +51,7 @@
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.core</artifactId>
- <version>0.4.1-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
Modified: aries/branches/1.0-prototype/blueprint/blueprint-core/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/1.0-prototype/blueprint/blueprint-core/pom.xml?rev=1309577&r1=1309576&r2=1309577&view=diff
==============================================================================
--- aries/branches/1.0-prototype/blueprint/blueprint-core/pom.xml (original)
+++ aries/branches/1.0-prototype/blueprint/blueprint-core/pom.xml Wed Apr 4 20:02:17 2012
@@ -22,14 +22,14 @@
<groupId>org.apache.aries</groupId>
<artifactId>java5-parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
- <relativePath/>
+ <relativePath />
</parent>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.core</artifactId>
<packaging>bundle</packaging>
<name>Apache Aries Blueprint Core</name>
- <version>0.4.1-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<description>
This bundle contains the core implementation of Blueprint
along with the "ext" namespace handler.
@@ -92,12 +92,12 @@
org/apache/aries/blueprint/blueprint.xsd=${project.build.directory}/sources/org/osgi/service/blueprint/blueprint.xsd
</aries.osgi.include.resource>
- <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>
+ <blueprint.annotation.api.version>1.0.0-SNAPSHOT</blueprint.annotation.api.version>
+ <blueprint.api.version>1.0.0-SNAPSHOT</blueprint.api.version>
+ <blueprint.parser.version>1.0.0-SNAPSHOT</blueprint.parser.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>
+ <quiesce.api.version>0.3.1-SNAPSHOT</quiesce.api.version>
<util.version>1.0.0-SNAPSHOT</util.version>
</properties>
Modified: aries/branches/1.0-prototype/blueprint/blueprint-itests/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/1.0-prototype/blueprint/blueprint-itests/pom.xml?rev=1309577&r1=1309576&r2=1309577&view=diff
==============================================================================
--- aries/branches/1.0-prototype/blueprint/blueprint-itests/pom.xml (original)
+++ aries/branches/1.0-prototype/blueprint/blueprint-itests/pom.xml Wed Apr 4 20:02:17 2012
@@ -22,13 +22,13 @@
<groupId>org.apache.aries</groupId>
<artifactId>java5-parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
- <relativePath/>
+ <relativePath />
</parent>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.itests</artifactId>
<name>Apache Aries Blueprint iTests</name>
- <version>0.4.1-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<description>
Integration tests using the standalone blueprint-bundle for the implementation
and blueprint-sample for the blueprint application to be tested.
@@ -60,13 +60,13 @@
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint</artifactId>
<scope>test</scope>
- <version>0.4.1-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.jexl.evaluator</artifactId>
<scope>test</scope>
- <version>0.1.1-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.aries</groupId>
@@ -78,19 +78,19 @@
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.sample</artifactId>
<scope>test</scope>
- <version>0.3.3-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.testbundlea</artifactId>
<scope>test</scope>
- <version>0.3.3-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.testbundleb</artifactId>
<scope>test</scope>
- <version>0.3.3-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.aries.testsupport</groupId>
@@ -179,27 +179,27 @@
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.testquiescebundle</artifactId>
- <version>0.3.3-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<type>bundle</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.api</artifactId>
- <version>0.3.2-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.core</artifactId>
- <version>0.4.1-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<type>bundle</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.cm</artifactId>
- <version>0.3.3-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<type>bundle</type>
<scope>compile</scope>
</dependency>
@@ -207,7 +207,7 @@
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>blueprint-parser</artifactId>
<scope>provided</scope>
- <version>0.4.1-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
Modified: aries/branches/1.0-prototype/blueprint/blueprint-jexl-evaluator/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/1.0-prototype/blueprint/blueprint-jexl-evaluator/pom.xml?rev=1309577&r1=1309576&r2=1309577&view=diff
==============================================================================
--- aries/branches/1.0-prototype/blueprint/blueprint-jexl-evaluator/pom.xml (original)
+++ aries/branches/1.0-prototype/blueprint/blueprint-jexl-evaluator/pom.xml Wed Apr 4 20:02:17 2012
@@ -1,97 +1,97 @@
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.aries</groupId>
- <artifactId>java5-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- <relativePath/>
- </parent>
-
- <groupId>org.apache.aries.blueprint</groupId>
- <artifactId>org.apache.aries.blueprint.jexl.evaluator</artifactId>
- <packaging>bundle</packaging>
- <name>Apache Aries Blueprint JEXL evaluator</name>
- <version>0.1.1-SNAPSHOT</version>
- <description>
- This bundle contains a plugin to the "ext" namespace handler for evaluating expressions using JEXL
- </description>
-
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/blueprint/blueprint-jexl-evaluator</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/blueprint/blueprint-jexl-evaluator</developerConnection>
- <url>http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-jexl-evaluator</url>
- </scm>
- <properties>
-
- <!-- Export package versions are maintained in packageinfo files -->
- <aries.osgi.export.pkg/>
- <!--
- We use the range macro to get a 0.x to 0.x+1 version range while Aries is still
- stabilizing API. This should be removed once the dependency is available at a
- version greater than or equal to 1.0.0
- -->
- <aries.osgi.import>
- org.apache.aries.blueprint.ext.evaluator;version="$<range;[==,=+)>",
- org.apache.commons.jexl2,
- org.slf4j,
- org.osgi.service.blueprint
- </aries.osgi.import>
- <aries.osgi.private.pkg>
- org.apache.aries.blueprint.jexl.evaluator
- </aries.osgi.private.pkg>
-
- <blueprint.core.version>0.4</blueprint.core.version>
- </properties>
-
- <profiles>
- <profile>
- <id>dev</id>
- <properties>
- <blueprint.core.version>0.4.1-SNAPSHOT</blueprint.core.version>
- </properties>
- </profile>
- </profiles>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.aries.blueprint</groupId>
- <artifactId>org.apache.aries.blueprint.core</artifactId>
- <version>0.4</version>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-jexl</artifactId>
- <version>2.0</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-
-</project>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.aries</groupId>
+ <artifactId>java5-parent</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <relativePath />
+ </parent>
+
+ <groupId>org.apache.aries.blueprint</groupId>
+ <artifactId>org.apache.aries.blueprint.jexl.evaluator</artifactId>
+ <packaging>bundle</packaging>
+ <name>Apache Aries Blueprint JEXL evaluator</name>
+ <version>1.0.0-SNAPSHOT</version>
+ <description>
+ This bundle contains a plugin to the "ext" namespace handler for evaluating expressions using JEXL
+ </description>
+
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/blueprint/blueprint-jexl-evaluator</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/blueprint/blueprint-jexl-evaluator</developerConnection>
+ <url>http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-jexl-evaluator</url>
+ </scm>
+ <properties>
+
+ <!-- Export package versions are maintained in packageinfo files -->
+ <aries.osgi.export.pkg />
+ <!--
+ We use the range macro to get a 0.x to 0.x+1 version range while Aries is still
+ stabilizing API. This should be removed once the dependency is available at a
+ version greater than or equal to 1.0.0
+ -->
+ <aries.osgi.import>
+ org.apache.aries.blueprint.ext.evaluator;version="$<range;[==,=+)>",
+ org.apache.commons.jexl2,
+ org.slf4j,
+ org.osgi.service.blueprint
+ </aries.osgi.import>
+ <aries.osgi.private.pkg>
+ org.apache.aries.blueprint.jexl.evaluator
+ </aries.osgi.private.pkg>
+
+ <blueprint.core.version>0.4</blueprint.core.version>
+ </properties>
+
+ <profiles>
+ <profile>
+ <id>dev</id>
+ <properties>
+ <blueprint.core.version>0.4.1-SNAPSHOT</blueprint.core.version>
+ </properties>
+ </profile>
+ </profiles>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.aries.blueprint</groupId>
+ <artifactId>org.apache.aries.blueprint.core</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-jexl</artifactId>
+ <version>2.0</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
+</project>
Modified: aries/branches/1.0-prototype/blueprint/blueprint-parser/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/1.0-prototype/blueprint/blueprint-parser/pom.xml?rev=1309577&r1=1309576&r2=1309577&view=diff
==============================================================================
--- aries/branches/1.0-prototype/blueprint/blueprint-parser/pom.xml (original)
+++ aries/branches/1.0-prototype/blueprint/blueprint-parser/pom.xml Wed Apr 4 20:02:17 2012
@@ -1,71 +1,71 @@
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.aries</groupId>
- <artifactId>java5-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- <relativePath/>
- </parent>
-
- <groupId>org.apache.aries.blueprint</groupId>
- <artifactId>blueprint-parser</artifactId>
- <packaging>jar</packaging>
- <name>Apache Aries Blueprint Parser</name>
- <version>0.4.1-SNAPSHOT</version>
- <description>
- This bundle contains the blueprint parser in a plain jar.
- </description>
-
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/blueprint/blueprint-parser</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/blueprint/blueprint-parser</developerConnection>
- <url>http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-parser</url>
- </scm>
-
- <properties>
- <blueprint.api.version>0.3</blueprint.api.version>
- </properties>
-
- <profiles>
- <profile>
- <id>dev</id>
- <properties>
- <blueprint.api.version>0.3.2-SNAPSHOT</blueprint.api.version>
- </properties>
- </profile>
- </profiles>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.aries.blueprint</groupId>
- <artifactId>org.apache.aries.blueprint.api</artifactId>
- <version>${blueprint.api.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-
-
-</project>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.aries</groupId>
+ <artifactId>java5-parent</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <relativePath />
+ </parent>
+
+ <groupId>org.apache.aries.blueprint</groupId>
+ <artifactId>blueprint-parser</artifactId>
+ <packaging>jar</packaging>
+ <name>Apache Aries Blueprint Parser</name>
+ <version>1.0.0-SNAPSHOT</version>
+ <description>
+ This bundle contains the blueprint parser in a plain jar.
+ </description>
+
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/blueprint/blueprint-parser</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/blueprint/blueprint-parser</developerConnection>
+ <url>http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-parser</url>
+ </scm>
+
+ <properties>
+ <blueprint.api.version>1.0.0-SNAPSHOT</blueprint.api.version>
+ </properties>
+
+ <profiles>
+ <profile>
+ <id>dev</id>
+ <properties>
+ <blueprint.api.version>0.3.2-SNAPSHOT</blueprint.api.version>
+ </properties>
+ </profile>
+ </profiles>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.aries.blueprint</groupId>
+ <artifactId>org.apache.aries.blueprint.api</artifactId>
+ <version>${blueprint.api.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
+
+</project>
Modified: aries/branches/1.0-prototype/blueprint/blueprint-sample-annotation/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/1.0-prototype/blueprint/blueprint-sample-annotation/pom.xml?rev=1309577&r1=1309576&r2=1309577&view=diff
==============================================================================
--- aries/branches/1.0-prototype/blueprint/blueprint-sample-annotation/pom.xml (original)
+++ aries/branches/1.0-prototype/blueprint/blueprint-sample-annotation/pom.xml Wed Apr 4 20:02:17 2012
@@ -20,13 +20,13 @@
<groupId>org.apache.aries</groupId>
<artifactId>java5-parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
- <relativePath/>
+ <relativePath />
</parent>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.sample-annotation</artifactId>
<name>Apache Aries Blueprint Sample for Testing Annotation</name>
- <version>0.3.3-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<description>
Example blueprint application, mostly used for annotation tests.
@@ -49,7 +49,7 @@
org.apache.aries.blueprint.annotation;version="$<range;[==,=+)>",
*
</aries.osgi.import>
- <aries.osgi.private.pkg/>
+ <aries.osgi.private.pkg />
</properties>
<dependencies>
@@ -61,12 +61,12 @@
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.api</artifactId>
- <version>0.3</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.annotation.api</artifactId>
- <version>0.3</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
</dependencies>
Modified: aries/branches/1.0-prototype/blueprint/blueprint-sample-fragment/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/1.0-prototype/blueprint/blueprint-sample-fragment/pom.xml?rev=1309577&r1=1309576&r2=1309577&view=diff
==============================================================================
--- aries/branches/1.0-prototype/blueprint/blueprint-sample-fragment/pom.xml (original)
+++ aries/branches/1.0-prototype/blueprint/blueprint-sample-fragment/pom.xml Wed Apr 4 20:02:17 2012
@@ -20,13 +20,13 @@
<groupId>org.apache.aries</groupId>
<artifactId>java5-parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
- <relativePath/>
+ <relativePath />
</parent>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.sample-fragment</artifactId>
<name>Apache Aries Blueprint Sample Fragment for Testing Annotation</name>
- <version>0.3.3-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<description>
Example blueprint fragment, mostly used for annotation tests.
@@ -46,7 +46,7 @@
org.apache.aries.blueprint.annotation;version="$<range;[==,=+)>",
*
</aries.osgi.import>
- <aries.osgi.private.pkg/>
+ <aries.osgi.private.pkg />
</properties>
<dependencies>
@@ -58,12 +58,12 @@
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.api</artifactId>
- <version>0.3</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.annotation.api</artifactId>
- <version>0.3</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
</dependencies>
Modified: aries/branches/1.0-prototype/blueprint/blueprint-sample/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/1.0-prototype/blueprint/blueprint-sample/pom.xml?rev=1309577&r1=1309576&r2=1309577&view=diff
==============================================================================
--- aries/branches/1.0-prototype/blueprint/blueprint-sample/pom.xml (original)
+++ aries/branches/1.0-prototype/blueprint/blueprint-sample/pom.xml Wed Apr 4 20:02:17 2012
@@ -20,14 +20,14 @@
<groupId>org.apache.aries</groupId>
<artifactId>java5-parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
- <relativePath/>
+ <relativePath />
</parent>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.sample</artifactId>
<name>Apache Aries Blueprint Sample</name>
<packaging>bundle</packaging>
- <version>0.3.3-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<description>
Example blueprint application, mostly used for integration tests.
</description>
@@ -45,7 +45,7 @@
<aries.osgi.activator>
org.apache.aries.blueprint.sample.Activator
</aries.osgi.activator>
- <aries.osgi.private.pkg/>
+ <aries.osgi.private.pkg />
<aries.osgi.import.pkg>*
</aries.osgi.import.pkg>
</properties>
@@ -59,7 +59,7 @@
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.api</artifactId>
- <version>0.3</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
</dependencies>
Modified: aries/branches/1.0-prototype/blueprint/blueprint-testbundlea/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/1.0-prototype/blueprint/blueprint-testbundlea/pom.xml?rev=1309577&r1=1309576&r2=1309577&view=diff
==============================================================================
--- aries/branches/1.0-prototype/blueprint/blueprint-testbundlea/pom.xml (original)
+++ aries/branches/1.0-prototype/blueprint/blueprint-testbundlea/pom.xml Wed Apr 4 20:02:17 2012
@@ -21,13 +21,13 @@
<groupId>org.apache.aries</groupId>
<artifactId>java5-parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
- <relativePath/>
+ <relativePath />
</parent>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.testbundlea</artifactId>
<name>Apache Aries Blueprint Test Bundle A</name>
- <version>0.3.3-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<scm>
@@ -40,7 +40,7 @@
<aries.osgi.activator>
org.apache.aries.blueprint.testbundlea.Activator
</aries.osgi.activator>
- <aries.osgi.private.pkg/>
+ <aries.osgi.private.pkg />
<aries.osgi.export.pkg>${project.artifactId}*</aries.osgi.export.pkg>
</properties>
@@ -53,12 +53,12 @@
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.api</artifactId>
- <version>0.3</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.core</artifactId>
- <version>0.4</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
</dependencies>
Modified: aries/branches/1.0-prototype/blueprint/blueprint-testbundleb/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/1.0-prototype/blueprint/blueprint-testbundleb/pom.xml?rev=1309577&r1=1309576&r2=1309577&view=diff
==============================================================================
--- aries/branches/1.0-prototype/blueprint/blueprint-testbundleb/pom.xml (original)
+++ aries/branches/1.0-prototype/blueprint/blueprint-testbundleb/pom.xml Wed Apr 4 20:02:17 2012
@@ -21,13 +21,13 @@
<groupId>org.apache.aries</groupId>
<artifactId>java5-parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
- <relativePath/>
+ <relativePath />
</parent>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.testbundleb</artifactId>
<name>Apache Aries Blueprint Test Bundle B</name>
- <version>0.3.3-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<scm>
@@ -40,7 +40,7 @@
<aries.osgi.activator>
org.apache.aries.blueprint.testbundleb.Activator
</aries.osgi.activator>
- <aries.osgi.private.pkg/>
+ <aries.osgi.private.pkg />
<aries.osgi.export.pkg>${project.artifactId}*</aries.osgi.export.pkg>
</properties>
@@ -53,17 +53,17 @@
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.api</artifactId>
- <version>0.3</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.testbundlea</artifactId>
- <version>0.3.2</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.core</artifactId>
- <version>0.4</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
</dependencies>
Modified: aries/branches/1.0-prototype/blueprint/blueprint-testquiescebundle/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/1.0-prototype/blueprint/blueprint-testquiescebundle/pom.xml?rev=1309577&r1=1309576&r2=1309577&view=diff
==============================================================================
--- aries/branches/1.0-prototype/blueprint/blueprint-testquiescebundle/pom.xml (original)
+++ aries/branches/1.0-prototype/blueprint/blueprint-testquiescebundle/pom.xml Wed Apr 4 20:02:17 2012
@@ -1,67 +1,67 @@
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <description>Blueprint Test Quiesce Bundle, tests the blueprint participant for the quiesce functionality.</description>
- <parent>
- <groupId>org.apache.aries</groupId>
- <artifactId>java5-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- <relativePath/>
- </parent>
-
- <groupId>org.apache.aries.blueprint</groupId>
- <artifactId>org.apache.aries.blueprint.testquiescebundle</artifactId>
- <name>Apache Aries Blueprint Test Quiesce Bundle</name>
- <packaging>bundle</packaging>
- <version>0.3.3-SNAPSHOT</version>
-
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/blueprint/blueprint-testquiescebundle</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/blueprint/blueprint-testquiescebundle</developerConnection>
- <url>http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-testquiescebundle</url>
- </scm>
- <properties>
- <aries.osgi.activator>
- org.apache.aries.blueprint.testquiescebundle.Activator
- </aries.osgi.activator>
- <aries.osgi.private.pkg/>
- <aries.osgi.import.pkg>*
- </aries.osgi.import.pkg>
- <aries.osgi.export.pkg>${project.artifactId}*</aries.osgi.export.pkg>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.eclipse</groupId>
- <artifactId>osgi</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.aries.blueprint</groupId>
- <artifactId>org.apache.aries.blueprint.api</artifactId>
- <version>0.3</version>
- </dependency>
- <dependency>
- <groupId>org.apache.aries.blueprint</groupId>
- <artifactId>org.apache.aries.blueprint.core</artifactId>
- <version>0.4.1-SNAPSHOT</version>
- </dependency>
- </dependencies>
-
-</project>
-
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <description>Blueprint Test Quiesce Bundle, tests the blueprint participant for the quiesce functionality.</description>
+ <parent>
+ <groupId>org.apache.aries</groupId>
+ <artifactId>java5-parent</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <relativePath />
+ </parent>
+
+ <groupId>org.apache.aries.blueprint</groupId>
+ <artifactId>org.apache.aries.blueprint.testquiescebundle</artifactId>
+ <name>Apache Aries Blueprint Test Quiesce Bundle</name>
+ <packaging>bundle</packaging>
+ <version>1.0.0-SNAPSHOT</version>
+
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/blueprint/blueprint-testquiescebundle</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/blueprint/blueprint-testquiescebundle</developerConnection>
+ <url>http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-testquiescebundle</url>
+ </scm>
+ <properties>
+ <aries.osgi.activator>
+ org.apache.aries.blueprint.testquiescebundle.Activator
+ </aries.osgi.activator>
+ <aries.osgi.private.pkg />
+ <aries.osgi.import.pkg>*
+ </aries.osgi.import.pkg>
+ <aries.osgi.export.pkg>${project.artifactId}*</aries.osgi.export.pkg>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.eclipse</groupId>
+ <artifactId>osgi</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.aries.blueprint</groupId>
+ <artifactId>org.apache.aries.blueprint.api</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.aries.blueprint</groupId>
+ <artifactId>org.apache.aries.blueprint.core</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+
+</project>
+
Modified: aries/branches/1.0-prototype/blueprint/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/1.0-prototype/blueprint/pom.xml?rev=1309577&r1=1309576&r2=1309577&view=diff
==============================================================================
--- aries/branches/1.0-prototype/blueprint/pom.xml (original)
+++ aries/branches/1.0-prototype/blueprint/pom.xml Wed Apr 4 20:02:17 2012
@@ -22,7 +22,7 @@
<groupId>org.apache.aries</groupId>
<artifactId>java5-parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
- <relativePath/>
+ <relativePath />
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -30,7 +30,7 @@
<artifactId>blueprint</artifactId>
<name>Apache Aries Blueprint</name>
<packaging>pom</packaging>
- <version>0.4-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<description>
Implementation of the Blueprint Container Specification
Modified: aries/branches/1.0-prototype/ejb/ejb-modeller-itest/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/1.0-prototype/ejb/ejb-modeller-itest/pom.xml?rev=1309577&r1=1309576&r2=1309577&view=diff
==============================================================================
--- aries/branches/1.0-prototype/ejb/ejb-modeller-itest/pom.xml (original)
+++ aries/branches/1.0-prototype/ejb/ejb-modeller-itest/pom.xml Wed Apr 4 20:02:17 2012
@@ -100,7 +100,7 @@
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint</artifactId>
- <version>0.4.1-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: aries/branches/1.0-prototype/ejb/openejb-extender-itest/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/1.0-prototype/ejb/openejb-extender-itest/pom.xml?rev=1309577&r1=1309576&r2=1309577&view=diff
==============================================================================
--- aries/branches/1.0-prototype/ejb/openejb-extender-itest/pom.xml (original)
+++ aries/branches/1.0-prototype/ejb/openejb-extender-itest/pom.xml Wed Apr 4 20:02:17 2012
@@ -106,7 +106,7 @@
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint</artifactId>
- <version>0.4.1-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: aries/branches/1.0-prototype/jmx/jmx-itests/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/1.0-prototype/jmx/jmx-itests/pom.xml?rev=1309577&r1=1309576&r2=1309577&view=diff
==============================================================================
--- aries/branches/1.0-prototype/jmx/jmx-itests/pom.xml (original)
+++ aries/branches/1.0-prototype/jmx/jmx-itests/pom.xml Wed Apr 4 20:02:17 2012
@@ -80,7 +80,20 @@
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.sample</artifactId>
- <version>0.3.1</version>
+ <version>1.0.0-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
+<!-- Recent versions of blueprint sample need jexl -->
+ <dependency>
+ <groupId>org.apache.aries.blueprint</groupId>
+ <artifactId>org.apache.aries.blueprint.jexl.evaluator</artifactId>
+ <scope>test</scope>
+ <version>1.0.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-jexl</artifactId>
+ <version>2.0</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -119,7 +132,7 @@
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint</artifactId>
- <version>0.4.1-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: aries/branches/1.0-prototype/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/BlueprintMBeanTest.java
URL: http://svn.apache.org/viewvc/aries/branches/1.0-prototype/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/BlueprintMBeanTest.java?rev=1309577&r1=1309576&r2=1309577&view=diff
==============================================================================
--- aries/branches/1.0-prototype/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/BlueprintMBeanTest.java (original)
+++ aries/branches/1.0-prototype/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/BlueprintMBeanTest.java Wed Apr 4 20:02:17 2012
@@ -23,6 +23,8 @@ import static org.junit.Assert.fail;
import static org.apache.aries.itest.ExtraOptions.*;
+import java.util.Arrays;
+
import javax.management.MBeanServerInvocationHandler;
import javax.management.ObjectName;
import javax.management.openmbean.TabularData;
@@ -65,6 +67,8 @@ public class BlueprintMBeanTest extends
mavenBundle("org.ow2.asm", "asm-all"),
mavenBundle("org.apache.aries.proxy", "org.apache.aries.proxy"),
mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint"),
+ mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint.jexl.evaluator"),
+ mavenBundle("org.apache.commons", "commons-jexl"),
mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint.sample"),
mavenBundle("org.apache.aries.jmx", "org.apache.aries.jmx.blueprint"),
mavenBundle("org.osgi", "org.osgi.compendium")
@@ -105,7 +109,7 @@ public class BlueprintMBeanTest extends
// test getBlueprintBundleIds
long[] bpBundleIds = stateProxy.getBlueprintBundleIds();
- assertEquals(2, bpBundleIds.length);
+ assertEquals("The blueprint bundle ids are: " + Arrays.toString(bpBundleIds), 3, bpBundleIds.length);
// test getLastEvent
BlueprintEventValidator sampleValidator = new BlueprintEventValidator(sampleBundleId, extenderBundleId, 2);
sampleValidator.validate(stateProxy.getLastEvent(sampleBundleId));
@@ -135,7 +139,7 @@ public class BlueprintMBeanTest extends
// test getBlueprintContainerServiceIds
long[] bpContainerServiceIds = metadataProxy.getBlueprintContainerServiceIds();
- assertEquals(2, bpContainerServiceIds.length);
+ assertEquals(3, bpContainerServiceIds.length);
// test getBlueprintContainerServiceId
assertEquals(sampleBlueprintContainerServiceId, metadataProxy.getBlueprintContainerServiceId(sampleBundleId));
Modified: aries/branches/1.0-prototype/jndi/jndi-url-itest/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/1.0-prototype/jndi/jndi-url-itest/pom.xml?rev=1309577&r1=1309576&r2=1309577&view=diff
==============================================================================
--- aries/branches/1.0-prototype/jndi/jndi-url-itest/pom.xml (original)
+++ aries/branches/1.0-prototype/jndi/jndi-url-itest/pom.xml Wed Apr 4 20:02:17 2012
@@ -62,14 +62,14 @@
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.api</artifactId>
<scope>test</scope>
- <version>0.3</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.core</artifactId>
<scope>test</scope>
- <version>0.4.1-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
Modified: aries/branches/1.0-prototype/jpa/jpa-blueprint-aries/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/1.0-prototype/jpa/jpa-blueprint-aries/pom.xml?rev=1309577&r1=1309576&r2=1309577&view=diff
==============================================================================
--- aries/branches/1.0-prototype/jpa/jpa-blueprint-aries/pom.xml (original)
+++ aries/branches/1.0-prototype/jpa/jpa-blueprint-aries/pom.xml Wed Apr 4 20:02:17 2012
@@ -71,7 +71,7 @@
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.core</artifactId>
- <version>0.4.1-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
Modified: aries/branches/1.0-prototype/jpa/jpa-container-context/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/1.0-prototype/jpa/jpa-container-context/pom.xml?rev=1309577&r1=1309576&r2=1309577&view=diff
==============================================================================
--- aries/branches/1.0-prototype/jpa/jpa-container-context/pom.xml (original)
+++ aries/branches/1.0-prototype/jpa/jpa-container-context/pom.xml Wed Apr 4 20:02:17 2012
@@ -84,7 +84,7 @@
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint</artifactId>
- <version>0.4.1-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
Modified: aries/branches/1.0-prototype/jpa/jpa-container-itest/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/1.0-prototype/jpa/jpa-container-itest/pom.xml?rev=1309577&r1=1309576&r2=1309577&view=diff
==============================================================================
--- aries/branches/1.0-prototype/jpa/jpa-container-itest/pom.xml (original)
+++ aries/branches/1.0-prototype/jpa/jpa-container-itest/pom.xml Wed Apr 4 20:02:17 2012
@@ -115,13 +115,13 @@
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.api</artifactId>
- <version>0.3.1</version>
+ <version>1.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.core</artifactId>
- <version>0.4.1-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: aries/branches/1.0-prototype/samples/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/1.0-prototype/samples/pom.xml?rev=1309577&r1=1309576&r2=1309577&view=diff
==============================================================================
--- aries/branches/1.0-prototype/samples/pom.xml (original)
+++ aries/branches/1.0-prototype/samples/pom.xml Wed Apr 4 20:02:17 2012
@@ -68,12 +68,12 @@
<ariesApplicationUtilsVersion>0.3.1-SNAPSHOT</ariesApplicationUtilsVersion>
<!-- Aries Blueprint Versions -->
- <ariesBlueprintAnnotationApiVersion>0.3.2</ariesBlueprintAnnotationApiVersion>
- <ariesBlueprintAnnotationImplVersion>0.3.2</ariesBlueprintAnnotationImplVersion>
- <ariesBlueprintApiVersion>0.3.1</ariesBlueprintApiVersion>
- <ariesBlueprintVersion>0.4.1-SNAPSHOT</ariesBlueprintVersion>
- <ariesBlueprintCmVersion>0.3.2</ariesBlueprintCmVersion>
- <ariesBlueprintCoreVersion>0.4.1-SNAPSHOT</ariesBlueprintCoreVersion>
+ <ariesBlueprintAnnotationApiVersion>1.0.0-SNAPSHOT</ariesBlueprintAnnotationApiVersion>
+ <ariesBlueprintAnnotationImplVersion>1.0.0-SNAPSHOT</ariesBlueprintAnnotationImplVersion>
+ <ariesBlueprintApiVersion>1.0.0-SNAPSHOT</ariesBlueprintApiVersion>
+ <ariesBlueprintVersion>1.0.0-SNAPSHOT</ariesBlueprintVersion>
+ <ariesBlueprintCmVersion>1.0.0-SNAPSHOT</ariesBlueprintCmVersion>
+ <ariesBlueprintCoreVersion>1.0.0-SNAPSHOT</ariesBlueprintCoreVersion>
<!-- Aries Jmx Versions -->
<ariesJmxiApiVersion>0.3.1-SNAPSHOT</ariesJmxiApiVersion>
@@ -99,17 +99,17 @@
<ariesJpaContainerContextVersion>0.3.1-SNAPSHOT</ariesJpaContainerContextVersion>
<!-- Aries Proxy Versions -->
- <ariesProxyApiVersion>0.4</ariesProxyApiVersion>
+ <ariesProxyApiVersion>0.4.1-SNAPSHOT</ariesProxyApiVersion>
<ariesProxyVersion>0.4.1-SNAPSHOT</ariesProxyVersion>
<ariesProxyImplVersion>0.4.1-SNAPSHOT</ariesProxyImplVersion>
<!-- Aries Quiesce Versions -->
- <ariesQuiesceApiVersion>0.3</ariesQuiesceApiVersion>
- <ariesQuiesceManagerVersion>0.3.1</ariesQuiesceManagerVersion>
+ <ariesQuiesceApiVersion>0.3.1-SNAPSHOT</ariesQuiesceApiVersion>
+ <ariesQuiesceManagerVersion>0.3.2-SNAPSHOT</ariesQuiesceManagerVersion>
<!-- Aries Testsupport Versions -->
- <ariesTestsupportUnitVersion>0.4</ariesTestsupportUnitVersion>
+ <ariesTestsupportUnitVersion>0.5-SNAPSHOT</ariesTestsupportUnitVersion>
<!-- Aries Transaction Versions -->
<ariesTransactionBlueprintVersion>0.3.1-SNAPSHOT</ariesTransactionBlueprintVersion>
Modified: aries/branches/1.0-prototype/transaction/transaction-blueprint/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/1.0-prototype/transaction/transaction-blueprint/pom.xml?rev=1309577&r1=1309576&r2=1309577&view=diff
==============================================================================
--- aries/branches/1.0-prototype/transaction/transaction-blueprint/pom.xml (original)
+++ aries/branches/1.0-prototype/transaction/transaction-blueprint/pom.xml Wed Apr 4 20:02:17 2012
@@ -72,7 +72,7 @@
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.core</artifactId>
- <version>0.4.1-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
Modified: aries/branches/1.0-prototype/transaction/transaction-itests/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/1.0-prototype/transaction/transaction-itests/pom.xml?rev=1309577&r1=1309576&r2=1309577&view=diff
==============================================================================
--- aries/branches/1.0-prototype/transaction/transaction-itests/pom.xml (original)
+++ aries/branches/1.0-prototype/transaction/transaction-itests/pom.xml Wed Apr 4 20:02:17 2012
@@ -90,7 +90,7 @@
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint</artifactId>
<scope>test</scope>
- <version>0.4.1-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.aries.proxy</groupId>
Modified: aries/branches/1.0-prototype/transaction/transaction-wrappers/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/1.0-prototype/transaction/transaction-wrappers/pom.xml?rev=1309577&r1=1309576&r2=1309577&view=diff
==============================================================================
--- aries/branches/1.0-prototype/transaction/transaction-wrappers/pom.xml (original)
+++ aries/branches/1.0-prototype/transaction/transaction-wrappers/pom.xml Wed Apr 4 20:02:17 2012
@@ -22,8 +22,8 @@
<parent>
<groupId>org.apache.aries</groupId>
<artifactId>java5-parent</artifactId>
- <!-- use 0.4 instead of 0.5 for now as the enforcer doesn't like the JDBC java.sql.Connection stuff -->
- <version>1.0.0-SNAPSHOT</version>
+ <!-- use 0.4 instead of 1.0.0 for now as the enforcer doesn't like the JDBC java.sql.Connection stuff -->
+ <version>0.4</version>
<relativePath />
</parent>
<groupId>org.apache.aries.transaction</groupId>
Modified: aries/branches/1.0-prototype/web/web-itests/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/1.0-prototype/web/web-itests/pom.xml?rev=1309577&r1=1309576&r2=1309577&view=diff
==============================================================================
--- aries/branches/1.0-prototype/web/web-itests/pom.xml (original)
+++ aries/branches/1.0-prototype/web/web-itests/pom.xml Wed Apr 4 20:02:17 2012
@@ -65,7 +65,7 @@
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.sample</artifactId>
<scope>test</scope>
- <version>0.3.3-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
@@ -99,7 +99,7 @@
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint</artifactId>
<scope>test</scope>
- <version>0.4.1-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.ops4j.pax.logging</groupId>