Author: rwesten
Date: Wed Mar 28 09:53:11 2012
New Revision: 1306231
URL: http://svn.apache.org/viewvc?rev=1306231&view=rev
Log:
updates jersey from version 1.7 -> 1.12
Modified:
incubator/stanbol/trunk/launchers/bundlelists/stanbolcommons/src/main/bundles/list.xml
incubator/stanbol/trunk/parent/pom.xml
incubator/stanbol/trunk/pom.xml
Modified:
incubator/stanbol/trunk/launchers/bundlelists/stanbolcommons/src/main/bundles/list.xml
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/launchers/bundlelists/stanbolcommons/src/main/bundles/list.xml?rev=1306231&r1=1306230&r2=1306231&view=diff
==============================================================================
---
incubator/stanbol/trunk/launchers/bundlelists/stanbolcommons/src/main/bundles/list.xml
(original)
+++
incubator/stanbol/trunk/launchers/bundlelists/stanbolcommons/src/main/bundles/list.xml
Wed Mar 28 09:53:11 2012
@@ -142,7 +142,7 @@
<bundle>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-core</artifactId>
- <version>1.7</version>
+ <version>1.12</version>
</bundle>
<bundle>
<groupId>org.codehaus.jackson</groupId>
@@ -164,13 +164,18 @@
<bundle>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-server</artifactId>
- <version>1.7</version>
+ <version>1.12</version>
+ </bundle>
+ <bundle>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-servlet</artifactId>
+ <version>1.12</version>
</bundle>
<!-- needed to read data from mime multipart requests -->
<bundle>
<groupId>com.sun.jersey.contribs</groupId>
<artifactId>jersey-multipart</artifactId>
- <version>1.7</version>
+ <version>1.12</version>
</bundle>
<!-- dependency of jersey-multipart -->
<bundle>
Modified: incubator/stanbol/trunk/parent/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/parent/pom.xml?rev=1306231&r1=1306230&r2=1306231&view=diff
==============================================================================
--- incubator/stanbol/trunk/parent/pom.xml (original)
+++ incubator/stanbol/trunk/parent/pom.xml Wed Mar 28 09:53:11 2012
@@ -42,7 +42,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <jersey-version>1.7</jersey-version>
+ <jersey-version>1.12</jersey-version>
<pax-exam-version>2.3.0.M1</pax-exam-version>
</properties>
@@ -1206,6 +1206,11 @@
</dependency>
<dependency>
<groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-servlet</artifactId>
+ <version>${jersey-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.jersey</groupId>
<artifactId>jersey-core</artifactId>
<version>${jersey-version}</version>
</dependency>
Modified: incubator/stanbol/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/pom.xml?rev=1306231&r1=1306230&r2=1306231&view=diff
==============================================================================
--- incubator/stanbol/trunk/pom.xml (original)
+++ incubator/stanbol/trunk/pom.xml Wed Mar 28 09:53:11 2012
@@ -151,6 +151,8 @@
<exclude>**/*.txt</exclude>
<exclude>**/*.tsv</exclude>
<exclude>**/*.sem</exclude>
+ <!-- Open NLP model files. Not in SVN, but downloaded during
build -->
+ <exclude>**/*.bin</exclude>
<exclude>**/test/**/*.eml</exclude>
<exclude>**/test/**/*.nt</exclude>
<exclude>**/test/**/*.html</exclude>
@@ -158,8 +160,11 @@
<exclude>**/test/**/*.rdf</exclude>
<exclude>**/test/**/*.rtf</exclude>
<exclude>**/test/**/*.rules</exclude>
+ <exclude>**/test/**/*.odt</exclude>
<!-- approved licenses, see modules' POMs for details -->
+ <exclude>DEPENDENCIES</exclude>
+ <exclude>DEPENDENCIES-BY-LICENSE</exclude>
<exclude>**/src/license/THIRD-PARTY.properties</exclude>
<exclude>commons/web/home/src/main/resources/org/apache/stanbol/commons/web/home/static/scripts/jquery-1.4.2.js</exclude>
<exclude>contenthub/web/src/main/resources/org/apache/stanbol/contenthub/web/static/scripts/jit.js</exclude>
