You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by da...@apache.org on 2012/07/02 11:51:17 UTC
svn commit: r1356153 - in /aries/trunk/spi-fly: ./ spi-fly-core/
spi-fly-dynamic-bundle/ spi-fly-examples/
spi-fly-examples/spi-fly-example-client1-bundle/
spi-fly-examples/spi-fly-example-client1-jar/
spi-fly-examples/spi-fly-example-client2-bundle/ s...
Author: davidb
Date: Mon Jul 2 09:51:15 2012
New Revision: 1356153
URL: http://svn.apache.org/viewvc?rev=1356153&view=rev
Log:
Move SPI-Fly to 1.0.0-SNAPSHOT
Modified:
aries/trunk/spi-fly/pom.xml
aries/trunk/spi-fly/spi-fly-core/pom.xml
aries/trunk/spi-fly/spi-fly-dynamic-bundle/pom.xml
aries/trunk/spi-fly/spi-fly-examples/pom.xml
aries/trunk/spi-fly/spi-fly-examples/spi-fly-example-client1-bundle/pom.xml
aries/trunk/spi-fly/spi-fly-examples/spi-fly-example-client1-jar/pom.xml
aries/trunk/spi-fly/spi-fly-examples/spi-fly-example-client2-bundle/pom.xml
aries/trunk/spi-fly/spi-fly-examples/spi-fly-example-provider1-bundle/pom.xml
aries/trunk/spi-fly/spi-fly-examples/spi-fly-example-provider1-jar/pom.xml
aries/trunk/spi-fly/spi-fly-examples/spi-fly-example-provider2-bundle/pom.xml
aries/trunk/spi-fly/spi-fly-examples/spi-fly-example-spi-bundle/pom.xml
aries/trunk/spi-fly/spi-fly-static-bundle/pom.xml
aries/trunk/spi-fly/spi-fly-static-tool/pom.xml
aries/trunk/spi-fly/spi-fly-weaver/pom.xml
Modified: aries/trunk/spi-fly/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/spi-fly/pom.xml?rev=1356153&r1=1356152&r2=1356153&view=diff
==============================================================================
--- aries/trunk/spi-fly/pom.xml (original)
+++ aries/trunk/spi-fly/pom.xml Mon Jul 2 09:51:15 2012
@@ -31,31 +31,19 @@
<groupId>org.apache.aries.spifly</groupId>
<artifactId>spifly</artifactId>
<name>Apache Aries SPI Fly</name>
- <version>0.4-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<description>
SPI support for OSGi
</description>
- <properties>
- <asm.version>3.2</asm.version>
- </properties>
-
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/spi-fly</connection>
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/spi-fly</developerConnection>
<url>http://svn.apache.org/viewvc/aries/trunk/spi-fly</url>
</scm>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
<modules>
<module>spi-fly-core</module>
<module>spi-fly-weaver</module>
Modified: aries/trunk/spi-fly/spi-fly-core/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/spi-fly/spi-fly-core/pom.xml?rev=1356153&r1=1356152&r2=1356153&view=diff
==============================================================================
--- aries/trunk/spi-fly/spi-fly-core/pom.xml (original)
+++ aries/trunk/spi-fly/spi-fly-core/pom.xml Mon Jul 2 09:51:15 2012
@@ -21,12 +21,14 @@
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.spifly</groupId>
- <artifactId>spifly</artifactId>
- <version>0.4-SNAPSHOT</version>
+ <groupId>org.apache.aries</groupId>
+ <artifactId>java6-parent</artifactId>
+ <version>1.0.0</version>
</parent>
+ <groupId>org.apache.aries.spifly</groupId>
<artifactId>org.apache.aries.spifly.core</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Apache Aries SPI Fly Core</name>
<description>
@@ -51,7 +53,13 @@ JRE through META-INF/services resources)
<dependency>
<groupId>org.apache.aries</groupId>
<artifactId>org.apache.aries.util</artifactId>
- <version>0.4-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version> <!-- TODO move to 1.0.0 when available in maven -->
+ </dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
Modified: aries/trunk/spi-fly/spi-fly-dynamic-bundle/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/spi-fly/spi-fly-dynamic-bundle/pom.xml?rev=1356153&r1=1356152&r2=1356153&view=diff
==============================================================================
--- aries/trunk/spi-fly/spi-fly-dynamic-bundle/pom.xml (original)
+++ aries/trunk/spi-fly/spi-fly-dynamic-bundle/pom.xml Mon Jul 2 09:51:15 2012
@@ -10,8 +10,6 @@
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
@@ -23,12 +21,14 @@
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.spifly</groupId>
- <artifactId>spifly</artifactId>
- <version>0.4-SNAPSHOT</version>
+ <groupId>org.apache.aries</groupId>
+ <artifactId>java6-parent</artifactId>
+ <version>1.0.0</version>
</parent>
+ <groupId>org.apache.aries.spifly</groupId>
<artifactId>org.apache.aries.spifly.dynamic.bundle</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache Aries SPI Fly Dynamic Weaving Bundle</name>
<description>
@@ -41,7 +41,7 @@ JRE through META-INF/services resources)
<dependency>
<groupId>asm</groupId>
<artifactId>asm-all</artifactId>
- <version>${asm.version}</version>
+ <version>3.2</version>
</dependency>
<dependency>
@@ -81,6 +81,12 @@ JRE through META-INF/services resources)
</dependency>
<dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
<version>3.0</version>
Modified: aries/trunk/spi-fly/spi-fly-examples/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/spi-fly/spi-fly-examples/pom.xml?rev=1356153&r1=1356152&r2=1356153&view=diff
==============================================================================
--- aries/trunk/spi-fly/spi-fly-examples/pom.xml (original)
+++ aries/trunk/spi-fly/spi-fly-examples/pom.xml Mon Jul 2 09:51:15 2012
@@ -23,15 +23,15 @@
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.spifly</groupId>
- <artifactId>spifly</artifactId>
- <version>0.4-SNAPSHOT</version>
+ <groupId>org.apache.aries</groupId>
+ <artifactId>java6-parent</artifactId>
+ <version>1.0.0</version>
</parent>
<groupId>org.apache.aries.spifly.examples</groupId>
<artifactId>examples</artifactId>
<name>Apache Aries SPI Fly Examples</name>
- <version>0.4-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<description>
Modified: aries/trunk/spi-fly/spi-fly-examples/spi-fly-example-client1-bundle/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/spi-fly/spi-fly-examples/spi-fly-example-client1-bundle/pom.xml?rev=1356153&r1=1356152&r2=1356153&view=diff
==============================================================================
--- aries/trunk/spi-fly/spi-fly-examples/spi-fly-example-client1-bundle/pom.xml (original)
+++ aries/trunk/spi-fly/spi-fly-examples/spi-fly-example-client1-bundle/pom.xml Mon Jul 2 09:51:15 2012
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.aries.spifly.examples</groupId>
<artifactId>examples</artifactId>
- <version>0.4-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>org.apache.aries.spifly.examples.client1.bundle</artifactId>
Modified: aries/trunk/spi-fly/spi-fly-examples/spi-fly-example-client1-jar/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/spi-fly/spi-fly-examples/spi-fly-example-client1-jar/pom.xml?rev=1356153&r1=1356152&r2=1356153&view=diff
==============================================================================
--- aries/trunk/spi-fly/spi-fly-examples/spi-fly-example-client1-jar/pom.xml (original)
+++ aries/trunk/spi-fly/spi-fly-examples/spi-fly-example-client1-jar/pom.xml Mon Jul 2 09:51:15 2012
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.aries.spifly.examples</groupId>
<artifactId>examples</artifactId>
- <version>0.4-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>org.apache.aries.spifly.examples.client1.jar</artifactId>
Modified: aries/trunk/spi-fly/spi-fly-examples/spi-fly-example-client2-bundle/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/spi-fly/spi-fly-examples/spi-fly-example-client2-bundle/pom.xml?rev=1356153&r1=1356152&r2=1356153&view=diff
==============================================================================
--- aries/trunk/spi-fly/spi-fly-examples/spi-fly-example-client2-bundle/pom.xml (original)
+++ aries/trunk/spi-fly/spi-fly-examples/spi-fly-example-client2-bundle/pom.xml Mon Jul 2 09:51:15 2012
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.aries.spifly.examples</groupId>
<artifactId>examples</artifactId>
- <version>0.4-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>org.apache.aries.spifly.examples.client2.bundle</artifactId>
Modified: aries/trunk/spi-fly/spi-fly-examples/spi-fly-example-provider1-bundle/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/spi-fly/spi-fly-examples/spi-fly-example-provider1-bundle/pom.xml?rev=1356153&r1=1356152&r2=1356153&view=diff
==============================================================================
--- aries/trunk/spi-fly/spi-fly-examples/spi-fly-example-provider1-bundle/pom.xml (original)
+++ aries/trunk/spi-fly/spi-fly-examples/spi-fly-example-provider1-bundle/pom.xml Mon Jul 2 09:51:15 2012
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.aries.spifly.examples</groupId>
<artifactId>examples</artifactId>
- <version>0.4-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>org.apache.aries.spifly.examples.provider1.bundle</artifactId>
Modified: aries/trunk/spi-fly/spi-fly-examples/spi-fly-example-provider1-jar/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/spi-fly/spi-fly-examples/spi-fly-example-provider1-jar/pom.xml?rev=1356153&r1=1356152&r2=1356153&view=diff
==============================================================================
--- aries/trunk/spi-fly/spi-fly-examples/spi-fly-example-provider1-jar/pom.xml (original)
+++ aries/trunk/spi-fly/spi-fly-examples/spi-fly-example-provider1-jar/pom.xml Mon Jul 2 09:51:15 2012
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.aries.spifly.examples</groupId>
<artifactId>examples</artifactId>
- <version>0.4-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>org.apache.aries.spifly.examples.provider1.jar</artifactId>
Modified: aries/trunk/spi-fly/spi-fly-examples/spi-fly-example-provider2-bundle/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/spi-fly/spi-fly-examples/spi-fly-example-provider2-bundle/pom.xml?rev=1356153&r1=1356152&r2=1356153&view=diff
==============================================================================
--- aries/trunk/spi-fly/spi-fly-examples/spi-fly-example-provider2-bundle/pom.xml (original)
+++ aries/trunk/spi-fly/spi-fly-examples/spi-fly-example-provider2-bundle/pom.xml Mon Jul 2 09:51:15 2012
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.aries.spifly.examples</groupId>
<artifactId>examples</artifactId>
- <version>0.4-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>org.apache.aries.spifly.examples.provider2.bundle</artifactId>
Modified: aries/trunk/spi-fly/spi-fly-examples/spi-fly-example-spi-bundle/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/spi-fly/spi-fly-examples/spi-fly-example-spi-bundle/pom.xml?rev=1356153&r1=1356152&r2=1356153&view=diff
==============================================================================
--- aries/trunk/spi-fly/spi-fly-examples/spi-fly-example-spi-bundle/pom.xml (original)
+++ aries/trunk/spi-fly/spi-fly-examples/spi-fly-example-spi-bundle/pom.xml Mon Jul 2 09:51:15 2012
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.aries.spifly.examples</groupId>
<artifactId>examples</artifactId>
- <version>0.4-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>org.apache.aries.spifly.examples.spi.bundle</artifactId>
Modified: aries/trunk/spi-fly/spi-fly-static-bundle/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/spi-fly/spi-fly-static-bundle/pom.xml?rev=1356153&r1=1356152&r2=1356153&view=diff
==============================================================================
--- aries/trunk/spi-fly/spi-fly-static-bundle/pom.xml (original)
+++ aries/trunk/spi-fly/spi-fly-static-bundle/pom.xml Mon Jul 2 09:51:15 2012
@@ -21,12 +21,14 @@
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.spifly</groupId>
- <artifactId>spifly</artifactId>
- <version>0.4-SNAPSHOT</version>
+ <groupId>org.apache.aries</groupId>
+ <artifactId>java6-parent</artifactId>
+ <version>1.0.0</version>
</parent>
+ <groupId>org.apache.aries.spifly</groupId>
<artifactId>org.apache.aries.spifly.static.bundle</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache Aries SPI Fly Static Weaving Bundle</name>
<description>
Modified: aries/trunk/spi-fly/spi-fly-static-tool/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/spi-fly/spi-fly-static-tool/pom.xml?rev=1356153&r1=1356152&r2=1356153&view=diff
==============================================================================
--- aries/trunk/spi-fly/spi-fly-static-tool/pom.xml (original)
+++ aries/trunk/spi-fly/spi-fly-static-tool/pom.xml Mon Jul 2 09:51:15 2012
@@ -21,12 +21,14 @@
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.spifly</groupId>
- <artifactId>spifly</artifactId>
- <version>0.4-SNAPSHOT</version>
+ <groupId>org.apache.aries</groupId>
+ <artifactId>java6-parent</artifactId>
+ <version>1.0.0</version>
</parent>
+ <groupId>org.apache.aries.spifly</groupId>
<artifactId>org.apache.aries.spifly.static.tool</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Apache Aries SPI Fly Static Weaving Tool</name>
<description>
@@ -37,7 +39,7 @@
<dependency>
<groupId>asm</groupId>
<artifactId>asm-all</artifactId>
- <version>${asm.version}</version>
+ <version>3.2</version>
</dependency>
<dependency>
@@ -56,6 +58,12 @@
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
Modified: aries/trunk/spi-fly/spi-fly-weaver/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/spi-fly/spi-fly-weaver/pom.xml?rev=1356153&r1=1356152&r2=1356153&view=diff
==============================================================================
--- aries/trunk/spi-fly/spi-fly-weaver/pom.xml (original)
+++ aries/trunk/spi-fly/spi-fly-weaver/pom.xml Mon Jul 2 09:51:15 2012
@@ -21,12 +21,14 @@
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.spifly</groupId>
- <artifactId>spifly</artifactId>
- <version>0.4-SNAPSHOT</version>
+ <groupId>org.apache.aries</groupId>
+ <artifactId>java6-parent</artifactId>
+ <version>1.0.0</version>
</parent>
+ <groupId>org.apache.aries.spifly</groupId>
<artifactId>org.apache.aries.spifly.weaver</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Apache Aries SPI Fly Weaver</name>
@@ -34,7 +36,7 @@
<dependency>
<groupId>asm</groupId>
<artifactId>asm-all</artifactId>
- <version>${asm.version}</version>
+ <version>3.2</version>
<scope>provided</scope>
</dependency>
@@ -45,6 +47,12 @@
</dependency>
<dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
<version>3.0</version>