Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteffen Pingel2013-06-13 13:15:02 +0000
committerSteffen Pingel2013-06-14 07:11:38 +0000
commit7f4aeb994e6e54d7e83ba242dc6fcc344cd2119b (patch)
treecb863bfdc697ab7234b1050b73a094ea8311d3f1
parentdbb2a7c0c2cf422affc74a1c6f8acac17eca7088 (diff)
downloadorg.eclipse.mylyn-7f4aeb994e6e54d7e83ba242dc6fcc344cd2119b.tar.gz
org.eclipse.mylyn-7f4aeb994e6e54d7e83ba242dc6fcc344cd2119b.tar.xz
org.eclipse.mylyn-7f4aeb994e6e54d7e83ba242dc6fcc344cd2119b.zip
410655: add JDT @NonNull annotation bundle to targets
* fix detection of Mac OS specific profile Change-Id: Iad4737b4ce71d6d29c20823ec8fb0f3c58f99bef Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=410655
-rw-r--r--.gitignore1
-rw-r--r--org.eclipse.mylyn-parent/pom.xml10
-rw-r--r--org.eclipse.mylyn-target/mylyn-dev-all.target10
-rw-r--r--org.eclipse.mylyn-target/mylyn-dev-e3.5.target4
-rw-r--r--org.eclipse.mylyn-target/mylyn-dev-e3.6.target4
-rw-r--r--org.eclipse.mylyn-target/mylyn-dev-e3.7.target4
-rw-r--r--org.eclipse.mylyn-target/mylyn-dev-e3.8.target4
-rw-r--r--org.eclipse.mylyn-target/mylyn-e3.5.target4
-rw-r--r--org.eclipse.mylyn-target/mylyn-e3.6.target4
-rw-r--r--org.eclipse.mylyn-target/mylyn-e3.7.target4
-rw-r--r--org.eclipse.mylyn-target/mylyn-e3.8.target5
-rw-r--r--org.eclipse.mylyn-target/mylyn-e4.2.target5
-rw-r--r--org.eclipse.mylyn-target/mylyn-e4.3.target9
13 files changed, 53 insertions, 15 deletions
diff --git a/.gitignore b/.gitignore
index 535a71f..856cdf7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
/org.eclipse*/bin
/org.eclipse*/target
*.rej
+*~
!/org.eclipse.mylyn.releng/bin
diff --git a/org.eclipse.mylyn-parent/pom.xml b/org.eclipse.mylyn-parent/pom.xml
index 099c347..d194b8a 100644
--- a/org.eclipse.mylyn-parent/pom.xml
+++ b/org.eclipse.mylyn-parent/pom.xml
@@ -75,6 +75,7 @@
<alt-platform-repository-url>http://download.eclipse.org/releases/indigo/201202240900/</alt-platform-repository-url>
<orbit-repository-url>http://download.eclipse.org/tools/orbit/downloads/drops/R20130517111416/repository/</orbit-repository-url>
+ <jdt-annotation-repository-url>http://download.eclipse.org/mylyn/snapshots/jdt-annotation/</jdt-annotation-repository-url>
<mylyn-repository-url>http://download.eclipse.org/mylyn/snapshots/nightly/</mylyn-repository-url>
<mylyn-builds-repository-url>http://download.eclipse.org/mylyn/snapshots/nightly/builds/</mylyn-builds-repository-url>
<mylyn-commons-repository-url>http://download.eclipse.org/mylyn/snapshots/nightly/commons/</mylyn-commons-repository-url>
@@ -300,6 +301,11 @@
<layout>p2</layout>
<url>${orbit-repository-url}</url>
</repository>
+ <repository>
+ <id>eclipse-jdt-annotation</id>
+ <layout>p2</layout>
+ <url>${jdt-annotation-repository-url}</url>
+ </repository>
<!--
<repository>
<id>eclipse-mylyn</id>
@@ -471,8 +477,8 @@
<id>osx</id>
<activation>
<property>
- <name>java.vendor.url</name>
- <value>http://www.apple.com/</value>
+ <name>os.name</name>
+ <value>Mac OS X</value>
</property>
</activation>
<properties>
diff --git a/org.eclipse.mylyn-target/mylyn-dev-all.target b/org.eclipse.mylyn-target/mylyn-dev-all.target
index 9dbfba1..b0145da 100644
--- a/org.eclipse.mylyn-target/mylyn-dev-all.target
+++ b/org.eclipse.mylyn-target/mylyn-dev-all.target
@@ -18,13 +18,12 @@
<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20130517111416/repository/"/>
</location>
<location includeAllPlatforms="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.sdk.ide" version="0.0.0"/>
<unit id="org.eclipse.birt.feature.group" version="0.0.0"/>
<unit id="org.eclipse.emf.ecoretools.sdk.feature.group" version="0.0.0"/>
<unit id="org.eclipse.emf.transaction.feature.group" version="0.0.0"/>
<unit id="org.eclipse.gef.sdk.feature.group" version="0.0.0"/>
<unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.papyrus.sdk.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="0.0.0"/>
<unit id="org.eclipse.uml2.sdk.feature.group" version="0.0.0"/>
<unit id="org.eclipse.cdt.platform.feature.group" version="0.0.0"/>
<unit id="org.eclipse.ecf.core.feature.group" version="0.0.0"/>
@@ -34,7 +33,7 @@
<unit id="org.eclipse.emf.databinding.feature.group" version="0.0.0"/>
<unit id="org.eclipse.emf.edit.feature.group" version="0.0.0"/>
<unit id="org.eclipse.emf.edit.ui.feature.group" version="0.0.0"/>
-<repository location="http://download.eclipse.org/releases/indigo/201109230900/"/>
+<repository location="http://download.eclipse.org/releases/juno/201303010900/"/>
</location>
<location includeAllPlatforms="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.mylyn.builds.sdk.feature.group" version="0.0.0"/>
@@ -66,6 +65,11 @@
<unit id="org.eclipse.swtbot.eclipse.feature.group" version="0.0.0"/>
<repository location="http://download.eclipse.org/technology/swtbot/releases/latest/"/>
</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.jdt.annotation" version="1.0.1.v20130111-135246"/>
+<unit id="org.eclipse.sdk.ide" version="0.0.0"/>
+<repository location="http://download.eclipse.org/eclipse/updates/3.8/R-3.8.2-201301310800"/>
+</location>
</locations>
<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<launcherArgs>
diff --git a/org.eclipse.mylyn-target/mylyn-dev-e3.5.target b/org.eclipse.mylyn-target/mylyn-dev-e3.5.target
index 4fa3736..e64a457 100644
--- a/org.eclipse.mylyn-target/mylyn-dev-e3.5.target
+++ b/org.eclipse.mylyn-target/mylyn-dev-e3.5.target
@@ -60,6 +60,10 @@
<unit id="org.eclipse.swtbot.eclipse.feature.group" version="0.0.0"/>
<repository location="http://download.eclipse.org/technology/swtbot/helios/dev-build/update-site"/>
</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.jdt.annotation" version="1.0.1.v20130111-135246"/>
+<repository location="http://download.eclipse.org/eclipse/updates/3.8/R-3.8.2-201301310800"/>
+</location>
</locations>
<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<launcherArgs>
diff --git a/org.eclipse.mylyn-target/mylyn-dev-e3.6.target b/org.eclipse.mylyn-target/mylyn-dev-e3.6.target
index 79764a5..af95a65 100644
--- a/org.eclipse.mylyn-target/mylyn-dev-e3.6.target
+++ b/org.eclipse.mylyn-target/mylyn-dev-e3.6.target
@@ -59,6 +59,10 @@
<unit id="org.eclipse.swtbot.eclipse.feature.group" version="0.0.0"/>
<repository location="http://download.eclipse.org/technology/swtbot/helios/dev-build/update-site"/>
</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.jdt.annotation" version="1.0.1.v20130111-135246"/>
+<repository location="http://download.eclipse.org/eclipse/updates/3.8/R-3.8.2-201301310800"/>
+</location>
</locations>
<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<launcherArgs>
diff --git a/org.eclipse.mylyn-target/mylyn-dev-e3.7.target b/org.eclipse.mylyn-target/mylyn-dev-e3.7.target
index 81c8014..46faa71 100644
--- a/org.eclipse.mylyn-target/mylyn-dev-e3.7.target
+++ b/org.eclipse.mylyn-target/mylyn-dev-e3.7.target
@@ -59,6 +59,10 @@
<unit id="org.eclipse.swtbot.eclipse.feature.group" version="0.0.0"/>
<repository location="http://download.eclipse.org/technology/swtbot/helios/dev-build/update-site"/>
</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.jdt.annotation" version="1.0.1.v20130111-135246"/>
+<repository location="http://download.eclipse.org/eclipse/updates/3.8/R-3.8.2-201301310800"/>
+</location>
</locations>
<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<launcherArgs>
diff --git a/org.eclipse.mylyn-target/mylyn-dev-e3.8.target b/org.eclipse.mylyn-target/mylyn-dev-e3.8.target
index df98ebe..1770946 100644
--- a/org.eclipse.mylyn-target/mylyn-dev-e3.8.target
+++ b/org.eclipse.mylyn-target/mylyn-dev-e3.8.target
@@ -62,6 +62,10 @@
<unit id="org.eclipse.swtbot.eclipse.feature.group" version="0.0.0"/>
<repository location="http://download.eclipse.org/technology/swtbot/helios/dev-build/update-site"/>
</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.jdt.annotation" version="1.0.1.v20130111-135246"/>
+<repository location="http://download.eclipse.org/eclipse/updates/3.8/R-3.8.2-201301310800"/>
+</location>
</locations>
<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<launcherArgs>
diff --git a/org.eclipse.mylyn-target/mylyn-e3.5.target b/org.eclipse.mylyn-target/mylyn-e3.5.target
index 2c0cf45..ea5859e 100644
--- a/org.eclipse.mylyn-target/mylyn-e3.5.target
+++ b/org.eclipse.mylyn-target/mylyn-e3.5.target
@@ -74,5 +74,9 @@
<unit id="org.tigris.subversion.clientadapter.feature.feature.group" version="1.8.2"/>
<repository location="http://subclipse.tigris.org/archive/subclipse_1.8.10"/>
</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.jdt.annotation" version="1.0.1.v20130111-135246"/>
+<repository location="http://download.eclipse.org/eclipse/updates/3.8/R-3.8.2-201301310800"/>
+</location>
</locations>
</target>
diff --git a/org.eclipse.mylyn-target/mylyn-e3.6.target b/org.eclipse.mylyn-target/mylyn-e3.6.target
index 26bbbe2..0cd68df 100644
--- a/org.eclipse.mylyn-target/mylyn-e3.6.target
+++ b/org.eclipse.mylyn-target/mylyn-e3.6.target
@@ -81,5 +81,9 @@
<unit id="org.tigris.subversion.clientadapter.feature.feature.group" version="1.8.2"/>
<repository location="http://subclipse.tigris.org/archive/subclipse_1.8.10"/>
</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.jdt.annotation" version="1.0.1.v20130111-135246"/>
+<repository location="http://download.eclipse.org/eclipse/updates/3.8/R-3.8.2-201301310800"/>
+</location>
</locations>
</target>
diff --git a/org.eclipse.mylyn-target/mylyn-e3.7.target b/org.eclipse.mylyn-target/mylyn-e3.7.target
index b0995b2..c5ab69f 100644
--- a/org.eclipse.mylyn-target/mylyn-e3.7.target
+++ b/org.eclipse.mylyn-target/mylyn-e3.7.target
@@ -72,5 +72,9 @@
<unit id="org.tigris.subversion.clientadapter.feature.feature.group" version="1.8.2"/>
<repository location="http://subclipse.tigris.org/archive/subclipse_1.8.10"/>
</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.jdt.annotation" version="1.0.1.v20130111-135246"/>
+<repository location="http://download.eclipse.org/eclipse/updates/3.8/R-3.8.2-201301310800"/>
+</location>
</locations>
</target>
diff --git a/org.eclipse.mylyn-target/mylyn-e3.8.target b/org.eclipse.mylyn-target/mylyn-e3.8.target
index 1032729..69d9180 100644
--- a/org.eclipse.mylyn-target/mylyn-e3.8.target
+++ b/org.eclipse.mylyn-target/mylyn-e3.8.target
@@ -1,7 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?>
-
-<target name="mylyn-e3.8" sequenceNumber="12">
+<?pde version="3.8"?><target name="mylyn-e3.8" sequenceNumber="12">
<locations>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="com.google.gerrit.prettify" version="2.1.5.v201112241444"/>
@@ -52,6 +50,7 @@
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.sdk.ide" version="3.8.2.M20130131-0800"/>
+<unit id="org.eclipse.jdt.annotation" version="1.0.1.v20130111-135246"/>
<repository location="http://download.eclipse.org/eclipse/updates/3.8"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
diff --git a/org.eclipse.mylyn-target/mylyn-e4.2.target b/org.eclipse.mylyn-target/mylyn-e4.2.target
index ac13034..cbdc62a 100644
--- a/org.eclipse.mylyn-target/mylyn-e4.2.target
+++ b/org.eclipse.mylyn-target/mylyn-e4.2.target
@@ -74,9 +74,10 @@
<repository location="http://subclipse.tigris.org/archive/subclipse_1.8.10"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.osgi" version="3.8.0.v20120529-1548"/>
+<unit id="org.eclipse.osgi" version="3.8.2.v20130124-134944"/>
<unit id="org.eclipse.core.runtime.compatibility.auth" version="3.2.300.v20120523-2004"/>
-<repository location="http://download.eclipse.org/eclipse/updates/3.8/R-3.8-201206081200"/>
+<unit id="org.eclipse.jdt.annotation" version="1.0.1.v20130111-135246"/>
+<repository location="http://download.eclipse.org/eclipse/updates/3.8/R-3.8.2-201301310800"/>
</location>
</locations>
</target>
diff --git a/org.eclipse.mylyn-target/mylyn-e4.3.target b/org.eclipse.mylyn-target/mylyn-e4.3.target
index 73da686..8f603da 100644
--- a/org.eclipse.mylyn-target/mylyn-e4.3.target
+++ b/org.eclipse.mylyn-target/mylyn-e4.3.target
@@ -1,7 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?>
-
-<target name="mylyn-e4.3" sequenceNumber="12">
+<?pde version="3.8"?><target name="mylyn-e4.3" sequenceNumber="12">
<locations>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="com.google.gerrit.prettify" version="2.1.5.v201112241444"/>
@@ -71,9 +69,10 @@
<repository location="http://subclipse.tigris.org/archive/subclipse_1.8.10"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.osgi" version="3.8.0.v20120529-1548"/>
+<unit id="org.eclipse.osgi" version="3.8.2.v20130124-134944"/>
<unit id="org.eclipse.core.runtime.compatibility.auth" version="3.2.300.v20120523-2004"/>
-<repository location="http://download.eclipse.org/eclipse/updates/3.8/R-3.8-201206081200"/>
+<unit id="org.eclipse.jdt.annotation" version="1.0.1.v20130111-135246"/>
+<repository location="http://download.eclipse.org/eclipse/updates/3.8/R-3.8.2-201301310800"/>
</location>
</locations>
</target>

Back to the top