From ddf809dd72090d7799bae414f80f3a842f09cf02 Mon Sep 17 00:00:00 2001 From: sclarke Date: Tue, 7 Jan 2014 20:35:53 +0000 Subject: [424968] org.eclipse.jst.ws.jaxws.core bundle is causing initial conflicts when jaxb-api 2.2.6 is installed --- releng.webservices/maps/jaxws.map | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/releng.webservices/maps/jaxws.map b/releng.webservices/maps/jaxws.map index aa5fbd379..b27e61b6f 100644 --- a/releng.webservices/maps/jaxws.map +++ b/releng.webservices/maps/jaxws.map @@ -9,8 +9,8 @@ feature@org.eclipse.jst.ws.jaxws.assembly.feature=GIT,tag=GIT,tag=v200910130508, feature@org.eclipse.jst.ws.jaxws.assembly_sdk.feature=GIT,tag=GIT,tag=v200910130508,repo=git://git.eclipse.org/gitroot/webservices/webtools.webservices.jaxws.git,path=features/org.eclipse.jst.ws.jaxws.assembly_sdk.feature feature@org.eclipse.jst.ws.jaxws.assembly_tests.feature=GIT,tag=GIT,tag=v200910130535,repo=git://git.eclipse.org/gitroot/webservices/webtools.webservices.jaxws.git,path=features/org.eclipse.jst.ws.jaxws.assembly_tests.feature -feature@org.eclipse.jst.ws.jaxws.feature=GIT,tag=GIT,tag=v201302270042,repo=git://git.eclipse.org/gitroot/webservices/webtools.webservices.jaxws.git,path=features/org.eclipse.jst.ws.jaxws.feature -feature@org.eclipse.jst.ws.jaxws_sdk.feature=GIT,tag=GIT,tag=v201302270042,repo=git://git.eclipse.org/gitroot/webservices/webtools.webservices.jaxws.git,path=features/org.eclipse.jst.ws.jaxws_sdk.feature +feature@org.eclipse.jst.ws.jaxws.feature=GIT,tag=GIT,tag=v201401062141,repo=git://git.eclipse.org/gitroot/webservices/webtools.webservices.jaxws.git,path=features/org.eclipse.jst.ws.jaxws.feature +feature@org.eclipse.jst.ws.jaxws_sdk.feature=GIT,tag=GIT,tag=v201401062141,repo=git://git.eclipse.org/gitroot/webservices/webtools.webservices.jaxws.git,path=features/org.eclipse.jst.ws.jaxws_sdk.feature feature@org.eclipse.jst.ws.jaxws_tests.feature=GIT,tag=GIT,tag=v201203280639,repo=git://git.eclipse.org/gitroot/webservices/webtools.webservices.jaxws.git,path=features/org.eclipse.jst.ws.jaxws_tests.feature feature@org.eclipse.jst.ws.jaxws_userdoc.feature=GIT,tag=v201305122032,repo=git://git.eclipse.org/gitroot/webservices/webtools.webservices.jaxws.git,path=features/org.eclipse.jst.ws.jaxws_userdoc.feature @@ -24,7 +24,7 @@ feature@org.eclipse.jst.ws.jaxws.dom_sdk.feature=GIT,tag=v201109042201,repo=git: feature@org.eclipse.jst.ws.jaxws.dom_tests.feature=GIT,tag=v201305212157,repo=git://git.eclipse.org/gitroot/webservices/webtools.webservices.jaxws.git,path=features/org.eclipse.jst.ws.jaxws.dom_tests.feature bundle@org.eclipse.jst.ws.annotations.core=GIT,tag=v201304072043,repo=git://git.eclipse.org/gitroot/webservices/webtools.webservices.jaxws.git,path=bundles/org.eclipse.jst.ws.annotations.core -bundle@org.eclipse.jst.ws.jaxws.core=GIT,tag=v201304072043,repo=git://git.eclipse.org/gitroot/webservices/webtools.webservices.jaxws.git,path=bundles/org.eclipse.jst.ws.jaxws.core +bundle@org.eclipse.jst.ws.jaxws.core=GIT,tag=v201401062141,repo=git://git.eclipse.org/gitroot/webservices/webtools.webservices.jaxws.git,path=bundles/org.eclipse.jst.ws.jaxws.core bundle@org.eclipse.jst.ws.jaxb.core=GIT,tag=v201104031139,repo=git://git.eclipse.org/gitroot/webservices/webtools.webservices.jaxws.git,path=bundles/org.eclipse.jst.ws.jaxb.core bundle@org.eclipse.jst.ws.jaxws.ui=GIT,tag=v201302270042,repo=git://git.eclipse.org/gitroot/webservices/webtools.webservices.jaxws.git,path=bundles/org.eclipse.jst.ws.jaxws.ui -- cgit v1.2.3