From 0d89902f6f2de84cf2e90695f907d50634e6d15b Mon Sep 17 00:00:00 2001 From: Steffen Schaefer Date: Mon, 21 Nov 2016 13:48:23 +0100 Subject: [PATCH] Consistently using servlet API 3.1. There was an export of javax.servlet in the GWT bundles that had version 2.x but was 3.x. The GWT bundles do not export servlet API anymore, so everything can consistently be on servlet version 3.1 that is provided by our jetty server. --- .../META-INF/MANIFEST.MF | 2 +- java/com.sap.sailing.server.gateway/META-INF/MANIFEST.MF | 2 +- java/com.sap.sse.security.ui/META-INF/MANIFEST.MF | 2 +- java/com.sap.sse.security/META-INF/MANIFEST.MF | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/java/com.sap.sailing.server.gateway.test.support/META-INF/MANIFEST.MF b/java/com.sap.sailing.server.gateway.test.support/META-INF/MANIFEST.MF index 8a2010bc104..3d1b41d5573 100644 --- a/java/com.sap.sailing.server.gateway.test.support/META-INF/MANIFEST.MF +++ b/java/com.sap.sailing.server.gateway.test.support/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-SymbolicName: com.sap.sailing.server.gateway.test.support Bundle-Version: 1.0.0.qualifier Bundle-Vendor: SAP Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Require-Bundle: javax.servlet;bundle-version="2.6.0", +Require-Bundle: javax.servlet;bundle-version="3.1.0", com.sap.sailing.domain;bundle-version="1.0.0", com.sap.sailing.domain.common;bundle-version="1.0.0", com.sap.sailing.server;bundle-version="1.0.0", diff --git a/java/com.sap.sailing.server.gateway/META-INF/MANIFEST.MF b/java/com.sap.sailing.server.gateway/META-INF/MANIFEST.MF index c82f3f2f4ac..97f0dcf3b5f 100644 --- a/java/com.sap.sailing.server.gateway/META-INF/MANIFEST.MF +++ b/java/com.sap.sailing.server.gateway/META-INF/MANIFEST.MF @@ -23,7 +23,7 @@ Require-Bundle: com.sap.sailing.domain, com.sap.sse.mongodb, com.sap.sailing.domain.racelogtrackingadapter, org.mongodb.mongo-java-driver;bundle-version="2.13.0", - javax.servlet;bundle-version="2.6.0", + javax.servlet;bundle-version="3.1.0", com.sap.sailing.domain.common, com.sap.sailing.udpconnector, org.jdom;bundle-version="1.0.0", diff --git a/java/com.sap.sse.security.ui/META-INF/MANIFEST.MF b/java/com.sap.sse.security.ui/META-INF/MANIFEST.MF index b22d2fd373f..766d55ff388 100644 --- a/java/com.sap.sse.security.ui/META-INF/MANIFEST.MF +++ b/java/com.sap.sse.security.ui/META-INF/MANIFEST.MF @@ -10,7 +10,7 @@ Import-Package: org.osgi.framework;version="1.3.0", org.osgi.util.tracker;version="1.5.1" Bundle-ActivationPolicy: lazy Bundle-ClassPath: WEB-INF/classes/ -Require-Bundle: javax.servlet;bundle-version="2.5.0", +Require-Bundle: javax.servlet;bundle-version="3.1.0", com.sap.sse.gwt, com.google.gwt.user;bundle-version="2.8.0";resolution:=optional, com.google.gwt.servlet;bundle-version="2.8.0", diff --git a/java/com.sap.sse.security/META-INF/MANIFEST.MF b/java/com.sap.sse.security/META-INF/MANIFEST.MF index 486da0880bc..dde6a66b53b 100644 --- a/java/com.sap.sse.security/META-INF/MANIFEST.MF +++ b/java/com.sap.sse.security/META-INF/MANIFEST.MF @@ -17,7 +17,7 @@ Import-Package: com.sap.sse.util, org.osgi.util.tracker;version="1.5.1" Bundle-ActivationPolicy: lazy Bundle-ClassPath: . -Require-Bundle: javax.servlet;bundle-version="2.5.0", +Require-Bundle: javax.servlet;bundle-version="3.1.0", slf4j.api;bundle-version="1.6.4", org.json.simple, com.sun.jersey,