From: Jani Simomaa <jani.simomaa@semantum.fi>
Date: Thu, 16 Apr 2020 08:55:47 +0000 (+0000)
Subject: Merge "Add missing javax.servlet-api bundle requirement for jersey bundles"
X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=commitdiff_plain;h=1ecae6e1ad40507badb8807fb14bb67b4adf199c;hp=08c2bc8c90c7342582fd792bbeeaa16d6c18f9b1

Merge "Add missing javax.servlet-api bundle requirement for jersey bundles"
---

diff --git a/releng/org.simantics.sdk.build.p2.site/pom.xml b/releng/org.simantics.sdk.build.p2.site/pom.xml
index 9c3e9fae3..ec095415a 100644
--- a/releng/org.simantics.sdk.build.p2.site/pom.xml
+++ b/releng/org.simantics.sdk.build.p2.site/pom.xml
@@ -26,7 +26,7 @@
         <jakarta.version.actual>2.1.6.b0005</jakarta.version.actual>
         <jersey.version>2.30.1</jersey.version>
         <!-- This can be removed once jersey version is bumped -->
-        <jersey.version.actual>2.30.1.b0005</jersey.version.actual>
+        <jersey.version.actual>2.30.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>
@@ -478,6 +478,7 @@
                                         <Require-Bundle>
                                              javax.annotation,
                                              javax.inject,
+                                             javax.servlet-api,
                                              jakarta.validation.jakarta.validation-api,
                                              jakarta.ws.rs-api,
                                              jakarta.xml.bind-api
@@ -497,6 +498,7 @@
                                         <Require-Bundle>
                                              javax.annotation,
                                              javax.inject,
+                                             javax.servlet-api,
                                              jakarta.validation.jakarta.validation-api,
                                              jakarta.ws.rs-api,
                                              jakarta.xml.bind-api
@@ -513,6 +515,7 @@
                                         <Require-Bundle>
                                              javax.annotation,
                                              javax.inject,
+                                             javax.servlet-api,
                                              jakarta.validation.jakarta.validation-api,
                                              jakarta.ws.rs-api,
                                              jakarta.xml.bind-api
@@ -542,6 +545,7 @@
                                         <Bundle-Version>${jersey.version.actual}</Bundle-Version>
                                         <Require-Bundle>
                                              jakarta.ws.rs-api,
+                                             javax.servlet-api,
                                              org.glassfish.jersey.core.jersey-server
                                         </Require-Bundle>
                                         <Import-Package>!javax.*,*;resolution:=optional</Import-Package>
@@ -559,6 +563,7 @@
                                         <Require-Bundle>
                                              javax.annotation,
                                              javax.inject,
+                                             javax.servlet-api,
                                              jakarta.validation.jakarta.validation-api,
                                              jakarta.ws.rs-api,
                                              jakarta.xml.bind-api
@@ -575,6 +580,7 @@
                                         <Require-Bundle>
                                              javax.annotation,
                                              javax.inject,
+                                             javax.servlet-api,
                                              jakarta.validation.jakarta.validation-api,
                                              jakarta.ws.rs-api,
                                              jakarta.xml.bind-api