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 2011/06/27 09:22:31 UTC
svn commit: r1140032 - in /aries/trunk/spi-fly: contrib/ pom.xml
spi-fly-deps/ spi-fly-dynamic-bundle/pom.xml spi-fly-static-tool/pom.xml
Author: davidb
Date: Mon Jun 27 07:22:30 2011
New Revision: 1140032
URL: http://svn.apache.org/viewvc?rev=1140032&view=rev
Log:
Switch from direct download of eclipse jar to dependency on osgi 4.3 via maven.
Also deleted old contrib dir.
Removed:
aries/trunk/spi-fly/contrib/
aries/trunk/spi-fly/spi-fly-deps/
Modified:
aries/trunk/spi-fly/pom.xml
aries/trunk/spi-fly/spi-fly-dynamic-bundle/pom.xml
aries/trunk/spi-fly/spi-fly-static-tool/pom.xml
Modified: aries/trunk/spi-fly/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/spi-fly/pom.xml?rev=1140032&r1=1140031&r2=1140032&view=diff
==============================================================================
--- aries/trunk/spi-fly/pom.xml (original)
+++ aries/trunk/spi-fly/pom.xml Mon Jun 27 07:22:30 2011
@@ -58,7 +58,6 @@
</dependencies>
<modules>
- <module>spi-fly-deps</module>
<module>spi-fly-core</module>
<module>spi-fly-weaver</module>
<module>spi-fly-dynamic-bundle</module>
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=1140032&r1=1140031&r2=1140032&view=diff
==============================================================================
--- aries/trunk/spi-fly/spi-fly-dynamic-bundle/pom.xml (original)
+++ aries/trunk/spi-fly/spi-fly-dynamic-bundle/pom.xml Mon Jun 27 07:22:30 2011
@@ -66,17 +66,21 @@ JRE through META-INF/services resources)
<artifactId>org.apache.aries.spifly.weaver</artifactId>
<version>${project.version}</version>
</dependency>
-
+
<dependency>
- <!-- Use the Eclipse version of OSGi until the core 4.3 OSGi jar is available in Maven. -->
- <groupId>org.eclipse</groupId>
- <artifactId>osgi</artifactId>
- <version>3.7M5</version>
- <scope>system</scope>
- <systemPath>${basedir}/../spi-fly-deps/target/downloaded/org.eclipse.osgi_3.7.0.jar</systemPath>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <version>4.3.0</version>
+ <scope>provided</scope>
</dependency>
<dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
<version>3.0</version>
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=1140032&r1=1140031&r2=1140032&view=diff
==============================================================================
--- aries/trunk/spi-fly/spi-fly-static-tool/pom.xml (original)
+++ aries/trunk/spi-fly/spi-fly-static-tool/pom.xml Mon Jun 27 07:22:30 2011
@@ -51,6 +51,11 @@
<artifactId>org.apache.aries.spifly.weaver</artifactId>
<version>${project.version}</version>
</dependency>
+
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ </dependency>
</dependencies>
<build>