Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkus Knauer2016-02-12 12:58:17 +0000
committerMarkus Knauer2016-02-12 12:59:09 +0000
commit92053a147221081609de26c365e5a73f1b6c98ce (patch)
tree6a75ad993b13d519f19e05318ec37cb2c19cee9e /packages/org.eclipse.epp.package.java.feature
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>
Diffstat (limited to 'packages/org.eclipse.epp.package.java.feature')
-rw-r--r--packages/org.eclipse.epp.package.java.feature/feature.xml6
-rw-r--r--packages/org.eclipse.epp.package.java.feature/p2.inf13
2 files changed, 2 insertions, 17 deletions
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);

Back to the top