You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stanbol.apache.org by re...@apache.org on 2013/09/18 18:58:06 UTC
svn commit: r1524490 - in /stanbol/branches/commons-ng:
commons/web/base.jersey/
commons/web/rdfviewable-writer/src/main/java/org/apache/stanbol/commons/web/rdfviewable/writer/impl/
launchers/bundlelists/stanbolcommons/src/main/bundles/ parent/
Author: reto
Date: Wed Sep 18 16:58:06 2013
New Revision: 1524490
URL: http://svn.apache.org/r1524490
Log:
CLEREZZA-823: updated jersey to 2.2
Modified:
stanbol/branches/commons-ng/commons/web/base.jersey/pom.xml
stanbol/branches/commons-ng/commons/web/rdfviewable-writer/src/main/java/org/apache/stanbol/commons/web/rdfviewable/writer/impl/RdfSerializingWriter.java
stanbol/branches/commons-ng/launchers/bundlelists/stanbolcommons/src/main/bundles/list.xml
stanbol/branches/commons-ng/parent/pom.xml
Modified: stanbol/branches/commons-ng/commons/web/base.jersey/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/commons/web/base.jersey/pom.xml?rev=1524490&r1=1524489&r2=1524490&view=diff
==============================================================================
--- stanbol/branches/commons-ng/commons/web/base.jersey/pom.xml (original)
+++ stanbol/branches/commons-ng/commons/web/base.jersey/pom.xml Wed Sep 18 16:58:06 2013
@@ -98,7 +98,7 @@
use "jersey-container-servlet-core", otherwise
"jersey-container-servlet" -->
<artifactId>jersey-container-servlet-core</artifactId>
- <version>2.0</version>
+ <version>2.2</version>
</dependency>
<!-- jersey depends on unavailable version -->
<dependency>
Modified: stanbol/branches/commons-ng/commons/web/rdfviewable-writer/src/main/java/org/apache/stanbol/commons/web/rdfviewable/writer/impl/RdfSerializingWriter.java
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/commons/web/rdfviewable-writer/src/main/java/org/apache/stanbol/commons/web/rdfviewable/writer/impl/RdfSerializingWriter.java?rev=1524490&r1=1524489&r2=1524490&view=diff
==============================================================================
--- stanbol/branches/commons-ng/commons/web/rdfviewable-writer/src/main/java/org/apache/stanbol/commons/web/rdfviewable/writer/impl/RdfSerializingWriter.java (original)
+++ stanbol/branches/commons-ng/commons/web/rdfviewable-writer/src/main/java/org/apache/stanbol/commons/web/rdfviewable/writer/impl/RdfSerializingWriter.java Wed Sep 18 16:58:06 2013
@@ -151,7 +151,7 @@ public class RdfSerializingWriter implem
}
private Set<UriRef> getSubjectExpansionProperties(GraphNode recipe) {
- final MultivaluedMap<String, String> queryParams = uriInfo.getQueryParameters();
+ final MultivaluedMap<String, String> queryParams = uriInfo.getQueryParameters(true);
final List<String> paramValues = queryParams.get(SUBJ_EXP_PARAM);
final Set<UriRef> result = new HashSet<UriRef>();
if (paramValues != null) {
@@ -173,7 +173,7 @@ public class RdfSerializingWriter implem
}
private Set<UriRef> getObjectExpansionProperties(GraphNode recipe) {
- final MultivaluedMap<String, String> queryParams = uriInfo.getQueryParameters();
+ final MultivaluedMap<String, String> queryParams = uriInfo.getQueryParameters(true);
final List<String> paramValues = queryParams.get(OBJ_EXP_PARAM);
final Set<UriRef> result = new HashSet<UriRef>();
if (paramValues != null) {
Modified: stanbol/branches/commons-ng/launchers/bundlelists/stanbolcommons/src/main/bundles/list.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/launchers/bundlelists/stanbolcommons/src/main/bundles/list.xml?rev=1524490&r1=1524489&r2=1524490&view=diff
==============================================================================
--- stanbol/branches/commons-ng/launchers/bundlelists/stanbolcommons/src/main/bundles/list.xml (original)
+++ stanbol/branches/commons-ng/launchers/bundlelists/stanbolcommons/src/main/bundles/list.xml Wed Sep 18 16:58:06 2013
@@ -241,7 +241,7 @@
use "jersey-container-servlet-core", otherwise
"jersey-container-servlet" -->
<artifactId>jersey-container-servlet-core</artifactId>
- <version>2.0</version>
+ <version>2.2</version>
</bundle>
<bundle>
<groupId>javax.validation</groupId>
@@ -251,32 +251,32 @@
<bundle>
<groupId>org.glassfish.jersey.core</groupId>
<artifactId>jersey-common</artifactId>
- <version>2.0</version>
+ <version>2.2</version>
</bundle>
<bundle>
<groupId>org.glassfish.jersey.core</groupId>
<artifactId>jersey-server</artifactId>
- <version>2.0</version>
+ <version>2.2</version>
</bundle>
<bundle>
<groupId>org.glassfish.jersey.core</groupId>
<artifactId>jersey-client</artifactId>
- <version>2.0</version>
+ <version>2.2</version>
</bundle>
<bundle>
<groupId>org.glassfish.hk2</groupId>
<artifactId>hk2-api</artifactId>
- <version>2.1.88</version>
+ <version>2.2.0-b15</version>
</bundle>
<bundle>
<groupId>org.glassfish.hk2</groupId>
<artifactId>hk2-locator</artifactId>
- <version>2.1.88</version>
+ <version>2.2.0-b15</version>
</bundle>
<bundle>
<groupId>org.glassfish.hk2</groupId>
<artifactId>hk2-utils</artifactId>
- <version>2.1.88</version>
+ <version>2.2.0-b15</version>
</bundle>
<bundle>
<groupId>org.glassfish.hk2</groupId>
Modified: stanbol/branches/commons-ng/parent/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/parent/pom.xml?rev=1524490&r1=1524489&r2=1524490&view=diff
==============================================================================
--- stanbol/branches/commons-ng/parent/pom.xml (original)
+++ stanbol/branches/commons-ng/parent/pom.xml Wed Sep 18 16:58:06 2013
@@ -1367,9 +1367,25 @@
<dependency>
<groupId>org.glassfish.jersey.core</groupId>
<artifactId>jersey-client</artifactId>
- <version>2.0</version>
+ <version>2.2</version>
<scope>test</scope>
</dependency>
+
+ <dependency>
+ <groupId>org.glassfish.hk2</groupId>
+ <artifactId>hk2-locator</artifactId>
+ <version>2.2.0-b15</version>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.hk2</groupId>
+ <artifactId>hk2-utils</artifactId>
+ <version>2.2.0-b15</version>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.hk2</groupId>
+ <artifactId>osgi-resource-locator</artifactId>
+ <version>1.0.1</version>
+ </dependency>
<!-- Test configuration to run a lightweight felix based OSGi container in
tests using JUnit4 annotation for the OSGi test setup -->