Bug 507370: ecotj.jar does not contain necessary classes for annotation

processing
- update extractVersions
- cleanup

2 files changed, 16 insertions, 3 deletions

diff --git a/releng/build-scripts/bin/extractVersions b/releng/build-scripts/bin/extractVersions
index 268fc61d7..d2fe89588 100755
--- a/releng/build-scripts/bin/extractVersions
+++ b/releng/build-scripts/bin/extractVersions
@@ -16,13 +16,21 @@ fi
 PDEBUILD=eclipse/plugins/org.eclipse.pde.build_.*/about.html
 LAUNCHER=eclipse/plugins/org.eclipse.equinox.launcher_
 JDTFEATURE=eclipse/features/org.eclipse.jdt_.*/feature.xml
+JDT_COMPILER_APT=eclipse/plugins/org.eclipse.jdt.compiler.apt_
+JDT_COMPILER_TOOL=eclipse/plugins/org.eclipse.jdt.compiler.tool_
 
-for VERSION in `tar tzvf $SDK | egrep "${PDEBUILD}|${LAUNCHER}|${JDTFEATURE}" | sed -e "s#.*eclipse/[^/]*/\([^/]*\).*#\1#"`
+for VERSION in `tar tzvf $SDK | egrep "${PDEBUILD}|${LAUNCHER}|${JDTFEATURE}|${JDT_COMPILER_APT}|${JDT_COMPILER_TOOL}" | sed -e "s#.*eclipse/[^/]*/\([^/]*\).*#\1#"`
 do
 	case $VERSION in
 		org.eclipse.pde.build*)
 			PDEBUILD_VERSION=$VERSION
 			;;
+		org.eclipse.jdt.compiler.apt*)
+			JDT_COMPILER_APT_VERSION=$VERSION
+			;;
+		org.eclipse.jdt.compiler.tool*)
+			JDT_COMPILER_TOOL_VERSION=$VERSION
+			;;
 		org.eclipse.jdt*)
 			JDT_VERSION_ALL=`echo $VERSION|grep jdt | sed -e 's/org.eclipse.jdt_\(.*\)/\1/'`
 			JDT_VERSIONA=`echo ${JDT_VERSION_ALL}| sed -e 's/\([0-9]\.[0-9]*\.[0-9]\.[^-]*-\)[0-9]\{4\}.*/\1/'`
@@ -44,6 +52,11 @@ echo
 echo "# for patching our patch feature to match this version with any suffix:"
 echo "jdt.feature.version=${JDT_VERSIONA}${JDT_VERSIONB}"
 echo "jdt.feature.version.next=${JDT_VERSIONA}${JDT_VERSIONB_NEXT}"
+echo
+echo "# jdt.core fragments for extracting pre-built classes and properties:"
+echo "jdt.compiler.apt=${JDT_COMPILER_APT_VERSION}"
+echo "jdt.compiler.tool=${JDT_COMPILER_TOOL_VERSION}"
+echo "============================"
 
 echo
 echo "Version for org.eclipse.objectteams.otdt.core.patch.feature:"
diff --git a/releng/build-scripts/build/run.properties b/releng/build-scripts/build/run.properties
index 82ba1f727..55229ccd5 100644
--- a/releng/build-scripts/build/run.properties
+++ b/releng/build-scripts/build/run.properties
@@ -27,8 +27,8 @@ 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
+jdt.compiler.apt=org.eclipse.jdt.compiler.apt_1.3.0.v20160907-0458.jar
+jdt.compiler.tool=org.eclipse.jdt.compiler.tool_1.2.0.v20160907-0458.jar
 # -----------------------------------------------------------
 
 #Git Support for PDE BUILD: