[eclipse-wtp-webservices] Build feature org.eclipse.wst.ws_ui.feature instead of core
Gerard Ryan
galileo at fedoraproject.org
Sat Jun 16 01:31:37 UTC 2012
commit 338122ae368b286e69bb0438f49e505f8e114d06
Author: Gerard Ryan <gerard at ryan.lt>
Date: Sat Jun 16 01:58:36 2012 +0100
Build feature org.eclipse.wst.ws_ui.feature instead of core
The org.eclipse.wst.ws_ui.feature includes other plugins not in the
org.eclipse.wst.ws_core.feature. It also includes the core feature,
so that doesn't need to be explicitly built separately.
With this ui feature, many plugins from eclipse-wtp-common, and
eclipse-wtp-sourceediting are cp'ed in, so these have been replaced
with symlinks.
eclipse-wtp-webservices.spec | 112 ++++++++++++--
...vices-fix-javax.wsdl-version-in-manifests.patch | 156 ++++++++++++++++++++
...-rm-javax.wsdl-version-check-in-manifests.patch | 55 -------
3 files changed, 253 insertions(+), 70 deletions(-)
---
diff --git a/eclipse-wtp-webservices.spec b/eclipse-wtp-webservices.spec
index 17edbe5..dc408c4 100644
--- a/eclipse-wtp-webservices.spec
+++ b/eclipse-wtp-webservices.spec
@@ -1,10 +1,16 @@
%global cvstag 20120602cvs
%global eclipse_base %{_libdir}/eclipse
-%global install_loc %{_datadir}/eclipse/dropins/wtp-webservices
+%global eclipse_dropins %{_datadir}/eclipse/dropins
+%global install_loc %{eclipse_dropins}/wtp-webservices
+
+#location of symlinked plugins from eclipse-wtp-common
+%global common_plugins %{eclipse_dropins}/eclipse-wtp-common/eclipse/plugins
+#location of symlinked plugins from eclipse-wtp-sourceediting
+%global se_plugins %{eclipse_dropins}/wtp-sourceediting/eclipse/plugins
Name: eclipse-wtp-webservices
Version: 3.4.0
-Release: 0.3.%{cvstag}%{?dist}
+Release: 0.4.%{cvstag}%{?dist}
Summary: Tools for developing and interacting with Java Web services
Group: Development/Tools
@@ -17,7 +23,7 @@ URL: http://www.eclipse.org/webtools/ws/
Source0: %{name}-HEAD-%{cvstag}.tar.xz
# build fails looking for old versions of javax.wsdl
-Patch0: webservices-rm-javax.wsdl-version-check-in-manifests.patch
+Patch0: webservices-fix-javax.wsdl-version-in-manifests.patch
Patch1: webservices-rm-javax.wsdl-version-check-in-wsdl15-feature.patch
# fix order of plugins in feature.xml so they build in correct order
@@ -30,9 +36,6 @@ Patch3: webservices-wsdl-unimplemented-methods.patch
# fix to work with fedora packaged xerces-j2 (more up-to-date)
Patch4: webservices-wsdl.validation-fix-for-xerces-j2-2.11.0.patch
-# try to get wst.ws.parser manifest to work for jeetools
-Patch5: webservices-fix-wst.ws.parser-manifest.patch
-
BuildArch: noarch
BuildRequires: ant
@@ -113,30 +116,25 @@ pushd orbit
%{__ln_s} %{_javadir}/apache-commons-discovery.jar
popd
-%patch0
+%patch0 -p1
%patch1
%patch2
%patch3 -p1
%patch4 -p1
-%patch5 -p1
%build
%{_bindir}/eclipse-pdebuild \
- -f org.eclipse.wst.ws_core.feature \
+ -f org.eclipse.wst.ws_ui.feature \
-d "xsd eclipse-wtp-common wtp-sourceediting emf gef \
- org.eclipse.jst.server_ui.feature" \
+ org.eclipse.jst.server_ui.feature jem" \
-o `pwd`/orbit
-%{_bindir}/eclipse-pdebuild -f org.eclipse.wst.ws_userdoc.feature
-
%install
install -d -m 755 %{buildroot}%{install_loc}
%{__unzip} -q -d %{buildroot}%{install_loc} \
- build/rpmBuild/org.eclipse.wst.ws_core.feature.zip
-%{__unzip} -q -d %{buildroot}%{install_loc} \
- build/rpmBuild/org.eclipse.wst.ws_userdoc.feature.zip
+ build/rpmBuild/org.eclipse.wst.ws_ui.feature.zip
#Recreate symlinks & remove duplicate jars
pushd %{buildroot}%{install_loc}/eclipse/plugins
@@ -151,6 +149,87 @@ rm -f org.apache.commons.logging*.jar
%{__ln_s} %{_javadir}/javamail/mail.jar
%{__ln_s} %{_javadir}/apache-commons-codec.jar
%{__ln_s} %{_javadir}/apache-commons-logging.jar
+
+# provided by eclipse-wtp-common
+rm -f org.eclipse.jem.util_*.jar
+rm -f org.eclipse.wst.common.ui_*.jar
+rm -f org.eclipse.wst.common.emf_*.jar
+rm -f org.eclipse.wst.validation_*.jar
+rm -f org.eclipse.wst.common.core_*.jar
+rm -f org.eclipse.wst.validation.ui_*.jar
+rm -f org.eclipse.wst.common.infopop_*.jar
+rm -f org.eclipse.wst.internet.cache_*.jar
+rm -f org.eclipse.wst.common.snippets_*.jar
+rm -f org.eclipse.wst.common.frameworks_*.jar
+rm -f org.eclipse.wst.common.modulecore_*.jar
+rm -f org.eclipse.wst.common.uriresolver_*.jar
+rm -f org.eclipse.wst.common.environment_*.jar
+rm -f org.eclipse.wst.validation.infopop_*.jar
+rm -f org.eclipse.wst.common.modulecore.ui_*.jar
+rm -f org.eclipse.wst.common.frameworks.ui_*.jar
+rm -f org.eclipse.wst.common.emfworkbench.integration_*.jar
+
+%{__ln_s} %{common_plugins}/org.eclipse.jem.util_*.jar
+%{__ln_s} %{common_plugins}/org.eclipse.wst.common.ui_*.jar
+%{__ln_s} %{common_plugins}/org.eclipse.wst.common.emf_*.jar
+%{__ln_s} %{common_plugins}/org.eclipse.wst.validation_*.jar
+%{__ln_s} %{common_plugins}/org.eclipse.wst.common.core_*.jar
+%{__ln_s} %{common_plugins}/org.eclipse.wst.validation.ui_*.jar
+%{__ln_s} %{common_plugins}/org.eclipse.wst.common.infopop_*.jar
+%{__ln_s} %{common_plugins}/org.eclipse.wst.internet.cache_*.jar
+%{__ln_s} %{common_plugins}/org.eclipse.wst.common.snippets_*.jar
+%{__ln_s} %{common_plugins}/org.eclipse.wst.common.frameworks_*.jar
+%{__ln_s} %{common_plugins}/org.eclipse.wst.common.modulecore_*.jar
+%{__ln_s} %{common_plugins}/org.eclipse.wst.common.uriresolver_*.jar
+%{__ln_s} %{common_plugins}/org.eclipse.wst.common.environment_*.jar
+%{__ln_s} %{common_plugins}/org.eclipse.wst.validation.infopop_*.jar
+%{__ln_s} %{common_plugins}/org.eclipse.wst.common.modulecore.ui_*.jar
+%{__ln_s} %{common_plugins}/org.eclipse.wst.common.frameworks.ui_*.jar
+%{__ln_s} %{common_plugins}/org.eclipse.wst.common.emfworkbench.integration_*jar
+
+#provided by eclipse-wtp-sourceediting
+rm -f org.eclipse.wst.xsd.ui_*.jar
+rm -f org.eclipse.wst.dtd.ui_*.jar
+rm -f org.eclipse.wst.sse.ui_*.jar
+rm -f org.eclipse.wst.xml.ui_*.jar
+rm -f org.eclipse.wst.dtd.core_*.jar
+rm -f org.eclipse.wst.xsd.core_*.jar
+rm -f org.eclipse.wst.sse.core_*.jar
+rm -f org.eclipse.wst.xml.core_*.jar
+rm -f org.eclipse.wst.validation_*.jar
+rm -f org.eclipse.wst.sse.doc.user_*.jar
+rm -f org.eclipse.wst.validation.ui_*.jar
+rm -f org.eclipse.wst.sse.ui.infopop_*.jar
+rm -f org.eclipse.wst.xml.ui.infopop_*.jar
+rm -f org.eclipse.wst.dtd.ui.infopop_*.jar
+rm -f org.eclipse.wst.internet.cache_*.jar
+rm -f org.eclipse.wst.standard.schemas_*.jar
+rm -f org.eclipse.wst.validation.infopop_*.jar
+rm -f org.eclipse.wst.xmleditor.doc.user_*.jar
+rm -f org.eclipse.wst.xsdeditor.doc.user_*.jar
+rm -f org.eclipse.wst.dtdeditor.doc.user_*.jar
+
+%{__ln_s} %{se_plugins}/org.eclipse.wst.xsd.ui_*.jar
+%{__ln_s} %{se_plugins}/org.eclipse.wst.dtd.ui_*.jar
+%{__ln_s} %{se_plugins}/org.eclipse.wst.sse.ui_*.jar
+%{__ln_s} %{se_plugins}/org.eclipse.wst.xml.ui_*.jar
+%{__ln_s} %{se_plugins}/org.eclipse.wst.dtd.core_*.jar
+%{__ln_s} %{se_plugins}/org.eclipse.wst.xsd.core_*.jar
+%{__ln_s} %{se_plugins}/org.eclipse.wst.sse.core_*.jar
+%{__ln_s} %{se_plugins}/org.eclipse.wst.xml.core_*.jar
+%{__ln_s} %{se_plugins}/org.eclipse.wst.validation_*.jar
+%{__ln_s} %{se_plugins}/org.eclipse.wst.sse.doc.user_*.jar
+%{__ln_s} %{se_plugins}/org.eclipse.wst.validation.ui_*.jar
+%{__ln_s} %{se_plugins}/org.eclipse.wst.sse.ui.infopop_*.jar
+%{__ln_s} %{se_plugins}/org.eclipse.wst.xml.ui.infopop_*.jar
+%{__ln_s} %{se_plugins}/org.eclipse.wst.dtd.ui.infopop_*.jar
+%{__ln_s} %{se_plugins}/org.eclipse.wst.internet.cache_*.jar
+%{__ln_s} %{se_plugins}/org.eclipse.wst.standard.schemas_*.jar
+%{__ln_s} %{se_plugins}/org.eclipse.wst.validation.infopop_*.jar
+%{__ln_s} %{se_plugins}/org.eclipse.wst.xmleditor.doc.user_*.jar
+%{__ln_s} %{se_plugins}/org.eclipse.wst.xsdeditor.doc.user_*.jar
+%{__ln_s} %{se_plugins}/org.eclipse.wst.dtdeditor.doc.user_*.jar
+
popd
%files
@@ -159,6 +238,9 @@ popd
%doc features/org.eclipse.wst.ws_wsdl14.feature/license.html
%changelog
+* Thu Jun 14 2012 Gerard Ryan <galileo at fedoraproject.org> 3.4.0-0.4.20120602cvs
+- Build org.eclipse.wst.ws_ui.feature, which will in turn build the others
+
* Thu Jun 14 2012 Gerard Ryan <galileo at fedoraproject.org> 3.4.0-0.3.20120602cvs
- Include license.html as a doc, add additional Requires/BuildRequires
diff --git a/webservices-fix-javax.wsdl-version-in-manifests.patch b/webservices-fix-javax.wsdl-version-in-manifests.patch
new file mode 100644
index 0000000..2567b16
--- /dev/null
+++ b/webservices-fix-javax.wsdl-version-in-manifests.patch
@@ -0,0 +1,156 @@
+diff -ur webservices.orig/plugins/org.eclipse.jst.ws.axis.consumption.ui/META-INF/MANIFEST.MF webservices/plugins/org.eclipse.jst.ws.axis.consumption.ui/META-INF/MANIFEST.MF
+--- webservices.orig/plugins/org.eclipse.jst.ws.axis.consumption.ui/META-INF/MANIFEST.MF 2012-06-15 23:52:10.018942079 +0100
++++ webservices/plugins/org.eclipse.jst.ws.axis.consumption.ui/META-INF/MANIFEST.MF 2012-06-15 23:55:54.305698403 +0100
+@@ -41,7 +41,7 @@
+ org.eclipse.jem.workbench;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.wst.ws;bundle-version="[1.0.100,1.2.0)",
+ org.eclipse.wst.common.modulecore;bundle-version="[1.1.0,2.0.0)",
+- javax.wsdl;bundle-version="[1.5.0,1.6.0)",
++ javax.wsdl;bundle-version="[1.6.2,1.7.0)",
+ org.apache.axis;bundle-version="[1.4.0,1.5.0)",
+ org.eclipse.wst.common.frameworks;bundle-version="[1.1.0,2.0.0)",
+ org.eclipse.wst.common.environment;bundle-version="[1.0.100,1.1.0)"
+diff -ur webservices.orig/plugins/org.eclipse.jst.ws.axis.creation.ui/META-INF/MANIFEST.MF webservices/plugins/org.eclipse.jst.ws.axis.creation.ui/META-INF/MANIFEST.MF
+--- webservices.orig/plugins/org.eclipse.jst.ws.axis.creation.ui/META-INF/MANIFEST.MF 2012-06-15 23:52:13.042884903 +0100
++++ webservices/plugins/org.eclipse.jst.ws.axis.creation.ui/META-INF/MANIFEST.MF 2012-06-15 23:55:54.586693083 +0100
+@@ -38,7 +38,7 @@
+ org.eclipse.jst.j2ee;bundle-version="[1.1.0,1.2.0)",
+ org.eclipse.jst.j2ee.core;bundle-version="[1.1.0,2.0.0)",
+ org.eclipse.jst.j2ee.web;bundle-version="[1.1.0,1.2.0)",
+- javax.wsdl;bundle-version="[1.5.0,1.6.0)",
++ javax.wsdl;bundle-version="[1.6.2,1.7.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)",
+ org.eclipse.wst.common.frameworks;bundle-version="[1.1.0,2.0.0)",
+diff -ur webservices.orig/plugins/org.eclipse.jst.ws.consumption/META-INF/MANIFEST.MF webservices/plugins/org.eclipse.jst.ws.consumption/META-INF/MANIFEST.MF
+--- webservices.orig/plugins/org.eclipse.jst.ws.consumption/META-INF/MANIFEST.MF 2012-06-15 23:52:11.043922701 +0100
++++ webservices/plugins/org.eclipse.jst.ws.consumption/META-INF/MANIFEST.MF 2012-06-15 23:55:54.514694445 +0100
+@@ -50,7 +50,7 @@
+ org.eclipse.jst.j2ee;bundle-version="[1.1.0,1.2.0)",
+ org.eclipse.jst.j2ee.web;bundle-version="[1.1.0,1.2.0)",
+ org.eclipse.wst.common.frameworks;bundle-version="[1.1.0,2.0.0)",
+- javax.wsdl;bundle-version="[1.5.0,1.6.0)",
++ javax.wsdl;bundle-version="[1.6.2,1.7.0)",
+ org.eclipse.jem.util;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.wst.common.environment;bundle-version="[1.0.100,1.1.0)",
+ org.eclipse.wst.common.project.facet.core;bundle-version="[1.1.0,2.0.0)",
+diff -ur webservices.orig/plugins/org.eclipse.jst.ws.consumption.ui/META-INF/MANIFEST.MF webservices/plugins/org.eclipse.jst.ws.consumption.ui/META-INF/MANIFEST.MF
+--- webservices.orig/plugins/org.eclipse.jst.ws.consumption.ui/META-INF/MANIFEST.MF 2012-06-15 23:52:10.627930565 +0100
++++ webservices/plugins/org.eclipse.jst.ws.consumption.ui/META-INF/MANIFEST.MF 2012-06-15 23:55:54.445695752 +0100
+@@ -66,7 +66,7 @@
+ org.eclipse.jst.j2ee.webservice.ui;bundle-version="[1.1.0,1.2.0)",
+ org.eclipse.wst.common.modulecore;bundle-version="[1.1.0,2.0.0)",
+ org.eclipse.wst.ws.ui;bundle-version="[1.1.0,1.2.0)",
+- javax.wsdl;bundle-version="[1.5.0,1.6.0)",
++ javax.wsdl;bundle-version="[1.6.2,1.7.0)",
+ org.eclipse.jem.util;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.wst.wsdl.validation;bundle-version="[1.1.0,1.2.0)",
+ org.eclipse.wst.common.frameworks.ui;bundle-version="[1.1.0,2.0.0)",
+diff -ur webservices.orig/plugins/org.eclipse.jst.ws.creation.ui/META-INF/MANIFEST.MF webservices/plugins/org.eclipse.jst.ws.creation.ui/META-INF/MANIFEST.MF
+--- webservices.orig/plugins/org.eclipse.jst.ws.creation.ui/META-INF/MANIFEST.MF 2012-06-15 23:52:10.451933893 +0100
++++ webservices/plugins/org.eclipse.jst.ws.creation.ui/META-INF/MANIFEST.MF 2012-06-15 23:55:54.396696679 +0100
+@@ -39,7 +39,7 @@
+ org.eclipse.jst.j2ee;bundle-version="[1.1.0,1.2.0)",
+ org.eclipse.jst.j2ee.core;bundle-version="[1.1.0,2.0.0)",
+ org.eclipse.jst.j2ee.ejb;bundle-version="[1.1.0,1.2.0)",
+- javax.wsdl;bundle-version="[1.5.0,1.6.0)",
++ javax.wsdl;bundle-version="[1.6.2,1.7.0)",
+ org.eclipse.wst.common.frameworks;bundle-version="[1.1.0,2.0.0)",
+ org.eclipse.wst.common.environment;bundle-version="[1.0.100,1.1.0)",
+ org.eclipse.wst.common.project.facet.core;bundle-version="[1.1.0,2.0.0)",
+diff -ur webservices.orig/plugins/org.eclipse.wst.ws/META-INF/MANIFEST.MF webservices/plugins/org.eclipse.wst.ws/META-INF/MANIFEST.MF
+--- webservices.orig/plugins/org.eclipse.wst.ws/META-INF/MANIFEST.MF 2012-06-15 23:52:10.120940152 +0100
++++ webservices/plugins/org.eclipse.wst.ws/META-INF/MANIFEST.MF 2012-06-15 23:55:54.350697551 +0100
+@@ -39,7 +39,7 @@
+ org.eclipse.wst.command.env.core;bundle-version="[1.0.101,1.1.0)",
+ org.eclipse.wst.ws.parser;bundle-version="[1.0.100,1.1.0)",
+ org.eclipse.emf.common;bundle-version="[2.2.0,3.0.0)",
+- javax.wsdl;bundle-version="[1.5.0,1.6.0)",
++ javax.wsdl;bundle-version="[1.6.2,1.7.0)",
+ org.apache.wsil4j;bundle-version="[1.0.0,1.1.0)",
+ org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.wst.command.env;bundle-version="[1.0.101,1.1.0)",
+diff -ur webservices.orig/plugins/org.eclipse.wst.wsdl/META-INF/MANIFEST.MF webservices/plugins/org.eclipse.wst.wsdl/META-INF/MANIFEST.MF
+--- webservices.orig/plugins/org.eclipse.wst.wsdl/META-INF/MANIFEST.MF 2012-06-15 23:52:10.324936294 +0100
++++ webservices/plugins/org.eclipse.wst.wsdl/META-INF/MANIFEST.MF 2012-06-15 23:55:54.362697323 +0100
+@@ -28,7 +28,7 @@
+ Require-Bundle: org.eclipse.emf.ecore;bundle-version="[2.2.0,3.0.0)",
+ org.eclipse.xsd;bundle-version="[2.2.0,3.0.0)",
+ org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
+- javax.wsdl;bundle-version="[1.5.0,1.6.0)",
++ javax.wsdl;bundle-version="[1.6.2,1.7.0)",
+ org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
+ org.apache.xerces;bundle-version="[2.8.0,3.0.0)"
+ Import-Package: com.ibm.icu.util; version="3.8"
+diff -ur webservices.orig/plugins/org.eclipse.wst.wsdl.ui/META-INF/MANIFEST.MF webservices/plugins/org.eclipse.wst.wsdl.ui/META-INF/MANIFEST.MF
+--- webservices.orig/plugins/org.eclipse.wst.wsdl.ui/META-INF/MANIFEST.MF 2012-06-15 23:52:12.620892883 +0100
++++ webservices/plugins/org.eclipse.wst.wsdl.ui/META-INF/MANIFEST.MF 2012-06-15 23:55:54.543693896 +0100
+@@ -76,7 +76,7 @@
+ 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)",
+- javax.wsdl;bundle-version="[1.5.0,1.6.0)",
++ javax.wsdl;bundle-version="[1.6.2,1.7.0)",
+ org.eclipse.wst.wsdl.validation;bundle-version="[1.1.0,2.0.0)",
+ 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)",
+diff -ur webservices.orig/plugins/org.eclipse.wst.wsdl.validation/META-INF/MANIFEST.MF webservices/plugins/org.eclipse.wst.wsdl.validation/META-INF/MANIFEST.MF
+--- webservices.orig/plugins/org.eclipse.wst.wsdl.validation/META-INF/MANIFEST.MF 2012-06-15 23:52:10.489933174 +0100
++++ webservices/plugins/org.eclipse.wst.wsdl.validation/META-INF/MANIFEST.MF 2012-06-15 23:55:54.416696301 +0100
+@@ -24,7 +24,7 @@
+ org.apache.ant;bundle-version="[1.6.5,2.0.0)";resolution:=optional,
+ org.eclipse.wst.common.uriresolver;bundle-version="[1.1.0,1.3.0)",
+ org.eclipse.wst.validation;bundle-version="[1.2.0,1.3.0)",
+- javax.wsdl;bundle-version="[1.5.0,1.6.0)",
++ javax.wsdl;bundle-version="[1.6.2,1.7.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)"
+diff -ur webservices.orig/plugins/org.eclipse.wst.ws.explorer/META-INF/MANIFEST.MF webservices/plugins/org.eclipse.wst.ws.explorer/META-INF/MANIFEST.MF
+--- webservices.orig/plugins/org.eclipse.wst.ws.explorer/META-INF/MANIFEST.MF 2012-06-15 23:52:11.429915402 +0100
++++ webservices/plugins/org.eclipse.wst.ws.explorer/META-INF/MANIFEST.MF 2012-06-15 23:55:54.532694105 +0100
+@@ -23,7 +23,7 @@
+ org.eclipse.wst.ws;bundle-version="[1.0.100,1.2.0)",
+ org.eclipse.wst.ws.parser;bundle-version="[1.0.100,1.1.0)",
+ org.eclipse.wst.wsdl;bundle-version="[1.2.0,1.3.0)",
+- javax.wsdl;bundle-version="[1.5.0,1.6.0)",
++ javax.wsdl;bundle-version="[1.6.2,1.7.0)",
+ org.apache.wsil4j;bundle-version="[1.0.0,1.1.0)",
+ org.uddi4j;bundle-version="[2.0.4,2.1.0)",
+ org.apache.axis;bundle-version="[1.4.0,2.0.0)",
+diff -ur webservices.orig/plugins/org.eclipse.wst.wsi/META-INF/MANIFEST.MF webservices/plugins/org.eclipse.wst.wsi/META-INF/MANIFEST.MF
+--- webservices.orig/plugins/org.eclipse.wst.wsi/META-INF/MANIFEST.MF 2012-06-15 23:52:10.743928372 +0100
++++ webservices/plugins/org.eclipse.wst.wsi/META-INF/MANIFEST.MF 2012-06-15 23:55:54.470695279 +0100
+@@ -49,7 +49,7 @@
+ org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.wst.wsdl.validation;bundle-version="[1.1.0,1.2.0)",
+ org.eclipse.wst.ws;bundle-version="[1.0.100,2.0.0)",
+- javax.wsdl;bundle-version="[1.5.0,1.6.0)",
++ javax.wsdl;bundle-version="[1.6.2,1.7.0)",
+ org.uddi4j;bundle-version="[2.0.4,2.1.0)",
+ org.apache.axis;bundle-version="[1.3.0,2.0.0)",
+ org.apache.xerces;bundle-version="[2.8.0,3.0.0)",
+diff -ur webservices.orig/plugins/org.eclipse.wst.wsi.ui/META-INF/MANIFEST.MF webservices/plugins/org.eclipse.wst.wsi.ui/META-INF/MANIFEST.MF
+--- webservices.orig/plugins/org.eclipse.wst.wsi.ui/META-INF/MANIFEST.MF 2012-06-15 23:52:12.980886075 +0100
++++ webservices/plugins/org.eclipse.wst.wsi.ui/META-INF/MANIFEST.MF 2012-06-15 23:55:54.578693233 +0100
+@@ -32,7 +32,7 @@
+ org.eclipse.wst.wsi;bundle-version="[1.0.101,1.1.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)",
++ javax.wsdl;bundle-version="[1.6.2,1.7.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)"
+ Bundle-ActivationPolicy: lazy
+diff -ur webservices.orig/plugins/org.eclipse.wst.ws.parser/META-INF/MANIFEST.MF webservices/plugins/org.eclipse.wst.ws.parser/META-INF/MANIFEST.MF
+--- webservices.orig/plugins/org.eclipse.wst.ws.parser/META-INF/MANIFEST.MF 2012-06-15 23:52:12.830888913 +0100
++++ webservices/plugins/org.eclipse.wst.ws.parser/META-INF/MANIFEST.MF 2012-06-15 23:55:54.562693537 +0100
+@@ -13,7 +13,7 @@
+ org.eclipse.wst.ws.internal.parser.wsil;x-internal:=true,
+ org.eclipse.wst.ws.parser
+ Require-Bundle: org.eclipse.wst.wsdl;bundle-version="[1.2.0,1.3.0)",
+- javax.wsdl;bundle-version="[1.5.0,1.6.0)",
++ javax.wsdl;bundle-version="[1.6.2,1.7.0)",
+ org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
+ org.apache.wsil4j;bundle-version="[1.0.0,1.1.0)",
+ org.uddi4j;bundle-version="[2.0.4,2.1.0)",
More information about the scm-commits
mailing list