[SCM] eclipse-wtp packaging branch, master, updated. upstream/3.4.1-28-g3b48bc0
Jakub Adam
jakub.adam at ktknet.cz
Sat Sep 29 21:30:08 UTC 2012
The following commit has been merged in the master branch:
commit 6690c6e56969847c8f2932ff77b5cdf77264be37
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date: Sat Sep 29 20:23:15 2012 +0200
Regenerated debian-custom-build.patch
diff --git a/debian/patches/debian-custom-build.patch b/debian/patches/debian-custom-build.patch
index 2e8ac2a..c0095f7 100644
--- a/debian/patches/debian-custom-build.patch
+++ b/debian/patches/debian-custom-build.patch
@@ -1,97 +1,35 @@
From: Jakub Adam <jakub.adam at ktknet.cz>
-Date: Fri, 14 Oct 2011 18:46:33 +0200
+Date: Sat, 29 Sep 2012 20:14:43 +0200
Subject: debian-custom-build
- - Remove license features
- - Remove dependency on unused org.apache.xml.serializer
- - Remove version specifications from orbit dependencies so that
- distribution versions of libs can be used
- - web_ui, xml_ui and ws_ui features: import common features not include
- (avoids duplication of plugins in eclipse-wtp, eclipse-wtp-xml-tools,
- eclipse-wtp-web-tools, eclipse-wtp-ws)
- - java_cup.runtime and org.apache.bcel are part of org.apache.xalan
---
- org.eclipse.wst.common.fproj/feature.xml | 4 +---
- org.eclipse.wst.common_core.feature/feature.xml | 4 +---
- org.eclipse.wst.common_ui.feature/feature.xml | 4 +---
- .../META-INF/MANIFEST.MF | 2 +-
- org.eclipse.wst.jsdt.feature/feature.xml | 6 ++----
- .../feature.xml | 4 +---
- org.eclipse.wst.server_core.feature/feature.xml | 4 +---
- org.eclipse.wst.server_ui.feature/feature.xml | 12 +++++------
- org.eclipse.wst.server_userdoc.feature/feature.xml | 4 +---
- org.eclipse.wst.web_core.feature/feature.xml | 22 +++++++-------------
- org.eclipse.wst.web_ui.feature/feature.xml | 17 ++++++---------
- org.eclipse.wst.web_userdoc.feature/feature.xml | 4 +---
- org.eclipse.wst.ws.explorer/META-INF/MANIFEST.MF | 2 +-
- org.eclipse.wst.ws.parser/META-INF/MANIFEST.MF | 2 +-
- org.eclipse.wst.ws/META-INF/MANIFEST.MF | 2 +-
- org.eclipse.wst.ws_core.feature/feature.xml | 15 +++++++------
- org.eclipse.wst.ws_ui.feature/feature.xml | 12 +++++------
- org.eclipse.wst.ws_userdoc.feature/feature.xml | 4 +---
- org.eclipse.wst.ws_wsdl15.feature/feature.xml | 6 ++----
- org.eclipse.wst.wsdl.ui/META-INF/MANIFEST.MF | 2 +-
- .../META-INF/MANIFEST.MF | 2 +-
- org.eclipse.wst.wsdl/META-INF/MANIFEST.MF | 2 +-
- org.eclipse.wst.wsi.ui/META-INF/MANIFEST.MF | 2 +-
- org.eclipse.wst.wsi/META-INF/MANIFEST.MF | 2 +-
- .../feature.xml | 8 +++----
- .../META-INF/MANIFEST.MF | 2 +-
- org.eclipse.wst.xml_core.feature/feature.xml | 17 ++++-----------
- org.eclipse.wst.xml_ui.feature/feature.xml | 10 ++++-----
- org.eclipse.wst.xml_userdoc.feature/feature.xml | 4 +---
- org.eclipse.wst.xsl.feature/feature.xml | 12 +++++------
- .../schema/processor.exsd | 2 +-
- org.eclipse.wst.xsl.xalan/plugin.xml | 2 +-
- 32 files changed, 71 insertions(+), 126 deletions(-)
+ .../META-INF/MANIFEST.MF | 2 +-
+ org.eclipse.wst.jsdt.feature/feature.xml | 2 +-
+ org.eclipse.wst.server_ui.feature/feature.xml | 8 ++++----
+ org.eclipse.wst.web_core.feature/feature.xml | 18 ++++++------------
+ org.eclipse.wst.web_ui.feature/feature.xml | 13 +++++--------
+ org.eclipse.wst.ws.explorer/META-INF/MANIFEST.MF | 2 +-
+ org.eclipse.wst.ws.parser/META-INF/MANIFEST.MF | 2 +-
+ org.eclipse.wst.ws/META-INF/MANIFEST.MF | 2 +-
+ org.eclipse.wst.ws_core.feature/feature.xml | 11 ++++++-----
+ org.eclipse.wst.ws_ui.feature/feature.xml | 8 ++++----
+ org.eclipse.wst.ws_wsdl15.feature/feature.xml | 2 +-
+ org.eclipse.wst.wsdl.ui/META-INF/MANIFEST.MF | 2 +-
+ org.eclipse.wst.wsdl.validation/META-INF/MANIFEST.MF | 2 +-
+ org.eclipse.wst.wsdl/META-INF/MANIFEST.MF | 2 +-
+ org.eclipse.wst.wsi.ui/META-INF/MANIFEST.MF | 2 +-
+ org.eclipse.wst.wsi/META-INF/MANIFEST.MF | 2 +-
+ .../feature.xml | 4 ++--
+ .../META-INF/MANIFEST.MF | 2 +-
+ org.eclipse.wst.xml_core.feature/feature.xml | 13 +++----------
+ org.eclipse.wst.xml_ui.feature/feature.xml | 6 +++---
+ org.eclipse.wst.xsl.feature/feature.xml | 8 ++++----
+ .../schema/processor.exsd | 2 +-
+ org.eclipse.wst.xsl.xalan/plugin.xml | 2 +-
+ 23 files changed, 51 insertions(+), 66 deletions(-)
-diff --git a/org.eclipse.wst.common.fproj/feature.xml b/org.eclipse.wst.common.fproj/feature.xml
-index cc97c1f..1b21040 100644
---- a/org.eclipse.wst.common.fproj/feature.xml
-+++ b/org.eclipse.wst.common.fproj/feature.xml
-@@ -4,9 +4,7 @@
- label="%featureName"
- version="3.4.0.qualifier"
- provider-name="%providerName"
-- plugin="org.eclipse.wst.common.project.facet.core"
-- license-feature="org.eclipse.license"
-- license-feature-version="1.0.0.qualifier">
-+ plugin="org.eclipse.wst.common.project.facet.core">
-
- <description>
- %description
-diff --git a/org.eclipse.wst.common_core.feature/feature.xml b/org.eclipse.wst.common_core.feature/feature.xml
-index 8bc7d18..2128807 100644
---- a/org.eclipse.wst.common_core.feature/feature.xml
-+++ b/org.eclipse.wst.common_core.feature/feature.xml
-@@ -3,9 +3,7 @@
- id="org.eclipse.wst.common_core.feature"
- label="%featureName"
- version="3.4.0.qualifier"
-- provider-name="%providerName"
-- license-feature="org.eclipse.license"
-- license-feature-version="1.0.0.qualifier">
-+ provider-name="%providerName">
-
- <description>
- %description
-diff --git a/org.eclipse.wst.common_ui.feature/feature.xml b/org.eclipse.wst.common_ui.feature/feature.xml
-index b93ba0f..60caf88 100644
---- a/org.eclipse.wst.common_ui.feature/feature.xml
-+++ b/org.eclipse.wst.common_ui.feature/feature.xml
-@@ -3,9 +3,7 @@
- id="org.eclipse.wst.common_ui.feature"
- label="%featureName"
- version="3.4.0.qualifier"
-- provider-name="%providerName"
-- license-feature="org.eclipse.license"
-- license-feature-version="1.0.0.qualifier">
-+ provider-name="%providerName">
-
- <description>
- %description
diff --git a/org.eclipse.wst.jsdt.debug.rhino.ui/META-INF/MANIFEST.MF b/org.eclipse.wst.jsdt.debug.rhino.ui/META-INF/MANIFEST.MF
-index 7c72fd4..25bfcf8 100644
+index 27412d8..70dad0d 100644
--- a/org.eclipse.wst.jsdt.debug.rhino.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.wst.jsdt.debug.rhino.ui/META-INF/MANIFEST.MF
@@ -18,7 +18,7 @@ Require-Bundle: org.eclipse.ui,
@@ -104,21 +42,10 @@ index 7c72fd4..25bfcf8 100644
org.eclipse.wst.jsdt.ui
Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/org.eclipse.wst.jsdt.feature/feature.xml b/org.eclipse.wst.jsdt.feature/feature.xml
-index 203a9d4..5d91e6c 100644
+index f606cdc..bda3a9b 100644
--- a/org.eclipse.wst.jsdt.feature/feature.xml
+++ b/org.eclipse.wst.jsdt.feature/feature.xml
-@@ -4,9 +4,7 @@
- label="%featureName"
- version="1.4.0.qualifier"
- provider-name="%providerName"
-- plugin="org.eclipse.wst.jsdt.ui"
-- license-feature="org.eclipse.license"
-- license-feature-version="1.0.0.qualifier">
-+ plugin="org.eclipse.wst.jsdt.ui">
-
- <description>
- %description
-@@ -112,7 +110,7 @@
+@@ -112,7 +112,7 @@
id="org.mozilla.javascript"
download-size="0"
install-size="0"
@@ -127,99 +54,32 @@ index 203a9d4..5d91e6c 100644
unpack="false"/>
<plugin
-diff --git a/org.eclipse.wst.server_adapters.feature/feature.xml b/org.eclipse.wst.server_adapters.feature/feature.xml
-index c7b4543..3ddd409 100644
---- a/org.eclipse.wst.server_adapters.feature/feature.xml
-+++ b/org.eclipse.wst.server_adapters.feature/feature.xml
-@@ -3,9 +3,7 @@
- id="org.eclipse.wst.server_adapters.feature"
- label="%featureName"
- version="3.2.101.qualifier"
-- provider-name="%providerName"
-- license-feature="org.eclipse.license"
-- license-feature-version="1.0.0.qualifier">
-+ provider-name="%providerName">
-
- <description>
- %description
-diff --git a/org.eclipse.wst.server_core.feature/feature.xml b/org.eclipse.wst.server_core.feature/feature.xml
-index 42ac33c..ed80c50 100644
---- a/org.eclipse.wst.server_core.feature/feature.xml
-+++ b/org.eclipse.wst.server_core.feature/feature.xml
-@@ -3,9 +3,7 @@
- id="org.eclipse.wst.server_core.feature"
- label="%featureName"
- version="3.3.100.qualifier"
-- provider-name="%providerName"
-- license-feature="org.eclipse.license"
-- license-feature-version="1.0.0.qualifier">
-+ provider-name="%providerName">
-
- <description>
- %description
diff --git a/org.eclipse.wst.server_ui.feature/feature.xml b/org.eclipse.wst.server_ui.feature/feature.xml
-index da77fba..39dd59e 100644
+index f426f9c..0b68484 100644
--- a/org.eclipse.wst.server_ui.feature/feature.xml
+++ b/org.eclipse.wst.server_ui.feature/feature.xml
-@@ -3,9 +3,7 @@
- id="org.eclipse.wst.server_ui.feature"
- label="%featureName"
- version="3.3.100.qualifier"
-- provider-name="%providerName"
-- license-feature="org.eclipse.license"
-- license-feature-version="1.0.0.qualifier">
-+ provider-name="%providerName">
-
- <description>
- %description
-@@ -19,12 +17,12 @@
- %license
- </license>
-
-- <includes
-- id="org.eclipse.wst.server_userdoc.feature"
-- version="0.0.0"/>
-+ <requires>
-+ <import feature="org.eclipse.wst.server_core.feature" version="0.0.0"/>
-+ </requires>
-
- <includes
-- id="org.eclipse.wst.server_core.feature"
-+ id="org.eclipse.wst.server_userdoc.feature"
- version="0.0.0"/>
-
- <plugin
-diff --git a/org.eclipse.wst.server_userdoc.feature/feature.xml b/org.eclipse.wst.server_userdoc.feature/feature.xml
-index f471459..547cca8 100644
---- a/org.eclipse.wst.server_userdoc.feature/feature.xml
-+++ b/org.eclipse.wst.server_userdoc.feature/feature.xml
-@@ -3,9 +3,7 @@
- id="org.eclipse.wst.server_userdoc.feature"
- label="%featureName"
- version="3.3.0.qualifier"
-- provider-name="%providerName"
-- license-feature="org.eclipse.license"
-- license-feature-version="1.0.0.qualifier">
-+ provider-name="%providerName">
-
- <description>
- %description
+@@ -19,12 +19,12 @@
+ %license
+ </license>
+
+- <includes
+- id="org.eclipse.wst.server_userdoc.feature"
+- version="0.0.0"/>
++ <requires>
++ <import feature="org.eclipse.wst.server_core.feature" version="0.0.0"/>
++ </requires>
+
+ <includes
+- id="org.eclipse.wst.server_core.feature"
++ id="org.eclipse.wst.server_userdoc.feature"
+ version="0.0.0"/>
+
+ <plugin
diff --git a/org.eclipse.wst.web_core.feature/feature.xml b/org.eclipse.wst.web_core.feature/feature.xml
-index 67777b4..dcb1efb 100644
+index 3eb6270..b953ab7 100644
--- a/org.eclipse.wst.web_core.feature/feature.xml
+++ b/org.eclipse.wst.web_core.feature/feature.xml
-@@ -3,9 +3,7 @@
- id="org.eclipse.wst.web_core.feature"
- label="%featureName"
- version="3.4.0.qualifier"
-- provider-name="%providerName"
-- license-feature="org.eclipse.license"
-- license-feature-version="1.0.0.qualifier">
-+ provider-name="%providerName">
-
- <description>
- %description
-@@ -19,20 +17,14 @@
+@@ -19,20 +19,14 @@
%license
</license>
@@ -247,21 +107,10 @@ index 67777b4..dcb1efb 100644
<plugin
diff --git a/org.eclipse.wst.web_ui.feature/feature.xml b/org.eclipse.wst.web_ui.feature/feature.xml
-index b10181f..2e48055 100644
+index df70478..37fd15e 100644
--- a/org.eclipse.wst.web_ui.feature/feature.xml
+++ b/org.eclipse.wst.web_ui.feature/feature.xml
-@@ -4,9 +4,7 @@
- label="%featureName"
- version="3.4.0.qualifier"
- provider-name="%providerName"
-- plugin="org.eclipse.wst.web.ui"
-- license-feature="org.eclipse.license"
-- license-feature-version="1.0.0.qualifier">
-+ plugin="org.eclipse.wst.web.ui">
-
- <description>
- %description
-@@ -20,6 +18,11 @@
+@@ -20,6 +20,11 @@
%license
</license>
@@ -273,7 +122,7 @@ index b10181f..2e48055 100644
<includes
id="org.eclipse.wst.web_userdoc.feature"
version="0.0.0"/>
-@@ -33,17 +36,9 @@
+@@ -33,17 +38,9 @@
version="0.0.0"/>
<includes
@@ -291,21 +140,6 @@ index b10181f..2e48055 100644
<plugin
id="org.eclipse.wst.jsdt.web.core"
download-size="0"
-diff --git a/org.eclipse.wst.web_userdoc.feature/feature.xml b/org.eclipse.wst.web_userdoc.feature/feature.xml
-index e3619cd..4725d94 100644
---- a/org.eclipse.wst.web_userdoc.feature/feature.xml
-+++ b/org.eclipse.wst.web_userdoc.feature/feature.xml
-@@ -3,9 +3,7 @@
- id="org.eclipse.wst.web_userdoc.feature"
- label="%featureName"
- version="3.3.0.qualifier"
-- provider-name="%providerName"
-- license-feature="org.eclipse.license"
-- license-feature-version="1.0.0.qualifier">
-+ provider-name="%providerName">
-
- <description>
- %description
diff --git a/org.eclipse.wst.ws.explorer/META-INF/MANIFEST.MF b/org.eclipse.wst.ws.explorer/META-INF/MANIFEST.MF
index 2e65603..f651ae7 100644
--- a/org.eclipse.wst.ws.explorer/META-INF/MANIFEST.MF
@@ -346,21 +180,10 @@ index 8f5488f..6aae09b 100644
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 --git a/org.eclipse.wst.ws_core.feature/feature.xml b/org.eclipse.wst.ws_core.feature/feature.xml
-index 19031b8..ba88d6b 100644
+index 19031b8..52dd0ea 100644
--- a/org.eclipse.wst.ws_core.feature/feature.xml
+++ b/org.eclipse.wst.ws_core.feature/feature.xml
-@@ -3,9 +3,7 @@
- id="org.eclipse.wst.ws_core.feature"
- label="%featureName"
- version="3.4.0.qualifier"
-- provider-name="%providerName"
-- license-feature="org.eclipse.license"
-- license-feature-version="1.0.0.qualifier">
-+ provider-name="%providerName">
-
- <description>
- %description
-@@ -37,12 +35,12 @@
+@@ -37,12 +37,12 @@
version="0.0.0"
unpack="false"/>
@@ -375,7 +198,7 @@ index 19031b8..ba88d6b 100644
<plugin
id="org.eclipse.wst.ws"
-@@ -90,7 +88,7 @@
+@@ -90,7 +90,7 @@
id="org.apache.log4j"
download-size="0"
install-size="0"
@@ -384,7 +207,7 @@ index 19031b8..ba88d6b 100644
unpack="false"/>
<plugin
-@@ -111,7 +109,8 @@
+@@ -111,7 +111,8 @@
id="org.apache.commons.discovery"
download-size="0"
install-size="0"
@@ -394,7 +217,7 @@ index 19031b8..ba88d6b 100644
<plugin
id="javax.xml.rpc"
-@@ -123,7 +122,7 @@
+@@ -123,7 +124,7 @@
id="javax.xml.soap"
download-size="0"
install-size="0"
@@ -404,73 +227,36 @@ index 19031b8..ba88d6b 100644
<plugin
id="org.apache.axis"
diff --git a/org.eclipse.wst.ws_ui.feature/feature.xml b/org.eclipse.wst.ws_ui.feature/feature.xml
-index 15ff7c7..55bbce0 100644
+index a3cad4d..6839293 100644
--- a/org.eclipse.wst.ws_ui.feature/feature.xml
+++ b/org.eclipse.wst.ws_ui.feature/feature.xml
-@@ -3,9 +3,7 @@
- id="org.eclipse.wst.ws_ui.feature"
- label="%featureName"
- version="3.4.0.qualifier"
-- provider-name="%providerName"
-- license-feature="org.eclipse.license"
-- license-feature-version="1.0.0.qualifier">
-+ provider-name="%providerName">
-
- <description>
- %description
-@@ -19,6 +17,10 @@
- %license
- </license>
-
-+ <requires>
-+ <import feature="org.eclipse.wst.xml_ui.feature" version="0.0.0"/>
-+ </requires>
-+
- <includes
- id="org.eclipse.wst.ws_userdoc.feature"
- version="0.0.0"/>
-@@ -27,10 +29,6 @@
- id="org.eclipse.wst.ws_core.feature"
- version="0.0.0"/>
-
-- <includes
-- id="org.eclipse.wst.xml_ui.feature"
-- version="0.0.0"/>
--
- <plugin
- id="org.eclipse.wst.command.env.ui"
- download-size="0"
-diff --git a/org.eclipse.wst.ws_userdoc.feature/feature.xml b/org.eclipse.wst.ws_userdoc.feature/feature.xml
-index 77ce7df..8c55222 100644
---- a/org.eclipse.wst.ws_userdoc.feature/feature.xml
-+++ b/org.eclipse.wst.ws_userdoc.feature/feature.xml
-@@ -3,9 +3,7 @@
- id="org.eclipse.wst.ws_userdoc.feature"
- label="%featureName"
- version="3.1.300.qualifier"
-- provider-name="%providerName"
-- license-feature="org.eclipse.license"
-- license-feature-version="1.0.0.qualifier">
-+ provider-name="%providerName">
-
- <description>
- %description
+@@ -19,6 +19,10 @@
+ %license
+ </license>
+
++ <requires>
++ <import feature="org.eclipse.wst.xml_ui.feature" version="0.0.0"/>
++ </requires>
++
+ <includes
+ id="org.eclipse.wst.ws_userdoc.feature"
+ version="0.0.0"/>
+@@ -27,10 +31,6 @@
+ id="org.eclipse.wst.ws_core.feature"
+ version="0.0.0"/>
+
+- <includes
+- id="org.eclipse.wst.xml_ui.feature"
+- version="0.0.0"/>
+-
+ <plugin
+ id="org.eclipse.wst.command.env.ui"
+ download-size="0"
diff --git a/org.eclipse.wst.ws_wsdl15.feature/feature.xml b/org.eclipse.wst.ws_wsdl15.feature/feature.xml
-index 913ab43..1f042de 100644
+index 913ab43..48f28a5 100644
--- a/org.eclipse.wst.ws_wsdl15.feature/feature.xml
+++ b/org.eclipse.wst.ws_wsdl15.feature/feature.xml
-@@ -4,9 +4,7 @@
- label="%featureName"
- version="1.5.301.qualifier"
- provider-name="%providerName"
-- image="eclipse_update_120.jpg"
-- license-feature="org.eclipse.license"
-- license-feature-version="1.0.0.qualifier">
-+ image="eclipse_update_120.jpg">
-
- <description>
- %description
-@@ -24,7 +22,7 @@
+@@ -24,7 +24,7 @@
id="javax.wsdl"
download-size="0"
install-size="0"
@@ -545,21 +331,10 @@ index e2475d3..7d003b2 100644
org.apache.axis;bundle-version="[1.3.0,2.0.0)",
org.apache.xerces;bundle-version="[2.8.0,3.0.0)",
diff --git a/org.eclipse.wst.xml.xpath2.processor.feature/feature.xml b/org.eclipse.wst.xml.xpath2.processor.feature/feature.xml
-index c508a43..0e23e3f 100644
+index c508a43..83872ce 100644
--- a/org.eclipse.wst.xml.xpath2.processor.feature/feature.xml
+++ b/org.eclipse.wst.xml.xpath2.processor.feature/feature.xml
-@@ -4,9 +4,7 @@
- label="%featureName"
- version="2.0.100.qualifier"
- provider-name="%providerName"
-- plugin="org.eclipse.wst.xml.xpath2"
-- license-feature="org.eclipse.license"
-- license-feature-version="1.0.0.qualifier">
-+ plugin="org.eclipse.wst.xml.xpath2">
-
- <description>
- %description
-@@ -20,12 +18,12 @@
+@@ -20,12 +20,12 @@
%license
</license>
@@ -588,21 +363,10 @@ index bb71d57..0af23b7 100644
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Export-Package: org.eclipse.wst.xml.xpath2.api,
diff --git a/org.eclipse.wst.xml_core.feature/feature.xml b/org.eclipse.wst.xml_core.feature/feature.xml
-index 4744bdf..ea47ee6 100644
+index 0b7c456..5af3c54 100644
--- a/org.eclipse.wst.xml_core.feature/feature.xml
+++ b/org.eclipse.wst.xml_core.feature/feature.xml
-@@ -3,9 +3,7 @@
- id="org.eclipse.wst.xml_core.feature"
- label="%featureName"
- version="3.4.0.qualifier"
-- provider-name="%providerName"
-- license-feature="org.eclipse.license"
-- license-feature-version="1.0.0.qualifier">
-+ provider-name="%providerName">
-
- <description>
- %description
-@@ -23,28 +21,21 @@
+@@ -23,28 +23,21 @@
id="javax.xml"
download-size="190"
install-size="190"
@@ -635,22 +399,11 @@ index 4744bdf..ea47ee6 100644
<plugin
diff --git a/org.eclipse.wst.xml_ui.feature/feature.xml b/org.eclipse.wst.xml_ui.feature/feature.xml
-index f78886a..f5fbd21 100644
+index 182e0f1..a7ab3a6 100644
--- a/org.eclipse.wst.xml_ui.feature/feature.xml
+++ b/org.eclipse.wst.xml_ui.feature/feature.xml
-@@ -4,9 +4,7 @@
- label="%featureName"
- version="3.4.0.qualifier"
- provider-name="%providerName"
-- plugin="org.eclipse.wst.xml.ui"
-- license-feature="org.eclipse.license"
-- license-feature-version="1.0.0.qualifier">
-+ plugin="org.eclipse.wst.xml.ui">
-
- <description>
- %description
-@@ -24,9 +22,9 @@
- <update label="%updateSiteName" url="http://download.eclipse.org/webtools/repository/indigo"/>
+@@ -24,9 +24,9 @@
+ <update label="%updateSiteName" url="http://download.eclipse.org/webtools/repository/juno"/>
</url>
- <includes
@@ -662,37 +415,11 @@ index f78886a..f5fbd21 100644
<includes
id="org.eclipse.wst.xml_userdoc.feature"
-diff --git a/org.eclipse.wst.xml_userdoc.feature/feature.xml b/org.eclipse.wst.xml_userdoc.feature/feature.xml
-index 7b4a96d..0bc7bf7 100644
---- a/org.eclipse.wst.xml_userdoc.feature/feature.xml
-+++ b/org.eclipse.wst.xml_userdoc.feature/feature.xml
-@@ -3,9 +3,7 @@
- id="org.eclipse.wst.xml_userdoc.feature"
- label="%featureName"
- version="3.3.0.qualifier"
-- provider-name="%providerName"
-- license-feature="org.eclipse.license"
-- license-feature-version="1.0.0.qualifier">
-+ provider-name="%providerName">
-
- <description>
- %description
diff --git a/org.eclipse.wst.xsl.feature/feature.xml b/org.eclipse.wst.xsl.feature/feature.xml
-index fd7d908..0917a30 100644
+index fd7d908..919284f 100644
--- a/org.eclipse.wst.xsl.feature/feature.xml
+++ b/org.eclipse.wst.xsl.feature/feature.xml
-@@ -4,9 +4,7 @@
- label="%featureName"
- version="1.3.100.qualifier"
- provider-name="%providerName"
-- plugin="org.eclipse.wst.xsl"
-- license-feature="org.eclipse.license"
-- license-feature-version="1.0.0.qualifier">
-+ plugin="org.eclipse.wst.xsl">
-
- <description>
- %description
-@@ -105,19 +103,19 @@
+@@ -105,19 +105,19 @@
version="0.0.0"
unpack="false"/>
--
eclipse-wtp packaging
More information about the pkg-java-commits
mailing list