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 2014/04/18 14:11:27 UTC
svn commit: r1588454 - in /stanbol/trunk: ./ commons/solr/core/
enhancement-engines/ enhancement-engines/dereference/entityhub/
enhancement-engines/lucenefstlinking/
launchers/bundlelists/osgiframework/src/main/bundles/
launchers/bundlelists/stanbolcom...
Author: rwesten
Date: Fri Apr 18 12:11:26 2014
New Revision: 1588454
URL: http://svn.apache.org/r1588454
Log:
most changes for STANBOL-1324 for 1.0.0. Also updated jersey from 2.2 to 2.7 (including all dependencies). The update from Guava from 14.* to 16.* is prepaired, but currently not possible because the clerezza jena tdb module does not allow for it (see first comment on STANBOL-1296 for details)
Modified:
stanbol/trunk/ (props changed)
stanbol/trunk/commons/solr/core/pom.xml
stanbol/trunk/enhancement-engines/ (props changed)
stanbol/trunk/enhancement-engines/dereference/entityhub/pom.xml
stanbol/trunk/enhancement-engines/lucenefstlinking/pom.xml
stanbol/trunk/launchers/bundlelists/osgiframework/src/main/bundles/list.xml
stanbol/trunk/launchers/bundlelists/stanbolcommons/src/main/bundles/list.xml
Propchange: stanbol/trunk/
------------------------------------------------------------------------------
Merged /stanbol/branches/release-0.12:r1588447,1588449
Modified: stanbol/trunk/commons/solr/core/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/commons/solr/core/pom.xml?rev=1588454&r1=1588453&r2=1588454&view=diff
==============================================================================
--- stanbol/trunk/commons/solr/core/pom.xml (original)
+++ stanbol/trunk/commons/solr/core/pom.xml Fri Apr 18 12:11:26 2014
@@ -89,6 +89,7 @@
org.restlet;resolution:=optional,
org.restlet.*;resolution:=optional,
org.apache.hadoop.*;resolution:=optional,
+ com.google.common.*; version="[14.0.0,18.0.0)",
*
</Import-Package>
<DynamicImport-Package>*</DynamicImport-Package>
Propchange: stanbol/trunk/enhancement-engines/
------------------------------------------------------------------------------
Merged /stanbol/branches/release-0.12/enhancement-engines:r1588447
Modified: stanbol/trunk/enhancement-engines/dereference/entityhub/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/enhancement-engines/dereference/entityhub/pom.xml?rev=1588454&r1=1588453&r2=1588454&view=diff
==============================================================================
--- stanbol/trunk/enhancement-engines/dereference/entityhub/pom.xml (original)
+++ stanbol/trunk/enhancement-engines/dereference/entityhub/pom.xml Fri Apr 18 12:11:26 2014
@@ -58,6 +58,7 @@
<configuration>
<instructions>
<Import-Package>
+ com.google.common.*; version="[14.0.0,18.0.0)",
org.apache.stanbol.enhancer.engines.dereference;version=${project.version}; provide:=true,
*
</Import-Package>
Modified: stanbol/trunk/enhancement-engines/lucenefstlinking/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/enhancement-engines/lucenefstlinking/pom.xml?rev=1588454&r1=1588453&r2=1588454&view=diff
==============================================================================
--- stanbol/trunk/enhancement-engines/lucenefstlinking/pom.xml (original)
+++ stanbol/trunk/enhancement-engines/lucenefstlinking/pom.xml Fri Apr 18 12:11:26 2014
@@ -62,6 +62,7 @@
<instructions>
<Import-Package>
!org.mitre.solr.tagger.*,
+ com.google.common.*; version="[14.0.0,18.0.0)",
org.apache.stanbol.enhancer.servicesapi; provide:=true; version="[0.10,1.1)",
org.apache.stanbol.enhancer.engines.entitylinking;version=${project.version}; provide:=true,
*
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=1588454&r1=1588453&r2=1588454&view=diff
==============================================================================
--- stanbol/trunk/launchers/bundlelists/osgiframework/src/main/bundles/list.xml (original)
+++ stanbol/trunk/launchers/bundlelists/osgiframework/src/main/bundles/list.xml Fri Apr 18 12:11:26 2014
@@ -172,6 +172,8 @@
<artifactId>org.apache.felix.webconsole.plugins.memoryusage</artifactId>
<version>1.0.4</version>
</bundle>
+ </startLevel>
+ <startLevel level="20">
<!-- required by org.apache.felix.webconsole.plugins.packageadmin -->
<bundle>
<groupId>commons-io</groupId>
@@ -181,7 +183,7 @@
<bundle>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
- <version>1.3</version>
+ <version>1.3.1</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=1588454&r1=1588453&r2=1588454&view=diff
==============================================================================
--- stanbol/trunk/launchers/bundlelists/stanbolcommons/src/main/bundles/list.xml (original)
+++ stanbol/trunk/launchers/bundlelists/stanbolcommons/src/main/bundles/list.xml Fri Apr 18 12:11:26 2014
@@ -106,7 +106,7 @@
<bundle>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
- <version>3.2.1</version>
+ <version>3.3.2</version>
</bundle>
<bundle>
<groupId>commons-collections</groupId>
@@ -116,32 +116,33 @@
<bundle>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
- <version>1.6</version>
+ <version>1.8</version>
</bundle>
<bundle>
<groupId>org.tukaani</groupId>
<artifactId>xz</artifactId>
- <version>1.4</version>
+ <version>1.5</version>
</bundle>
<bundle>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
- <version>1.8</version>
+ <version>1.9</version>
</bundle>
<bundle> <!-- commons-beanutils as bundle provided by servicemix.apache.org -->
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.commons-beanutils</artifactId>
- <version>1.8.3_1</version>
+ <version>1.8.3_2</version>
</bundle>
<bundle>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
+ <!-- TODO: update to 16.0.1 -->
<version>14.0.1</version>
</bundle>
<bundle> <!-- used by Solr4 spatial -->
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.spatial4j</artifactId>
- <version>0.3_2</version>
+ <groupId>com.spatial4j</groupId>
+ <artifactId>spatial4j</artifactId>
+ <version>0.4.1</version>
</bundle>
<bundle> <!-- used by Lucene core -->
<groupId>com.googlecode.concurrentlinkedhashmap</groupId>
@@ -163,16 +164,6 @@
<artifactId>httpclient-osgi</artifactId>
<version>4.3.1</version>
</bundle>
- <!-- bundle> Stax is included in JDK 1.6+
- <groupId>org.apache.servicemix.specs</groupId>
- <artifactId>org.apache.servicemix.specs.stax-api-1.0</artifactId>
- <version>2.1.0</version>
- </bundle -->
- <!-- bundle> - no longer used by Stanbol -
- <groupId>org.codehaus.woodstox</groupId>
- <artifactId>woodstox-core-asl</artifactId>
- <version>4.2.0</version>
- </bundle -->
<bundle> <!-- jarkata regexp as bundle provided by servicemix.apache.org -->
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.regexp</artifactId>
@@ -187,22 +178,22 @@
<bundle> <!-- used for simple JSON parsing/writing in Stanbol -->
<groupId>org.codehaus.jettison</groupId>
<artifactId>jettison</artifactId>
- <version>1.3.3</version>
+ <version>1.3.5</version>
</bundle>
<bundle> <!-- used for stream parsing/serialization -->
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-core-asl</artifactId>
- <version>1.9.12</version>
+ <version>1.9.13</version>
</bundle>
<bundle> <!-- JSON Tree model and JSON - Object mappings -->
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-mapper-asl</artifactId>
- <version>1.9.12</version>
+ <version>1.9.13</version>
</bundle>
<bundle> <!-- for JAX-RS integration -->
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-jaxrs</artifactId>
- <version>1.9.12</version>
+ <version>1.9.13</version>
</bundle>
<!-- Velocity -->
<!-- only used by Enhancer Benchmarking (org.apache.stanbol.enhancer.benchmark) -->
@@ -219,7 +210,7 @@
<bundle>
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
- <version>1.4.5</version>
+ <version>1.4.7</version>
</bundle>
</startLevel>
<!-- Jersey -->
@@ -246,7 +237,7 @@
use "jersey-container-servlet-core", otherwise
"jersey-container-servlet" -->
<artifactId>jersey-container-servlet-core</artifactId>
- <version>2.2</version>
+ <version>2.7</version>
</bundle>
<bundle>
<groupId>javax.validation</groupId>
@@ -256,32 +247,32 @@
<bundle>
<groupId>org.glassfish.jersey.core</groupId>
<artifactId>jersey-common</artifactId>
- <version>2.2</version>
+ <version>2.7</version>
</bundle>
<bundle>
<groupId>org.glassfish.jersey.core</groupId>
<artifactId>jersey-server</artifactId>
- <version>2.2</version>
+ <version>2.7</version>
</bundle>
<bundle>
<groupId>org.glassfish.jersey.core</groupId>
<artifactId>jersey-client</artifactId>
- <version>2.2</version>
+ <version>2.7</version>
</bundle>
<bundle>
<groupId>org.glassfish.hk2</groupId>
<artifactId>hk2-api</artifactId>
- <version>2.2.0-b15</version>
+ <version>2.2.0</version>
</bundle>
<bundle>
<groupId>org.glassfish.hk2</groupId>
<artifactId>hk2-locator</artifactId>
- <version>2.2.0-b15</version>
+ <version>2.2.0</version>
</bundle>
<bundle>
<groupId>org.glassfish.hk2</groupId>
<artifactId>hk2-utils</artifactId>
- <version>2.2.0-b15</version>
+ <version>2.2.0</version>
</bundle>
<bundle>
<groupId>org.glassfish.hk2</groupId>
@@ -289,26 +280,41 @@
<version>1.0.1</version>
</bundle>
-<bundle>
+ <bundle>
<groupId>org.glassfish.hk2.external</groupId>
<artifactId>javax.inject</artifactId>
- <version>2.1.88</version>
+ <version>2.2.0</version>
</bundle>
<bundle>
<groupId>org.glassfish.hk2.external</groupId>
<artifactId>asm-all-repackaged</artifactId>
- <version>2.1.88</version>
+ <version>2.2.0</version>
</bundle>
<bundle>
<groupId>org.glassfish.hk2.external</groupId>
<artifactId>cglib</artifactId>
- <version>2.1.88</version>
+ <version>2.2.0-b23</version>
+</bundle>
+<bundle>
+ <groupId>org.glassfish.hk2.external</groupId>
+ <artifactId>aopalliance-repackaged</artifactId>
+ <version>2.2.0</version>
+</bundle>
+<bundle>
+ <groupId>org.javassist</groupId>
+ <artifactId>javassist</artifactId>
+ <version>3.18.0-GA</version>
+</bundle>
+<bundle>
+ <groupId>org.glassfish.jersey.bundles.repackaged</groupId>
+ <artifactId>jersey-guava</artifactId>
+ <version>2.7</version>
</bundle>
<bundle>
<groupId>javax.ws.rs</groupId>
<artifactId>javax.ws.rs-api</artifactId>
<version>2.0</version>
-</bundle>
+ </bundle>
</startLevel>
<startLevel level="25">
@@ -330,11 +336,11 @@
</bundle>
<!-- dependency of jersey-multipart -->
- <bundle>
+ <!-- bundle>
<groupId>org.jvnet</groupId>
<artifactId>mimepull</artifactId>
- <version>1.4</version>
- </bundle>
+ <version>1.6</version>
+ </bundle -->
<!-- MessageBodyReaders and Writers for Clereza RDF entities -->
<bundle>
<groupId>org.apache.clerezza</groupId>
@@ -507,12 +513,12 @@
<bundle>
<groupId>org.apache.opennlp</groupId>
<artifactId>opennlp-maxent</artifactId>
- <version>3.0.2-incubating</version>
+ <version>3.0.3</version>
</bundle>
<bundle>
<groupId>org.apache.opennlp</groupId>
<artifactId>opennlp-tools</artifactId>
- <version>1.5.2-incubating</version>
+ <version>1.5.3</version>
</bundle>
<bundle>
<groupId>org.apache.stanbol</groupId>