Author: cschneider
Date: Fri Mar 23 21:22:04 2012
New Revision: 1304607
URL: http://svn.apache.org/viewvc?rev=1304607&view=rev
Log:
Using karaf.main instead of osgi core bundle to avoid build problems on jdk 7
Modified:
karaf/trunk/bundle/command/pom.xml
karaf/trunk/bundle/core/pom.xml
karaf/trunk/bundle/management/pom.xml
karaf/trunk/bundle/springstate/pom.xml
Modified: karaf/trunk/bundle/command/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/trunk/bundle/command/pom.xml?rev=1304607&r1=1304606&r2=1304607&view=diff
==============================================================================
--- karaf/trunk/bundle/command/pom.xml (original)
+++ karaf/trunk/bundle/command/pom.xml Fri Mar 23 21:22:04 2012
@@ -47,9 +47,9 @@
<artifactId>org.apache.karaf.bundle.core</artifactId>
</dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <dependency>
+ <groupId>org.apache.karaf</groupId>
+ <artifactId>org.apache.karaf.main</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
Modified: karaf/trunk/bundle/core/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/trunk/bundle/core/pom.xml?rev=1304607&r1=1304606&r2=1304607&view=diff
==============================================================================
--- karaf/trunk/bundle/core/pom.xml (original)
+++ karaf/trunk/bundle/core/pom.xml Fri Mar 23 21:22:04 2012
@@ -44,12 +44,19 @@
<artifactId>org.apache.aries.blueprint.api</artifactId>
<scope>provided</scope>
</dependency>
-
+
+ <dependency>
+ <groupId>org.apache.karaf</groupId>
+ <artifactId>org.apache.karaf.main</artifactId>
+ <scope>provided</scope>
+ </dependency>
+<!--
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
</dependency>
+ -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
Modified: karaf/trunk/bundle/management/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/trunk/bundle/management/pom.xml?rev=1304607&r1=1304606&r2=1304607&view=diff
==============================================================================
--- karaf/trunk/bundle/management/pom.xml (original)
+++ karaf/trunk/bundle/management/pom.xml Fri Mar 23 21:22:04 2012
@@ -43,9 +43,9 @@
<artifactId>org.apache.karaf.bundle.core</artifactId>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <dependency>
+ <groupId>org.apache.karaf</groupId>
+ <artifactId>org.apache.karaf.main</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
Modified: karaf/trunk/bundle/springstate/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/trunk/bundle/springstate/pom.xml?rev=1304607&r1=1304606&r2=1304607&view=diff
==============================================================================
--- karaf/trunk/bundle/springstate/pom.xml (original)
+++ karaf/trunk/bundle/springstate/pom.xml Fri Mar 23 21:22:04 2012
@@ -46,9 +46,9 @@
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <dependency>
+ <groupId>org.apache.karaf</groupId>
+ <artifactId>org.apache.karaf.main</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
