Bug 507370: ecotj.jar does not contain necessary classes for annotation
processing
- fix version of existing fragments
diff --git a/org.eclipse.jdt.core/scripts/export-ecj.xml b/org.eclipse.jdt.core/scripts/export-ecj.xml
index 513eee3..fb88fa6 100644
--- a/org.eclipse.jdt.core/scripts/export-ecj.xml
+++ b/org.eclipse.jdt.core/scripts/export-ecj.xml
@@ -77,8 +77,7 @@
 			</fileset>
 		</copy>
 <!-- {ObjectTeams: add apt and tool: -->
-		<property name="version.compiler.apt" value="1.3.0.${eclipse.sdk.qualifier}"/>
-		<property name="compiler.apt" value="${build.root.dir}/eclipse/plugins/org.eclipse.jdt.compiler.apt_${version.compiler.apt}.jar"/>
+		<property name="compiler.apt" value="${build.root.dir}/eclipse/plugins/org.eclipse.jdt.compiler.apt_${jdt.compiler.apt}.jar"/>
 		<echo message="compiler.apt=${compiler.apt}"/>
 		<unzip src="${compiler.apt}" dest="${ecj-temp-folder}">
 		    <patternset>
@@ -86,8 +85,7 @@
 		        <include name="**/*.properties"/>
 		    </patternset>
 		</unzip>
-		<property name="version.compiler.tool" value="1.2.0.${eclipse.sdk.qualifier}"/>
-		<property name="compiler.tool" value="${build.root.dir}/eclipse/plugins/org.eclipse.jdt.compiler.tool_${version.compiler.tool}.jar"/>
+		<property name="compiler.tool" value="${build.root.dir}/eclipse/plugins/org.eclipse.jdt.compiler.tool_${jdt.compiler.tool}.jar"/>
 		<echo message="compiler.tool=${compiler.tool}"/>
 		<unzip src="${compiler.tool}" dest="${ecj-temp-folder}">
 		    <patternset>
diff --git a/releng/build-scripts/build/run.properties b/releng/build-scripts/build/run.properties
index 0464751..82ba1f7 100644
--- a/releng/build-scripts/build/run.properties
+++ b/releng/build-scripts/build/run.properties
@@ -25,6 +25,10 @@
 # for patching our patch feature to match this version with any suffix:
 jdt.feature.version=3.13.0.v20161027-0700
 jdt.feature.version.next=3.13.0.v20161027-0701
+
+# jdt.core fragments for extracting pre-built classes and properties:
+jdt.compiler.apt=1.3.0.v20160907-0458
+jdt.compiler.tool=1.2.0.v20160907-0458
 # -----------------------------------------------------------
 
 #Git Support for PDE BUILD:
diff --git a/releng/build-scripts/build/run.xml b/releng/build-scripts/build/run.xml
index 1d83f4c..f1caa83 100644
--- a/releng/build-scripts/build/run.xml
+++ b/releng/build-scripts/build/run.xml
@@ -253,7 +253,8 @@
 		    	<arg value="-DfetchCacheLocation=${fetchCacheLocation}"/>
 	            <arg value="-Declipse-app.tgz=${eclipse-app.tgz}"/>
 	            <arg value="-Declipse.tests.zip=${eclipse.tests.zip}"/>
-				<arg value="-Declipse.sdk.qualifier=${eclipse.sdk.qualifier}"/>
+				<arg value="-Djdt.compiler.apt=${eclipse.compiler.apt}"/>
+				<arg value="-Djdt.compiler.tool=${eclipse.compiler.tool}"/>
 	            <!--arg value="-verbose" /-->
 	            <jvmarg value="${vm.args}"/>
         </java>
@@ -337,7 +338,8 @@
 				<arg value="-Ddo.build.all=${do.build.all}"/>
 				<arg value="-Declipse-app.tgz=${eclipse-app.tgz}"/>
 				<arg value="-Declipse.tests.zip=${eclipse.tests.zip}"/>
-				<arg value="-Declipse.sdk.qualifier=${eclipse.sdk.qualifier}"/>
+				<arg value="-Djdt.compiler.apt=${eclipse.compiler.apt}"/>
+				<arg value="-Djdt.compiler.tool=${eclipse.compiler.tool}"/>
 				<!--arg value="-verbose" /-->
 				<jvmarg value="${vm.args}"/>
 				<!-- arg value="${verboseAnt}"/ -->