aries-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jwr...@apache.org
Subject svn commit: r1376053 - in /aries/trunk/subsystem: subsystem-api/ subsystem-api/src/main/java/org/osgi/service/repository/ subsystem-api/src/main/java/org/osgi/service/resolver/ subsystem-core/ subsystem-itests/ subsystem-itests/src/test/java/org/apache...
Date Wed, 22 Aug 2012 13:56:11 GMT
Author: jwross
Date: Wed Aug 22 13:56:10 2012
New Revision: 1376053

URL: http://svn.apache.org/viewvc?rev=1376053&view=rev
Log:
Deleted repository and resolver packages from subsystem-api project. Those APIs are now available
in org.osgi.enterprise 5.0.0. The only API provided by subsystem-api should be the Subsystem
API.

Also changed POM dependencies from org.eclipse.equinox to the generic org.osgi.core and org.osgi.enterprise
where applicable.

Removed:
    aries/trunk/subsystem/subsystem-api/src/main/java/org/osgi/service/repository/
    aries/trunk/subsystem/subsystem-api/src/main/java/org/osgi/service/resolver/
Modified:
    aries/trunk/subsystem/subsystem-api/pom.xml
    aries/trunk/subsystem/subsystem-core/pom.xml
    aries/trunk/subsystem/subsystem-itests/pom.xml
    aries/trunk/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/SubsystemTest.java

Modified: aries/trunk/subsystem/subsystem-api/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/subsystem/subsystem-api/pom.xml?rev=1376053&r1=1376052&r2=1376053&view=diff
==============================================================================
--- aries/trunk/subsystem/subsystem-api/pom.xml (original)
+++ aries/trunk/subsystem/subsystem-api/pom.xml Wed Aug 22 13:56:10 2012
@@ -42,15 +42,15 @@
     <properties>
          <!-- Export package versions are maintained in packageinfo files -->
         <aries.osgi.export.pkg>
-            org.osgi.service.repository,org.osgi.service.resolver,org.osgi.service.subsystem
+            org.osgi.service.subsystem
         </aries.osgi.export.pkg>
     </properties>
 
     <dependencies>
         <dependency>
-            <groupId>org.eclipse</groupId>
-            <artifactId>org.eclipse.osgi</artifactId>
-            <version>3.8.0-SNAPSHOT</version>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.core</artifactId>
+            <version>5.0.0</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>

Modified: aries/trunk/subsystem/subsystem-core/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/subsystem/subsystem-core/pom.xml?rev=1376053&r1=1376052&r2=1376053&view=diff
==============================================================================
--- aries/trunk/subsystem/subsystem-core/pom.xml (original)
+++ aries/trunk/subsystem/subsystem-core/pom.xml Wed Aug 22 13:56:10 2012
@@ -46,12 +46,7 @@
         <aries.osgi.private.pkg>
         	org.apache.aries.subsystem.core,
         	org.apache.aries.subsystem.core.archive,
-            org.apache.aries.subsystem.core.internal,
-            org.apache.aries.subsystem.core.obr,
-            org.apache.aries.subsystem.core.obr.felix,
-            org.apache.aries.subsystem.core.resource,
-            org.apache.felix.resolver,
-            org.apache.felix.resolver.impl
+            org.apache.aries.subsystem.core.internal
         </aries.osgi.private.pkg>
          <aries.osgi.import>
          	*
@@ -104,9 +99,15 @@
             </exclusions>
         </dependency>
     	<dependency>
-            <groupId>org.eclipse</groupId>
-            <artifactId>org.eclipse.osgi</artifactId>
-            <version>3.8.0-SNAPSHOT</version>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.core</artifactId>
+            <version>5.0.0</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.enterprise</artifactId>
+            <version>5.0.0</version>
             <scope>provided</scope>
         </dependency>
     	<dependency>

Modified: aries/trunk/subsystem/subsystem-itests/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/subsystem/subsystem-itests/pom.xml?rev=1376053&r1=1376052&r2=1376053&view=diff
==============================================================================
--- aries/trunk/subsystem/subsystem-itests/pom.xml (original)
+++ aries/trunk/subsystem/subsystem-itests/pom.xml Wed Aug 22 13:56:10 2012
@@ -185,10 +185,10 @@
             </exclusions>
         </dependency>
         <dependency>
-            <groupId>org.eclipse</groupId>
-            <artifactId>org.eclipse.osgi</artifactId>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.core</artifactId>
             <scope>test</scope>
-            <version>3.8.0-SNAPSHOT</version>
+            <version>5.0.0</version>
         </dependency>
     	<dependency>
             <groupId>org.eclipse.equinox</groupId>
@@ -197,10 +197,10 @@
             <version>3.8.0-SNAPSHOT</version>
         </dependency>
         <dependency>
-            <groupId>org.eclipse.osgi</groupId>
-            <artifactId>org.eclipse.osgi.services</artifactId>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.enterprise</artifactId>
             <scope>test</scope>
-            <version>3.8.0-SNAPSHOT</version>
+            <version>5.0.0</version>
         </dependency>
         <dependency>
             <groupId>org.ops4j.pax.exam</groupId>

Modified: aries/trunk/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/SubsystemTest.java
URL: http://svn.apache.org/viewvc/aries/trunk/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/SubsystemTest.java?rev=1376053&r1=1376052&r2=1376053&view=diff
==============================================================================
--- aries/trunk/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/SubsystemTest.java
(original)
+++ aries/trunk/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/SubsystemTest.java
Wed Aug 22 13:56:10 2012
@@ -186,7 +186,7 @@ public abstract class SubsystemTest exte
 				// Felix mvn url handler
 				mavenBundle("org.ops4j.pax.url", "pax-url-mvn"),
 				// Bundles
-				mavenBundle("org.eclipse.osgi", "org.eclipse.osgi.services").version("3.8.0-SNAPSHOT"),
+				mavenBundle("org.osgi", "org.osgi.enterprise").version("5.0.0"),
 				mavenBundle("org.eclipse.equinox", "org.eclipse.equinox.region").version("3.8.0-SNAPSHOT"),
 				mavenBundle("org.apache.aries.testsupport", "org.apache.aries.testsupport.unit"),
 				mavenBundle("org.apache.aries.application", "org.apache.aries.application.api"),



Mime
View raw message