From: jsimomaa <jani.simomaa@gmail.com>
Date: Thu, 23 Apr 2020 11:16:21 +0000 (+0300)
Subject: Do not override jersey in p2.site pom.xml as release/1.43.0 is jdk8
X-Git-Tag: v1.43.0~36
X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=commitdiff_plain;h=8167288b723956989be31d3fda7f8cf32cdbd97d

Do not override jersey in p2.site pom.xml as release/1.43.0 is jdk8

gitlab #486

Change-Id: If9c4759de1a034cd747e3bc6cd2bd973e11c784a
---

diff --git a/releng/org.simantics.sdk.build.p2.site/pom.xml b/releng/org.simantics.sdk.build.p2.site/pom.xml
index c5f83c3fd..adc9960e5 100644
--- a/releng/org.simantics.sdk.build.p2.site/pom.xml
+++ b/releng/org.simantics.sdk.build.p2.site/pom.xml
@@ -22,8 +22,6 @@
         <jackson.version.actual>2.8.11</jackson.version.actual>
         <javax.version>3.1.0</javax.version>
         <jersey.version>2.25.1</jersey.version>
-        <!-- This can be removed once jersey version is bumped -->
-        <jersey.version.actual>2.25.1.b0006</jersey.version.actual>
         <jfreechart.version>1.5.0</jfreechart.version>
         <slf4j.version>1.7.30</slf4j.version>
         <slf4j.version.actual>1.7.30</slf4j.version.actual>
@@ -82,12 +80,12 @@
             <plugin>
                 <groupId>org.eclipse.tycho.extras</groupId>
                 <artifactId>tycho-p2-extras-plugin</artifactId>
-                <version>1.0.0</version>
+                <version>1.7.0</version>
             </plugin>
             <plugin>
                 <groupId>org.reficio</groupId>
                 <artifactId>p2-maven-plugin</artifactId>
-                <version>1.2.0</version>
+                <version>1.3.0</version>
                 <executions>
                     <execution>
                         <id>default-cli</id>
@@ -446,70 +444,28 @@
                                      <id>org.apache.aries.spifly:org.apache.aries.spifly.dynamic.bundle:${org.apache.aries.spifly.dynamic.bundle.version}</id>
                                      <source>true</source>
                                  </artifact>
-                                <artifact>
-                                    <id>org.glassfish.jersey.core:jersey-common:${jersey.version}</id>
-                                    <source>true</source>
-                                    <override>true</override>
-                                    <instructions>
-                                        <Bundle-Version>${jersey.version.actual}</Bundle-Version>
-                                        <Import-Package>*;resolution:=optional</Import-Package>
-                                        <Export-Package>
-                                            org.glassfish.jersey.*;version="${jersey.version}"
-                                        </Export-Package>
-                                    </instructions>
-                                </artifact>
                                 <artifact>
                                     <id>org.glassfish.jersey.core:jersey-server:${jersey.version}</id>
                                     <source>true</source>
-                                    <override>true</override>
-                                    <instructions>
-                                        <Bundle-Version>${jersey.version.actual}</Bundle-Version>
-                                        <Import-Package>*;resolution:=optional</Import-Package>
-                                    </instructions>
                                 </artifact>
                                 <artifact>
                                     <id>org.glassfish.jersey.core:jersey-client:${jersey.version}</id>
                                     <source>true</source>
-                                    <override>true</override>
-                                    <instructions>
-                                        <Bundle-Version>${jersey.version.actual}</Bundle-Version>
-                                        <Import-Package>*;resolution:=optional</Import-Package>
-                                    </instructions>
                                 </artifact>
-                                
                                 <artifact>
                                     <id>org.glassfish.jersey.media:jersey-media-multipart:${jersey.version}</id>
                                     <source>true</source>
                                 </artifact>
-                                <artifact>
-                                    <id>org.glassfish.jersey.ext:jersey-entity-filtering:${jersey.version}</id>
-                                    <source>true</source>
-                                    <override>true</override>
-                                    <instructions>
-                                        <Bundle-Version>${jersey.version.actual}</Bundle-Version>
-                                        <Import-Package>*;resolution:=optional</Import-Package>
-                                    </instructions>
-                                </artifact>
                                 <artifact>
                                     <id>org.glassfish.jersey.media:jersey-media-json-jackson:${jersey.version}</id>
                                     <source>true</source>
-                                    <override>true</override>
                                     <excludes>
                                         <exclude>com.fasterxml.jackson.*</exclude>
                                     </excludes>
-                                    <instructions>
-                                        <Bundle-Version>${jersey.version.actual}</Bundle-Version>
-                                        <Import-Package>*;resolution:=optional</Import-Package>
-                                    </instructions>
                                 </artifact>
                                 <artifact>
                                     <id>org.glassfish.jersey.containers:jersey-container-servlet-core:${jersey.version}</id>
                                     <source>true</source>
-                                    <override>true</override>
-                                    <instructions>
-                                        <Bundle-Version>${jersey.version.actual}</Bundle-Version>
-                                        <Import-Package>*;resolution:=optional</Import-Package>
-                                    </instructions>
                                 </artifact>
                                 <artifact>
                                     <id>org.jboss.windup.decompiler:decompiler-procyon:${decompiler-procyon.version}</id>