added javax.xml.bind to target platform and require it from bundles that use it

Change-Id: Iceac809df6ce2ce1b52ce7f1da8a2daf2c5e2998
This commit is contained in:
Axel Uhl
2018-11-23 00:19:18 +01:00
parent e646fbe37d
commit 34f476e30f
7 changed files with 62 additions and 50 deletions
@@ -8,5 +8,6 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Export-Package: com.sap.sailing.competitorimport Export-Package: com.sap.sailing.competitorimport
Require-Bundle: com.sap.sse.common, Require-Bundle: com.sap.sse.common,
com.sap.sailing.domain.shared.android, com.sap.sailing.domain.shared.android,
com.sap.sailing.domain.common com.sap.sailing.domain.common,
javax.xml.bind;bundle-version="2.2.0"
Automatic-Module-Name: com.sap.sailing.competitorimport Automatic-Module-Name: com.sap.sailing.competitorimport
@@ -14,7 +14,8 @@ Require-Bundle: com.sap.sailing.domain,
com.sap.sse.common, com.sap.sse.common,
com.sap.sse, com.sap.sse,
com.sap.sailing.xrr.schema, com.sap.sailing.xrr.schema,
com.sap.sailing.domain.shared.android com.sap.sailing.domain.shared.android,
javax.xml.bind;bundle-version="2.2.0"
Export-Package: com.sap.sailing.domain.swisstimingadapter, Export-Package: com.sap.sailing.domain.swisstimingadapter,
com.sap.sailing.domain.swisstimingadapter.impl;x-friends:="com.sap.sailing.server.test,com.sap.sailing.mongodb.test,com.sap.sailing.domain.swisstimingadapter.persistence" com.sap.sailing.domain.swisstimingadapter.impl;x-friends:="com.sap.sailing.server.test,com.sap.sailing.mongodb.test,com.sap.sailing.domain.swisstimingadapter.persistence"
Import-Package: com.sap.sailing.xrr.schema, Import-Package: com.sap.sailing.xrr.schema,
@@ -17,5 +17,6 @@ Require-Bundle: com.sap.sailing.manage2sail,
com.sap.sailing.xrr.schema, com.sap.sailing.xrr.schema,
com.sap.sailing.domain.shared.android, com.sap.sailing.domain.shared.android,
com.sap.sailing.competitorimport, com.sap.sailing.competitorimport,
com.sap.sse com.sap.sse,
javax.xml.bind;bundle-version="2.2.0"
Automatic-Module-Name: com.sap.sailing.manage2sail.resultimport Automatic-Module-Name: com.sap.sailing.manage2sail.resultimport
@@ -1,46 +1,46 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?> <?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde version="3.8"?><target name="Race Analysis Target" sequenceNumber="114"> <?pde version="3.8"?><target name="Race Analysis Target" sequenceNumber="122">
<locations> <locations>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit"> <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="com.sap.sailing.target.base.feature.group" version="1.0.0"/> <unit id="com.sap.sailing.target.base.feature.group" version="1.0.0"/>
<unit id="com.sap.sailing.target.jackson.feature.group" version="1.0.0"/>
<unit id="com.sap.sailing.target.jms.feature.group" version="1.0.0"/> <unit id="com.sap.sailing.target.jms.feature.group" version="1.0.0"/>
<unit id="com.sap.sailing.target.shiro.feature.group" version="1.0.0"/> <unit id="com.sap.sailing.target.shiro.feature.group" version="1.0.0"/>
<unit id="com.sap.sailing.target.test.feature.group" version="1.0.0"/> <unit id="com.sap.sailing.target.test.feature.group" version="1.0.0"/>
<unit id="com.sap.sailing.target.jackson.feature.group" version="1.0.0"/>
<repository location="https://p2.sapsailing.com/p2/sailing/"/> <repository location="https://p2.sapsailing.com/p2/sailing/"/>
</location> </location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit"> <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.osgi" version="3.10.2.v20150203-1939"/>
<unit id="org.eclipse.osgi.source" version="3.10.2.v20150203-1939"/>
<unit id="org.eclipse.osgi.services" version="3.4.0.v20140312-2051"/>
<unit id="org.eclipse.osgi.services.source" version="3.4.0.v20140312-2051"/>
<unit id="org.eclipse.equinox.common" version="3.6.200.v20130402-1505"/>
<unit id="org.eclipse.equinox.common.source" version="3.6.200.v20130402-1505"/>
<unit id="org.eclipse.equinox.util" version="1.0.500.v20130404-1337"/>
<unit id="org.eclipse.equinox.util.source" version="1.0.500.v20130404-1337"/>
<unit id="org.eclipse.equinox.simpleconfigurator" version="1.1.0.v20131217-1203"/>
<unit id="org.eclipse.equinox.simpleconfigurator.source" version="1.1.0.v20131217-1203"/>
<unit id="org.eclipse.equinox.console" version="1.1.0.v20140131-1639"/>
<unit id="org.eclipse.equinox.console.source" version="1.1.0.v20140131-1639"/>
<unit id="org.eclipse.equinox.launcher" version="1.3.0.v20140415-2008"/>
<unit id="org.eclipse.equinox.launcher.source" version="1.3.0.v20140415-2008"/>
<unit id="org.apache.felix.gogo.command" version="0.10.0.v201209301215"/> <unit id="org.apache.felix.gogo.command" version="0.10.0.v201209301215"/>
<unit id="org.apache.felix.gogo.command.source" version="0.10.0.v201209301215"/> <unit id="org.apache.felix.gogo.command.source" version="0.10.0.v201209301215"/>
<unit id="org.apache.felix.gogo.runtime" version="0.10.0.v201209301036"/> <unit id="org.apache.felix.gogo.runtime" version="0.10.0.v201209301036"/>
<unit id="org.apache.felix.gogo.runtime.source" version="0.10.0.v201209301036"/> <unit id="org.apache.felix.gogo.runtime.source" version="0.10.0.v201209301036"/>
<unit id="org.apache.felix.gogo.shell" version="0.10.0.v201212101605"/> <unit id="org.apache.felix.gogo.shell" version="0.10.0.v201212101605"/>
<unit id="org.apache.felix.gogo.shell.source" version="0.10.0.v201212101605"/> <unit id="org.apache.felix.gogo.shell.source" version="0.10.0.v201212101605"/>
<unit id="org.eclipse.equinox.common" version="3.6.200.v20130402-1505"/>
<unit id="org.eclipse.equinox.common.source" version="3.6.200.v20130402-1505"/>
<unit id="org.eclipse.equinox.console" version="1.1.0.v20140131-1639"/>
<unit id="org.eclipse.equinox.console.source" version="1.1.0.v20140131-1639"/>
<unit id="org.eclipse.equinox.launcher" version="1.3.0.v20140415-2008"/>
<unit id="org.eclipse.equinox.launcher.source" version="1.3.0.v20140415-2008"/>
<unit id="org.eclipse.equinox.simpleconfigurator" version="1.1.0.v20131217-1203"/>
<unit id="org.eclipse.equinox.simpleconfigurator.source" version="1.1.0.v20131217-1203"/>
<unit id="org.eclipse.equinox.util" version="1.0.500.v20130404-1337"/>
<unit id="org.eclipse.equinox.util.source" version="1.0.500.v20130404-1337"/>
<unit id="org.eclipse.osgi" version="3.10.2.v20150203-1939"/>
<unit id="org.eclipse.osgi.services" version="3.4.0.v20140312-2051"/>
<unit id="org.eclipse.osgi.services.source" version="3.4.0.v20140312-2051"/>
<unit id="org.eclipse.osgi.source" version="3.10.2.v20150203-1939"/>
<repository location="http://download.eclipse.org/releases/luna"/> <repository location="http://download.eclipse.org/releases/luna"/>
</location> </location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit"> <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="org.junit" version="4.8.2.v4_8_2_v20130308-0413"/>
<unit id="org.junit.source" version="4.8.2.v4_8_2_v20130308-0413"/>
<unit id="org.hamcrest" version="1.1.0.v20090501071000"/> <unit id="org.hamcrest" version="1.1.0.v20090501071000"/>
<unit id="org.hamcrest.core" version="1.1.0.v20090501071000"/> <unit id="org.hamcrest.core" version="1.1.0.v20090501071000"/>
<unit id="org.hamcrest.generator" version="1.1.0.v20090501071000"/> <unit id="org.hamcrest.generator" version="1.1.0.v20090501071000"/>
<unit id="org.hamcrest.integration" version="1.1.0.v201303031500"/> <unit id="org.hamcrest.integration" version="1.1.0.v201303031500"/>
<unit id="org.hamcrest.library" version="1.1.0.v20090501071000"/> <unit id="org.hamcrest.library" version="1.1.0.v20090501071000"/>
<unit id="org.hamcrest.text" version="1.1.0.v20090501071000"/> <unit id="org.hamcrest.text" version="1.1.0.v20090501071000"/>
<unit id="org.junit" version="4.8.2.v4_8_2_v20130308-0413"/>
<unit id="org.junit.source" version="4.8.2.v4_8_2_v20130308-0413"/>
<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20140114142710/repository/"/> <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20140114142710/repository/"/>
</location> </location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit"> <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
@@ -49,6 +49,24 @@
<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20160221192158/repository/"/> <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20160221192158/repository/"/>
</location> </location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit"> <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="com.fasterxml.jackson.core.jackson-annotations" version="2.5.0.v201504151636"/>
<unit id="com.fasterxml.jackson.core.jackson-core" version="2.5.0.v201504151636"/>
<unit id="com.fasterxml.jackson.core.jackson-databind" version="2.5.0.v201504151636"/>
<unit id="com.sun.jersey" version="1.17.0.v201503170330"/>
<unit id="com.sun.jersey.source" version="1.17.0.v201503170330"/>
<unit id="javax.servlet" version="3.1.0.v201410161800"/>
<unit id="javax.servlet.source" version="3.1.0.v201410161800"/>
<unit id="javax.validation" version="1.0.0.GA_v201205091237"/>
<unit id="javax.validation.source" version="1.0.0.GA_v201205091237"/>
<unit id="javax.xml.bind" version="2.2.0.v201105210648"/>
<unit id="javax.xml.bind.source" version="2.2.0.v201105210648"/>
<unit id="javax.xml.ws" version="2.1.0.v200902101523"/>
<unit id="org.apache.commons.beanutils" version="1.8.0.v201205091237"/>
<unit id="org.apache.commons.beanutils.source" version="1.8.0.v201205091237"/>
<unit id="org.apache.commons.codec" version="1.6.0.v201305230611"/>
<unit id="org.apache.commons.codec.source" version="1.6.0.v201305230611"/>
<unit id="org.apache.commons.collections" version="3.2.2.v201511171945"/>
<unit id="org.apache.commons.collections.source" version="3.2.2.v201511171945"/>
<unit id="org.apache.commons.fileupload" version="1.2.2.v20111214-1400"/> <unit id="org.apache.commons.fileupload" version="1.2.2.v20111214-1400"/>
<unit id="org.apache.commons.fileupload.source" version="1.2.2.v20111214-1400"/> <unit id="org.apache.commons.fileupload.source" version="1.2.2.v20111214-1400"/>
<unit id="org.apache.commons.io" version="2.2.0.v201405211200"/> <unit id="org.apache.commons.io" version="2.2.0.v201405211200"/>
@@ -56,34 +74,19 @@
<unit id="org.apache.commons.lang" version="2.6.0.v201404270220"/> <unit id="org.apache.commons.lang" version="2.6.0.v201404270220"/>
<unit id="org.apache.commons.lang.source" version="2.6.0.v201404270220"/> <unit id="org.apache.commons.lang.source" version="2.6.0.v201404270220"/>
<unit id="org.apache.commons.math" version="2.1.0.v201105210652"/> <unit id="org.apache.commons.math" version="2.1.0.v201105210652"/>
<unit id="org.apache.commons.codec" version="1.6.0.v201305230611"/>
<unit id="org.apache.commons.codec.source" version="1.6.0.v201305230611"/>
<unit id="org.apache.commons.collections" version="3.2.2.v201511171945"/>
<unit id="org.apache.commons.collections.source" version="3.2.2.v201511171945"/>
<unit id="org.apache.commons.beanutils" version="1.8.0.v201205091237"/>
<unit id="org.apache.commons.beanutils.source" version="1.8.0.v201205091237"/>
<unit id="org.jdom" version="1.1.1.v201101151400"/>
<unit id="org.jdom.source" version="1.1.1.v201101151400"/>
<unit id="javax.validation" version="1.0.0.GA_v201205091237"/>
<unit id="javax.validation.source" version="1.0.0.GA_v201205091237"/>
<unit id="com.sun.jersey" version="1.17.0.v201503170330"/>
<unit id="com.sun.jersey.source" version="1.17.0.v201503170330"/>
<unit id="org.objectweb.asm" version="5.0.1.v201404251740"/>
<unit id="org.objectweb.asm.source" version="5.0.1.v201404251740"/>
<unit id="org.apache.httpcomponents.httpclient" version="4.2.6.v201311072007"/> <unit id="org.apache.httpcomponents.httpclient" version="4.2.6.v201311072007"/>
<unit id="org.apache.httpcomponents.httpclient.source" version="4.2.6.v201311072007"/> <unit id="org.apache.httpcomponents.httpclient.source" version="4.2.6.v201311072007"/>
<unit id="org.apache.httpcomponents.httpcore" version="4.2.5.v201311072007"/> <unit id="org.apache.httpcomponents.httpcore" version="4.2.5.v201311072007"/>
<unit id="org.apache.httpcomponents.httpcore.source" version="4.2.5.v201311072007"/> <unit id="org.apache.httpcomponents.httpcore.source" version="4.2.5.v201311072007"/>
<unit id="javax.servlet" version="3.1.0.v201410161800"/>
<unit id="javax.servlet.source" version="3.1.0.v201410161800"/>
<unit id="org.dom4j" version="1.6.1.v201312101416"/>
<unit id="org.apache.xmlbeans" version="2.3.0.v201605172150"/>
<unit id="org.apache.poi" version="3.9.0.v201405241750"/> <unit id="org.apache.poi" version="3.9.0.v201405241750"/>
<unit id="org.apache.poi.ooxml" version="3.9.0.v201405241905"/> <unit id="org.apache.poi.ooxml" version="3.9.0.v201405241905"/>
<unit id="org.apache.poi.ooxml.schemas" version="3.9.0.v201405241750"/> <unit id="org.apache.poi.ooxml.schemas" version="3.9.0.v201405241750"/>
<unit id="com.fasterxml.jackson.core.jackson-annotations" version="2.5.0.v201504151636"/> <unit id="org.apache.xmlbeans" version="2.3.0.v201605172150"/>
<unit id="com.fasterxml.jackson.core.jackson-core" version="2.5.0.v201504151636"/> <unit id="org.dom4j" version="1.6.1.v201312101416"/>
<unit id="com.fasterxml.jackson.core.jackson-databind" version="2.5.0.v201504151636"/> <unit id="org.jdom" version="1.1.1.v201101151400"/>
<unit id="org.jdom.source" version="1.1.1.v201101151400"/>
<unit id="org.objectweb.asm" version="5.0.1.v201404251740"/>
<unit id="org.objectweb.asm.source" version="5.0.1.v201404251740"/>
<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20160520211859/repository/"/> <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20160520211859/repository/"/>
</location> </location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit"> <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
@@ -105,16 +108,19 @@
<plugin id="jackson-mapper-asl"/> <plugin id="jackson-mapper-asl"/>
<plugin id="javax.security.auth.message"/> <plugin id="javax.security.auth.message"/>
<plugin id="javax.security.auth.message.source"/> <plugin id="javax.security.auth.message.source"/>
<plugin id="javax.servlet" version="3.1.0.v201410161800"/> <plugin id="javax.servlet"/>
<plugin id="javax.servlet.source" version="3.1.0.v201410161800"/> <plugin id="javax.servlet.source"/>
<plugin id="javax.validation"/> <plugin id="javax.validation"/>
<plugin id="javax.validation.source"/> <plugin id="javax.validation.source"/>
<plugin id="javax.ws.rs"/> <plugin id="javax.ws.rs"/>
<plugin id="javax.ws.rs.source"/> <plugin id="javax.ws.rs.source"/>
<plugin id="javax.xml.bind"/>
<plugin id="javax.xml.bind.source"/>
<plugin id="javax.xml.ws"/>
<plugin id="jcl.over.slf4j"/> <plugin id="jcl.over.slf4j"/>
<plugin id="jul.to.slf4j"/> <plugin id="jul.to.slf4j"/>
<plugin id="lz4-java"/> <plugin id="lz4-java"/>
<plugin id="org.apache.commons.beanutils"/> <plugin id="org.apache.commons.beanutils" version="1.9.0"/>
<plugin id="org.apache.commons.beanutils.source"/> <plugin id="org.apache.commons.beanutils.source"/>
<plugin id="org.apache.commons.codec"/> <plugin id="org.apache.commons.codec"/>
<plugin id="org.apache.commons.collections"/> <plugin id="org.apache.commons.collections"/>
@@ -214,8 +220,8 @@
<plugin id="org.hyperic.sigar"/> <plugin id="org.hyperic.sigar"/>
<plugin id="org.jdom"/> <plugin id="org.jdom"/>
<plugin id="org.jdom.source"/> <plugin id="org.jdom.source"/>
<plugin id="org.junit" version="4.8.2.v4_8_2_v20130308-0413"/> <plugin id="org.junit"/>
<plugin id="org.junit.source" version="4.8.2.v4_8_2_v20130308-0413"/> <plugin id="org.junit.source"/>
<plugin id="org.jvnet.mimepull"/> <plugin id="org.jvnet.mimepull"/>
<plugin id="org.mockito.mockito-core"/> <plugin id="org.mockito.mockito-core"/>
<plugin id="org.mongodb.mongo-java-driver"/> <plugin id="org.mongodb.mongo-java-driver"/>
@@ -18,5 +18,6 @@ Import-Package: com.sap.sailing.server,
Require-Bundle: com.sap.sailing.domain, Require-Bundle: com.sap.sailing.domain,
com.sap.sailing.domain.common, com.sap.sailing.domain.common,
com.sap.sailing.resultimport, com.sap.sailing.resultimport,
com.sap.sse.common com.sap.sse.common,
javax.xml.bind;bundle-version="2.2.0"
Bundle-Activator: com.sap.sailing.xrr.resultimport.impl.Activator Bundle-Activator: com.sap.sailing.xrr.resultimport.impl.Activator
@@ -17,7 +17,8 @@ Require-Bundle: com.google.gwt.user;bundle-version="2.8.2";resolution:=optional,
com.sap.sailing.xrr.resultimport;bundle-version="1.0.0", com.sap.sailing.xrr.resultimport;bundle-version="1.0.0",
com.sap.sse.common;bundle-version="1.0.0", com.sap.sse.common;bundle-version="1.0.0",
com.sap.sailing.resultimport;bundle-version="1.0.0", com.sap.sailing.resultimport;bundle-version="1.0.0",
com.sap.sse com.sap.sse,
javax.xml.bind;bundle-version="2.2.0"
Import-Package: com.sap.sailing.server.operationaltransformation, Import-Package: com.sap.sailing.server.operationaltransformation,
com.sap.sailing.xrr.schema, com.sap.sailing.xrr.schema,
org.json.simple, org.json.simple,
@@ -13,5 +13,6 @@ Require-Bundle: com.sap.sailing.domain.common,
com.sap.sailing.resultimport, com.sap.sailing.resultimport,
com.sap.sailing.xrr.resultimport, com.sap.sailing.xrr.resultimport,
com.sap.sse.common, com.sap.sse.common,
com.sap.sailing.xrr.schema com.sap.sailing.xrr.schema,
javax.xml.bind;bundle-version="2.2.0"
Automatic-Module-Name: com.sap.sailing.yachtscoring.resultimport Automatic-Module-Name: com.sap.sailing.yachtscoring.resultimport