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/05/07 18:04:27 UTC
svn commit: r942139 - in
/geronimo/server/trunk/framework/configs/karaf-framework: pom.xml
src/main/filtered-resources/etc/startup.properties
src/main/history/dependencies.xml
Author: gawor
Date: Fri May 7 16:04:26 2010
New Revision: 942139
URL: http://svn.apache.org/viewvc?rev=942139&view=rev
Log:
don't need karaf.admin at this point
Modified:
geronimo/server/trunk/framework/configs/karaf-framework/pom.xml
geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/startup.properties
geronimo/server/trunk/framework/configs/karaf-framework/src/main/history/dependencies.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=942139&r1=942138&r2=942139&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/karaf-framework/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/karaf-framework/pom.xml Fri May 7 16:04:26 2010
@@ -53,7 +53,6 @@
<felix.webconsole.version>2.0.0</felix.webconsole.version>
<felix.metatype.version>1.0.2</felix.metatype.version>
<aries.blueprint.version>0.1-incubating</aries.blueprint.version>
- <geronimo.servlet.version>1.1.2</geronimo.servlet.version>
<jansi.version>1.1</jansi.version>
<jetty.bundle.version>6.1.14_1</jetty.bundle.version>
<junit.version>3.8.2_1</junit.version>
@@ -65,9 +64,6 @@
<pax.runner.version>1.2.1</pax.runner.version>
<pax.url.version>1.1.2</pax.url.version>
<pax.web.version>0.7.1</pax.web.version>
- <servlet.api.version>2.5</servlet.api.version>
- <!--<spring.osgi.version>1.2.0</spring.osgi.version>-->
- <!--<spring.version>2.5.6.SEC01</spring.version>-->
<sshd.version>0.4.0-SNAPSHOT</sshd.version>
</properties>
@@ -82,12 +78,6 @@
<scope>import</scope>
</dependency>
- <!--<dependency>-->
- <!--<groupId>org.apache.felix</groupId>-->
- <!--<artifactId>org.apache.felix.configadmin</artifactId>-->
- <!--<version>${felix.configadmin.version}</version>-->
- <!--</dependency>-->
-
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.eventadmin</artifactId>
@@ -270,11 +260,6 @@
<artifactId>org.apache.felix.karaf.shell.console</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.felix.karaf.admin</groupId>
- <artifactId>org.apache.felix.karaf.admin.core</artifactId>
- <version>${felix.karaf.version}</version>
- </dependency>
- <dependency>
<groupId>org.apache.felix.karaf.shell</groupId>
<artifactId>org.apache.felix.karaf.shell.obr</artifactId>
</dependency>
Modified: geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/startup.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/startup.properties?rev=942139&r1=942138&r2=942139&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/startup.properties (original)
+++ geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/startup.properties Fri May 7 16:04:26 2010
@@ -42,7 +42,6 @@ org/apache/felix/gogo/org.apache.felix.g
org/apache/felix/karaf/shell/org.apache.felix.karaf.shell.console/${felix.karaf.version}/org.apache.felix.karaf.shell.console-${felix.karaf.version}.jar=30
org/apache/felix/karaf/deployer/org.apache.felix.karaf.deployer.blueprint/${felix.karaf.version}/org.apache.felix.karaf.deployer.blueprint-${felix.karaf.version}.jar=30
#org/apache/felix/karaf/deployer/org.apache.felix.karaf.deployer.features/${felix.karaf.version}/org.apache.felix.karaf.deployer.features-${felix.karaf.version}.jar=30
-org/apache/felix/karaf/admin/org.apache.felix.karaf.admin.core/${felix.karaf.version}/org.apache.felix.karaf.admin.core-${felix.karaf.version}.jar=30
org/apache/felix/karaf/shell/org.apache.felix.karaf.shell.osgi/${felix.karaf.version}/org.apache.felix.karaf.shell.osgi-${felix.karaf.version}.jar=30
org/apache/felix/karaf/shell/org.apache.felix.karaf.shell.log/${felix.karaf.version}/org.apache.felix.karaf.shell.log-${felix.karaf.version}.jar=30
org/apache/felix/karaf/shell/org.apache.felix.karaf.shell.config/${felix.karaf.version}/org.apache.felix.karaf.shell.config-${felix.karaf.version}.jar=30
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=942139&r1=942138&r2=942139&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 Fri May 7 16:04:26 2010
@@ -72,11 +72,6 @@
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.apache.felix.karaf.admin</groupId>
- <artifactId>org.apache.felix.karaf.admin.core</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
<groupId>org.apache.felix.karaf.deployer</groupId>
<artifactId>org.apache.felix.karaf.deployer.blueprint</artifactId>
<type>jar</type>