Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornickboldt2018-02-16 21:39:14 +0000
committernickboldt2018-02-20 21:54:08 +0000
commit2b86ab4132c1f1fe9c0c2a6b85800c1974481448 (patch)
treeac13656770a9ec89f9307ffce912bc82e7f5fe85
parent715ab9aad8328f39737ec355265b066ef54d1411 (diff)
downloadwebtools.webservices-2b86ab4132c1f1fe9c0c2a6b85800c1974481448.tar.gz
webtools.webservices-2b86ab4132c1f1fe9c0c2a6b85800c1974481448.tar.xz
webtools.webservices-2b86ab4132c1f1fe9c0c2a6b85800c1974481448.zip
fix jaxws features - bump versions, remove obsolete sourceTemplateBundle/sourceTemplatePlugin, etc.
upversion org.eclipse.jst.ws.jaxws_sdk.feature :: 1.2.204 => 1.2.205 use parent pom 3.10 and tycho 1.1 remove org.eclipse.jst.enterprise_ui.feature.source from org.eclipse.jst.enterprise_sdk.feature fix deps on sse plugins which have moved from 1.1 to 1.2 Signed-off-by: nickboldt <nboldt@redhat.com>
-rw-r--r--axis2/features/org.eclipse.jst.ws.axis2tools_sdk.feature/feature.xml11
-rw-r--r--core/bundles/org.eclipse.wst.wsdl.ui/META-INF/MANIFEST.MF12
-rw-r--r--core/bundles/org.eclipse.wst.wsdl.ui/pom.xml2
-rw-r--r--core/bundles/org.eclipse.wst.wsdl.validation/META-INF/MANIFEST.MF4
-rw-r--r--core/bundles/org.eclipse.wst.wsdl.validation/pom.xml2
-rw-r--r--core/bundles/org.eclipse.wst.wsi.ui/META-INF/MANIFEST.MF6
-rw-r--r--core/bundles/org.eclipse.wst.wsi.ui/pom.xml2
-rw-r--r--core/features/javaee-web/org.eclipse.jst.enterprise_sdk.feature/feature.xml1
-rw-r--r--core/features/javaee-web/org.eclipse.jst.web_sdk.feature/feature.xml1
-rw-r--r--core/features/org.eclipse.wst.ws_sdk.feature/feature.xml10
-rw-r--r--jaxws/bundles/org.eclipse.jst.ws.cxf.core/META-INF/MANIFEST.MF6
-rw-r--r--jaxws/bundles/org.eclipse.jst.ws.cxf.core/pom.xml2
-rw-r--r--jaxws/bundles/org.eclipse.jst.ws.jaxws.core/META-INF/MANIFEST.MF6
-rw-r--r--jaxws/bundles/org.eclipse.jst.ws.jaxws.core/pom.xml2
-rw-r--r--jaxws/features/org.eclipse.jst.ws.cxf.feature/feature.xml10
-rw-r--r--jaxws/features/org.eclipse.jst.ws.cxf.feature/pom.xml2
-rw-r--r--jaxws/features/org.eclipse.jst.ws.cxf.feature/sourceTemplateBundle/about.html28
-rw-r--r--jaxws/features/org.eclipse.jst.ws.cxf.feature/sourceTemplateBundle/about.ini13
-rw-r--r--jaxws/features/org.eclipse.jst.ws.cxf.feature/sourceTemplateBundle/about.mappings6
-rw-r--r--jaxws/features/org.eclipse.jst.ws.cxf.feature/sourceTemplateBundle/about.properties26
-rw-r--r--jaxws/features/org.eclipse.jst.ws.cxf.feature/sourceTemplateBundle/build.properties2
-rw-r--r--jaxws/features/org.eclipse.jst.ws.cxf.feature/sourceTemplateBundle/cxf32.gifbin1669 -> 0 bytes
-rw-r--r--jaxws/features/org.eclipse.jst.ws.cxf.feature/sourceTemplateBundle/plugin.properties12
-rw-r--r--jaxws/features/org.eclipse.jst.ws.cxf.feature/sourceTemplatePlugin/about.html28
-rw-r--r--jaxws/features/org.eclipse.jst.ws.cxf.feature/sourceTemplatePlugin/about.ini13
-rw-r--r--jaxws/features/org.eclipse.jst.ws.cxf.feature/sourceTemplatePlugin/about.mappings6
-rw-r--r--jaxws/features/org.eclipse.jst.ws.cxf.feature/sourceTemplatePlugin/about.properties26
-rw-r--r--jaxws/features/org.eclipse.jst.ws.cxf.feature/sourceTemplatePlugin/build.properties2
-rw-r--r--jaxws/features/org.eclipse.jst.ws.cxf.feature/sourceTemplatePlugin/cxf32.gifbin1669 -> 0 bytes
-rw-r--r--jaxws/features/org.eclipse.jst.ws.cxf.feature/sourceTemplatePlugin/plugin.properties13
-rw-r--r--jaxws/features/org.eclipse.jst.ws.cxf_sdk.feature/build.properties2
-rw-r--r--jaxws/features/org.eclipse.jst.ws.cxf_sdk.feature/feature.xml13
-rw-r--r--jaxws/features/org.eclipse.jst.ws.cxf_sdk.feature/pom.xml4
-rw-r--r--jaxws/features/org.eclipse.jst.ws.cxf_sdk.feature/sourceTemplateFeature/.gitkeep0
-rw-r--r--jaxws/features/org.eclipse.jst.ws.jaxws.assembly.feature/feature.xml17
-rw-r--r--jaxws/features/org.eclipse.jst.ws.jaxws.assembly_sdk.feature/feature.xml16
-rw-r--r--jaxws/features/org.eclipse.jst.ws.jaxws.assembly_tests.feature/feature.xml16
-rw-r--r--jaxws/features/org.eclipse.jst.ws.jaxws.dom_sdk.feature/feature.xml10
-rw-r--r--jaxws/features/org.eclipse.jst.ws.jaxws_sdk.feature/feature.xml2
-rw-r--r--jaxws/features/org.eclipse.jst.ws.jaxws_sdk.feature/pom.xml2
-rw-r--r--jaxws/features/pom.xml76
-rw-r--r--jaxws/pom.xml16
-rw-r--r--pom.xml4
43 files changed, 139 insertions, 293 deletions
diff --git a/axis2/features/org.eclipse.jst.ws.axis2tools_sdk.feature/feature.xml b/axis2/features/org.eclipse.jst.ws.axis2tools_sdk.feature/feature.xml
index 39b1fc43d..7bc8e3918 100644
--- a/axis2/features/org.eclipse.jst.ws.axis2tools_sdk.feature/feature.xml
+++ b/axis2/features/org.eclipse.jst.ws.axis2tools_sdk.feature/feature.xml
@@ -19,12 +19,7 @@
%license
</license>
- <includes
- id="org.eclipse.jst.ws.axis2tools.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.jst.ws.axis2tools.feature.source"
- version="0.0.0"/>
-
+ <requires>
+ <import feature="org.eclipse.jst.ws.axis2tools.feature"/>
+ </requires>
</feature>
diff --git a/core/bundles/org.eclipse.wst.wsdl.ui/META-INF/MANIFEST.MF b/core/bundles/org.eclipse.wst.wsdl.ui/META-INF/MANIFEST.MF
index e962fad94..117c15249 100644
--- a/core/bundles/org.eclipse.wst.wsdl.ui/META-INF/MANIFEST.MF
+++ b/core/bundles/org.eclipse.wst.wsdl.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %_UI_PLUGIN_NAME
Bundle-SymbolicName: org.eclipse.wst.wsdl.ui; singleton:=true
-Bundle-Version: 1.2.800.qualifier
+Bundle-Version: 1.2.801.qualifier
Bundle-Activator: org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin
Bundle-Vendor: %providerName
Bundle-Localization: plugin
@@ -63,16 +63,16 @@ Require-Bundle: org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
org.eclipse.ui.ide;bundle-version="[3.2.0,4.0.0)",
org.eclipse.ui.views;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.ui;bundle-version="[1.0.101,1.4.0)",
+ org.eclipse.wst.sse.core;bundle-version="[1.1.0,2.0.0)",
+ org.eclipse.wst.sse.ui;bundle-version="[1.0.101,2.0.0)",
org.eclipse.wst.common.uriresolver;bundle-version="[1.1.0,2.0.0)",
org.eclipse.wst.common.ui;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.xml.core;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.xml.ui;bundle-version="[1.0.100,1.2.0)",
+ org.eclipse.wst.xml.core;bundle-version="[1.1.0,2.0.0)",
+ org.eclipse.wst.xml.ui;bundle-version="[1.0.100,2.0.0)",
org.eclipse.xsd;bundle-version="[2.2.0,3.0.0)",
org.eclipse.wst.wsdl;bundle-version="[1.2.0,1.3.0)",
org.eclipse.wst.common.core;bundle-version="[1.1.0,2.0.0)",
- org.eclipse.wst.xsd.ui;bundle-version="[1.2.0,1.3.0)",
+ org.eclipse.wst.xsd.ui;bundle-version="[1.2.0,2.0.0)",
org.eclipse.emf.edit;bundle-version="[2.2.0,3.0.0)",
org.eclipse.emf.edit.ui;bundle-version="[2.2.0,3.0.0)",
org.eclipse.wst.validation;bundle-version="[1.1.0,2.0.0)",
diff --git a/core/bundles/org.eclipse.wst.wsdl.ui/pom.xml b/core/bundles/org.eclipse.wst.wsdl.ui/pom.xml
index a04ac6eef..20b2745d5 100644
--- a/core/bundles/org.eclipse.wst.wsdl.ui/pom.xml
+++ b/core/bundles/org.eclipse.wst.wsdl.ui/pom.xml
@@ -22,6 +22,6 @@
<groupId>org.eclipse.webtools.webservices</groupId>
<artifactId>org.eclipse.wst.wsdl.ui</artifactId>
- <version>1.2.800-SNAPSHOT</version>
+ <version>1.2.801-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/core/bundles/org.eclipse.wst.wsdl.validation/META-INF/MANIFEST.MF b/core/bundles/org.eclipse.wst.wsdl.validation/META-INF/MANIFEST.MF
index f9475f81c..81ffb244d 100644
--- a/core/bundles/org.eclipse.wst.wsdl.validation/META-INF/MANIFEST.MF
+++ b/core/bundles/org.eclipse.wst.wsdl.validation/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %_PLUGIN_NAME
Bundle-SymbolicName: org.eclipse.wst.wsdl.validation; singleton:=true
-Bundle-Version: 1.1.700.qualifier
+Bundle-Version: 1.1.701.qualifier
Bundle-Activator: org.eclipse.wst.wsdl.validation.internal.eclipse.ValidateWSDLPlugin
Bundle-Vendor: %_PROVIDER_NAME
Bundle-Localization: plugin
@@ -27,6 +27,6 @@ Require-Bundle: org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
javax.wsdl;bundle-version="[1.5.0,1.6.0)",
org.apache.xerces;bundle-version="[2.8.0,3.0.0)";visibility:=reexport,
org.eclipse.core.runtime;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)"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/core/bundles/org.eclipse.wst.wsdl.validation/pom.xml b/core/bundles/org.eclipse.wst.wsdl.validation/pom.xml
index bc646860e..856d33e69 100644
--- a/core/bundles/org.eclipse.wst.wsdl.validation/pom.xml
+++ b/core/bundles/org.eclipse.wst.wsdl.validation/pom.xml
@@ -22,6 +22,6 @@
<groupId>org.eclipse.webtools.webservices</groupId>
<artifactId>org.eclipse.wst.wsdl.validation</artifactId>
- <version>1.1.700-SNAPSHOT</version>
+ <version>1.1.701-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/core/bundles/org.eclipse.wst.wsi.ui/META-INF/MANIFEST.MF b/core/bundles/org.eclipse.wst.wsi.ui/META-INF/MANIFEST.MF
index 8fc571823..a97452683 100644
--- a/core/bundles/org.eclipse.wst.wsi.ui/META-INF/MANIFEST.MF
+++ b/core/bundles/org.eclipse.wst.wsi.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %_PLUGIN_NAME
Bundle-SymbolicName: org.eclipse.wst.wsi.ui; singleton:=true
-Bundle-Version: 1.0.600.qualifier
+Bundle-Version: 1.0.601.qualifier
Bundle-Activator: org.eclipse.wst.wsi.ui.internal.WSIUIPlugin
Bundle-Vendor: %_PROVIDER_NAME
Bundle-Localization: plugin
@@ -33,7 +33,7 @@ Require-Bundle: org.eclipse.core.runtime; bundle-version="[3.2.0,4.0.0)",
org.eclipse.wst.internet.monitor.core;bundle-version="[1.0.102,1.1.0)",
org.eclipse.wst.internet.monitor.ui;bundle-version="[1.0.102,1.1.0)",
javax.wsdl;bundle-version="[1.5.0,1.6.0)",
- org.eclipse.wst.xml.ui;bundle-version="[1.0.100,1.2.0)",
- org.eclipse.wst.xml.core;bundle-version="[1.1.0,1.2.0)"
+ org.eclipse.wst.xml.ui;bundle-version="[1.0.100,2.0.0)",
+ org.eclipse.wst.xml.core;bundle-version="[1.1.0,2.0.0)"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/core/bundles/org.eclipse.wst.wsi.ui/pom.xml b/core/bundles/org.eclipse.wst.wsi.ui/pom.xml
index 5a647d03e..1dd0737f4 100644
--- a/core/bundles/org.eclipse.wst.wsi.ui/pom.xml
+++ b/core/bundles/org.eclipse.wst.wsi.ui/pom.xml
@@ -22,6 +22,6 @@
<groupId>org.eclipse.webtools.webservices</groupId>
<artifactId>org.eclipse.wst.wsi.ui</artifactId>
- <version>1.0.600-SNAPSHOT</version>
+ <version>1.0.601-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/core/features/javaee-web/org.eclipse.jst.enterprise_sdk.feature/feature.xml b/core/features/javaee-web/org.eclipse.jst.enterprise_sdk.feature/feature.xml
index a680666cd..b4df097e1 100644
--- a/core/features/javaee-web/org.eclipse.jst.enterprise_sdk.feature/feature.xml
+++ b/core/features/javaee-web/org.eclipse.jst.enterprise_sdk.feature/feature.xml
@@ -21,7 +21,6 @@
<requires>
<import feature="org.eclipse.jst.enterprise_ui.feature"/>
- <import feature="org.eclipse.jst.enterprise_ui.feature.source"/>
</requires>
</feature>
diff --git a/core/features/javaee-web/org.eclipse.jst.web_sdk.feature/feature.xml b/core/features/javaee-web/org.eclipse.jst.web_sdk.feature/feature.xml
index 8a21c2f57..fc5ad4b1f 100644
--- a/core/features/javaee-web/org.eclipse.jst.web_sdk.feature/feature.xml
+++ b/core/features/javaee-web/org.eclipse.jst.web_sdk.feature/feature.xml
@@ -22,7 +22,6 @@
<requires>
<import feature="org.eclipse.wst.ws_sdk.feature"/>
<import feature="org.eclipse.jst.web_ui.feature"/>
- <import feature="org.eclipse.jst.web_ui.feature.source"/>
<import plugin="org.eclipse.jst.jsf.doc.dev"/>
</requires>
</feature>
diff --git a/core/features/org.eclipse.wst.ws_sdk.feature/feature.xml b/core/features/org.eclipse.wst.ws_sdk.feature/feature.xml
index 150c0e680..1499cdadc 100644
--- a/core/features/org.eclipse.wst.ws_sdk.feature/feature.xml
+++ b/core/features/org.eclipse.wst.ws_sdk.feature/feature.xml
@@ -19,13 +19,9 @@
%license
</license>
- <includes
- id="org.eclipse.wst.ws_ui.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.wst.ws_ui.feature.source"
- version="0.0.0"/>
+ <requires>
+ <import feature="org.eclipse.wst.ws_ui.feature"/>
+ </requires>
<plugin
id="org.eclipse.wst.ws.api.doc"
diff --git a/jaxws/bundles/org.eclipse.jst.ws.cxf.core/META-INF/MANIFEST.MF b/jaxws/bundles/org.eclipse.jst.ws.cxf.core/META-INF/MANIFEST.MF
index e14af5a92..9d6ac1a20 100644
--- a/jaxws/bundles/org.eclipse.jst.ws.cxf.core/META-INF/MANIFEST.MF
+++ b/jaxws/bundles/org.eclipse.jst.ws.cxf.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.jst.ws.cxf.core;singleton:=true
-Bundle-Version: 1.1.300.qualifier
+Bundle-Version: 1.1.301.qualifier
Bundle-Activator: org.eclipse.jst.ws.internal.cxf.core.CXFCorePlugin
Bundle-Vendor: %pluginProvider
Bundle-Localization: plugin
@@ -38,8 +38,8 @@ Require-Bundle: org.eclipse.wst.common.project.facet.ui;bundle-version="[1.3.0,2
org.eclipse.jdt.core;bundle-version="[3.4.0,4.0.0)",
org.eclipse.debug.core;bundle-version="[3.4.0,4.0.0)",
org.eclipse.jdt.launching;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.wst.sse.core;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.sse.ui;bundle-version="[1.1.0,1.4.0)",
+ org.eclipse.wst.sse.core;bundle-version="[1.1.0,2.0.0)",
+ org.eclipse.wst.sse.ui;bundle-version="[1.1.0,2.0.0)",
org.eclipse.jdt.ui;bundle-version="[3.4.0,4.0.0)",
javax.wsdl;bundle-version="[1.6.2,1.7.0)",
org.eclipse.ltk.core.refactoring;bundle-version="[3.4.0,4.0.0)",
diff --git a/jaxws/bundles/org.eclipse.jst.ws.cxf.core/pom.xml b/jaxws/bundles/org.eclipse.jst.ws.cxf.core/pom.xml
index 719c73887..ba56d87f3 100644
--- a/jaxws/bundles/org.eclipse.jst.ws.cxf.core/pom.xml
+++ b/jaxws/bundles/org.eclipse.jst.ws.cxf.core/pom.xml
@@ -22,6 +22,6 @@
<groupId>org.eclipse.webtools.webservices</groupId>
<artifactId>org.eclipse.jst.ws.cxf.core</artifactId>
- <version>1.1.300-SNAPSHOT</version>
+ <version>1.1.301-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/jaxws/bundles/org.eclipse.jst.ws.jaxws.core/META-INF/MANIFEST.MF b/jaxws/bundles/org.eclipse.jst.ws.jaxws.core/META-INF/MANIFEST.MF
index 3ea302789..cae9e786e 100644
--- a/jaxws/bundles/org.eclipse.jst.ws.jaxws.core/META-INF/MANIFEST.MF
+++ b/jaxws/bundles/org.eclipse.jst.ws.jaxws.core/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.jst.ws.jaxws.core;singleton:=true
Bundle-Vendor: %pluginProvider
-Bundle-Version: 1.0.500.qualifier
+Bundle-Version: 1.0.501.qualifier
Bundle-ClassPath: .
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: J2SE-1.5
@@ -17,8 +17,8 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
javax.wsdl;bundle-version="[1.6.2,1.7.0)",
javax.xml.soap;bundle-version="[1.2.0,1.3.0)",
org.apache.xerces;bundle-version="[2.9.0,3.0.0)",
- org.eclipse.wst.sse.core;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.sse.ui;bundle-version="[1.1.0,1.4.0)",
+ org.eclipse.wst.sse.core;bundle-version="[1.1.0,2.0.0)",
+ org.eclipse.wst.sse.ui;bundle-version="[1.1.0,2.0.0)",
org.eclipse.wst.common.project.facet.core;bundle-version="[1.3.0,1.5.0)",
org.eclipse.wst.common.modulecore;bundle-version="[1.1.0,1.4.0)"
Export-Package: org.eclipse.jst.ws.internal.jaxws.core;x-friends:="org.eclipse.jst.ws.jaxws.core.tests,org.eclipse.jst.ws.jaxws.ui,org.eclipse.jst.ws.jaxws.dom.runtime.tests",
diff --git a/jaxws/bundles/org.eclipse.jst.ws.jaxws.core/pom.xml b/jaxws/bundles/org.eclipse.jst.ws.jaxws.core/pom.xml
index 32a8bcdcc..8ed59debe 100644
--- a/jaxws/bundles/org.eclipse.jst.ws.jaxws.core/pom.xml
+++ b/jaxws/bundles/org.eclipse.jst.ws.jaxws.core/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.eclipse.webtools.webservices</groupId>
<artifactId>org.eclipse.jst.ws.jaxws.core</artifactId>
- <version>1.0.500-SNAPSHOT</version>
+ <version>1.0.501-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<build>
diff --git a/jaxws/features/org.eclipse.jst.ws.cxf.feature/feature.xml b/jaxws/features/org.eclipse.jst.ws.cxf.feature/feature.xml
index 1e492404a..48e9ff421 100644
--- a/jaxws/features/org.eclipse.jst.ws.cxf.feature/feature.xml
+++ b/jaxws/features/org.eclipse.jst.ws.cxf.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.jst.ws.cxf.feature"
label="%featureName"
- version="1.1.300.qualifier"
+ version="1.1.301.qualifier"
provider-name="%featureProvider"
plugin="org.eclipse.jst.ws.cxf.core"
image="eclipse_update_120.jpg"
@@ -21,10 +21,10 @@
%license
</license>
- <includes
- id="org.eclipse.jst.ws.jaxws_userdoc.feature"
- version="0.0.0"/>
-
+ <requires>
+ <import feature="org.eclipse.jst.ws.jaxws_userdoc.feature"/>
+ </requires>
+
<plugin
id="org.jdom"
download-size="156"
diff --git a/jaxws/features/org.eclipse.jst.ws.cxf.feature/pom.xml b/jaxws/features/org.eclipse.jst.ws.cxf.feature/pom.xml
index 8fea228b2..dfa24a5a3 100644
--- a/jaxws/features/org.eclipse.jst.ws.cxf.feature/pom.xml
+++ b/jaxws/features/org.eclipse.jst.ws.cxf.feature/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.eclipse.webtools.webservices</groupId>
<artifactId>org.eclipse.jst.ws.cxf.feature</artifactId>
- <version>1.1.300-SNAPSHOT</version>
+ <version>1.1.301-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
<build>
diff --git a/jaxws/features/org.eclipse.jst.ws.cxf.feature/sourceTemplateBundle/about.html b/jaxws/features/org.eclipse.jst.ws.cxf.feature/sourceTemplateBundle/about.html
deleted file mode 100644
index 3d169bfb7..000000000
--- a/jaxws/features/org.eclipse.jst.ws.cxf.feature/sourceTemplateBundle/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>September 12, 2008</p>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;). A copy of the EPL is available
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was
-provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
diff --git a/jaxws/features/org.eclipse.jst.ws.cxf.feature/sourceTemplateBundle/about.ini b/jaxws/features/org.eclipse.jst.ws.cxf.feature/sourceTemplateBundle/about.ini
deleted file mode 100644
index a86472743..000000000
--- a/jaxws/features/org.eclipse.jst.ws.cxf.feature/sourceTemplateBundle/about.ini
+++ /dev/null
@@ -1,13 +0,0 @@
-# about.ini
-# contains information about a feature
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# "%key" are externalized strings defined in about.properties
-# This file does not need to be translated.
-
-# Property "aboutText" contains blurb for feature details in the "About"
-# dialog (translated). Maximum 15 lines and 75 characters per line.
-aboutText=%blurb
-
-# Property "featureImage" contains path to feature image (32x32)
-featureImage=cxf32.gif
-
diff --git a/jaxws/features/org.eclipse.jst.ws.cxf.feature/sourceTemplateBundle/about.mappings b/jaxws/features/org.eclipse.jst.ws.cxf.feature/sourceTemplateBundle/about.mappings
deleted file mode 100644
index a28390a75..000000000
--- a/jaxws/features/org.eclipse.jst.ws.cxf.feature/sourceTemplateBundle/about.mappings
+++ /dev/null
@@ -1,6 +0,0 @@
-# about.mappings
-# contains fill-ins for about.properties
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file does not need to be translated.
-
-0=@build@
diff --git a/jaxws/features/org.eclipse.jst.ws.cxf.feature/sourceTemplateBundle/about.properties b/jaxws/features/org.eclipse.jst.ws.cxf.feature/sourceTemplateBundle/about.properties
deleted file mode 100644
index d3589ad37..000000000
--- a/jaxws/features/org.eclipse.jst.ws.cxf.feature/sourceTemplateBundle/about.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-###############################################################################
-# Copyright (c) 2008 IONA Technologies PLC
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IONA Technologies PLC - initial API and implementation
-###############################################################################
-# about.properties
-# contains externalized strings for about.ini
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# fill-ins are supplied by about.mappings
-# This file should be translated.
-#
-# Do not translate any values surrounded by {}
-
-blurb=CXF Web Services Source\n\
-\n\
-Version: {featureVersion}\n\
-Build id: {0}\n\
-\n\
-(c) Copyright Eclipse contributors and others 2008, 2010. All rights reserved.\n\
-Visit http://www.eclipse.org/webtools/\n\
-\n
diff --git a/jaxws/features/org.eclipse.jst.ws.cxf.feature/sourceTemplateBundle/build.properties b/jaxws/features/org.eclipse.jst.ws.cxf.feature/sourceTemplateBundle/build.properties
deleted file mode 100644
index 1c4344d7f..000000000
--- a/jaxws/features/org.eclipse.jst.ws.cxf.feature/sourceTemplateBundle/build.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-bin.includes = about.html, about.ini, about.mappings, about.properties, cxf32.png, plugin.properties, plugin.xml, src/**, META-INF/
-sourcePlugin = true
diff --git a/jaxws/features/org.eclipse.jst.ws.cxf.feature/sourceTemplateBundle/cxf32.gif b/jaxws/features/org.eclipse.jst.ws.cxf.feature/sourceTemplateBundle/cxf32.gif
deleted file mode 100644
index 811eccb4a..000000000
--- a/jaxws/features/org.eclipse.jst.ws.cxf.feature/sourceTemplateBundle/cxf32.gif
+++ /dev/null
Binary files differ
diff --git a/jaxws/features/org.eclipse.jst.ws.cxf.feature/sourceTemplateBundle/plugin.properties b/jaxws/features/org.eclipse.jst.ws.cxf.feature/sourceTemplateBundle/plugin.properties
deleted file mode 100644
index e05e53481..000000000
--- a/jaxws/features/org.eclipse.jst.ws.cxf.feature/sourceTemplateBundle/plugin.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-###############################################################################
-# Copyright (c) 2008 IONA Technologies PLC
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IONA Technologies PLC - initial API and implementation
-###############################################################################
-pluginName=CXF Web Services Source
-pluginProvider=Eclipse Web Tools Platform
diff --git a/jaxws/features/org.eclipse.jst.ws.cxf.feature/sourceTemplatePlugin/about.html b/jaxws/features/org.eclipse.jst.ws.cxf.feature/sourceTemplatePlugin/about.html
deleted file mode 100644
index 3d169bfb7..000000000
--- a/jaxws/features/org.eclipse.jst.ws.cxf.feature/sourceTemplatePlugin/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>September 12, 2008</p>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;). A copy of the EPL is available
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was
-provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
diff --git a/jaxws/features/org.eclipse.jst.ws.cxf.feature/sourceTemplatePlugin/about.ini b/jaxws/features/org.eclipse.jst.ws.cxf.feature/sourceTemplatePlugin/about.ini
deleted file mode 100644
index a86472743..000000000
--- a/jaxws/features/org.eclipse.jst.ws.cxf.feature/sourceTemplatePlugin/about.ini
+++ /dev/null
@@ -1,13 +0,0 @@
-# about.ini
-# contains information about a feature
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# "%key" are externalized strings defined in about.properties
-# This file does not need to be translated.
-
-# Property "aboutText" contains blurb for feature details in the "About"
-# dialog (translated). Maximum 15 lines and 75 characters per line.
-aboutText=%blurb
-
-# Property "featureImage" contains path to feature image (32x32)
-featureImage=cxf32.gif
-
diff --git a/jaxws/features/org.eclipse.jst.ws.cxf.feature/sourceTemplatePlugin/about.mappings b/jaxws/features/org.eclipse.jst.ws.cxf.feature/sourceTemplatePlugin/about.mappings
deleted file mode 100644
index a28390a75..000000000
--- a/jaxws/features/org.eclipse.jst.ws.cxf.feature/sourceTemplatePlugin/about.mappings
+++ /dev/null
@@ -1,6 +0,0 @@
-# about.mappings
-# contains fill-ins for about.properties
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file does not need to be translated.
-
-0=@build@
diff --git a/jaxws/features/org.eclipse.jst.ws.cxf.feature/sourceTemplatePlugin/about.properties b/jaxws/features/org.eclipse.jst.ws.cxf.feature/sourceTemplatePlugin/about.properties
deleted file mode 100644
index d3589ad37..000000000
--- a/jaxws/features/org.eclipse.jst.ws.cxf.feature/sourceTemplatePlugin/about.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-###############################################################################
-# Copyright (c) 2008 IONA Technologies PLC
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IONA Technologies PLC - initial API and implementation
-###############################################################################
-# about.properties
-# contains externalized strings for about.ini
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# fill-ins are supplied by about.mappings
-# This file should be translated.
-#
-# Do not translate any values surrounded by {}
-
-blurb=CXF Web Services Source\n\
-\n\
-Version: {featureVersion}\n\
-Build id: {0}\n\
-\n\
-(c) Copyright Eclipse contributors and others 2008, 2010. All rights reserved.\n\
-Visit http://www.eclipse.org/webtools/\n\
-\n
diff --git a/jaxws/features/org.eclipse.jst.ws.cxf.feature/sourceTemplatePlugin/build.properties b/jaxws/features/org.eclipse.jst.ws.cxf.feature/sourceTemplatePlugin/build.properties
deleted file mode 100644
index 1c4344d7f..000000000
--- a/jaxws/features/org.eclipse.jst.ws.cxf.feature/sourceTemplatePlugin/build.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-bin.includes = about.html, about.ini, about.mappings, about.properties, cxf32.png, plugin.properties, plugin.xml, src/**, META-INF/
-sourcePlugin = true
diff --git a/jaxws/features/org.eclipse.jst.ws.cxf.feature/sourceTemplatePlugin/cxf32.gif b/jaxws/features/org.eclipse.jst.ws.cxf.feature/sourceTemplatePlugin/cxf32.gif
deleted file mode 100644
index 811eccb4a..000000000
--- a/jaxws/features/org.eclipse.jst.ws.cxf.feature/sourceTemplatePlugin/cxf32.gif
+++ /dev/null
Binary files differ
diff --git a/jaxws/features/org.eclipse.jst.ws.cxf.feature/sourceTemplatePlugin/plugin.properties b/jaxws/features/org.eclipse.jst.ws.cxf.feature/sourceTemplatePlugin/plugin.properties
deleted file mode 100644
index 6d1cff40c..000000000
--- a/jaxws/features/org.eclipse.jst.ws.cxf.feature/sourceTemplatePlugin/plugin.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-###############################################################################
-# Copyright (c) 2008 IONA Technologies PLC
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IONA Technologies PLC - initial API and implementation
-###############################################################################
-
-pluginName=CXF Web Services Source
-pluginProvider=Eclipse Web Tools Platform
diff --git a/jaxws/features/org.eclipse.jst.ws.cxf_sdk.feature/build.properties b/jaxws/features/org.eclipse.jst.ws.cxf_sdk.feature/build.properties
index f2b3ad20f..8a0239f92 100644
--- a/jaxws/features/org.eclipse.jst.ws.cxf_sdk.feature/build.properties
+++ b/jaxws/features/org.eclipse.jst.ws.cxf_sdk.feature/build.properties
@@ -1,6 +1,4 @@
bin.includes = eclipse_update_120.jpg,\
feature.properties,\
feature.xml,\
-
-generate.feature@org.eclipse.jst.ws.cxf.feature.source=org.eclipse.jst.ws.cxf.feature
diff --git a/jaxws/features/org.eclipse.jst.ws.cxf_sdk.feature/feature.xml b/jaxws/features/org.eclipse.jst.ws.cxf_sdk.feature/feature.xml
index 28dd5980d..3bd65aff1 100644
--- a/jaxws/features/org.eclipse.jst.ws.cxf_sdk.feature/feature.xml
+++ b/jaxws/features/org.eclipse.jst.ws.cxf_sdk.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.jst.ws.cxf_sdk.feature"
label="%featureName"
- version="1.1.203.qualifier"
+ version="1.1.204.qualifier"
provider-name="%featureProvider"
image="eclipse_update_120.jpg"
license-feature="org.eclipse.license"
@@ -20,12 +20,7 @@
%license
</license>
- <includes
- id="org.eclipse.jst.ws.cxf.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.jst.ws.cxf.feature.source"
- version="0.0.0"/>
-
+ <requires>
+ <import feature="org.eclipse.jst.ws.cxf.feature"/>
+ </requires>
</feature>
diff --git a/jaxws/features/org.eclipse.jst.ws.cxf_sdk.feature/pom.xml b/jaxws/features/org.eclipse.jst.ws.cxf_sdk.feature/pom.xml
index c9d8a9bc1..e0da2599b 100644
--- a/jaxws/features/org.eclipse.jst.ws.cxf_sdk.feature/pom.xml
+++ b/jaxws/features/org.eclipse.jst.ws.cxf_sdk.feature/pom.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2012, 2014 Eclipse Foundation and others.
+ Copyright (c) 2012, 2014, 2018 Eclipse Foundation and others.
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Distribution License v1.0
which accompanies this distribution, and is available at
@@ -22,6 +22,6 @@
<groupId>org.eclipse.webtools.webservices</groupId>
<artifactId>org.eclipse.jst.ws.cxf_sdk.feature</artifactId>
- <version>1.1.203-SNAPSHOT</version>
+ <version>1.1.204-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/jaxws/features/org.eclipse.jst.ws.cxf_sdk.feature/sourceTemplateFeature/.gitkeep b/jaxws/features/org.eclipse.jst.ws.cxf_sdk.feature/sourceTemplateFeature/.gitkeep
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/jaxws/features/org.eclipse.jst.ws.cxf_sdk.feature/sourceTemplateFeature/.gitkeep
diff --git a/jaxws/features/org.eclipse.jst.ws.jaxws.assembly.feature/feature.xml b/jaxws/features/org.eclipse.jst.ws.jaxws.assembly.feature/feature.xml
index 9962276ad..28c8828b6 100644
--- a/jaxws/features/org.eclipse.jst.ws.jaxws.assembly.feature/feature.xml
+++ b/jaxws/features/org.eclipse.jst.ws.jaxws.assembly.feature/feature.xml
@@ -18,17 +18,10 @@ This feature should never appear in build distributions or update sites.
%license
</license>
-
- <includes
- id="org.eclipse.jst.ws.jaxws.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.jst.ws.cxf.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.jst.ws.jaxws.dom.feature"
- version="0.0.0"/>
+ <requires>
+ <import feature="org.eclipse.jst.ws.jaxws.feature"/>
+ <import feature="org.eclipse.jst.ws.cxf.feature"/>
+ <import feature="org.eclipse.jst.ws.jaxws.dom.feature"/>
+ </requires>
</feature>
diff --git a/jaxws/features/org.eclipse.jst.ws.jaxws.assembly_sdk.feature/feature.xml b/jaxws/features/org.eclipse.jst.ws.jaxws.assembly_sdk.feature/feature.xml
index bea8a1f5c..f166ce70c 100644
--- a/jaxws/features/org.eclipse.jst.ws.jaxws.assembly_sdk.feature/feature.xml
+++ b/jaxws/features/org.eclipse.jst.ws.jaxws.assembly_sdk.feature/feature.xml
@@ -18,16 +18,10 @@ This feature should never appear in build distributions or update sites.
%license
</license>
- <includes
- id="org.eclipse.jst.ws.jaxws_sdk.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.jst.ws.cxf_sdk.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.jst.ws.jaxws.dom_sdk.feature"
- version="0.0.0"/>
+ <requires>
+ <import feature="org.eclipse.jst.ws.jaxws_sdk.feature"/>
+ <import feature="org.eclipse.jst.ws.cxf_sdk.feature"/>
+ <import feature="org.eclipse.jst.ws.jaxws.dom_sdk.feature"/>
+ </requires>
</feature>
diff --git a/jaxws/features/org.eclipse.jst.ws.jaxws.assembly_tests.feature/feature.xml b/jaxws/features/org.eclipse.jst.ws.jaxws.assembly_tests.feature/feature.xml
index 7317c5489..0f852b6d5 100644
--- a/jaxws/features/org.eclipse.jst.ws.jaxws.assembly_tests.feature/feature.xml
+++ b/jaxws/features/org.eclipse.jst.ws.jaxws.assembly_tests.feature/feature.xml
@@ -18,16 +18,10 @@ This feature should never appear in build distributions or update sites.
%license
</license>
- <includes
- id="org.eclipse.jst.ws.jaxws_tests.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.jst.ws.cxf_tests.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.jst.ws.jaxws.dom_tests.feature"
- version="0.0.0"/>
+ <requires>
+ <import feature="org.eclipse.jst.ws.jaxws_tests.feature"/>
+ <import feature="org.eclipse.jst.ws.cxf_tests.feature"/>
+ <import feature="org.eclipse.jst.ws.jaxws.dom_tests.feature"/>
+ </requires>
</feature>
diff --git a/jaxws/features/org.eclipse.jst.ws.jaxws.dom_sdk.feature/feature.xml b/jaxws/features/org.eclipse.jst.ws.jaxws.dom_sdk.feature/feature.xml
index 1f9c38f9d..7ae31c5e1 100644
--- a/jaxws/features/org.eclipse.jst.ws.jaxws.dom_sdk.feature/feature.xml
+++ b/jaxws/features/org.eclipse.jst.ws.jaxws.dom_sdk.feature/feature.xml
@@ -20,13 +20,9 @@
%license
</license>
- <includes
- id="org.eclipse.jst.ws.jaxws.dom.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.jst.ws.jaxws.dom.feature.source"
- version="0.0.0"/>
+ <requires>
+ <import feature="org.eclipse.jst.ws.jaxws.dom.feature"/>
+ </requires>
<plugin
id="org.eclipse.jst.ws.jaxws.dom.doc.isv"
diff --git a/jaxws/features/org.eclipse.jst.ws.jaxws_sdk.feature/feature.xml b/jaxws/features/org.eclipse.jst.ws.jaxws_sdk.feature/feature.xml
index 52dcd6fdf..dc5282876 100644
--- a/jaxws/features/org.eclipse.jst.ws.jaxws_sdk.feature/feature.xml
+++ b/jaxws/features/org.eclipse.jst.ws.jaxws_sdk.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.jst.ws.jaxws_sdk.feature"
label="%featureName"
- version="1.2.203.qualifier"
+ version="1.2.204.qualifier"
provider-name="%featureProvider"
image="eclipse_update_120.jpg"
license-feature="org.eclipse.license"
diff --git a/jaxws/features/org.eclipse.jst.ws.jaxws_sdk.feature/pom.xml b/jaxws/features/org.eclipse.jst.ws.jaxws_sdk.feature/pom.xml
index 7c6f0e319..0660deb79 100644
--- a/jaxws/features/org.eclipse.jst.ws.jaxws_sdk.feature/pom.xml
+++ b/jaxws/features/org.eclipse.jst.ws.jaxws_sdk.feature/pom.xml
@@ -22,6 +22,6 @@
<groupId>org.eclipse.webtools.webservices</groupId>
<artifactId>org.eclipse.jst.ws.jaxws_sdk.feature</artifactId>
- <version>1.2.203-SNAPSHOT</version>
+ <version>1.2.204-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/jaxws/features/pom.xml b/jaxws/features/pom.xml
new file mode 100644
index 000000000..071a6a80f
--- /dev/null
+++ b/jaxws/features/pom.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (c) 2012, 2013 Eclipse Foundation and others.
+ All rights reserved. This program and the accompanying materials
+ are made available under the terms of the Eclipse Distribution License v1.0
+ which accompanies this distribution, and is available at
+ http://www.eclipse.org/org/documents/edl-v10.php
+
+ Contributors:
+ Thanh Ha (Eclipse Foundation) - initial implementation
+-->
+
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.eclipse.webtools.webservices</groupId>
+ <artifactId>org.eclipse.webtools.webservices.jaxws</artifactId>
+ <version>3.6.0-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.eclipse.webtools.webservices</groupId>
+ <artifactId>org.eclipse.webtools.webservices.jaxws.features</artifactId>
+ <version>3.6.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+
+ <modules>
+ <module>org.eclipse.jst.ws.cxf.feature</module>
+ <module>org.eclipse.jst.ws.cxf_sdk.feature</module>
+ <module>org.eclipse.jst.ws.cxf_tests.feature</module>
+ <module>org.eclipse.jst.ws.jaxws.assembly.feature</module>
+ <module>org.eclipse.jst.ws.jaxws.assembly_sdk.feature</module>
+ <module>org.eclipse.jst.ws.jaxws.assembly_tests.feature</module>
+ <module>org.eclipse.jst.ws.jaxws.dom.feature</module>
+ <module>org.eclipse.jst.ws.jaxws.dom_sdk.feature</module>
+ <module>org.eclipse.jst.ws.jaxws.dom_tests.feature</module>
+ <module>org.eclipse.jst.ws.jaxws.feature</module>
+ <module>org.eclipse.jst.ws.jaxws_sdk.feature</module>
+ <module>org.eclipse.jst.ws.jaxws_tests.feature</module>
+ <module>org.eclipse.jst.ws.jaxws_userdoc.feature</module>
+ </modules>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho.extras</groupId>
+ <artifactId>tycho-source-feature-plugin</artifactId>
+ <version>${tycho-extras.version}</version>
+ <executions>
+ <execution>
+ <id>source-feature</id>
+ <phase>package</phase>
+ <goals>
+ <goal>source-feature</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-p2-plugin</artifactId>
+ <version>${tycho.version}</version>
+ <executions>
+ <execution>
+ <id>attached-p2-metadata</id>
+ <phase>package</phase>
+ <goals>
+ <goal>p2-metadata</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
diff --git a/jaxws/pom.xml b/jaxws/pom.xml
index 568808ff9..2a4a42a17 100644
--- a/jaxws/pom.xml
+++ b/jaxws/pom.xml
@@ -50,20 +50,6 @@
<module>docs/org.eclipse.jst.ws.jaxws.doc.user</module>
<module>docs/org.eclipse.jst.ws.jaxws.dom.doc.isv</module>
- <module>features/org.eclipse.jst.ws.cxf.feature</module>
- <module>features/org.eclipse.jst.ws.cxf_sdk.feature</module>
- <module>features/org.eclipse.jst.ws.cxf_tests.feature</module>
- <module>features/org.eclipse.jst.ws.jaxws.assembly.feature</module>
- <module>features/org.eclipse.jst.ws.jaxws.assembly_sdk.feature</module>
- <module>features/org.eclipse.jst.ws.jaxws.assembly_tests.feature</module>
- <module>features/org.eclipse.jst.ws.jaxws.dom.feature</module>
- <module>features/org.eclipse.jst.ws.jaxws.dom_sdk.feature</module>
- <module>features/org.eclipse.jst.ws.jaxws.dom_tests.feature</module>
- <module>features/org.eclipse.jst.ws.jaxws.feature</module>
- <module>features/org.eclipse.jst.ws.jaxws_sdk.feature</module>
- <module>features/org.eclipse.jst.ws.jaxws_tests.feature</module>
- <module>features/org.eclipse.jst.ws.jaxws_userdoc.feature</module>
-
<module>tests/org.eclipse.jst.ws.cxf.tests</module>
<module>tests/org.eclipse.jst.ws.jaxb.core.tests</module>
<module>tests/org.eclipse.jst.ws.jaxws.core.tests</module>
@@ -73,5 +59,7 @@
<module>tests/org.eclipse.jst.ws.jaxws.testutils</module>
<module>tests/org.eclipse.jst.ws.jaxws.utils.tests</module>
<module>tests/org.jmock</module>
+
+ <module>features</module>
</modules>
</project>
diff --git a/pom.xml b/pom.xml
index 04e377e3f..afdec22a6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,7 +17,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>
@@ -28,8 +28,6 @@
<properties>
<tycho.scmUrl>scm:git:git://git.eclipse.org/gitroot/webservices/webtools.webservices.git</tycho.scmUrl>
- <tycho.version>1.0.0</tycho.version>
- <tycho-extras.version>1.0.0</tycho-extras.version>
</properties>
<repositories>

Back to the top