Bug 558872 - ecj jar signer data is broken on every jdt core version bump
Change-Id: Icbee51bc1c0815c6ac0458c5271fa2f74422728b
Signed-off-by: Sravan Kumar Lakkimsetti <sravankumarl@in.ibm.com>
diff --git a/org.eclipse.jdt.compiler.apt/pom.xml b/org.eclipse.jdt.compiler.apt/pom.xml
index 574ff0e..d2162c3 100644
--- a/org.eclipse.jdt.compiler.apt/pom.xml
+++ b/org.eclipse.jdt.compiler.apt/pom.xml
@@ -120,11 +120,18 @@
<addMavenDescriptor>false</addMavenDescriptor>
</archive>
<target>
+ <path id="ecj.id">
+ <fileset dir="${basedir}/../org.eclipse.jdt.core/target/">
+ <include name="org.eclipse.jdt.core-*-SNAPSHOT-batch-compiler.jar"/>
+ </fileset>
+ </path>
+
+ <property name="ecj.file" refid="ecj.id"/>
<exec dir="${basedir}/../org.eclipse.jdt.core/target/" executable="curl">
<arg value="--output"/>
- <arg value="org.eclipse.jdt.core-3.21.0-SNAPSHOT-batch-compiler.jar"/>
+ <arg value="${ecj.file}"/>
<arg value="--form"/>
- <arg value="file=@org.eclipse.jdt.core-3.21.0-SNAPSHOT-batch-compiler.jar"/>
+ <arg value="file=@${ecj.file}"/>
<arg value="--silent"/>
<arg value="--show-error"/>
<arg value="--fail"/>
diff --git a/org.eclipse.jdt.compiler.tool/pom.xml b/org.eclipse.jdt.compiler.tool/pom.xml
index d26372d..540f97e 100644
--- a/org.eclipse.jdt.compiler.tool/pom.xml
+++ b/org.eclipse.jdt.compiler.tool/pom.xml
@@ -121,11 +121,18 @@
<addMavenDescriptor>false</addMavenDescriptor>
</archive>
<target>
+ <path id="ecj.id">
+ <fileset dir="${basedir}/../org.eclipse.jdt.core/target/">
+ <include name="org.eclipse.jdt.core-*-SNAPSHOT-batch-compiler.jar"/>
+ </fileset>
+ </path>
+
+ <property name="ecj.file" refid="ecj.id"/>
<exec dir="${basedir}/../org.eclipse.jdt.core/target/" executable="curl">
<arg value="--output"/>
- <arg value="org.eclipse.jdt.core-3.21.0-SNAPSHOT-batch-compiler.jar"/>
+ <arg value="${ecj.file}"/>
<arg value="--form"/>
- <arg value="file=@org.eclipse.jdt.core-3.21.0-SNAPSHOT-batch-compiler.jar"/>
+ <arg value="file=@${ecj.file}"/>
<arg value="--silent"/>
<arg value="--show-error"/>
<arg value="--fail"/>
