summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsclarke2014-01-07 15:35:53 (EST)
committersclarke2014-01-07 15:35:53 (EST)
commitddf809dd72090d7799bae414f80f3a842f09cf02 (patch)
tree47dee93587973fae68846e22345a4e666dad96d1
parentcfd27af13fc322e9c8dbc754ebe5a804113e43b4 (diff)
downloadwebtools.maps-ddf809dd72090d7799bae414f80f3a842f09cf02.zip
webtools.maps-ddf809dd72090d7799bae414f80f3a842f09cf02.tar.gz
webtools.maps-ddf809dd72090d7799bae414f80f3a842f09cf02.tar.bz2
[424968] org.eclipse.jst.ws.jaxws.core bundle is causing initial
conflicts when jaxb-api 2.2.6 is installed
-rw-r--r--releng.webservices/maps/jaxws.map6
1 files changed, 3 insertions, 3 deletions
diff --git a/releng.webservices/maps/jaxws.map b/releng.webservices/maps/jaxws.map
index aa5fbd3..b27e61b 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