You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2012/01/06 03:39:19 UTC
svn commit: r1227943 - /geronimo/server/trunk/pom.xml
Author: djencks
Date: Fri Jan 6 02:39:19 2012
New Revision: 1227943
URL: http://svn.apache.org/viewvc?rev=1227943&view=rev
Log:
hack to workaround karaf including osgi core classes
Modified:
geronimo/server/trunk/pom.xml
Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=1227943&r1=1227942&r2=1227943&view=diff
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Fri Jan 6 02:39:19 2012
@@ -1693,11 +1693,12 @@ only found in cxf
<version>${equinox.version}</version>
</dependency>
- <!--<dependency>-->
- <!--<groupId>org.osgi</groupId>-->
- <!--<artifactId>org.osgi.core</artifactId>-->
- <!--<version>4.3.0</version>-->
- <!--</dependency>-->
+ <!-- todo karaf now includes these classes, get rid of this? Most likely will cause java 7 compilation problems-->
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <version>4.3.0</version>
+ </dependency>
<!--<dependency>-->
<!--<groupId>org.osgi</groupId>-->