You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stanbol.apache.org by rw...@apache.org on 2012/12/13 10:58:50 UTC
svn commit: r1421180 - in /stanbol/trunk:
commons/installer/bundleprovider/pom.xml commons/solr/install/pom.xml
launchers/bundlelists/osgiframework/src/main/bundles/list.xml
launchers/bundlelists/stanbolcommons/src/main/bundles/list.xml parent/pom.xml
Author: rwesten
Date: Thu Dec 13 09:58:49 2012
New Revision: 1421180
URL: http://svn.apache.org/viewvc?rev=1421180&view=rev
Log:
STANBOL-841: updated Sling Installer to avoid issues with the Servlet 3.0 API
Modified:
stanbol/trunk/commons/installer/bundleprovider/pom.xml
stanbol/trunk/commons/solr/install/pom.xml
stanbol/trunk/launchers/bundlelists/osgiframework/src/main/bundles/list.xml
stanbol/trunk/launchers/bundlelists/stanbolcommons/src/main/bundles/list.xml
stanbol/trunk/parent/pom.xml
Modified: stanbol/trunk/commons/installer/bundleprovider/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/commons/installer/bundleprovider/pom.xml?rev=1421180&r1=1421179&r2=1421180&view=diff
==============================================================================
--- stanbol/trunk/commons/installer/bundleprovider/pom.xml (original)
+++ stanbol/trunk/commons/installer/bundleprovider/pom.xml Thu Dec 13 09:58:49 2012
@@ -77,7 +77,7 @@
<!-- Sling installer dependency -->
<dependency>
<groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.installer.core</artifactId>
+ <artifactId>org.apache.sling.installer.api</artifactId>
</dependency>
<dependency>
<groupId>commons-io</groupId>
Modified: stanbol/trunk/commons/solr/install/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/commons/solr/install/pom.xml?rev=1421180&r1=1421179&r2=1421180&view=diff
==============================================================================
--- stanbol/trunk/commons/solr/install/pom.xml (original)
+++ stanbol/trunk/commons/solr/install/pom.xml Thu Dec 13 09:58:49 2012
@@ -93,7 +93,7 @@
<!-- for the Solr Index Installer -->
<dependency>
<groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.installer.core</artifactId>
+ <artifactId>org.apache.sling.installer.api</artifactId>
</dependency>
<dependency>
<groupId>commons-io</groupId>
Modified: stanbol/trunk/launchers/bundlelists/osgiframework/src/main/bundles/list.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/launchers/bundlelists/osgiframework/src/main/bundles/list.xml?rev=1421180&r1=1421179&r2=1421180&view=diff
==============================================================================
--- stanbol/trunk/launchers/bundlelists/osgiframework/src/main/bundles/list.xml (original)
+++ stanbol/trunk/launchers/bundlelists/osgiframework/src/main/bundles/list.xml Thu Dec 13 09:58:49 2012
@@ -68,11 +68,16 @@
<artifactId>org.apache.felix.deploymentadmin</artifactId>
<version>0.9.0</version>
</bundle -->
- <bundle> <!-- OSGi Command Line Shell support -->
+ <bundle>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.shell</artifactId>
+ <version>1.4.3</version>
+ </bundle>
+ <!-- bundle> OSGi Command Line Shell support (replaced by org.apache.felix.shell)
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.gogo.runtime</artifactId>
<version>0.10.0</version>
- </bundle>
+ </bundle -->
<!-- <bundle>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.commons.osgi</artifactId>
@@ -132,5 +137,10 @@
<artifactId>org.apache.felix.webconsole.plugins.memoryusage</artifactId>
<version>1.0.4</version>
</bundle>
+ <bundle> <!-- The Apache Sling Installer WebConsole plugin -->
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.installer.console</artifactId>
+ <version>1.0.0</version>
+ </bundle>
</startLevel>
</bundles>
\ No newline at end of file
Modified: stanbol/trunk/launchers/bundlelists/stanbolcommons/src/main/bundles/list.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/launchers/bundlelists/stanbolcommons/src/main/bundles/list.xml?rev=1421180&r1=1421179&r2=1421180&view=diff
==============================================================================
--- stanbol/trunk/launchers/bundlelists/stanbolcommons/src/main/bundles/list.xml (original)
+++ stanbol/trunk/launchers/bundlelists/stanbolcommons/src/main/bundles/list.xml Thu Dec 13 09:58:49 2012
@@ -40,19 +40,22 @@
<startLevel level="8">
<bundle>
<groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.installer.api</artifactId>
+ <version>1.0.0</version>
+ </bundle>
+ <bundle>
+ <groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.installer.core</artifactId>
- <version>3.3.6</version>
+ <version>3.4.2</version>
</bundle>
<bundle>
<groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.installer.factory.configuration
- </artifactId>
+ <artifactId>org.apache.sling.installer.factory.configuration</artifactId>
<version>1.0.8</version>
</bundle>
<bundle>
<groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.commons.installer.bundleprovider
- </artifactId>
+ <artifactId>org.apache.stanbol.commons.installer.bundleprovider</artifactId>
<version>0.10.0-SNAPSHOT</version>
</bundle>
<bundle>
@@ -66,13 +69,18 @@
<startLevel level="9">
<bundle>
<groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.launchpad.installer</artifactId>
- <version>1.1.2</version>
+ <artifactId>org.apache.sling.launchpad.api</artifactId>
+ <version>1.1.0</version>
</bundle>
<bundle>
<groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.launchpad.api</artifactId>
- <version>1.1.0</version>
+ <artifactId>org.apache.sling.settings</artifactId>
+ <version>1.2.2</version>
+ </bundle>
+ <bundle>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.launchpad.installer</artifactId>
+ <version>1.2.0</version>
</bundle>
</startLevel>
Modified: stanbol/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/parent/pom.xml?rev=1421180&r1=1421179&r2=1421180&view=diff
==============================================================================
--- stanbol/trunk/parent/pom.xml (original)
+++ stanbol/trunk/parent/pom.xml Thu Dec 13 09:58:49 2012
@@ -1275,7 +1275,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.launchpad.installer</artifactId>
- <version>1.1.2</version>
+ <version>1.2.0</version>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
@@ -1284,8 +1284,13 @@
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.installer.api</artifactId>
+ <version>1.0.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.installer.core</artifactId>
- <version>3.3.6</version>
+ <version>3.4.2</version>
</dependency>
<!-- Apache James -->