You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2008/01/28 09:17:55 UTC
svn commit: r615754 - in /incubator/sling/trunk: commons/mime/ jcr/api/
jcr/classloader/ jcr/jackrabbit-client/ jcr/jackrabbit-server/ jcr/ocm/
jcr/resource/ jcr/webdav/ launchpad/launchpad-servlets/
maven/maven-jspc-plugin/ maven/maven-sling-plugin/ o...
Author: cziegeler
Date: Mon Jan 28 00:17:53 2008
New Revision: 615754
URL: http://svn.apache.org/viewvc?rev=615754&view=rev
Log:
Use OSGi core and cmpendium jars from Felix project.
Modified:
incubator/sling/trunk/commons/mime/pom.xml
incubator/sling/trunk/jcr/api/pom.xml
incubator/sling/trunk/jcr/classloader/pom.xml
incubator/sling/trunk/jcr/jackrabbit-client/pom.xml
incubator/sling/trunk/jcr/jackrabbit-server/pom.xml
incubator/sling/trunk/jcr/ocm/pom.xml
incubator/sling/trunk/jcr/resource/pom.xml
incubator/sling/trunk/jcr/webdav/pom.xml
incubator/sling/trunk/launchpad/launchpad-servlets/pom.xml
incubator/sling/trunk/maven/maven-jspc-plugin/pom.xml
incubator/sling/trunk/maven/maven-sling-plugin/pom.xml
incubator/sling/trunk/osgi/assembly/pom.xml
incubator/sling/trunk/osgi/commons/pom.xml
incubator/sling/trunk/osgi/console-web/pom.xml
incubator/sling/trunk/osgi/log/pom.xml
incubator/sling/trunk/osgi/obr/pom.xml
incubator/sling/trunk/parent/pom.xml
incubator/sling/trunk/scripting/api/pom.xml
incubator/sling/trunk/scripting/jsp-taglib/pom.xml
incubator/sling/trunk/scripting/jsp/pom.xml
incubator/sling/trunk/scripting/resolver/pom.xml
incubator/sling/trunk/sling/adapter/pom.xml
incubator/sling/trunk/sling/adapter/src/test/java/org/apache/sling/adapter/mock/MockBundle.java
incubator/sling/trunk/sling/core/pom.xml
incubator/sling/trunk/sling/event/pom.xml
incubator/sling/trunk/sling/sample/pom.xml
incubator/sling/trunk/sling/scheduler/pom.xml
incubator/sling/trunk/sling/servlet-resolver/pom.xml
incubator/sling/trunk/sling/servlets-standard/pom.xml
Modified: incubator/sling/trunk/commons/mime/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/commons/mime/pom.xml?rev=615754&r1=615753&r2=615754&view=diff
==============================================================================
--- incubator/sling/trunk/commons/mime/pom.xml (original)
+++ incubator/sling/trunk/commons/mime/pom.xml Mon Jan 28 00:17:53 2008
@@ -74,12 +74,12 @@
</build>
<dependencies>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi_R4_core</artifactId>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.core</artifactId>
</dependency>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi_R4_compendium</artifactId>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
</dependency>
<dependency>
<groupId>junit</groupId>
Modified: incubator/sling/trunk/jcr/api/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/jcr/api/pom.xml?rev=615754&r1=615753&r2=615754&view=diff
==============================================================================
--- incubator/sling/trunk/jcr/api/pom.xml (original)
+++ incubator/sling/trunk/jcr/api/pom.xml Mon Jan 28 00:17:53 2008
@@ -104,12 +104,12 @@
<!-- OSGi Libraries -->
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi_R4_core</artifactId>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.core</artifactId>
</dependency>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi_R4_compendium</artifactId>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
</dependency>
</dependencies>
Modified: incubator/sling/trunk/jcr/classloader/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/jcr/classloader/pom.xml?rev=615754&r1=615753&r2=615754&view=diff
==============================================================================
--- incubator/sling/trunk/jcr/classloader/pom.xml (original)
+++ incubator/sling/trunk/jcr/classloader/pom.xml Mon Jan 28 00:17:53 2008
@@ -113,12 +113,12 @@
<artifactId>commons-collections</artifactId>
</dependency>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi_R4_core</artifactId>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.core</artifactId>
</dependency>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi_R4_compendium</artifactId>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
</dependency>
</dependencies>
</project>
Modified: incubator/sling/trunk/jcr/jackrabbit-client/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/jcr/jackrabbit-client/pom.xml?rev=615754&r1=615753&r2=615754&view=diff
==============================================================================
--- incubator/sling/trunk/jcr/jackrabbit-client/pom.xml (original)
+++ incubator/sling/trunk/jcr/jackrabbit-client/pom.xml Mon Jan 28 00:17:53 2008
@@ -103,12 +103,12 @@
<!-- OSGi Libraries -->
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi_R4_core</artifactId>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.core</artifactId>
</dependency>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi_R4_compendium</artifactId>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
</dependency>
</dependencies>
</project>
Modified: incubator/sling/trunk/jcr/jackrabbit-server/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/jcr/jackrabbit-server/pom.xml?rev=615754&r1=615753&r2=615754&view=diff
==============================================================================
--- incubator/sling/trunk/jcr/jackrabbit-server/pom.xml (original)
+++ incubator/sling/trunk/jcr/jackrabbit-server/pom.xml Mon Jan 28 00:17:53 2008
@@ -197,12 +197,12 @@
<!-- OSGi Libraries -->
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi_R4_core</artifactId>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.core</artifactId>
</dependency>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi_R4_compendium</artifactId>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
</dependency>
<dependency>
Modified: incubator/sling/trunk/jcr/ocm/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/jcr/ocm/pom.xml?rev=615754&r1=615753&r2=615754&view=diff
==============================================================================
--- incubator/sling/trunk/jcr/ocm/pom.xml (original)
+++ incubator/sling/trunk/jcr/ocm/pom.xml Mon Jan 28 00:17:53 2008
@@ -112,12 +112,12 @@
</build>
<dependencies>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi_R4_core</artifactId>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.core</artifactId>
</dependency>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi_R4_compendium</artifactId>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
Modified: incubator/sling/trunk/jcr/resource/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/jcr/resource/pom.xml?rev=615754&r1=615753&r2=615754&view=diff
==============================================================================
--- incubator/sling/trunk/jcr/resource/pom.xml (original)
+++ incubator/sling/trunk/jcr/resource/pom.xml Mon Jan 28 00:17:53 2008
@@ -94,12 +94,12 @@
</build>
<dependencies>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi_R4_core</artifactId>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.core</artifactId>
</dependency>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi_R4_compendium</artifactId>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
Modified: incubator/sling/trunk/jcr/webdav/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/jcr/webdav/pom.xml?rev=615754&r1=615753&r2=615754&view=diff
==============================================================================
--- incubator/sling/trunk/jcr/webdav/pom.xml (original)
+++ incubator/sling/trunk/jcr/webdav/pom.xml Mon Jan 28 00:17:53 2008
@@ -152,12 +152,12 @@
<!-- OSGi Libraries -->
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi_R4_core</artifactId>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.core</artifactId>
</dependency>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi_R4_compendium</artifactId>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
</dependency>
</dependencies>
</project>
Modified: incubator/sling/trunk/launchpad/launchpad-servlets/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/launchpad-servlets/pom.xml?rev=615754&r1=615753&r2=615754&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/launchpad-servlets/pom.xml (original)
+++ incubator/sling/trunk/launchpad/launchpad-servlets/pom.xml Mon Jan 28 00:17:53 2008
@@ -69,12 +69,12 @@
<dependencies>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi_R4_core</artifactId>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.core</artifactId>
</dependency>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi_R4_compendium</artifactId>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
Modified: incubator/sling/trunk/maven/maven-jspc-plugin/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/maven/maven-jspc-plugin/pom.xml?rev=615754&r1=615753&r2=615754&view=diff
==============================================================================
--- incubator/sling/trunk/maven/maven-jspc-plugin/pom.xml (original)
+++ incubator/sling/trunk/maven/maven-jspc-plugin/pom.xml Mon Jan 28 00:17:53 2008
@@ -105,8 +105,8 @@
</dependency>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi_R4_core</artifactId>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.core</artifactId>
</dependency>
</dependencies>
</project>
Modified: incubator/sling/trunk/maven/maven-sling-plugin/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/maven/maven-sling-plugin/pom.xml?rev=615754&r1=615753&r2=615754&view=diff
==============================================================================
--- incubator/sling/trunk/maven/maven-sling-plugin/pom.xml (original)
+++ incubator/sling/trunk/maven/maven-sling-plugin/pom.xml Mon Jan 28 00:17:53 2008
@@ -61,9 +61,8 @@
<dependencies>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi_R4_core</artifactId>
- <version>1.0</version>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.core</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
Modified: incubator/sling/trunk/osgi/assembly/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/osgi/assembly/pom.xml?rev=615754&r1=615753&r2=615754&view=diff
==============================================================================
--- incubator/sling/trunk/osgi/assembly/pom.xml (original)
+++ incubator/sling/trunk/osgi/assembly/pom.xml Mon Jan 28 00:17:53 2008
@@ -80,12 +80,12 @@
<artifactId>org.apache.felix.bundlerepository</artifactId>
</dependency>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi_R4_core</artifactId>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.core</artifactId>
</dependency>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi_R4_compendium</artifactId>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
</dependency>
</dependencies>
</project>
Modified: incubator/sling/trunk/osgi/commons/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/osgi/commons/pom.xml?rev=615754&r1=615753&r2=615754&view=diff
==============================================================================
--- incubator/sling/trunk/osgi/commons/pom.xml (original)
+++ incubator/sling/trunk/osgi/commons/pom.xml Mon Jan 28 00:17:53 2008
@@ -77,12 +77,12 @@
<!-- OSGi Libraries -->
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi_R4_core</artifactId>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.core</artifactId>
</dependency>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi_R4_compendium</artifactId>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
</dependency>
<dependency>
Modified: incubator/sling/trunk/osgi/console-web/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/osgi/console-web/pom.xml?rev=615754&r1=615753&r2=615754&view=diff
==============================================================================
--- incubator/sling/trunk/osgi/console-web/pom.xml (original)
+++ incubator/sling/trunk/osgi/console-web/pom.xml Mon Jan 28 00:17:53 2008
@@ -110,12 +110,12 @@
</dependency>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi_R4_core</artifactId>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.core</artifactId>
</dependency>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi_R4_compendium</artifactId>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
</dependency>
<dependency>
Modified: incubator/sling/trunk/osgi/log/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/osgi/log/pom.xml?rev=615754&r1=615753&r2=615754&view=diff
==============================================================================
--- incubator/sling/trunk/osgi/log/pom.xml (original)
+++ incubator/sling/trunk/osgi/log/pom.xml Mon Jan 28 00:17:53 2008
@@ -128,12 +128,12 @@
<!-- OSGi Libraries not included here -->
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi_R4_core</artifactId>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.core</artifactId>
</dependency>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi_R4_compendium</artifactId>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
<scope>compile</scope>
<optional>true</optional>
</dependency>
Modified: incubator/sling/trunk/osgi/obr/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/osgi/obr/pom.xml?rev=615754&r1=615753&r2=615754&view=diff
==============================================================================
--- incubator/sling/trunk/osgi/obr/pom.xml (original)
+++ incubator/sling/trunk/osgi/obr/pom.xml Mon Jan 28 00:17:53 2008
@@ -128,12 +128,12 @@
<!-- OSGi Libraries -->
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi_R4_core</artifactId>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.core</artifactId>
</dependency>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi_R4_compendium</artifactId>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
</dependency>
<dependency>
Modified: incubator/sling/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/parent/pom.xml?rev=615754&r1=615753&r2=615754&view=diff
==============================================================================
--- incubator/sling/trunk/parent/pom.xml (original)
+++ incubator/sling/trunk/parent/pom.xml Mon Jan 28 00:17:53 2008
@@ -385,15 +385,15 @@
<dependencyManagement>
<dependencies>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi_R4_core</artifactId>
- <version>1.0</version>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <version>1.0.0</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi_R4_compendium</artifactId>
- <version>1.0</version>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ <version>1.0.0</version>
<scope>provided</scope>
</dependency>
Modified: incubator/sling/trunk/scripting/api/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/scripting/api/pom.xml?rev=615754&r1=615753&r2=615754&view=diff
==============================================================================
--- incubator/sling/trunk/scripting/api/pom.xml (original)
+++ incubator/sling/trunk/scripting/api/pom.xml Mon Jan 28 00:17:53 2008
@@ -89,12 +89,12 @@
</dependency>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi_R4_core</artifactId>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.core</artifactId>
</dependency>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi_R4_compendium</artifactId>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
</dependency>
<dependency>
Modified: incubator/sling/trunk/scripting/jsp-taglib/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/scripting/jsp-taglib/pom.xml?rev=615754&r1=615753&r2=615754&view=diff
==============================================================================
--- incubator/sling/trunk/scripting/jsp-taglib/pom.xml (original)
+++ incubator/sling/trunk/scripting/jsp-taglib/pom.xml Mon Jan 28 00:17:53 2008
@@ -88,12 +88,12 @@
<version>2.0.0-incubator-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi_R4_core</artifactId>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.core</artifactId>
</dependency>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi_R4_compendium</artifactId>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
Modified: incubator/sling/trunk/scripting/jsp/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/scripting/jsp/pom.xml?rev=615754&r1=615753&r2=615754&view=diff
==============================================================================
--- incubator/sling/trunk/scripting/jsp/pom.xml (original)
+++ incubator/sling/trunk/scripting/jsp/pom.xml Mon Jan 28 00:17:53 2008
@@ -151,12 +151,12 @@
</dependency>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi_R4_core</artifactId>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.core</artifactId>
</dependency>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi_R4_compendium</artifactId>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
</dependency>
<dependency>
<groupId>commons-collections</groupId>
Modified: incubator/sling/trunk/scripting/resolver/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/scripting/resolver/pom.xml?rev=615754&r1=615753&r2=615754&view=diff
==============================================================================
--- incubator/sling/trunk/scripting/resolver/pom.xml (original)
+++ incubator/sling/trunk/scripting/resolver/pom.xml Mon Jan 28 00:17:53 2008
@@ -101,12 +101,12 @@
</dependency>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi_R4_core</artifactId>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.core</artifactId>
</dependency>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi_R4_compendium</artifactId>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
</dependency>
<dependency>
Modified: incubator/sling/trunk/sling/adapter/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/sling/adapter/pom.xml?rev=615754&r1=615753&r2=615754&view=diff
==============================================================================
--- incubator/sling/trunk/sling/adapter/pom.xml (original)
+++ incubator/sling/trunk/sling/adapter/pom.xml Mon Jan 28 00:17:53 2008
@@ -90,12 +90,12 @@
<version>2.0.0-incubator-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi_R4_core</artifactId>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.core</artifactId>
</dependency>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi_R4_compendium</artifactId>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
Modified: incubator/sling/trunk/sling/adapter/src/test/java/org/apache/sling/adapter/mock/MockBundle.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/sling/adapter/src/test/java/org/apache/sling/adapter/mock/MockBundle.java?rev=615754&r1=615753&r2=615754&view=diff
==============================================================================
--- incubator/sling/trunk/sling/adapter/src/test/java/org/apache/sling/adapter/mock/MockBundle.java (original)
+++ incubator/sling/trunk/sling/adapter/src/test/java/org/apache/sling/adapter/mock/MockBundle.java Mon Jan 28 00:17:53 2008
@@ -24,6 +24,7 @@
import java.util.Enumeration;
import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceReference;
public class MockBundle implements Bundle {
@@ -117,6 +118,10 @@
public void update(InputStream in) {
+ }
+
+ public BundleContext getBundleContext() {
+ return null;
}
}
Modified: incubator/sling/trunk/sling/core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/sling/core/pom.xml?rev=615754&r1=615753&r2=615754&view=diff
==============================================================================
--- incubator/sling/trunk/sling/core/pom.xml (original)
+++ incubator/sling/trunk/sling/core/pom.xml Mon Jan 28 00:17:53 2008
@@ -135,12 +135,12 @@
<artifactId>commons-fileupload</artifactId>
</dependency>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi_R4_core</artifactId>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.core</artifactId>
</dependency>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi_R4_compendium</artifactId>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
Modified: incubator/sling/trunk/sling/event/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/sling/event/pom.xml?rev=615754&r1=615753&r2=615754&view=diff
==============================================================================
--- incubator/sling/trunk/sling/event/pom.xml (original)
+++ incubator/sling/trunk/sling/event/pom.xml Mon Jan 28 00:17:53 2008
@@ -83,12 +83,12 @@
</build>
<dependencies>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi_R4_core</artifactId>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.core</artifactId>
</dependency>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi_R4_compendium</artifactId>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
</dependency>
<dependency>
<groupId>javax.jcr</groupId>
Modified: incubator/sling/trunk/sling/sample/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/sling/sample/pom.xml?rev=615754&r1=615753&r2=615754&view=diff
==============================================================================
--- incubator/sling/trunk/sling/sample/pom.xml (original)
+++ incubator/sling/trunk/sling/sample/pom.xml Mon Jan 28 00:17:53 2008
@@ -143,8 +143,8 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi_R4_core</artifactId>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.core</artifactId>
</dependency>
</dependencies>
</project>
Modified: incubator/sling/trunk/sling/scheduler/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/sling/scheduler/pom.xml?rev=615754&r1=615753&r2=615754&view=diff
==============================================================================
--- incubator/sling/trunk/sling/scheduler/pom.xml (original)
+++ incubator/sling/trunk/sling/scheduler/pom.xml Mon Jan 28 00:17:53 2008
@@ -85,12 +85,12 @@
</build>
<dependencies>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi_R4_core</artifactId>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.core</artifactId>
</dependency>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi_R4_compendium</artifactId>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
Modified: incubator/sling/trunk/sling/servlet-resolver/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/sling/servlet-resolver/pom.xml?rev=615754&r1=615753&r2=615754&view=diff
==============================================================================
--- incubator/sling/trunk/sling/servlet-resolver/pom.xml (original)
+++ incubator/sling/trunk/sling/servlet-resolver/pom.xml Mon Jan 28 00:17:53 2008
@@ -116,12 +116,12 @@
<version>1.7.0</version>
</dependency>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi_R4_core</artifactId>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.core</artifactId>
</dependency>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi_R4_compendium</artifactId>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
Modified: incubator/sling/trunk/sling/servlets-standard/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/sling/servlets-standard/pom.xml?rev=615754&r1=615753&r2=615754&view=diff
==============================================================================
--- incubator/sling/trunk/sling/servlets-standard/pom.xml (original)
+++ incubator/sling/trunk/sling/servlets-standard/pom.xml Mon Jan 28 00:17:53 2008
@@ -103,12 +103,12 @@
<artifactId>slf4j-simple</artifactId>
</dependency>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi_R4_core</artifactId>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.core</artifactId>
</dependency>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi_R4_compendium</artifactId>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
</dependency>
</dependencies>
</project>