Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkus Knauer2016-02-12 07:58:17 -0500
committerMarkus Knauer2016-02-12 07:59:09 -0500
commit92053a147221081609de26c365e5a73f1b6c98ce (patch)
tree6a75ad993b13d519f19e05318ec37cb2c19cee9e
parentbf508d11497ebfaaf4532fccb585a8ab7c667f0e (diff)
downloadorg.eclipse.epp.packages-92053a147221081609de26c365e5a73f1b6c98ce.tar.gz
org.eclipse.epp.packages-92053a147221081609de26c365e5a73f1b6c98ce.tar.xz
org.eclipse.epp.packages-92053a147221081609de26c365e5a73f1b6c98ce.zip
Clean up p2.inf and feature.xml files
- Remove all superfluous and commented out lines from p2.inf files. - Remove discovery site URLs from feature.xml files (these were meant for listing update sites; if anything should be done, a add/remove p2 repository operation should be included in a p2.inf file). Change-Id: I63c42feb999a9c83a92486f885390e641984e875 Signed-off-by: Markus Knauer <mknauer@eclipsesource.com>
-rw-r--r--packages/org.eclipse.epp.package.android.feature/feature.xml6
-rw-r--r--packages/org.eclipse.epp.package.android.feature/p2.inf13
-rw-r--r--packages/org.eclipse.epp.package.automotive.feature/feature.xml5
-rw-r--r--packages/org.eclipse.epp.package.automotive.feature/p2.inf5
-rw-r--r--packages/org.eclipse.epp.package.committers.feature/feature.xml5
-rw-r--r--packages/org.eclipse.epp.package.committers.feature/p2.inf5
-rw-r--r--packages/org.eclipse.epp.package.common.feature/feature.xml5
-rw-r--r--packages/org.eclipse.epp.package.cpp.feature/feature.xml5
-rw-r--r--packages/org.eclipse.epp.package.cpp.feature/p2.inf5
-rw-r--r--packages/org.eclipse.epp.package.dsl.feature/feature.xml5
-rw-r--r--packages/org.eclipse.epp.package.dsl.feature/p2.inf4
-rw-r--r--packages/org.eclipse.epp.package.java.feature/feature.xml6
-rw-r--r--packages/org.eclipse.epp.package.java.feature/p2.inf13
-rw-r--r--packages/org.eclipse.epp.package.jee.feature/feature.xml4
-rw-r--r--packages/org.eclipse.epp.package.jee.feature/p2.inf13
-rw-r--r--packages/org.eclipse.epp.package.modeling.feature/feature.xml5
-rw-r--r--packages/org.eclipse.epp.package.modeling.feature/p2.inf5
-rw-r--r--packages/org.eclipse.epp.package.parallel.feature/feature.xml6
-rw-r--r--packages/org.eclipse.epp.package.parallel.feature/p2.inf5
-rw-r--r--packages/org.eclipse.epp.package.php.feature/feature.xml5
-rw-r--r--packages/org.eclipse.epp.package.php.feature/p2.inf5
-rw-r--r--packages/org.eclipse.epp.package.rcp.feature/feature.xml6
-rw-r--r--packages/org.eclipse.epp.package.rcp.feature/p2.inf5
-rw-r--r--packages/org.eclipse.epp.package.reporting.feature/feature.xml5
-rw-r--r--packages/org.eclipse.epp.package.reporting.feature/p2.inf5
-rw-r--r--packages/org.eclipse.epp.package.scout.feature/feature.xml5
-rw-r--r--packages/org.eclipse.epp.package.scout.feature/p2.inf5
-rw-r--r--packages/org.eclipse.epp.package.testing.feature/feature.xml5
-rw-r--r--packages/org.eclipse.epp.package.testing.feature/p2.inf15
29 files changed, 25 insertions, 156 deletions
diff --git a/packages/org.eclipse.epp.package.android.feature/feature.xml b/packages/org.eclipse.epp.package.android.feature/feature.xml
index 5c7b1aa9..c0b61eb3 100644
--- a/packages/org.eclipse.epp.package.android.feature/feature.xml
+++ b/packages/org.eclipse.epp.package.android.feature/feature.xml
@@ -20,12 +20,6 @@
%license
</license>
- <url>
- <discovery label="Neon" url="http://download.eclipse.org/releases/neon/"/>
- <discovery label="Eclipse Platform 4.6" url="http://download.eclipse.org/eclipse/updates/4.6"/>
- <discovery label="Mylyn for Eclipse Neon" url="http://download.eclipse.org/mylyn/releases/neon/"/>
- </url>
-
<requires>
<import feature="org.eclipse.andmore.android.basic.feature"/>
<import feature="org.eclipse.andmore.ndk.feature"/>
diff --git a/packages/org.eclipse.epp.package.android.feature/p2.inf b/packages/org.eclipse.epp.package.android.feature/p2.inf
index 64a8f664..db72e641 100644
--- a/packages/org.eclipse.epp.package.android.feature/p2.inf
+++ b/packages/org.eclipse.epp.package.android.feature/p2.inf
@@ -1,16 +1,7 @@
-#tell pde.build not to generate start levels
+# tell pde.build not to generate start levels
org.eclipse.pde.build.append.startlevels=false
-#add requirement on org.eclipse.platform.ide
+# add requirement on org.eclipse.platform.ide
requires.1.namespace=org.eclipse.equinox.p2.iu
requires.1.name=org.eclipse.platform.ide
-#requires.1.range=[3.5.0.I20090522-1710,3.5.0.I20090522-1710]
requires.1.greedy=true
-
-instructions.configure=\
-org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:0,location:http${#58}//download.eclipse.org/mylyn/releases/neon,name:Mylyn for Eclipse Neon);\
-org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:1,location:http${#58}//download.eclipse.org/mylyn/releases/neon,name:Mylyn for Eclipse Neon);
-
-instructions.unconfigure=\
-org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:0,location:http${#58}//download.eclipse.org/mylyn/releases/neon);\
-org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:1,location:http${#58}//download.eclipse.org/mylyn/releases/neon);
diff --git a/packages/org.eclipse.epp.package.automotive.feature/feature.xml b/packages/org.eclipse.epp.package.automotive.feature/feature.xml
index 7031ab0c..ef6e421e 100644
--- a/packages/org.eclipse.epp.package.automotive.feature/feature.xml
+++ b/packages/org.eclipse.epp.package.automotive.feature/feature.xml
@@ -20,11 +20,6 @@
%license
</license>
- <url>
- <discovery label="Neon" url="http://download.eclipse.org/releases/neon/"/>
- <discovery label="Eclipse Platform 4.6" url="http://download.eclipse.org/eclipse/updates/4.6"/>
- </url>
-
<requires>
<import feature="org.eclipse.cdt"/>
<import feature="org.eclipse.cdt.autotools"/>
diff --git a/packages/org.eclipse.epp.package.automotive.feature/p2.inf b/packages/org.eclipse.epp.package.automotive.feature/p2.inf
index 9d6a29d3..db72e641 100644
--- a/packages/org.eclipse.epp.package.automotive.feature/p2.inf
+++ b/packages/org.eclipse.epp.package.automotive.feature/p2.inf
@@ -1,8 +1,7 @@
-#tell pde.build not to generate start levels
+# tell pde.build not to generate start levels
org.eclipse.pde.build.append.startlevels=false
-#add requirement on org.eclipse.platform.ide
+# add requirement on org.eclipse.platform.ide
requires.1.namespace=org.eclipse.equinox.p2.iu
requires.1.name=org.eclipse.platform.ide
-#requires.1.range=[3.5.0.I20090522-1710,3.5.0.I20090522-1710]
requires.1.greedy=true
diff --git a/packages/org.eclipse.epp.package.committers.feature/feature.xml b/packages/org.eclipse.epp.package.committers.feature/feature.xml
index 12b3bd76..5b2edfce 100644
--- a/packages/org.eclipse.epp.package.committers.feature/feature.xml
+++ b/packages/org.eclipse.epp.package.committers.feature/feature.xml
@@ -20,11 +20,6 @@
%license
</license>
- <url>
- <discovery label="Neon" url="http://download.eclipse.org/releases/neon/"/>
- <discovery label="Eclipse Platform 4.6" url="http://download.eclipse.org/eclipse/updates/4.6"/>
- </url>
-
<includes
id="org.eclipse.platform"
version="0.0.0"
diff --git a/packages/org.eclipse.epp.package.committers.feature/p2.inf b/packages/org.eclipse.epp.package.committers.feature/p2.inf
index 23cb0849..db72e641 100644
--- a/packages/org.eclipse.epp.package.committers.feature/p2.inf
+++ b/packages/org.eclipse.epp.package.committers.feature/p2.inf
@@ -4,9 +4,4 @@ org.eclipse.pde.build.append.startlevels=false
# add requirement on org.eclipse.platform.ide
requires.1.namespace=org.eclipse.equinox.p2.iu
requires.1.name=org.eclipse.platform.ide
-#requires.1.range=[3.5.0.I20090522-1710,3.5.0.I20090522-1710]
requires.1.greedy=true
-
-# disable listing of feature in any category
-properties.1.name=org.eclipse.equinox.p2.type.category
-properties.1.value=false
diff --git a/packages/org.eclipse.epp.package.common.feature/feature.xml b/packages/org.eclipse.epp.package.common.feature/feature.xml
index 19ec2621..415cb9ee 100644
--- a/packages/org.eclipse.epp.package.common.feature/feature.xml
+++ b/packages/org.eclipse.epp.package.common.feature/feature.xml
@@ -19,11 +19,6 @@
%license
</license>
- <url>
- <discovery label="Neon" url="http://download.eclipse.org/releases/neon/"/>
- <discovery label="Eclipse Platform 4.6" url="http://download.eclipse.org/eclipse/updates/4.6"/>
- </url>
-
<requires>
<import feature="org.eclipse.epp.mpc"/>
<import feature="org.eclipse.epp.logging.aeri.feature"/>
diff --git a/packages/org.eclipse.epp.package.cpp.feature/feature.xml b/packages/org.eclipse.epp.package.cpp.feature/feature.xml
index e46f15e4..b0aa600e 100644
--- a/packages/org.eclipse.epp.package.cpp.feature/feature.xml
+++ b/packages/org.eclipse.epp.package.cpp.feature/feature.xml
@@ -20,11 +20,6 @@
%license
</license>
- <url>
- <discovery label="Neon" url="http://download.eclipse.org/releases/neon/"/>
- <discovery label="Eclipse Platform 4.6" url="http://download.eclipse.org/eclipse/updates/4.6"/>
- </url>
-
<!-- see p2.inf file for optionally imported Linux Tools features -->
<requires>
diff --git a/packages/org.eclipse.epp.package.cpp.feature/p2.inf b/packages/org.eclipse.epp.package.cpp.feature/p2.inf
index c63dd66d..3c698fe0 100644
--- a/packages/org.eclipse.epp.package.cpp.feature/p2.inf
+++ b/packages/org.eclipse.epp.package.cpp.feature/p2.inf
@@ -1,10 +1,9 @@
-#tell pde.build not to generate start levels
+# tell pde.build not to generate start levels
org.eclipse.pde.build.append.startlevels=false
-#add requirement on org.eclipse.platform.ide
+# add requirement on org.eclipse.platform.ide
requires.1.namespace=org.eclipse.equinox.p2.iu
requires.1.name=org.eclipse.platform.ide
-#requires.1.range=[3.5.0.I20090522-1710,3.5.0.I20090522-1710]
requires.1.greedy=true
# <import feature="org.eclipse.linuxtools.cdt.libhover.feature"/>
diff --git a/packages/org.eclipse.epp.package.dsl.feature/feature.xml b/packages/org.eclipse.epp.package.dsl.feature/feature.xml
index fa7e4129..ea98eaf6 100644
--- a/packages/org.eclipse.epp.package.dsl.feature/feature.xml
+++ b/packages/org.eclipse.epp.package.dsl.feature/feature.xml
@@ -20,11 +20,6 @@
%license
</license>
- <url>
- <discovery label="Neon" url="http://download.eclipse.org/releases/neon/"/>
- <discovery label="Eclipse Platform 4.6" url="http://download.eclipse.org/eclipse/updates/4.6"/>
- </url>
-
<requires>
<import feature="org.eclipse.sdk"/>
<import feature="org.eclipse.egit"/>
diff --git a/packages/org.eclipse.epp.package.dsl.feature/p2.inf b/packages/org.eclipse.epp.package.dsl.feature/p2.inf
index 0cf4783c..db72e641 100644
--- a/packages/org.eclipse.epp.package.dsl.feature/p2.inf
+++ b/packages/org.eclipse.epp.package.dsl.feature/p2.inf
@@ -1,7 +1,7 @@
-#tell pde.build not to generate start levels
+# tell pde.build not to generate start levels
org.eclipse.pde.build.append.startlevels=false
-#add requirement on org.eclipse.platform.ide
+# add requirement on org.eclipse.platform.ide
requires.1.namespace=org.eclipse.equinox.p2.iu
requires.1.name=org.eclipse.platform.ide
requires.1.greedy=true
diff --git a/packages/org.eclipse.epp.package.java.feature/feature.xml b/packages/org.eclipse.epp.package.java.feature/feature.xml
index 5d561a7a..fb3d832e 100644
--- a/packages/org.eclipse.epp.package.java.feature/feature.xml
+++ b/packages/org.eclipse.epp.package.java.feature/feature.xml
@@ -20,12 +20,6 @@
%license
</license>
- <url>
- <discovery label="Neon" url="http://download.eclipse.org/releases/neon/"/>
- <discovery label="Eclipse Platform 4.6" url="http://download.eclipse.org/eclipse/updates/4.6"/>
- <discovery label="Mylyn for Eclipse Neon" url="http://download.eclipse.org/mylyn/releases/neon/"/>
- </url>
-
<requires>
<import feature="org.eclipse.egit"/>
<import feature="org.eclipse.egit.import"/>
diff --git a/packages/org.eclipse.epp.package.java.feature/p2.inf b/packages/org.eclipse.epp.package.java.feature/p2.inf
index 64a8f664..db72e641 100644
--- a/packages/org.eclipse.epp.package.java.feature/p2.inf
+++ b/packages/org.eclipse.epp.package.java.feature/p2.inf
@@ -1,16 +1,7 @@
-#tell pde.build not to generate start levels
+# tell pde.build not to generate start levels
org.eclipse.pde.build.append.startlevels=false
-#add requirement on org.eclipse.platform.ide
+# add requirement on org.eclipse.platform.ide
requires.1.namespace=org.eclipse.equinox.p2.iu
requires.1.name=org.eclipse.platform.ide
-#requires.1.range=[3.5.0.I20090522-1710,3.5.0.I20090522-1710]
requires.1.greedy=true
-
-instructions.configure=\
-org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:0,location:http${#58}//download.eclipse.org/mylyn/releases/neon,name:Mylyn for Eclipse Neon);\
-org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:1,location:http${#58}//download.eclipse.org/mylyn/releases/neon,name:Mylyn for Eclipse Neon);
-
-instructions.unconfigure=\
-org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:0,location:http${#58}//download.eclipse.org/mylyn/releases/neon);\
-org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:1,location:http${#58}//download.eclipse.org/mylyn/releases/neon);
diff --git a/packages/org.eclipse.epp.package.jee.feature/feature.xml b/packages/org.eclipse.epp.package.jee.feature/feature.xml
index f6a5bacb..54361555 100644
--- a/packages/org.eclipse.epp.package.jee.feature/feature.xml
+++ b/packages/org.eclipse.epp.package.jee.feature/feature.xml
@@ -20,10 +20,6 @@
%license
</license>
- <url>
- <discovery label="%discoverySiteName" url="http://download.eclipse.org/releases/neon/"/>
- </url>
-
<includes
id="org.eclipse.platform"
version="0.0.0"
diff --git a/packages/org.eclipse.epp.package.jee.feature/p2.inf b/packages/org.eclipse.epp.package.jee.feature/p2.inf
index 303277ba..0094a36c 100644
--- a/packages/org.eclipse.epp.package.jee.feature/p2.inf
+++ b/packages/org.eclipse.epp.package.jee.feature/p2.inf
@@ -1,20 +1,15 @@
-#tell pde.build not to generate start levels
+# tell pde.build not to generate start levels
org.eclipse.pde.build.append.startlevels=false
-#add requirement on org.eclipse.platform.ide
+# add requirement on org.eclipse.platform.ide
requires.1.namespace=org.eclipse.equinox.p2.iu
requires.1.name=org.eclipse.platform.ide
-#requires.1.range=[3.5.0.I20090522-1710,3.5.0.I20090522-1710]
requires.1.greedy=true
instructions.configure=\
org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:0,location:http${#58}//download.eclipse.org/webtools/repository/neon,name:The Eclipse Web Tools Platform (WTP) software repository);\
-org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:1,location:http${#58}//download.eclipse.org/webtools/repository/neon,name:The Eclipse Web Tools Platform (WTP) software repository);\
-org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:0,location:http${#58}//download.eclipse.org/mylyn/releases/neon,name:Mylyn for Eclipse Neon);\
-org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:1,location:http${#58}//download.eclipse.org/mylyn/releases/neon,name:Mylyn for Eclipse Neon);
+org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:1,location:http${#58}//download.eclipse.org/webtools/repository/neon,name:The Eclipse Web Tools Platform (WTP) software repository);
instructions.unconfigure=\
org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:0,location:http${#58}//download.eclipse.org/webtools/repository/neon);\
-org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:1,location:http${#58}//download.eclipse.org/webtools/repository/neon);\
-org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:0,location:http${#58}//download.eclipse.org/mylyn/releases/neon);\
-org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:1,location:http${#58}//download.eclipse.org/mylyn/releases/neon);
+org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:1,location:http${#58}//download.eclipse.org/webtools/repository/neon);
diff --git a/packages/org.eclipse.epp.package.modeling.feature/feature.xml b/packages/org.eclipse.epp.package.modeling.feature/feature.xml
index 5ed0a024..d7cbb4db 100644
--- a/packages/org.eclipse.epp.package.modeling.feature/feature.xml
+++ b/packages/org.eclipse.epp.package.modeling.feature/feature.xml
@@ -20,11 +20,6 @@
%license
</license>
- <url>
- <discovery label="Neon" url="http://download.eclipse.org/releases/neon/"/>
- <discovery label="Eclipse Platform 4.6" url="http://download.eclipse.org/eclipse/updates/4.6"/>
- </url>
-
<includes
id="org.eclipse.platform"
version="0.0.0"
diff --git a/packages/org.eclipse.epp.package.modeling.feature/p2.inf b/packages/org.eclipse.epp.package.modeling.feature/p2.inf
index a0b3b4a2..0f1be63b 100644
--- a/packages/org.eclipse.epp.package.modeling.feature/p2.inf
+++ b/packages/org.eclipse.epp.package.modeling.feature/p2.inf
@@ -1,10 +1,9 @@
-#tell pde.build not to generate start levels
+# tell pde.build not to generate start levels
org.eclipse.pde.build.append.startlevels=false
-#add requirement on org.eclipse.platform.ide
+# add requirement on org.eclipse.platform.ide
requires.1.namespace=org.eclipse.equinox.p2.iu
requires.1.name=org.eclipse.platform.ide
-#requires.1.range=[3.5.0.I20090522-1710,3.5.0.I20090522-1710]
requires.1.greedy=true
instructions.configure=\
diff --git a/packages/org.eclipse.epp.package.parallel.feature/feature.xml b/packages/org.eclipse.epp.package.parallel.feature/feature.xml
index b5098847..87fa630c 100644
--- a/packages/org.eclipse.epp.package.parallel.feature/feature.xml
+++ b/packages/org.eclipse.epp.package.parallel.feature/feature.xml
@@ -20,12 +20,6 @@
%license
</license>
- <url>
- <discovery label="Neon" url="http://download.eclipse.org/releases/neon/"/>
- <discovery label="Eclipse Platform 4.6" url="http://download.eclipse.org/eclipse/updates/4.6"/>
- <discovery label="PTP" url="http://download.eclipse.org/tools/ptp/updates/neon/"/>
- </url>
-
<includes
id="org.eclipse.platform"
version="0.0.0"
diff --git a/packages/org.eclipse.epp.package.parallel.feature/p2.inf b/packages/org.eclipse.epp.package.parallel.feature/p2.inf
index ede092aa..85124e38 100644
--- a/packages/org.eclipse.epp.package.parallel.feature/p2.inf
+++ b/packages/org.eclipse.epp.package.parallel.feature/p2.inf
@@ -1,10 +1,9 @@
-#tell pde.build not to generate start levels
+# tell pde.build not to generate start levels
org.eclipse.pde.build.append.startlevels=false
-#add requirement on org.eclipse.platform.ide
+# add requirement on org.eclipse.platform.ide
requires.1.namespace=org.eclipse.equinox.p2.iu
requires.1.name=org.eclipse.platform.ide
-#requires.1.range=[3.5.0.I20090522-1710,3.5.0.I20090522-1710]
requires.1.greedy=true
# <import feature="org.eclipse.photran.intel"/>
diff --git a/packages/org.eclipse.epp.package.php.feature/feature.xml b/packages/org.eclipse.epp.package.php.feature/feature.xml
index 5f782bf1..0242642f 100644
--- a/packages/org.eclipse.epp.package.php.feature/feature.xml
+++ b/packages/org.eclipse.epp.package.php.feature/feature.xml
@@ -20,11 +20,6 @@
%license
</license>
- <url>
- <discovery label="Neon" url="http://download.eclipse.org/releases/neon/"/>
- <discovery label="Eclipse Platform 4.6" url="http://download.eclipse.org/eclipse/updates/4.6"/>
- </url>
-
<includes
id="org.eclipse.platform"
version="0.0.0"
diff --git a/packages/org.eclipse.epp.package.php.feature/p2.inf b/packages/org.eclipse.epp.package.php.feature/p2.inf
index 23cb0849..db72e641 100644
--- a/packages/org.eclipse.epp.package.php.feature/p2.inf
+++ b/packages/org.eclipse.epp.package.php.feature/p2.inf
@@ -4,9 +4,4 @@ org.eclipse.pde.build.append.startlevels=false
# add requirement on org.eclipse.platform.ide
requires.1.namespace=org.eclipse.equinox.p2.iu
requires.1.name=org.eclipse.platform.ide
-#requires.1.range=[3.5.0.I20090522-1710,3.5.0.I20090522-1710]
requires.1.greedy=true
-
-# disable listing of feature in any category
-properties.1.name=org.eclipse.equinox.p2.type.category
-properties.1.value=false
diff --git a/packages/org.eclipse.epp.package.rcp.feature/feature.xml b/packages/org.eclipse.epp.package.rcp.feature/feature.xml
index 63c63ec3..bd4fcb17 100644
--- a/packages/org.eclipse.epp.package.rcp.feature/feature.xml
+++ b/packages/org.eclipse.epp.package.rcp.feature/feature.xml
@@ -20,12 +20,6 @@
%license
</license>
- <url>
- <discovery label="Neon" url="http://download.eclipse.org/releases/neon/"/>
- <discovery label="Eclipse Platform 4.6" url="http://download.eclipse.org/eclipse/updates/4.6"/>
- </url>
-
-
<requires>
<!--
<import feature="org.eclipse.egit"/>
diff --git a/packages/org.eclipse.epp.package.rcp.feature/p2.inf b/packages/org.eclipse.epp.package.rcp.feature/p2.inf
index 23cb0849..db72e641 100644
--- a/packages/org.eclipse.epp.package.rcp.feature/p2.inf
+++ b/packages/org.eclipse.epp.package.rcp.feature/p2.inf
@@ -4,9 +4,4 @@ org.eclipse.pde.build.append.startlevels=false
# add requirement on org.eclipse.platform.ide
requires.1.namespace=org.eclipse.equinox.p2.iu
requires.1.name=org.eclipse.platform.ide
-#requires.1.range=[3.5.0.I20090522-1710,3.5.0.I20090522-1710]
requires.1.greedy=true
-
-# disable listing of feature in any category
-properties.1.name=org.eclipse.equinox.p2.type.category
-properties.1.value=false
diff --git a/packages/org.eclipse.epp.package.reporting.feature/feature.xml b/packages/org.eclipse.epp.package.reporting.feature/feature.xml
index 43e81842..c77f883c 100644
--- a/packages/org.eclipse.epp.package.reporting.feature/feature.xml
+++ b/packages/org.eclipse.epp.package.reporting.feature/feature.xml
@@ -20,11 +20,6 @@
%license
</license>
- <url>
- <discovery label="Neon" url="http://download.eclipse.org/releases/neon/"/>
- <discovery label="Eclipse Platform 4.6" url="http://download.eclipse.org/eclipse/updates/4.6"/>
- </url>
-
<includes
id="org.eclipse.platform"
version="0.0.0"
diff --git a/packages/org.eclipse.epp.package.reporting.feature/p2.inf b/packages/org.eclipse.epp.package.reporting.feature/p2.inf
index 9d6a29d3..db72e641 100644
--- a/packages/org.eclipse.epp.package.reporting.feature/p2.inf
+++ b/packages/org.eclipse.epp.package.reporting.feature/p2.inf
@@ -1,8 +1,7 @@
-#tell pde.build not to generate start levels
+# tell pde.build not to generate start levels
org.eclipse.pde.build.append.startlevels=false
-#add requirement on org.eclipse.platform.ide
+# add requirement on org.eclipse.platform.ide
requires.1.namespace=org.eclipse.equinox.p2.iu
requires.1.name=org.eclipse.platform.ide
-#requires.1.range=[3.5.0.I20090522-1710,3.5.0.I20090522-1710]
requires.1.greedy=true
diff --git a/packages/org.eclipse.epp.package.scout.feature/feature.xml b/packages/org.eclipse.epp.package.scout.feature/feature.xml
index a60940d1..2d7d450c 100644
--- a/packages/org.eclipse.epp.package.scout.feature/feature.xml
+++ b/packages/org.eclipse.epp.package.scout.feature/feature.xml
@@ -20,11 +20,6 @@
%license
</license>
- <url>
- <discovery label="Neon" url="http://download.eclipse.org/releases/neon/"/>
- <discovery label="Eclipse Platform 4.6" url="http://download.eclipse.org/eclipse/updates/4.6"/>
- </url>
-
<includes
id="org.eclipse.platform"
version="0.0.0"
diff --git a/packages/org.eclipse.epp.package.scout.feature/p2.inf b/packages/org.eclipse.epp.package.scout.feature/p2.inf
index 23cb0849..db72e641 100644
--- a/packages/org.eclipse.epp.package.scout.feature/p2.inf
+++ b/packages/org.eclipse.epp.package.scout.feature/p2.inf
@@ -4,9 +4,4 @@ org.eclipse.pde.build.append.startlevels=false
# add requirement on org.eclipse.platform.ide
requires.1.namespace=org.eclipse.equinox.p2.iu
requires.1.name=org.eclipse.platform.ide
-#requires.1.range=[3.5.0.I20090522-1710,3.5.0.I20090522-1710]
requires.1.greedy=true
-
-# disable listing of feature in any category
-properties.1.name=org.eclipse.equinox.p2.type.category
-properties.1.value=false
diff --git a/packages/org.eclipse.epp.package.testing.feature/feature.xml b/packages/org.eclipse.epp.package.testing.feature/feature.xml
index cb0aed38..7ef9d97e 100644
--- a/packages/org.eclipse.epp.package.testing.feature/feature.xml
+++ b/packages/org.eclipse.epp.package.testing.feature/feature.xml
@@ -20,11 +20,6 @@
%license
</license>
- <url>
- <discovery label="Neon" url="http://download.eclipse.org/releases/neon/"/>
- <discovery label="Eclipse Platform 4.6" url="http://download.eclipse.org/eclipse/updates/4.6"/>
- </url>
-
<includes
id="org.eclipse.platform"
version="0.0.0"
diff --git a/packages/org.eclipse.epp.package.testing.feature/p2.inf b/packages/org.eclipse.epp.package.testing.feature/p2.inf
index 2379bc78..d12e0da8 100644
--- a/packages/org.eclipse.epp.package.testing.feature/p2.inf
+++ b/packages/org.eclipse.epp.package.testing.feature/p2.inf
@@ -1,18 +1,13 @@
# tell pde.build not to generate start levels
org.eclipse.pde.build.append.startlevels=false
-# remove inclusion of javax.transaction - see bug #409122 for further information
-requires.0.namespace = org.eclipse.equinox.p2.iu
-requires.0.name = javax.transaction
-requires.0.min = 0
-requires.0.max = 0
-
# add requirement on org.eclipse.platform.ide
requires.1.namespace=org.eclipse.equinox.p2.iu
requires.1.name=org.eclipse.platform.ide
-#requires.1.range=[3.5.0.I20090522-1710,3.5.0.I20090522-1710]
requires.1.greedy=true
-# disable listing of feature in any category
-properties.1.name=org.eclipse.equinox.p2.type.category
-properties.1.value=false
+# remove inclusion of javax.transaction - see bug #409122 for further information
+requires.0.namespace = org.eclipse.equinox.p2.iu
+requires.0.name = javax.transaction
+requires.0.min = 0
+requires.0.max = 0

Back to the top