From: jsimomaa 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?a=commitdiff_plain;h=refs%2Fchanges%2F92%2F4192%2F2;p=simantics%2Fplatform.git 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 @@ 2.8.11 3.1.0 2.25.1 - - 2.25.1.b0006 1.5.0 1.7.30 1.7.30 @@ -82,12 +80,12 @@ org.eclipse.tycho.extras tycho-p2-extras-plugin - 1.0.0 + 1.7.0 org.reficio p2-maven-plugin - 1.2.0 + 1.3.0 default-cli @@ -446,70 +444,28 @@ org.apache.aries.spifly:org.apache.aries.spifly.dynamic.bundle:${org.apache.aries.spifly.dynamic.bundle.version} true - - org.glassfish.jersey.core:jersey-common:${jersey.version} - true - true - - ${jersey.version.actual} - *;resolution:=optional - - org.glassfish.jersey.*;version="${jersey.version}" - - - org.glassfish.jersey.core:jersey-server:${jersey.version} true - true - - ${jersey.version.actual} - *;resolution:=optional - org.glassfish.jersey.core:jersey-client:${jersey.version} true - true - - ${jersey.version.actual} - *;resolution:=optional - - org.glassfish.jersey.media:jersey-media-multipart:${jersey.version} true - - org.glassfish.jersey.ext:jersey-entity-filtering:${jersey.version} - true - true - - ${jersey.version.actual} - *;resolution:=optional - - org.glassfish.jersey.media:jersey-media-json-jackson:${jersey.version} true - true com.fasterxml.jackson.* - - ${jersey.version.actual} - *;resolution:=optional - org.glassfish.jersey.containers:jersey-container-servlet-core:${jersey.version} true - true - - ${jersey.version.actual} - *;resolution:=optional - org.jboss.windup.decompiler:decompiler-procyon:${decompiler-procyon.version}