Author: rwesten
Date: Tue Oct 20 07:43:36 2015
New Revision: 1709525
URL: http://svn.apache.org/viewvc?rev=1709525&view=rev
Log:
applied changed related to STANBOL-1444 to all the launcher
Modified:
stanbol/trunk/launchers/bundlelists/osgiframework/src/main/bundles/list.xml
stanbol/trunk/launchers/full-war/pom.xml
stanbol/trunk/launchers/full/pom.xml
stanbol/trunk/launchers/mini-war/pom.xml
stanbol/trunk/launchers/mini/pom.xml
stanbol/trunk/launchers/stable-war/pom.xml
stanbol/trunk/launchers/stable/pom.xml
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=1709525&r1=1709524&r2=1709525&view=diff
==============================================================================
--- stanbol/trunk/launchers/bundlelists/osgiframework/src/main/bundles/list.xml
(original)
+++ stanbol/trunk/launchers/bundlelists/osgiframework/src/main/bundles/list.xml
Tue Oct 20 07:43:36 2015
@@ -87,12 +87,12 @@
<bundle>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.commons.log</artifactId>
- <version>4.0.2</version>
+ <version>4.0.6</version>
</bundle>
<bundle>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.commons.logservice</artifactId>
- <version>1.0.4</version>
+ <version>1.0.6</version>
</bundle>
<bundle>
<groupId>org.slf4j</groupId>
Modified: stanbol/trunk/launchers/full-war/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/launchers/full-war/pom.xml?rev=1709525&r1=1709524&r2=1709525&view=diff
==============================================================================
--- stanbol/trunk/launchers/full-war/pom.xml (original)
+++ stanbol/trunk/launchers/full-war/pom.xml Tue Oct 20 07:43:36 2015
@@ -61,11 +61,12 @@
<goals>
<goal>prepare-package</goal>
</goals>
- <configuration>
- <includeDefaultBundles>false</includeDefaultBundles>
- </configuration>
</execution>
</executions>
+ <configuration>
+ <!-- Stanbol does not need the default Sling bundles -->
+ <includeDefaultBundles>false</includeDefaultBundles>
+ </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Modified: stanbol/trunk/launchers/full/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/launchers/full/pom.xml?rev=1709525&r1=1709524&r2=1709525&view=diff
==============================================================================
--- stanbol/trunk/launchers/full/pom.xml (original)
+++ stanbol/trunk/launchers/full/pom.xml Tue Oct 20 07:43:36 2015
@@ -75,7 +75,6 @@
<goal>prepare-package</goal>
</goals>
<configuration>
- <includeDefaultBundles>false</includeDefaultBundles>
<!-- Standalone jar requires an OSGi http service implementation
-->
<jarWebSupport>
<bundles>
@@ -98,6 +97,10 @@
</configuration>
</execution>
</executions>
+ <configuration>
+ <!-- Stanbol does not need the default Sling bundles -->
+ <includeDefaultBundles>false</includeDefaultBundles>
+ </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Modified: stanbol/trunk/launchers/mini-war/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/launchers/mini-war/pom.xml?rev=1709525&r1=1709524&r2=1709525&view=diff
==============================================================================
--- stanbol/trunk/launchers/mini-war/pom.xml (original)
+++ stanbol/trunk/launchers/mini-war/pom.xml Tue Oct 20 07:43:36 2015
@@ -61,11 +61,12 @@
<goals>
<goal>prepare-package</goal>
</goals>
- <configuration>
- <includeDefaultBundles>false</includeDefaultBundles>
- </configuration>
</execution>
</executions>
+ <configuration>
+ <!-- Stanbol does not need the default Sling bundles -->
+ <includeDefaultBundles>false</includeDefaultBundles>
+ </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Modified: stanbol/trunk/launchers/mini/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/launchers/mini/pom.xml?rev=1709525&r1=1709524&r2=1709525&view=diff
==============================================================================
--- stanbol/trunk/launchers/mini/pom.xml (original)
+++ stanbol/trunk/launchers/mini/pom.xml Tue Oct 20 07:43:36 2015
@@ -77,7 +77,6 @@
<goal>prepare-package</goal>
</goals>
<configuration>
- <includeDefaultBundles>false</includeDefaultBundles>
<!-- Standalone jar requires an OSGi http service implementation
-->
<jarWebSupport>
<bundles>
@@ -100,6 +99,10 @@
</configuration>
</execution>
</executions>
+ <configuration>
+ <!-- Stanbol does not need the default Sling bundles -->
+ <includeDefaultBundles>false</includeDefaultBundles>
+ </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Modified: stanbol/trunk/launchers/stable-war/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/launchers/stable-war/pom.xml?rev=1709525&r1=1709524&r2=1709525&view=diff
==============================================================================
--- stanbol/trunk/launchers/stable-war/pom.xml (original)
+++ stanbol/trunk/launchers/stable-war/pom.xml Tue Oct 20 07:43:36 2015
@@ -65,11 +65,12 @@
<goals>
<goal>prepare-package</goal>
</goals>
- <configuration>
- <includeDefaultBundles>false</includeDefaultBundles>
- </configuration>
</execution>
</executions>
+ <configuration>
+ <!-- Stanbol does not need the default Sling bundles -->
+ <includeDefaultBundles>false</includeDefaultBundles>
+ </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Modified: stanbol/trunk/launchers/stable/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/launchers/stable/pom.xml?rev=1709525&r1=1709524&r2=1709525&view=diff
==============================================================================
--- stanbol/trunk/launchers/stable/pom.xml (original)
+++ stanbol/trunk/launchers/stable/pom.xml Tue Oct 20 07:43:36 2015
@@ -79,7 +79,6 @@
<goal>prepare-package</goal>
</goals>
<configuration>
- <includeDefaultBundles>false</includeDefaultBundles>
<!-- Standalone jar requires an OSGi http service implementation
-->
<jarWebSupport>
<bundles>
@@ -102,6 +101,10 @@
</configuration>
</execution>
</executions>
+ <configuration>
+ <!-- Stanbol does not need the default Sling bundles -->
+ <includeDefaultBundles>false</includeDefaultBundles>
+ </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
