You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ga...@apache.org on 2010/04/27 21:54:11 UTC
svn commit: r938624 - in /geronimo/server/trunk:
framework/configs/karaf-framework/pom.xml
framework/configs/karaf-framework/src/main/history/dependencies.xml pom.xml
Author: gawor
Date: Tue Apr 27 19:54:10 2010
New Revision: 938624
URL: http://svn.apache.org/viewvc?rev=938624&view=rev
Log:
use 1.6 version of bundlerepoistory and make sure felix core & compendium bundles are not included with the framework
Modified:
geronimo/server/trunk/framework/configs/karaf-framework/pom.xml
geronimo/server/trunk/framework/configs/karaf-framework/src/main/history/dependencies.xml
geronimo/server/trunk/pom.xml
Modified: geronimo/server/trunk/framework/configs/karaf-framework/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/karaf-framework/pom.xml?rev=938624&r1=938623&r2=938624&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/karaf-framework/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/karaf-framework/pom.xml Tue Apr 27 19:54:10 2010
@@ -41,7 +41,7 @@
<depends.maven.plugin.version>1.0</depends.maven.plugin.version>
<easymock.version>2.4</easymock.version>
<equinox.version>3.5.1.v20090827</equinox.version>
- <felix.bundlerepository.version>1.5.0-SNAPSHOT</felix.bundlerepository.version>
+ <felix.bundlerepository.version>1.6.0</felix.bundlerepository.version>
<felix.compendium.version>1.2.0</felix.compendium.version>
<felix.configadmin.version>1.2.4</felix.configadmin.version>
<felix.fileinstall.version>2.0.8</felix.fileinstall.version>
@@ -104,6 +104,14 @@
<groupId>net.sf.kxml</groupId>
<artifactId>kxml2</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ </exclusion>
</exclusions>
</dependency>
@@ -116,6 +124,10 @@
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ </exclusion>
</exclusions>
</dependency>
@@ -369,10 +381,6 @@
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.configadmin</artifactId>
</dependency>
<dependency>
Modified: geronimo/server/trunk/framework/configs/karaf-framework/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/karaf-framework/src/main/history/dependencies.xml?rev=938624&r1=938623&r2=938624&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/karaf-framework/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/framework/configs/karaf-framework/src/main/history/dependencies.xml Tue Apr 27 19:54:10 2010
@@ -57,16 +57,6 @@
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.osgi.core</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
<groupId>org.apache.felix.gogo</groupId>
<artifactId>org.apache.felix.gogo.commands</artifactId>
<type>jar</type>
Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=938624&r1=938623&r2=938624&view=diff
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Tue Apr 27 19:54:10 2010
@@ -1880,7 +1880,7 @@ only found in cxf
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.bundlerepository</artifactId>
- <version>1.5.0-SNAPSHOT</version>
+ <version>1.6.0</version>
<exclusions>
<exclusion>
<groupId>org.apache.felix</groupId>