Skip to content

Commit

Permalink
Moving testsupport to 1.0.0. As part of this I moved application depl…
Browse files Browse the repository at this point in the history 
…oyment's test support from 0.3 to 1.0.0 and fixed some classpath ordering issues (which was why it was at 0.3)

git-svn-id: https://svn.apache.org/repos/asf/aries/branches/1.0-prototype@1325568 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information
Holly Cummins committed Apr 12, 2012
1 parent d9eaacd commit e77bc4e
Show file tree
Hide file tree
Showing 42 changed files with 60 additions and 53 deletions.
2 changes: 1 addition & 1 deletion application/application-converters/pom.xml
View file
Expand Up @@ -67,7 +67,7 @@
<groupId>org.apache.aries.testsupport</groupId>
<artifactId>org.apache.aries.testsupport.unit</artifactId>
<scope>test</scope>
<version>0.4</version>
<version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.aries.web</groupId>
Expand Down
26 changes: 15 additions & 11 deletions application/application-deployment-management/pom.xml
View file
Expand Up @@ -49,6 +49,21 @@
</properties>

<dependencies>
<!-- We need OSGi in the classpath before the pax bundles
which testsupport pulls in as transitive dependencies
or risk an "java.lang.NoClassDefFoundError: org.osgi.vendor.framework
property not set" error. -->
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.aries.testsupport</groupId>
<artifactId>org.apache.aries.testsupport.unit</artifactId>
<scope>test</scope>
<version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
Expand All @@ -64,17 +79,6 @@
<artifactId>org.apache.aries.util</artifactId>
<version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.aries.testsupport</groupId>
<artifactId>org.apache.aries.testsupport.unit</artifactId>
<scope>test</scope>
<version>0.3</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion application/application-install/pom.xml
View file
Expand Up @@ -69,7 +69,7 @@
<groupId>org.apache.aries.testsupport</groupId>
<artifactId>org.apache.aries.testsupport.unit</artifactId>
<scope>test</scope>
<version>0.4</version>
<version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
Expand Down
2 changes: 1 addition & 1 deletion application/application-itests/pom.xml
View file
Expand Up @@ -216,7 +216,7 @@
<dependency>
<groupId>org.apache.aries.testsupport</groupId>
<artifactId>org.apache.aries.testsupport.unit</artifactId>
<version>0.4</version>
<version>1.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion application/application-management/pom.xml
View file
Expand Up @@ -74,7 +74,7 @@
<groupId>org.apache.aries.testsupport</groupId>
<artifactId>org.apache.aries.testsupport.unit</artifactId>
<scope>test</scope>
<version>0.4</version>
<version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
Expand Down
2 changes: 1 addition & 1 deletion application/application-modeller-common-test/pom.xml
View file
Expand Up @@ -77,7 +77,7 @@
<groupId>org.apache.aries.testsupport</groupId>
<artifactId>org.apache.aries.testsupport.unit</artifactId>
<scope>test</scope>
<version>0.4</version>
<version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
Expand Down
2 changes: 1 addition & 1 deletion application/application-modeller/pom.xml
View file
Expand Up @@ -75,7 +75,7 @@
<groupId>org.apache.aries.testsupport</groupId>
<artifactId>org.apache.aries.testsupport.unit</artifactId>
<scope>test</scope>
<version>0.4</version>
<version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.aries.jndi</groupId>
Expand Down
2 changes: 1 addition & 1 deletion application/application-obr-resolver/pom.xml
View file
Expand Up @@ -88,7 +88,7 @@
<groupId>org.apache.aries.testsupport</groupId>
<artifactId>org.apache.aries.testsupport.unit</artifactId>
<scope>test</scope>
<version>0.3</version>
<version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>junit</groupId>
Expand Down
2 changes: 1 addition & 1 deletion application/application-resolve-transform-cm-itests/pom.xml
View file
Expand Up @@ -129,7 +129,7 @@
<dependency>
<groupId>org.apache.aries.testsupport</groupId>
<artifactId>org.apache.aries.testsupport.unit</artifactId>
<version>0.4</version>
<version>1.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion application/application-runtime-framework-management/pom.xml
View file
Expand Up @@ -78,7 +78,7 @@
<groupId>org.apache.aries.testsupport</groupId>
<artifactId>org.apache.aries.testsupport.unit</artifactId>
<scope>test</scope>
<version>0.4</version>
<version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
Expand Down
2 changes: 1 addition & 1 deletion application/application-runtime-framework/pom.xml
View file
Expand Up @@ -77,7 +77,7 @@
<groupId>org.apache.aries.testsupport</groupId>
<artifactId>org.apache.aries.testsupport.unit</artifactId>
<scope>test</scope>
<version>0.4</version>
<version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
Expand Down
2 changes: 1 addition & 1 deletion application/application-runtime-isolated/pom.xml
View file
Expand Up @@ -73,7 +73,7 @@
<groupId>org.apache.aries.testsupport</groupId>
<artifactId>org.apache.aries.testsupport.unit</artifactId>
<scope>test</scope>
<version>0.4</version>
<version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
Expand Down
2 changes: 1 addition & 1 deletion application/application-runtime-repository/pom.xml
View file
Expand Up @@ -73,7 +73,7 @@
<groupId>org.apache.aries.testsupport</groupId>
<artifactId>org.apache.aries.testsupport.unit</artifactId>
<scope>test</scope>
<version>0.4</version>
<version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
Expand Down
2 changes: 1 addition & 1 deletion application/application-runtime/pom.xml
View file
Expand Up @@ -65,7 +65,7 @@
<groupId>org.apache.aries.testsupport</groupId>
<artifactId>org.apache.aries.testsupport.unit</artifactId>
<scope>test</scope>
<version>0.4</version>
<version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
Expand Down
2 changes: 1 addition & 1 deletion application/application-utils/pom.xml
View file
Expand Up @@ -81,7 +81,7 @@
<groupId>org.apache.aries.testsupport</groupId>
<artifactId>org.apache.aries.testsupport.unit</artifactId>
<scope>test</scope>
<version>0.4</version>
<version>1.0.0-SNAPSHOT</version>
</dependency>


Expand Down
2 changes: 1 addition & 1 deletion blueprint/blueprint-annotation-itest/pom.xml
View file
Expand Up @@ -149,7 +149,7 @@
<dependency>
<groupId>org.apache.aries.testsupport</groupId>
<artifactId>org.apache.aries.testsupport.unit</artifactId>
<version>0.5-SNAPSHOT</version>
<version>1.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion blueprint/blueprint-core/pom.xml
View file
Expand Up @@ -173,7 +173,7 @@
<dependency>
<groupId>org.apache.aries.testsupport</groupId>
<artifactId>org.apache.aries.testsupport.unit</artifactId>
<version>0.3</version>
<version>1.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion blueprint/blueprint-itests/pom.xml
View file
Expand Up @@ -96,7 +96,7 @@
<groupId>org.apache.aries.testsupport</groupId>
<artifactId>org.apache.aries.testsupport.unit</artifactId>
<scope>test</scope>
<version>0.4</version>
<version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
Expand Down
2 changes: 1 addition & 1 deletion ejb/ejb-modeller-itest/pom.xml
View file
Expand Up @@ -112,7 +112,7 @@
<dependency>
<groupId>org.apache.aries.testsupport</groupId>
<artifactId>org.apache.aries.testsupport.unit</artifactId>
<version>0.4</version>
<version>1.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion ejb/ejb-modeller/pom.xml
View file
Expand Up @@ -100,7 +100,7 @@
<dependency>
<groupId>org.apache.aries.testsupport</groupId>
<artifactId>org.apache.aries.testsupport.unit</artifactId>
<version>0.4</version>
<version>1.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion ejb/openejb-extender-itest/pom.xml
View file
Expand Up @@ -124,7 +124,7 @@
<dependency>
<groupId>org.apache.aries.testsupport</groupId>
<artifactId>org.apache.aries.testsupport.unit</artifactId>
<version>0.4</version>
<version>1.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion ejb/openejb-extender/pom.xml
View file
Expand Up @@ -96,7 +96,7 @@
<dependency>
<groupId>org.apache.aries.testsupport</groupId>
<artifactId>org.apache.aries.testsupport.unit</artifactId>
<version>0.4</version>
<version>1.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion jmx/jmx-itests/pom.xml
View file
Expand Up @@ -74,7 +74,7 @@
<dependency>
<groupId>org.apache.aries.testsupport</groupId>
<artifactId>org.apache.aries.testsupport.unit</artifactId>
<version>0.4</version>
<version>1.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion jndi/jndi-core/pom.xml
View file
Expand Up @@ -87,7 +87,7 @@
<groupId>org.apache.aries.testsupport</groupId>
<artifactId>org.apache.aries.testsupport.unit</artifactId>
<scope>test</scope>
<version>0.3</version>
<version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
Expand Down
2 changes: 1 addition & 1 deletion jndi/jndi-url-itest/pom.xml
View file
Expand Up @@ -227,7 +227,7 @@
<dependency>
<groupId>org.apache.aries.testsupport</groupId>
<artifactId>org.apache.aries.testsupport.unit</artifactId>
<version>0.4</version>
<version>1.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>

Expand Down
2 changes: 1 addition & 1 deletion jndi/jndi-url/pom.xml
View file
Expand Up @@ -100,7 +100,7 @@
<groupId>org.apache.aries.testsupport</groupId>
<artifactId>org.apache.aries.testsupport.unit</artifactId>
<scope>test</scope>
<version>0.4</version>
<version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
Expand Down
2 changes: 1 addition & 1 deletion jpa/jpa-blueprint-aries/pom.xml
View file
Expand Up @@ -93,7 +93,7 @@
<groupId>org.apache.aries.testsupport</groupId>
<artifactId>org.apache.aries.testsupport.unit</artifactId>
<scope>test</scope>
<version>0.4</version>
<version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
Expand Down
2 changes: 1 addition & 1 deletion jpa/jpa-container-context/pom.xml
View file
Expand Up @@ -119,7 +119,7 @@
<groupId>org.apache.aries.testsupport</groupId>
<artifactId>org.apache.aries.testsupport.unit</artifactId>
<scope>test</scope>
<version>0.4</version>
<version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
Expand Down
2 changes: 1 addition & 1 deletion jpa/jpa-container-itest/pom.xml
View file
Expand Up @@ -312,7 +312,7 @@
<dependency>
<groupId>org.apache.aries.testsupport</groupId>
<artifactId>org.apache.aries.testsupport.unit</artifactId>
<version>0.4</version>
<version>1.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion jpa/jpa-container/pom.xml
View file
Expand Up @@ -117,7 +117,7 @@
<dependency>
<groupId>org.apache.aries.testsupport</groupId>
<artifactId>org.apache.aries.testsupport.unit</artifactId>
<version>0.4</version>
<version>1.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>

Expand Down
2 changes: 1 addition & 1 deletion proxy/proxy-impl/pom.xml
View file
Expand Up @@ -108,7 +108,7 @@
<dependency>
<groupId>org.apache.aries.testsupport</groupId>
<artifactId>org.apache.aries.testsupport.unit</artifactId>
<version>0.4</version>
<version>1.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion proxy/proxy-itests/pom.xml
View file
Expand Up @@ -77,7 +77,7 @@
<dependency>
<groupId>org.apache.aries.testsupport</groupId>
<artifactId>org.apache.aries.testsupport.unit</artifactId>
<version>0.4</version>
<version>1.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion quiesce/quiesce-manager-itest/pom.xml
View file
Expand Up @@ -53,7 +53,7 @@
<dependency>
<groupId>org.apache.aries.testsupport</groupId>
<artifactId>org.apache.aries.testsupport.unit</artifactId>
<version>0.4</version>
<version>1.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion samples/pom.xml
View file
Expand Up @@ -109,7 +109,7 @@


<!-- Aries Testsupport Versions -->
<ariesTestsupportUnitVersion>0.5-SNAPSHOT</ariesTestsupportUnitVersion>
<ariesTestsupportUnitVersion>1.0.0-SNAPSHOT</ariesTestsupportUnitVersion>

<!-- Aries Transaction Versions -->
<ariesTransactionBlueprintVersion>1.0.0-SNAPSHOT</ariesTransactionBlueprintVersion>
Expand Down
2 changes: 1 addition & 1 deletion testsupport/pom.xml
View file
Expand Up @@ -30,7 +30,7 @@
<artifactId>testsupport</artifactId>
<name>Apache Aries Test Support</name>
<packaging>pom</packaging>
<version>0.5-SNAPSHOT</version>
<version>1.0.0-SNAPSHOT</version>

<description>
Test Support for OSGi - reactor pom
Expand Down
7 changes: 5 additions & 2 deletions testsupport/testsupport-unit/pom.xml
View file
Expand Up @@ -28,7 +28,7 @@
<artifactId>org.apache.aries.testsupport.unit</artifactId>
<packaging>bundle</packaging>
<name>Apache Aries Unit Test Support</name>
<version>0.5-SNAPSHOT</version>
<version>1.0.0-SNAPSHOT</version>
<description>
This bundle provides unit test support.
</description>
Expand Down Expand Up @@ -65,10 +65,13 @@
<artifactId>junit</artifactId>
<scope>provided</scope>
</dependency>
<!-- Dependent projects need OSGi in the classpath before the pax bundles
or risk an "java.lang.NoClassDefFoundError: org.osgi.vendor.framework
property not set" error. Use default scope to propagate OSGi as
a transitive dependency to other projects. -->
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
Expand Down
2 changes: 1 addition & 1 deletion transaction/transaction-blueprint/pom.xml
View file
Expand Up @@ -78,7 +78,7 @@
<groupId>org.apache.aries.testsupport</groupId>
<artifactId>org.apache.aries.testsupport.unit</artifactId>
<scope>test</scope>
<version>0.4</version>
<version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
Expand Down
2 changes: 1 addition & 1 deletion transaction/transaction-itests/pom.xml
View file
Expand Up @@ -131,7 +131,7 @@
<dependency>
<groupId>org.apache.aries.testsupport</groupId>
<artifactId>org.apache.aries.testsupport.unit</artifactId>
<version>0.4</version>
<version>1.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion util/util-r42/pom.xml
View file
Expand Up @@ -83,7 +83,7 @@
<dependency>
<groupId>org.apache.aries.testsupport</groupId>
<artifactId>org.apache.aries.testsupport.unit</artifactId>
<version>0.3</version>
<version>1.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down

0 comments on commit e77bc4e

Please sign in to comment.