fix deps on sse plugins which have moved from 1.1 to 1.2 switch from include to require use parent pom 3.10 and tycho 1.1 Signed-off-by: nickboldt <nboldt@redhat.com>
diff --git a/features/org.eclipse.jst.enterprise_sdk.feature/feature.xml b/features/org.eclipse.jst.enterprise_sdk.feature/feature.xml index b94b1cc..11ac117 100644 --- a/features/org.eclipse.jst.enterprise_sdk.feature/feature.xml +++ b/features/org.eclipse.jst.enterprise_sdk.feature/feature.xml
@@ -2,7 +2,7 @@ <feature id="org.eclipse.jst.enterprise_sdk.feature" label="%featureName" - version="3.8.1.qualifier" + version="3.8.2.qualifier" provider-name="%providerName" license-feature="org.eclipse.license" license-feature-version="1.0.1.qualifier"> @@ -19,12 +19,9 @@ %license </license> - <includes - id="org.eclipse.jst.enterprise_ui.feature" - version="0.0.0"/> + <requires> + <import feature="org.eclipse.jst.enterprise_ui.feature"/> + </requires> - <includes - id="org.eclipse.jst.enterprise_ui.feature.source" - version="0.0.0"/> </feature>
diff --git a/features/org.eclipse.jst.enterprise_sdk.feature/pom.xml b/features/org.eclipse.jst.enterprise_sdk.feature/pom.xml index 76572ec..1781026 100644 --- a/features/org.eclipse.jst.enterprise_sdk.feature/pom.xml +++ b/features/org.eclipse.jst.enterprise_sdk.feature/pom.xml
@@ -21,6 +21,6 @@ <groupId>org.eclipse.webtools.javaee</groupId> <artifactId>org.eclipse.jst.enterprise_sdk.feature</artifactId> - <version>3.8.1-SNAPSHOT</version> + <version>3.8.2-SNAPSHOT</version> <packaging>eclipse-feature</packaging> </project>
diff --git a/plugins/org.eclipse.jst.ejb.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.ejb.ui/META-INF/MANIFEST.MF index 8b6f178..ee14424 100644 --- a/plugins/org.eclipse.jst.ejb.ui/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.jst.ejb.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.jst.ejb.ui; singleton:=true -Bundle-Version: 1.1.910.qualifier +Bundle-Version: 1.1.911.qualifier Bundle-Activator: org.eclipse.jst.ejb.ui.internal.plugin.EJBUIPlugin Bundle-Vendor: %providerName Bundle-Localization: plugin @@ -35,14 +35,14 @@ org.eclipse.jst.common.frameworks;bundle-version="[1.1.0,1.2.0)", org.eclipse.wst.common.project.facet.ui;bundle-version="[1.1.0,2.0.0)", org.eclipse.wst.common.project.facet.core;bundle-version="[1.1.0,2.0.0)", - org.eclipse.wst.web.ui;bundle-version="[1.1.0,1.2.0)", + org.eclipse.wst.web.ui;bundle-version="[1.1.0,2.0.0)", org.eclipse.ui.navigator.resources;bundle-version="[3.2.0,4.0.0)", org.eclipse.jem.workbench;bundle-version="[2.0.0,3.0.0)", org.eclipse.emf.edit.ui;bundle-version="[2.2.0,3.0.0)", org.eclipse.ui.ide;bundle-version="[3.2.0,4.0.0)", org.eclipse.wst.validation.ui;bundle-version="[1.1.0,2.0.0)", org.eclipse.wst.validation;bundle-version="[1.1.0,2.0.0)", - org.eclipse.wst.web;bundle-version="[1.1.0,1.2.0)", + org.eclipse.wst.web;bundle-version="[1.1.0,2.0.0)", org.eclipse.ui.forms;bundle-version="[3.3.0,4.0.0)", org.eclipse.jdt.ui;bundle-version="[3.4.0,4.0.0)", org.eclipse.jst.jee.ui;bundle-version="[1.0.100,2.0.0)",
diff --git a/plugins/org.eclipse.jst.ejb.ui/pom.xml b/plugins/org.eclipse.jst.ejb.ui/pom.xml index 12e1454..5f7a2dc 100644 --- a/plugins/org.eclipse.jst.ejb.ui/pom.xml +++ b/plugins/org.eclipse.jst.ejb.ui/pom.xml
@@ -21,6 +21,6 @@ <groupId>org.eclipse.webtools.ejb</groupId> <artifactId>org.eclipse.jst.ejb.ui</artifactId> - <version>1.1.910-SNAPSHOT</version> + <version>1.1.911-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>
diff --git a/plugins/org.eclipse.jst.j2ee.core/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.j2ee.core/META-INF/MANIFEST.MF index ee854c8..8e536d0 100644 --- a/plugins/org.eclipse.jst.j2ee.core/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.jst.j2ee.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name.0 Bundle-SymbolicName: org.eclipse.jst.j2ee.core; singleton:=true -Bundle-Version: 1.4.0.qualifier +Bundle-Version: 1.4.1.qualifier Bundle-Activator: org.eclipse.jst.j2ee.core.internal.plugin.J2EECorePlugin Bundle-Vendor: %Bundle-Vendor.0 Bundle-Localization: plugin @@ -119,11 +119,11 @@ org.eclipse.jem.util;bundle-version="[2.0.0,3.0.0)", com.ibm.icu;bundle-version="3.8.1", org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)", - org.eclipse.wst.xml.core;bundle-version="[1.1.0,1.2.0)", + org.eclipse.wst.xml.core;bundle-version="[1.1.0,2.0.0)", org.eclipse.wst.common.modulecore, org.eclipse.jdt.core, org.eclipse.wst.common.emfworkbench.integration, org.eclipse.wst.common.uriresolver;bundle-version="[1.1.0,2.0.0)", - org.eclipse.jst.common.frameworks;bundle-version="1.1.400" + org.eclipse.jst.common.frameworks;bundle-version="[1.1.400,2.0.0)" Eclipse-LazyStart: true Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/org.eclipse.jst.j2ee.core/pom.xml b/plugins/org.eclipse.jst.j2ee.core/pom.xml index 0470c75..b7fb27d 100644 --- a/plugins/org.eclipse.jst.j2ee.core/pom.xml +++ b/plugins/org.eclipse.jst.j2ee.core/pom.xml
@@ -21,6 +21,6 @@ <groupId>org.eclipse.webtools.javaee</groupId> <artifactId>org.eclipse.jst.j2ee.core</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>1.4.1-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/META-INF/MANIFEST.MF index 6e00e30..e5e0052 100644 --- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name.0 Bundle-SymbolicName: org.eclipse.jst.j2ee.ejb.annotations.ui; singleton:=true -Bundle-Version: 1.1.300.qualifier +Bundle-Version: 1.1.301.qualifier Bundle-ClassPath: . Bundle-Activator: org.eclipse.jst.j2ee.ejb.annotation.ui.internal.EjbAnnotationsUiPlugin Bundle-Vendor: %Bundle-Vendor.0 @@ -28,7 +28,7 @@ org.eclipse.jem.util;bundle-version="[2.0.0,3.0.0)", org.eclipse.jst.common.frameworks;bundle-version="[1.1.0,1.2.0)", org.eclipse.jdt.core;bundle-version="[3.2.0,4.0.0)", - org.eclipse.wst.web.ui;bundle-version="[1.1.0,1.2.0)", + org.eclipse.wst.web.ui;bundle-version="[1.1.0,2.0.0)", org.eclipse.wst.common.project.facet.ui;bundle-version="[1.1.0,2.0.0)", org.eclipse.jdt.ui;bundle-version="[3.2.0,4.0.0)", org.eclipse.jface.text;bundle-version="[3.2.0,4.0.0)",
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/pom.xml b/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/pom.xml index 4f33602..3ff34f8 100644 --- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/pom.xml +++ b/plugins/org.eclipse.jst.j2ee.ejb.annotations.ui/pom.xml
@@ -21,6 +21,6 @@ <groupId>org.eclipse.webtools.ejb</groupId> <artifactId>org.eclipse.jst.j2ee.ejb.annotations.ui</artifactId> - <version>1.1.300-SNAPSHOT</version> + <version>1.1.301-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.j2ee.ejb/META-INF/MANIFEST.MF index 4d39e4d..2eb5b77 100644 --- a/plugins/org.eclipse.jst.j2ee.ejb/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.jst.j2ee.ejb/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name.0 Bundle-SymbolicName: org.eclipse.jst.j2ee.ejb; singleton:=true -Bundle-Version: 1.1.900.qualifier +Bundle-Version: 1.1.901.qualifier Bundle-Activator: org.eclipse.jst.j2ee.ejb.internal.plugin.EjbPlugin Bundle-Vendor: %Bundle-Vendor.0 Bundle-Localization: plugin @@ -41,7 +41,7 @@ org.eclipse.jem.util;bundle-version="[2.0.0,3.0.0)", org.eclipse.wst.common.project.facet.core;bundle-version="[1.1.0,2.0.0)", org.eclipse.jst.common.project.facet.core;bundle-version="[1.1.0,2.0.0)", - org.eclipse.wst.web;bundle-version="[1.1.600,1.2.0)", + org.eclipse.wst.web;bundle-version="[1.1.600,2.0.0)", org.eclipse.emf.codegen;bundle-version="[2.4.0,3.0.0)", org.eclipse.jst.jee;bundle-version="[1.0.0,1.1.0)" Eclipse-LazyStart: true
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/pom.xml b/plugins/org.eclipse.jst.j2ee.ejb/pom.xml index a0d2eee..d469041 100644 --- a/plugins/org.eclipse.jst.j2ee.ejb/pom.xml +++ b/plugins/org.eclipse.jst.j2ee.ejb/pom.xml
@@ -21,6 +21,6 @@ <groupId>org.eclipse.webtools.ejb</groupId> <artifactId>org.eclipse.jst.j2ee.ejb</artifactId> - <version>1.1.900-SNAPSHOT</version> + <version>1.1.901-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>
diff --git a/plugins/org.eclipse.jst.j2ee.jca.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.j2ee.jca.ui/META-INF/MANIFEST.MF index eb3805b..d194962 100644 --- a/plugins/org.eclipse.jst.j2ee.jca.ui/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.jst.j2ee.jca.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.jst.j2ee.jca.ui; singleton:=true -Bundle-Version: 1.1.600.qualifier +Bundle-Version: 1.1.601.qualifier Bundle-Activator: org.eclipse.jst.j2ee.jca.ui.internal.plugin.JCAUIPlugin Bundle-Vendor: %providerName Bundle-Localization: plugin @@ -22,9 +22,9 @@ org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)", org.eclipse.wst.common.project.facet.core;bundle-version="[1.3.0,2.0.0)", org.eclipse.wst.common.project.facet.ui;bundle-version="[1.3.0,2.0.0)", - org.eclipse.wst.web.ui;bundle-version="[1.1.0,1.2.0)", + org.eclipse.wst.web.ui;bundle-version="[1.1.0,2.0.0)", org.eclipse.ui.navigator.resources;bundle-version="[3.2.0,4.0.0)", - org.eclipse.wst.web;bundle-version="[1.1.0,1.2.0)", + org.eclipse.wst.web;bundle-version="[1.1.0,2.0.0)", org.eclipse.jst.common.project.facet.core;bundle-version="[1.3.0,2.0.0)" Eclipse-LazyStart: true Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/org.eclipse.jst.j2ee.jca.ui/pom.xml b/plugins/org.eclipse.jst.j2ee.jca.ui/pom.xml index 21a0205..a8f1ffb 100644 --- a/plugins/org.eclipse.jst.j2ee.jca.ui/pom.xml +++ b/plugins/org.eclipse.jst.j2ee.jca.ui/pom.xml
@@ -21,6 +21,6 @@ <groupId>org.eclipse.webtools.javaee</groupId> <artifactId>org.eclipse.jst.j2ee.jca.ui</artifactId> - <version>1.1.600-SNAPSHOT</version> + <version>1.1.601-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>
diff --git a/plugins/org.eclipse.jst.j2ee.jca/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.j2ee.jca/META-INF/MANIFEST.MF index 6d42e1a..dd7b691 100644 --- a/plugins/org.eclipse.jst.j2ee.jca/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.jst.j2ee.jca/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.jst.j2ee.jca; singleton:=true -Bundle-Version: 1.1.900.qualifier +Bundle-Version: 1.1.901.qualifier Bundle-Activator: org.eclipse.jst.j2ee.jca.internal.plugin.JcaPlugin Bundle-Vendor: %pluginVendor Bundle-Localization: plugin @@ -35,6 +35,6 @@ org.eclipse.wst.common.project.facet.core;bundle-version="[1.3.0,2.0.0)", org.eclipse.jst.common.project.facet.core;bundle-version="[1.3.0,2.0.0)", org.eclipse.wst.common.environment;bundle-version="[1.0.100,1.1.0)", - org.eclipse.wst.web;bundle-version="[1.1.0,1.2.0)" + org.eclipse.wst.web;bundle-version="[1.1.0,2.0.0)" Eclipse-LazyStart: true Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/org.eclipse.jst.j2ee.jca/pom.xml b/plugins/org.eclipse.jst.j2ee.jca/pom.xml index 9c1ff8b..05e3451 100644 --- a/plugins/org.eclipse.jst.j2ee.jca/pom.xml +++ b/plugins/org.eclipse.jst.j2ee.jca/pom.xml
@@ -21,6 +21,6 @@ <groupId>org.eclipse.webtools.javaee</groupId> <artifactId>org.eclipse.jst.j2ee.jca</artifactId> - <version>1.1.900-SNAPSHOT</version> + <version>1.1.901-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>
diff --git a/plugins/org.eclipse.jst.j2ee.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.j2ee.ui/META-INF/MANIFEST.MF index f68e3dd..fcded24 100644 --- a/plugins/org.eclipse.jst.j2ee.ui/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.jst.j2ee.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name.0 Bundle-SymbolicName: org.eclipse.jst.j2ee.ui; singleton:=true -Bundle-Version: 1.1.930.qualifier +Bundle-Version: 1.1.931.qualifier Bundle-Activator: org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin Bundle-Vendor: %Bundle-Vendor.0 Bundle-Localization: plugin @@ -53,11 +53,11 @@ org.eclipse.ltk.core.refactoring;bundle-version="[3.2.0,4.0.0)", org.eclipse.ltk.ui.refactoring;bundle-version="[3.2.0,4.0.0)", org.eclipse.jface.text;bundle-version="[3.2.0,4.0.0)", - org.eclipse.wst.web;bundle-version="[1.1.0,1.2.0)", + org.eclipse.wst.web;bundle-version="[1.1.0,2.0.0)", org.eclipse.debug.ui;bundle-version="[3.2.0,4.0.0)", org.eclipse.ui.editors;bundle-version="[3.2.0,4.0.0)", org.eclipse.ui.workbench.texteditor;bundle-version="[3.2.0,4.0.0)", - org.eclipse.wst.sse.core;bundle-version="[1.1.0,1.2.0)", + org.eclipse.wst.sse.core;bundle-version="[1.1.0,2.0.0)", org.eclipse.wst.common.modulecore;bundle-version="[1.2.0,2.0.0)", org.eclipse.jst.common.frameworks;bundle-version="[1.1.0,1.2.0)", org.eclipse.jem.util;bundle-version="[2.0.0,3.0.0)", @@ -66,7 +66,7 @@ org.eclipse.wst.common.project.facet.core;bundle-version="[1.3.0,2.0.0)", org.eclipse.wst.common.project.facet.ui;bundle-version="[1.3.0,2.0.0)", org.eclipse.jst.server.core;bundle-version="[1.0.102,2.0.0)", - org.eclipse.wst.web.ui;bundle-version="[1.1.0,1.2.0)", + org.eclipse.wst.web.ui;bundle-version="[1.1.0,2.0.0)", org.eclipse.ui.navigator.resources;bundle-version="[3.2.0,4.0.0)", com.ibm.icu;bundle-version="3.8.1", org.eclipse.ui.forms;bundle-version="[3.2.0,4.0.0)", @@ -74,7 +74,7 @@ org.eclipse.jst.jee;bundle-version="[1.0.0,1.1.0)", org.eclipse.jst.common.project.facet.ui;bundle-version="[1.3.1,2.0.0)", org.eclipse.jst.common.project.facet.core;bundle-version="[1.3.100,2.0.0)", - org.eclipse.wst.common.modulecore.ui;bundle-version="1.0.0", - org.eclipse.jst.common.ui;bundle-version="1.0.0" + org.eclipse.wst.common.modulecore.ui;bundle-version="[1.0.0,2.0.0)", + org.eclipse.jst.common.ui;bundle-version="[1.0.0,2.0.0)" Eclipse-LazyStart: true Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/org.eclipse.jst.j2ee.ui/pom.xml b/plugins/org.eclipse.jst.j2ee.ui/pom.xml index 61968fd..a662a4c 100644 --- a/plugins/org.eclipse.jst.j2ee.ui/pom.xml +++ b/plugins/org.eclipse.jst.j2ee.ui/pom.xml
@@ -21,6 +21,6 @@ <groupId>org.eclipse.webtools.javaee</groupId> <artifactId>org.eclipse.jst.j2ee.ui</artifactId> - <version>1.1.930-SNAPSHOT</version> + <version>1.1.931-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>
diff --git a/plugins/org.eclipse.jst.j2ee.web/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.j2ee.web/META-INF/MANIFEST.MF index 0d65f74..1da97ab 100644 --- a/plugins/org.eclipse.jst.j2ee.web/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.jst.j2ee.web/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: Web Plug-in Bundle-SymbolicName: org.eclipse.jst.j2ee.web; singleton:=true -Bundle-Version: 1.1.910.qualifier +Bundle-Version: 1.1.911.qualifier Bundle-Activator: org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin Bundle-Vendor: Eclipse.org Bundle-Localization: plugin @@ -36,7 +36,7 @@ org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)", org.eclipse.jdt.core;bundle-version="[3.2.0,4.0.0)", org.eclipse.emf.codegen;bundle-version="[2.2.0,3.0.0)", - org.eclipse.wst.web;bundle-version="[1.1.0,1.2.0)", + org.eclipse.wst.web;bundle-version="[1.1.0,2.0.0)", org.eclipse.jst.common.annotations.controller;bundle-version="[1.1.0,1.2.0)", org.eclipse.jst.common.frameworks;bundle-version="[1.1.0,1.2.0)", org.eclipse.wst.common.modulecore;bundle-version="[1.2.101,2.0.0)",
diff --git a/plugins/org.eclipse.jst.j2ee.web/pom.xml b/plugins/org.eclipse.jst.j2ee.web/pom.xml index ffa549b..0c23a91 100644 --- a/plugins/org.eclipse.jst.j2ee.web/pom.xml +++ b/plugins/org.eclipse.jst.j2ee.web/pom.xml
@@ -21,6 +21,6 @@ <groupId>org.eclipse.webtools.javaee</groupId> <artifactId>org.eclipse.jst.j2ee.web</artifactId> - <version>1.1.910-SNAPSHOT</version> + <version>1.1.911-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>
diff --git a/plugins/org.eclipse.jst.j2ee/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.j2ee/META-INF/MANIFEST.MF index 03043e5..ecb9caf 100644 --- a/plugins/org.eclipse.jst.j2ee/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.jst.j2ee/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name.0 Bundle-SymbolicName: org.eclipse.jst.j2ee; singleton:=true -Bundle-Version: 1.2.300.qualifier +Bundle-Version: 1.2.301.qualifier Bundle-Activator: org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin Bundle-Vendor: %Bundle-Vendor.0 Bundle-Localization: plugin @@ -69,7 +69,7 @@ org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)", org.eclipse.emf.codegen;bundle-version="[2.2.0,3.0.0)", org.eclipse.jdt.launching;bundle-version="[3.2.0,4.0.0)", - org.eclipse.wst.sse.core;bundle-version="[1.1.0,1.2.0)", + org.eclipse.wst.sse.core;bundle-version="[1.1.0,2.0.0)", org.eclipse.jst.common.frameworks;bundle-version="[1.1.0,1.2.0)", org.eclipse.wst.common.modulecore;bundle-version="[1.2.302,2.0.0)";visibility:=reexport, org.eclipse.jem.util;bundle-version="[2.0.0,3.0.0)", @@ -77,8 +77,8 @@ org.eclipse.wst.common.uriresolver;bundle-version="[1.1.0,2.0.0)", org.eclipse.wst.common.project.facet.core;bundle-version="[1.3.0,2.0.0)", org.eclipse.jst.common.project.facet.core;bundle-version="[1.3.0,2.0.0)", - org.eclipse.wst.xml.core;bundle-version="[1.1.0,1.2.0)", - org.eclipse.wst.web;bundle-version="[1.1.600,1.2.0)", + org.eclipse.wst.xml.core;bundle-version="[1.1.0,2.0.0)", + org.eclipse.wst.web;bundle-version="[1.1.600,2.0.0)", com.ibm.icu;bundle-version="3.8.1", org.eclipse.wst.common.environment;bundle-version="[1.0.100,1.1.0)", org.eclipse.core.expressions;bundle-version="[3.4.0,4.0.0)",
diff --git a/plugins/org.eclipse.jst.j2ee/pom.xml b/plugins/org.eclipse.jst.j2ee/pom.xml index 1e6c424..02890bb 100644 --- a/plugins/org.eclipse.jst.j2ee/pom.xml +++ b/plugins/org.eclipse.jst.j2ee/pom.xml
@@ -21,6 +21,6 @@ <groupId>org.eclipse.webtools.javaee</groupId> <artifactId>org.eclipse.jst.j2ee</artifactId> - <version>1.2.300-SNAPSHOT</version> + <version>1.2.301-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>
diff --git a/plugins/org.eclipse.jst.jee.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.jee.ui/META-INF/MANIFEST.MF index 0c3ddc8..ace2e2d 100644 --- a/plugins/org.eclipse.jst.jee.ui/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.jst.jee.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name.0 Bundle-SymbolicName: org.eclipse.jst.jee.ui;singleton:=true -Bundle-Version: 1.0.900.qualifier +Bundle-Version: 1.0.901.qualifier Bundle-Activator: org.eclipse.jst.jee.ui.plugin.JEEUIPlugin Require-Bundle: org.eclipse.ui;bundle-version="[3.2.0,4.0.0)", org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)", @@ -14,8 +14,8 @@ org.eclipse.wst.common.frameworks;bundle-version="[1.2.0,2.0.0)", org.eclipse.jst.jee;bundle-version="[1.0.0,1.1.0)", org.eclipse.jem.util;bundle-version="[2.0.0,3.0.0)", - org.eclipse.wst.web.ui;bundle-version="[1.1.0,1.2.0)", - org.eclipse.wst.web;bundle-version="[1.1.0,1.2.0)", + org.eclipse.wst.web.ui;bundle-version="[1.1.0,2.0.0)", + org.eclipse.wst.web;bundle-version="[1.1.0,2.0.0)", org.eclipse.wst.common.frameworks.ui;bundle-version="[1.2.0,2.0.0)", org.eclipse.emf.ecore;bundle-version="[2.2.0,3.0.0)", org.eclipse.wst.server.core;bundle-version="[1.0.0,2.0.0)",
diff --git a/plugins/org.eclipse.jst.jee.ui/pom.xml b/plugins/org.eclipse.jst.jee.ui/pom.xml index 3575fa5..24e1e90 100644 --- a/plugins/org.eclipse.jst.jee.ui/pom.xml +++ b/plugins/org.eclipse.jst.jee.ui/pom.xml
@@ -21,6 +21,6 @@ <groupId>org.eclipse.webtools.javaee</groupId> <artifactId>org.eclipse.jst.jee.ui</artifactId> - <version>1.0.900-SNAPSHOT</version> + <version>1.0.901-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>
diff --git a/plugins/org.eclipse.jst.jee.web/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.jee.web/META-INF/MANIFEST.MF index 38cb6b6..1984631 100644 --- a/plugins/org.eclipse.jst.jee.web/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.jst.jee.web/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name.0 Bundle-SymbolicName: org.eclipse.jst.jee.web;singleton:=true -Bundle-Version: 1.0.700.qualifier +Bundle-Version: 1.0.701.qualifier Bundle-Activator: org.eclipse.jst.jee.web.Activator Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)", org.eclipse.wst.common.project.facet.core;bundle-version="[1.3.0,2.0.0)", @@ -10,7 +10,7 @@ org.eclipse.wst.common.frameworks;bundle-version="[1.2.0,2.0.0)", org.eclipse.jdt.core;bundle-version="[3.2.0,4.0.0)", org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)", - org.eclipse.wst.web;bundle-version="[1.1.0,1.2.0)", + org.eclipse.wst.web;bundle-version="[1.1.0,2.0.0)", org.eclipse.jem.util;bundle-version="[2.0.0,3.0.0)", org.eclipse.jst.common.frameworks;bundle-version="[1.1.0,1.2.0)", org.eclipse.jst.common.project.facet.core;bundle-version="[1.3.0,2.0.0)",
diff --git a/plugins/org.eclipse.jst.jee.web/pom.xml b/plugins/org.eclipse.jst.jee.web/pom.xml index 3af6bab..a286826 100644 --- a/plugins/org.eclipse.jst.jee.web/pom.xml +++ b/plugins/org.eclipse.jst.jee.web/pom.xml
@@ -21,6 +21,6 @@ <groupId>org.eclipse.webtools.javaee</groupId> <artifactId>org.eclipse.jst.jee.web</artifactId> - <version>1.0.700-SNAPSHOT</version> + <version>1.0.701-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>
diff --git a/plugins/org.eclipse.jst.jee/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.jee/META-INF/MANIFEST.MF index f8c52ce..10b26df 100644 --- a/plugins/org.eclipse.jst.jee/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.jst.jee/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name.0 Bundle-SymbolicName: org.eclipse.jst.jee;singleton:=true -Bundle-Version: 1.0.901.qualifier +Bundle-Version: 1.0.902.qualifier Bundle-Activator: org.eclipse.jst.jee.JEEPlugin Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)", org.eclipse.wst.common.project.facet.core;bundle-version="[1.3.0,2.0.0)", @@ -14,7 +14,7 @@ org.eclipse.jdt.core;bundle-version="[3.2.0,4.0.0)", org.eclipse.jst.common.project.facet.core;bundle-version="[1.3.0,2.0.0)", org.eclipse.emf.common;bundle-version="[2.2.0,3.0.0)", - org.eclipse.wst.web;bundle-version="[1.1.0,1.2.0)", + org.eclipse.wst.web;bundle-version="[1.1.0,2.0.0)", org.eclipse.jst.j2ee.core;bundle-version="[1.3.0,2.0.0)", org.eclipse.core.commands;bundle-version="[3.2.0,4.0.0)", org.eclipse.wst.server.core;bundle-version="[1.0.0,2.0.0)",
diff --git a/plugins/org.eclipse.jst.jee/pom.xml b/plugins/org.eclipse.jst.jee/pom.xml index 120ccb3..fcd7a92 100644 --- a/plugins/org.eclipse.jst.jee/pom.xml +++ b/plugins/org.eclipse.jst.jee/pom.xml
@@ -21,6 +21,6 @@ <groupId>org.eclipse.webtools.javaee</groupId> <artifactId>org.eclipse.jst.jee</artifactId> - <version>1.0.901-SNAPSHOT</version> + <version>1.0.902-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>
diff --git a/plugins/org.eclipse.jst.servlet.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.servlet.ui/META-INF/MANIFEST.MF index 73521f1..cf4f623 100644 --- a/plugins/org.eclipse.jst.servlet.ui/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.jst.servlet.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.jst.servlet.ui; singleton:=true -Bundle-Version: 1.1.920.qualifier +Bundle-Version: 1.1.921.qualifier Bundle-Activator: org.eclipse.jst.servlet.ui.internal.plugin.ServletUIPlugin Bundle-Vendor: %pluginVendor Bundle-Localization: plugin @@ -24,7 +24,7 @@ org.eclipse.jst.j2ee;bundle-version="[1.1.0,1.3.0)", org.eclipse.jst.j2ee.core;bundle-version="[1.3.0,2.0.0)", org.eclipse.jst.j2ee.web;bundle-version="[1.1.0,1.2.0)", - org.eclipse.wst.web;bundle-version="[1.1.0,1.2.0)", + org.eclipse.wst.web;bundle-version="[1.1.0,2.0.0)", org.eclipse.jdt.core;bundle-version="[3.2.0,4.0.0)", org.eclipse.jdt.ui;bundle-version="[3.2.0,4.0.0)", org.eclipse.wst.common.modulecore;bundle-version="[1.2.0,2.0.0)", @@ -37,7 +37,7 @@ org.eclipse.jst.server.core;bundle-version="[1.0.102,2.0.0)", org.eclipse.wst.common.project.facet.core;bundle-version="[1.3.0,2.0.0)", org.eclipse.wst.common.project.facet.ui;bundle-version="[1.3.0,2.0.0)", - org.eclipse.wst.web.ui;bundle-version="[1.1.0,1.2.0)", + org.eclipse.wst.web.ui;bundle-version="[1.1.0,2.0.0)", org.eclipse.ui.navigator.resources;bundle-version="[3.2.0,4.0.0)", org.eclipse.ui.navigator;bundle-version="[3.2.0,4.0.0)", org.eclipse.ui.ide;bundle-version="[3.2.0,4.0.0)",
diff --git a/plugins/org.eclipse.jst.servlet.ui/pom.xml b/plugins/org.eclipse.jst.servlet.ui/pom.xml index 0466e0b..4a3a517 100644 --- a/plugins/org.eclipse.jst.servlet.ui/pom.xml +++ b/plugins/org.eclipse.jst.servlet.ui/pom.xml
@@ -21,6 +21,6 @@ <groupId>org.eclipse.webtools.javaee</groupId> <artifactId>org.eclipse.jst.servlet.ui</artifactId> - <version>1.1.920-SNAPSHOT</version> + <version>1.1.921-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>
diff --git a/pom.xml b/pom.xml index 91dd4ea..e2ad365 100644 --- a/pom.xml +++ b/pom.xml
@@ -16,7 +16,7 @@ <parent> <groupId>org.eclipse</groupId> <artifactId>wtp-parent</artifactId> - <version>3.6.0-SNAPSHOT</version> + <version>3.10.0-SNAPSHOT</version> <relativePath>../wtp-parent</relativePath> </parent> @@ -27,8 +27,6 @@ <properties> <tycho.scmUrl>scm:git:git://git.eclipse.org/gitroot/jeetools/webtools.javaee.git</tycho.scmUrl> - <tycho.version>1.0.0</tycho.version> - <tycho-extras.version>1.0.0</tycho-extras.version> </properties> <repositories>