Bug 529012 - feature.xml is invalid according to its DTD
Remove 'requires' element from XML if empty.
Change-Id: I2c22f73d620fdd72fd835bc50b488f9d7558c101
Signed-off-by: Andreas Sewe <andreas.sewe@codetrails.com>
diff --git a/packages/org.eclipse.epp.package.committers.feature/feature.xml b/packages/org.eclipse.epp.package.committers.feature/feature.xml
index 46dea23..6c2d154 100644
--- a/packages/org.eclipse.epp.package.committers.feature/feature.xml
+++ b/packages/org.eclipse.epp.package.committers.feature/feature.xml
@@ -25,7 +25,6 @@
version="0.0.0"
search-location="both"/>
- <requires>
<!--
All requirements to features and the content of the product are defined
in the product configuration epp.product since Eclipse Neon. For further
@@ -34,7 +33,6 @@
Bug 332989 - Allow parts of a package to upgraded or removed
https://bugs.eclipse.org/bugs/show_bug.cgi?id=332989
-->
- </requires>
<plugin
id="org.eclipse.epp.package.committers"
diff --git a/packages/org.eclipse.epp.package.cpp.feature/feature.xml b/packages/org.eclipse.epp.package.cpp.feature/feature.xml
index 5a3abe9..ff0277b 100644
--- a/packages/org.eclipse.epp.package.cpp.feature/feature.xml
+++ b/packages/org.eclipse.epp.package.cpp.feature/feature.xml
@@ -22,7 +22,6 @@
<!-- see p2.inf file for optionally imported Linux Tools features -->
- <requires>
<!--
All requirements to features and the content of the product are defined
in the product configuration epp.product since Eclipse Neon. For further
@@ -35,7 +34,6 @@
the CPP feature; this hasn't been touched and could be part of another
change.
-->
- </requires>
<plugin
id="org.eclipse.epp.package.cpp"
diff --git a/packages/org.eclipse.epp.package.java.feature/feature.xml b/packages/org.eclipse.epp.package.java.feature/feature.xml
index 89ee9a2..6c29734 100644
--- a/packages/org.eclipse.epp.package.java.feature/feature.xml
+++ b/packages/org.eclipse.epp.package.java.feature/feature.xml
@@ -20,7 +20,6 @@
%license
</license>
- <requires>
<!--
All requirements to features and the content of the product are defined
in the product configuration epp.product since Eclipse Neon. For further
@@ -29,7 +28,6 @@
Bug 332989 - Allow parts of a package to upgraded or removed
https://bugs.eclipse.org/bugs/show_bug.cgi?id=332989
-->
- </requires>
<plugin
id="org.eclipse.epp.package.java"
diff --git a/packages/org.eclipse.epp.package.jee.feature/feature.xml b/packages/org.eclipse.epp.package.jee.feature/feature.xml
index 71c123e..732552d 100644
--- a/packages/org.eclipse.epp.package.jee.feature/feature.xml
+++ b/packages/org.eclipse.epp.package.jee.feature/feature.xml
@@ -25,7 +25,6 @@
version="0.0.0"
search-location="both"/>
- <requires>
<!--
All requirements to features and the content of the product are defined
in the product configuration epp.product since Eclipse Neon. For further
@@ -38,7 +37,6 @@
plugins defined within this feature; these dependencies haven't been
changed.
-->
- </requires>
<plugin
id="org.eclipse.epp.package.jee"
diff --git a/packages/org.eclipse.epp.package.modeling.feature/feature.xml b/packages/org.eclipse.epp.package.modeling.feature/feature.xml
index 42b0d81..4b333e7 100644
--- a/packages/org.eclipse.epp.package.modeling.feature/feature.xml
+++ b/packages/org.eclipse.epp.package.modeling.feature/feature.xml
@@ -25,7 +25,6 @@
version="0.0.0"
search-location="both"/>
- <requires>
<!--
All requirements to features and the content of the product are defined
in the product configuration epp.product since Eclipse Neon. For further
@@ -34,7 +33,6 @@
Bug 332989 - Allow parts of a package to upgraded or removed
https://bugs.eclipse.org/bugs/show_bug.cgi?id=332989
-->
- </requires>
<plugin
id="org.eclipse.epp.package.modeling"
diff --git a/packages/org.eclipse.epp.package.parallel.feature/feature.xml b/packages/org.eclipse.epp.package.parallel.feature/feature.xml
index 810862b..7748af0 100644
--- a/packages/org.eclipse.epp.package.parallel.feature/feature.xml
+++ b/packages/org.eclipse.epp.package.parallel.feature/feature.xml
@@ -85,7 +85,6 @@
optional="true"
search-location="both"/>
- <requires>
<!--
All requirements to features and the content of the product are defined
in the product configuration epp.product since Eclipse Neon. For further
@@ -97,7 +96,6 @@
The (optional) plug-in dependencies within this feature.xml have been
left as they are.
-->
- </requires>
<plugin
id="org.eclipse.epp.package.parallel"
diff --git a/packages/org.eclipse.epp.package.php.feature/feature.xml b/packages/org.eclipse.epp.package.php.feature/feature.xml
index c215466..6b73907 100644
--- a/packages/org.eclipse.epp.package.php.feature/feature.xml
+++ b/packages/org.eclipse.epp.package.php.feature/feature.xml
@@ -25,7 +25,6 @@
version="0.0.0"
search-location="both"/>
- <requires>
<!--
All requirements to features and the content of the product are defined
in the product configuration epp.product since Eclipse Neon. For further
@@ -34,7 +33,6 @@
Bug 332989 - Allow parts of a package to upgraded or removed
https://bugs.eclipse.org/bugs/show_bug.cgi?id=332989
-->
- </requires>
<plugin
id="org.eclipse.epp.package.php"
diff --git a/packages/org.eclipse.epp.package.rcp.feature/feature.xml b/packages/org.eclipse.epp.package.rcp.feature/feature.xml
index 8fe7f7b..aebbb46 100644
--- a/packages/org.eclipse.epp.package.rcp.feature/feature.xml
+++ b/packages/org.eclipse.epp.package.rcp.feature/feature.xml
@@ -20,7 +20,6 @@
%license
</license>
- <requires>
<!--
All requirements to features and the content of the product are defined
in the product configuration epp.product since Eclipse Neon. For further
@@ -29,7 +28,6 @@
Bug 332989 - Allow parts of a package to upgraded or removed
https://bugs.eclipse.org/bugs/show_bug.cgi?id=332989
-->
- </requires>
<plugin
id="org.eclipse.epp.package.rcp"
diff --git a/packages/org.eclipse.epp.package.reporting.feature/feature.xml b/packages/org.eclipse.epp.package.reporting.feature/feature.xml
index 095883d..2780ef0 100644
--- a/packages/org.eclipse.epp.package.reporting.feature/feature.xml
+++ b/packages/org.eclipse.epp.package.reporting.feature/feature.xml
@@ -25,7 +25,6 @@
version="0.0.0"
search-location="both"/>
- <requires>
<!--
All requirements to features and the content of the product are defined
in the product configuration epp.product since Eclipse Neon. For further
@@ -34,7 +33,6 @@
Bug 332989 - Allow parts of a package to upgraded or removed
https://bugs.eclipse.org/bugs/show_bug.cgi?id=332989
-->
- </requires>
<plugin
id="org.eclipse.epp.package.reporting"
diff --git a/packages/org.eclipse.epp.package.rust.feature/feature.xml b/packages/org.eclipse.epp.package.rust.feature/feature.xml
index 1bc922b..519ba8c 100644
--- a/packages/org.eclipse.epp.package.rust.feature/feature.xml
+++ b/packages/org.eclipse.epp.package.rust.feature/feature.xml
@@ -25,7 +25,6 @@
version="0.0.0"
search-location="both"/>
- <requires>
<!--
All requirements to features and the content of the product are defined
in the product configuration epp.product since Eclipse Neon. For further
@@ -34,7 +33,6 @@
Bug 332989 - Allow parts of a package to upgraded or removed
https://bugs.eclipse.org/bugs/show_bug.cgi?id=332989
-->
- </requires>
<plugin
id="org.eclipse.epp.package.rust"
diff --git a/packages/org.eclipse.epp.package.scout.feature/feature.xml b/packages/org.eclipse.epp.package.scout.feature/feature.xml
index f21b1c2..39c6bd9 100644
--- a/packages/org.eclipse.epp.package.scout.feature/feature.xml
+++ b/packages/org.eclipse.epp.package.scout.feature/feature.xml
@@ -25,7 +25,6 @@
version="0.0.0"
search-location="both"/>
- <requires>
<!--
All requirements to features and the content of the product are defined
in the product configuration epp.product since Eclipse Neon. For further
@@ -34,7 +33,6 @@
Bug 332989 - Allow parts of a package to upgraded or removed
https://bugs.eclipse.org/bugs/show_bug.cgi?id=332989
-->
- </requires>
<plugin
id="org.eclipse.epp.package.scout"
diff --git a/packages/org.eclipse.epp.package.testing.feature/feature.xml b/packages/org.eclipse.epp.package.testing.feature/feature.xml
index 626d969..92c6679 100644
--- a/packages/org.eclipse.epp.package.testing.feature/feature.xml
+++ b/packages/org.eclipse.epp.package.testing.feature/feature.xml
@@ -25,7 +25,6 @@
version="0.0.0"
search-location="both"/>
- <requires>
<!--
All requirements to features and the content of the product are defined
in the product configuration epp.product since Eclipse Neon. For further
@@ -34,7 +33,6 @@
Bug 332989 - Allow parts of a package to upgraded or removed
https://bugs.eclipse.org/bugs/show_bug.cgi?id=332989
-->
- </requires>
<plugin
id="org.eclipse.epp.package.testing"
