Author: rwesten
Date: Fri Feb 8 06:39:36 2013
New Revision: 1443854
URL: http://svn.apache.org/r1443854
Log:
STANBOL-915: Upgraded Sling maven-lauchpad-plugin to current released version
in the trunk. Also upgraded to commons-compress version 1.4 (after the OSGI
dependency issue got resolved). This also means that the tika engine no longer
requires to embed version 1.4 of commons-compress
Modified:
stanbol/trunk/enhancement-engines/tika/pom.xml
stanbol/trunk/parent/pom.xml
Modified: stanbol/trunk/enhancement-engines/tika/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/enhancement-engines/tika/pom.xml?rev=1443854&r1=1443853&r2=1443854&view=diff
==============================================================================
--- stanbol/trunk/enhancement-engines/tika/pom.xml (original)
+++ stanbol/trunk/enhancement-engines/tika/pom.xml Fri Feb 8 06:39:36 2013
@@ -65,11 +65,6 @@
<Private-Package>
org.apache.stanbol.enhancer.engines.tika.*
</Private-Package>
- <!-- Workaround for COMPRESS-199 -->
- <Embed-Dependency>
- commons-compress,
- xz
- </Embed-Dependency>
</instructions>
</configuration>
</plugin>
@@ -137,17 +132,9 @@
<groupId>org.apache.clerezza</groupId>
<artifactId>rdf.ontologies</artifactId>
</dependency>
- <!-- Tika 1.2 requires commons-compress 1.4.1 but this can not be used
- as OSGI bundle because of COMPRESS-199 -->
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
- <version>1.4.1</version>
- </dependency>
- <dependency>
- <groupId>org.tukaani</groupId>
- <artifactId>xz</artifactId>
- <version>1.1</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
Modified: stanbol/trunk/parent/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/parent/pom.xml?rev=1443854&r1=1443853&r2=1443854&view=diff
==============================================================================
--- stanbol/trunk/parent/pom.xml (original)
+++ stanbol/trunk/parent/pom.xml Fri Feb 8 06:39:36 2013
@@ -280,7 +280,7 @@
<plugin>
<groupId>org.apache.sling</groupId>
<artifactId>maven-launchpad-plugin</artifactId>
- <version>2.1.0</version>
+ <version>2.2.0</version>
<extensions>true</extensions>
</plugin>
<!-- generates version number of dependencies suitable for
introspection
@@ -380,7 +380,7 @@
<pluginExecutionFilter>
<groupId>org.apache.sling</groupId>
<artifactId>maven-launchpad-plugin</artifactId>
- <versionRange>[2.1.0,)</versionRange>
+ <versionRange>[2.2.0,)</versionRange>
<goals>
<goal>prepare-package</goal>
</goals>
@@ -694,8 +694,12 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
- <!-- Unable to use version 1.4+ because of COMPRESS-199 -->
- <version>1.3</version>
+ <version>1.4.1</version>
+ </dependency>
+ <dependency> <!-- dependency of commons-compress 1.4+ -->
+ <groupId>org.tukaani</groupId>
+ <artifactId>xz</artifactId>
+ <version>1.2</version>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
@@ -1313,7 +1317,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.installer.core</artifactId>
- <version>3.4.2</version>
+ <version>3.4.4</version>
</dependency>
<!-- Apache James -->
