diff options
author | tle | 2012-08-23 21:27:17 +0000 |
---|---|---|
committer | tle | 2012-08-23 21:27:17 +0000 |
commit | 7201610c5868c0336ac3de4684d3b149ced4fa1a (patch) | |
tree | 0de3fc8bb6f46fe6d200a2027c13f483ee9cb9c8 | |
parent | 417141a089ac026a9f1eed778bffa4863b1b50a8 (diff) | |
parent | 27946f8cd0891d0543d5f65e62d8b9906f363452 (diff) | |
download | webtools.maps-7201610c5868c0336ac3de4684d3b149ced4fa1a.tar.gz webtools.maps-7201610c5868c0336ac3de4684d3b149ced4fa1a.tar.xz webtools.maps-7201610c5868c0336ac3de4684d3b149ced4fa1a.zip |
Merge branch 'R3_4_maintenance' of ssh://tle@git.eclipse.org:22/gitroot/webtools/webtools.maps.git into R3_4_maintenance
-rw-r--r-- | releng.common/maps/jst-common.map | 2 | ||||
-rw-r--r-- | releng.jeetools/maps/jst-j2ee-basic.map | 2 | ||||
-rw-r--r-- | releng.jeetools/maps/jst-web-component-features.map | 6 | ||||
-rw-r--r-- | releng.webservices/maps/wst-ws-component.features.map | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/releng.common/maps/jst-common.map b/releng.common/maps/jst-common.map index d5a8e9d3a..070cc505c 100644 --- a/releng.common/maps/jst-common.map +++ b/releng.common/maps/jst-common.map @@ -6,6 +6,6 @@ plugin@org.eclipse.jst.common.annotations.controller=GIT,tag=v200908252030,repo= plugin@org.eclipse.jst.common.annotations.core=GIT,tag=v201004141630,repo=git://git.eclipse.org/gitroot/jeetools/webtools.javaee.git,path=plugins/org.eclipse.jst.common.annotations.core plugin@org.eclipse.jst.common.annotations.ui=GIT,tag=v201002081900,repo=git://git.eclipse.org/gitroot/jeetools/webtools.javaee.git,path=plugins/org.eclipse.jst.common.annotations.ui plugin@org.eclipse.jst.common.frameworks=GIT,tag=v201208160700,repo=git://git.eclipse.org/gitroot/jeetools/webtools.javaee.git,path=plugins/org.eclipse.jst.common.frameworks -plugin@org.eclipse.jst.common.ui=GIT,tag=v201202020230,repo=git://git.eclipse.org/gitroot/webtools-common/webtools.common.git,path=plugins/org.eclipse.jst.common.ui +plugin@org.eclipse.jst.common.ui=GIT,tag=v201208231800,repo=git://git.eclipse.org/gitroot/webtools-common/webtools.common.git,path=plugins/org.eclipse.jst.common.ui !***************
\ No newline at end of file diff --git a/releng.jeetools/maps/jst-j2ee-basic.map b/releng.jeetools/maps/jst-j2ee-basic.map index 9ae525fd1..62b78bbc1 100644 --- a/releng.jeetools/maps/jst-j2ee-basic.map +++ b/releng.jeetools/maps/jst-j2ee-basic.map @@ -8,7 +8,7 @@ plugin@org.eclipse.jst.j2ee.navigator.ui=GIT,tag=v201203142300,repo=git://git.eclipse.org/gitroot/jeetools/webtools.javaee.git,path=plugins/org.eclipse.jst.j2ee.navigator.ui plugin@org.eclipse.jst.j2ee.ui=GIT,tag=v201205170400,repo=git://git.eclipse.org/gitroot/jeetools/webtools.javaee.git,path=plugins/org.eclipse.jst.j2ee.ui -plugin@org.eclipse.jst.j2ee=GIT,tag=v201208160100,repo=git://git.eclipse.org/gitroot/jeetools/webtools.javaee.git,path=plugins/org.eclipse.jst.j2ee +plugin@org.eclipse.jst.j2ee=GIT,tag=v201208231800,repo=git://git.eclipse.org/gitroot/jeetools/webtools.javaee.git,path=plugins/org.eclipse.jst.j2ee plugin@org.eclipse.jst.j2ee.core=GIT,tag=v201205030130,repo=git://git.eclipse.org/gitroot/jeetools/webtools.javaee.git,path=plugins/org.eclipse.jst.j2ee.core plugin@org.eclipse.jst.j2ee.web=GIT,tag=v201203142300,repo=git://git.eclipse.org/gitroot/jeetools/webtools.javaee.git,path=plugins/org.eclipse.jst.j2ee.web plugin@org.eclipse.jst.servlet.ui=GIT,tag=v201202011057,repo=git://git.eclipse.org/gitroot/jeetools/webtools.javaee.git,path=plugins/org.eclipse.jst.servlet.ui diff --git a/releng.jeetools/maps/jst-web-component-features.map b/releng.jeetools/maps/jst-web-component-features.map index 2bc99f052..8a6d891f6 100644 --- a/releng.jeetools/maps/jst-web-component-features.map +++ b/releng.jeetools/maps/jst-web-component-features.map @@ -6,10 +6,10 @@ ! from the master branch feature@org.eclipse.jst.web_core.feature=GIT,tag=v201208160300,repo=git://git.eclipse.org/gitroot/jeetools/webtools.javaee.git,path=features/org.eclipse.jst.web_core.feature -feature@org.eclipse.jst.web_sdk.feature=GIT,tag=v201111022313,repo=git://git.eclipse.org/gitroot/jeetools/webtools.javaee.git,path=features/org.eclipse.jst.web_sdk.feature +feature@org.eclipse.jst.web_sdk.feature=GIT,tag=v201208231800,repo=git://git.eclipse.org/gitroot/jeetools/webtools.javaee.git,path=features/org.eclipse.jst.web_sdk.feature feature@org.eclipse.jst.web_tests.feature=GIT,tag=v201111022313,repo=git://git.eclipse.org/gitroot/jeetools/webtools.javaee.tests.git,path=features/org.eclipse.jst.web_tests.feature -feature@org.eclipse.jst.web_ui.feature=GIT,tag=v201111022313,repo=git://git.eclipse.org/gitroot/jeetools/webtools.javaee.git,path=features/org.eclipse.jst.web_ui.feature +feature@org.eclipse.jst.web_ui.feature=GIT,tag=v201208231800,repo=git://git.eclipse.org/gitroot/jeetools/webtools.javaee.git,path=features/org.eclipse.jst.web_ui.feature -feature@org.eclipse.jst.web_userdoc.feature=GIT,tag=v201111022313,repo=git://git.eclipse.org/gitroot/jeetools/webtools.javaee.git,path=features/org.eclipse.jst.web_userdoc.feature +feature@org.eclipse.jst.web_userdoc.feature=GIT,tag=v201208231800,repo=git://git.eclipse.org/gitroot/jeetools/webtools.javaee.git,path=features/org.eclipse.jst.web_userdoc.feature !***************
\ No newline at end of file diff --git a/releng.webservices/maps/wst-ws-component.features.map b/releng.webservices/maps/wst-ws-component.features.map index 195b75da0..8b947a97a 100644 --- a/releng.webservices/maps/wst-ws-component.features.map +++ b/releng.webservices/maps/wst-ws-component.features.map @@ -1,9 +1,9 @@ !*************** wst-ws-component.features.map feature@org.eclipse.wst.ws_core.feature=GIT,tag=v201108230503,repo=git://git.eclipse.org/gitroot/webservices/webtools.webservices.git,path=features/org.eclipse.wst.ws_core.feature -feature@org.eclipse.wst.ws_sdk.feature=GIT,tag=v201108102008,repo=git://git.eclipse.org/gitroot/webservices/webtools.webservices.git,path=features/org.eclipse.wst.ws_sdk.feature +feature@org.eclipse.wst.ws_sdk.feature=GIT,tag=v201208172041,repo=git://git.eclipse.org/gitroot/webservices/webtools.webservices.git,path=features/org.eclipse.wst.ws_sdk.feature feature@org.eclipse.wst.ws_tests.feature=GIT,tag=v201109010430,repo=git://git.eclipse.org/gitroot/webservices/webtools.webservices.git,path=features/org.eclipse.wst.ws_tests.feature -feature@org.eclipse.wst.ws_ui.feature=GIT,tag=v201203150412,repo=git://git.eclipse.org/gitroot/webservices/webtools.webservices.git,path=features/org.eclipse.wst.ws_ui.feature +feature@org.eclipse.wst.ws_ui.feature=GIT,tag=v201208172041,repo=git://git.eclipse.org/gitroot/webservices/webtools.webservices.git,path=features/org.eclipse.wst.ws_ui.feature feature@org.eclipse.wst.ws_userdoc.feature=GIT,tag=v201102200555,repo=git://git.eclipse.org/gitroot/webservices/webtools.webservices.git,path=features/org.eclipse.wst.ws_userdoc.feature feature@org.eclipse.wst.ws_wsdl15.feature=GIT,tag=v201102200555,repo=git://git.eclipse.org/gitroot/webservices/webtools.webservices.git,path=features/org.eclipse.wst.ws_wsdl15.feature |