From 9b3718ed191758dfb3b79f95dc6320c1a09b899d Mon Sep 17 00:00:00 2001 From: Axel Uhl Date: Mon, 3 Dec 2018 00:23:54 +0100 Subject: [PATCH] moved the dependencies to the bundle, not the test fragment --- .../META-INF/MANIFEST.MF | 2 -- .../META-INF/MANIFEST.MF | 3 ++- .../META-INF/MANIFEST.MF | 5 +---- java/com.sap.sailing.xrr.resultimport/META-INF/MANIFEST.MF | 1 + .../META-INF/MANIFEST.MF | 2 -- .../META-INF/MANIFEST.MF | 3 ++- 6 files changed, 6 insertions(+), 10 deletions(-) diff --git a/java/com.sap.sailing.manage2sail.resultimport.test/META-INF/MANIFEST.MF b/java/com.sap.sailing.manage2sail.resultimport.test/META-INF/MANIFEST.MF index c327b741496..62b1746e6c8 100644 --- a/java/com.sap.sailing.manage2sail.resultimport.test/META-INF/MANIFEST.MF +++ b/java/com.sap.sailing.manage2sail.resultimport.test/META-INF/MANIFEST.MF @@ -11,8 +11,6 @@ Import-Package: com.sap.sailing.domain.common, com.sap.sailing.server, com.sap.sailing.server.impl, com.sap.sailing.xrr.schema, - com.sun.istack;version="3.0.7", - javax.xml.bind, org.osgi.framework;version="1.5.0" Fragment-Host: com.sap.sailing.manage2sail.resultimport Require-Bundle: org.junit;bundle-version="4.8.2", diff --git a/java/com.sap.sailing.manage2sail.resultimport/META-INF/MANIFEST.MF b/java/com.sap.sailing.manage2sail.resultimport/META-INF/MANIFEST.MF index 1e75a4937d4..639be6aa045 100644 --- a/java/com.sap.sailing.manage2sail.resultimport/META-INF/MANIFEST.MF +++ b/java/com.sap.sailing.manage2sail.resultimport/META-INF/MANIFEST.MF @@ -6,7 +6,8 @@ Bundle-Version: 1.0.0.qualifier Bundle-Activator: com.sap.sailing.manage2sail.resultimport.Activator Bundle-Vendor: SAP Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Import-Package: javax.xml.bind, +Import-Package: com.sun.istack;version="3.0.7", + javax.xml.bind, org.osgi.framework;version="1.5.0", org.osgi.util.tracker;version="1.5.1" Bundle-ActivationPolicy: lazy diff --git a/java/com.sap.sailing.xrr.resultimport.test/META-INF/MANIFEST.MF b/java/com.sap.sailing.xrr.resultimport.test/META-INF/MANIFEST.MF index 47411431300..7a2bf0b388d 100644 --- a/java/com.sap.sailing.xrr.resultimport.test/META-INF/MANIFEST.MF +++ b/java/com.sap.sailing.xrr.resultimport.test/META-INF/MANIFEST.MF @@ -9,8 +9,5 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: org.junit;bundle-version="4.8.2", com.sap.sse.common Export-Package: com.sap.sailing.xrr.resultimport.test -Import-Package: com.sap.sailing.xrr.schema, - com.sun.istack;version="3.0.7", - javax.xml, - javax.xml.bind +Import-Package: com.sap.sailing.xrr.schema Automatic-Module-Name: com.sap.sailing.xrr.resultimport.test diff --git a/java/com.sap.sailing.xrr.resultimport/META-INF/MANIFEST.MF b/java/com.sap.sailing.xrr.resultimport/META-INF/MANIFEST.MF index e552e1a2256..db53388d93a 100644 --- a/java/com.sap.sailing.xrr.resultimport/META-INF/MANIFEST.MF +++ b/java/com.sap.sailing.xrr.resultimport/META-INF/MANIFEST.MF @@ -12,6 +12,7 @@ Import-Package: com.sap.sailing.server, com.sap.sailing.server.impl, com.sap.sailing.server.operationaltransformation, com.sap.sailing.xrr.schema, + com.sun.istack;version="3.0.7", javax.xml.bind, org.json.simple, org.json.simple.parser, diff --git a/java/com.sap.sailing.yachtscoring.resultimport.test/META-INF/MANIFEST.MF b/java/com.sap.sailing.yachtscoring.resultimport.test/META-INF/MANIFEST.MF index 0df277d279e..ae35ab64ee9 100644 --- a/java/com.sap.sailing.yachtscoring.resultimport.test/META-INF/MANIFEST.MF +++ b/java/com.sap.sailing.yachtscoring.resultimport.test/META-INF/MANIFEST.MF @@ -12,8 +12,6 @@ Import-Package: com.sap.sailing.domain.common, com.sap.sailing.server, com.sap.sailing.server.impl, com.sap.sailing.xrr.schema, - com.sun.istack;version="3.0.7", - javax.xml.bind, org.osgi.framework;version="1.5.0" Fragment-Host: com.sap.sailing.yachtscoring.resultimport Require-Bundle: org.junit;bundle-version="4.8.2", diff --git a/java/com.sap.sailing.yachtscoring.resultimport/META-INF/MANIFEST.MF b/java/com.sap.sailing.yachtscoring.resultimport/META-INF/MANIFEST.MF index 2501c4e90b5..167b019e68e 100644 --- a/java/com.sap.sailing.yachtscoring.resultimport/META-INF/MANIFEST.MF +++ b/java/com.sap.sailing.yachtscoring.resultimport/META-INF/MANIFEST.MF @@ -6,7 +6,8 @@ Bundle-Version: 1.0.0.qualifier Bundle-Activator: com.sap.sailing.yachtscoring.resultimport.Activator Bundle-Vendor: SAP Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Import-Package: javax.xml.bind, +Import-Package: com.sun.istack;version="3.0.7", + javax.xml.bind, org.osgi.framework;version="1.5.0", org.osgi.util.tracker;version="1.5.1" Bundle-ActivationPolicy: lazy