From 4ba5873bfd8299cf0529605b748c02616a2d6c47 Mon Sep 17 00:00:00 2001
From: jsimomaa <jani.simomaa@gmail.com>
Date: Wed, 23 Aug 2017 14:45:49 +0300
Subject: [PATCH] Change jersey from 2.25.1 to 2.26 to resolve resource-locator
 problems

refs #7447

Change-Id: I9a63dc06c735fc1ac1f4902a7f21c2b721feba24
---
 releng/org.simantics.sdk.build.p2.site/pom.xml | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/releng/org.simantics.sdk.build.p2.site/pom.xml b/releng/org.simantics.sdk.build.p2.site/pom.xml
index 8b445806f..827a40e6a 100644
--- a/releng/org.simantics.sdk.build.p2.site/pom.xml
+++ b/releng/org.simantics.sdk.build.p2.site/pom.xml
@@ -15,8 +15,9 @@
         <lucene.prefix>org.apache.lucene4</lucene.prefix>
         <jdom.version>2.0.6</jdom.version>
         <jdom.version.actual>2.0.6.b0001</jdom.version.actual>
+        <jackson.version>2.8.8</jackson.version>
         <javax.version>3.1.0</javax.version>
-        <jersey.version>2.25.1</jersey.version>
+        <jersey.version>2.26-b09</jersey.version>
     </properties>
 
 
@@ -326,33 +327,28 @@
                                     <id>net.java.dev.jna:jna-platform:4.3.0</id>
                                     <source>true</source>
                                 </artifact>
-                                <!-- We do not want 1.0.1 version of this !  -->
-                                <artifact>
-                                    <id>org.glassfish.hk2:osgi-resource-locator:2.5.0-b32</id>
-                                    <source>true</source>
-                                </artifact>
                                 <artifact>
                                     <id>javax.servlet:javax.servlet-api:${javax.version}</id>
                                     <source>true</source>
                                 </artifact>
                                 <artifact>
-                                    <id>com.fasterxml.jackson.core:jackson-core:2.8.8</id>
+                                    <id>com.fasterxml.jackson.core:jackson-core:${jackson.version}</id>
                                     <source>true</source>
                                 </artifact>
                                 <artifact>
-                                    <id>com.fasterxml.jackson.core:jackson-databind:2.8.8</id>
+                                    <id>com.fasterxml.jackson.core:jackson-databind:${jackson.version}</id>
                                     <source>true</source>
                                 </artifact>
                                 <artifact>
-                                    <id>com.fasterxml.jackson.dataformat:jackson-dataformat-csv:2.8.8</id>
+                                    <id>com.fasterxml.jackson.dataformat:jackson-dataformat-csv:${jackson.version}</id>
                                     <source>true</source>
                                 </artifact>
                                 <artifact>
-                                    <id>com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.8.8</id>
+                                    <id>com.fasterxml.jackson.dataformat:jackson-dataformat-xml:${jackson.version}</id>
                                     <source>true</source>
                                 </artifact>
                                 <artifact>
-                                    <id>com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.8.8</id>
+                                    <id>com.fasterxml.jackson.datatype:jackson-datatype-jsr310:${jackson.version}</id>
                                     <source>true</source>
                                 </artifact>
                                 <artifact>
-- 
2.47.1