diff options
author | Thanh Ha | 2013-11-19 18:38:03 +0000 |
---|---|---|
committer | Jayaprakash Arthanareeswaran | 2013-11-25 09:41:52 +0000 |
commit | ca172e14f3d28ca6ba95b665c76bb5be5714334e (patch) | |
tree | 00f008e73cb4a710f157d57b24142a32486f06d1 | |
parent | aa5ce27a475814f17b646b2beba8cac9b5933169 (diff) | |
download | eclipse.jdt.core-ca172e14f3d28ca6ba95b665c76bb5be5714334e.tar.gz eclipse.jdt.core-ca172e14f3d28ca6ba95b665c76bb5be5714334e.tar.xz eclipse.jdt.core-ca172e14f3d28ca6ba95b665c76bb5be5714334e.zip |
Bug 417072 - compiler.version should not have to be manually set
Fix Eclipse-SourceBundle property in batch-compiler-src to replace
.qualifier with the ${buildQualifier}. This approach uses
maven-resources-plugin to copy scripts/source to target/ so that the
resources plugin and replace .qualifier using the property
${buildQualifier} via filtering.
This patch also removes the maven-antrun-plugin call instead using
maven-resources-plugin to do the same sort of filtering for the
messages.properties file as well.
Signed-off-by: Thanh Ha <thanh.ha@eclipse.org>
3 files changed, 41 insertions, 24 deletions
diff --git a/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/messages.properties b/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/messages.properties index 4a55336347..a38d86e28d 100644 --- a/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/messages.properties +++ b/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/messages.properties @@ -23,7 +23,7 @@ #Format: compiler.name = word1 word2 word3 compiler.name = Eclipse Compiler for Java(TM) #Format: compiler.version = (The place holders will be automatically filled. Do not remove or alter it) -compiler.version = bundle_qualifier, bundle_version +compiler.version = ${buildQualifier}, ${unqualifiedVersion} compiler.copyright = Copyright IBM Corp 2000, 2013. All rights reserved. ### progress diff --git a/org.eclipse.jdt.core/pom.xml b/org.eclipse.jdt.core/pom.xml index 8d4411a03f..63beb120f2 100644 --- a/org.eclipse.jdt.core/pom.xml +++ b/org.eclipse.jdt.core/pom.xml @@ -27,27 +27,44 @@ <build> <plugins> - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <phase>prepare-package</phase> - <configuration> - <tasks> - <replace token="bundle_qualifier," value="${buildQualifier}," dir="${project.build.directory}/classes"> - <include name="org/eclipse/jdt/internal/compiler/batch/messages.properties"/> - </replace> - <replace token="bundle_version" value="${unqualifiedVersion}" dir="${project.build.directory}/classes"> - <include name="org/eclipse/jdt/internal/compiler/batch/messages.properties" /> - </replace> - </tasks> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> - </executions> - </plugin> + <plugin> + <artifactId>maven-resources-plugin</artifactId> + <version>2.6</version> + <executions> + <execution> + <id>copy-batch-compiler-source</id> + <phase>package</phase> + <goals> + <goal>copy-resources</goal> + </goals> + <configuration> + <outputDirectory>${project.build.directory}/scripts/source</outputDirectory> + <resources> + <resource> + <directory>${project.basedir}/scripts/source</directory> + <filtering>true</filtering> + </resource> + </resources> + </configuration> + </execution> + <execution> + <id>copy-batch</id> + <phase>package</phase> + <goals> + <goal>copy-resources</goal> + </goals> + <configuration> + <outputDirectory>${project.build.directory}/classes</outputDirectory> + <resources> + <resource> + <directory>${project.basedir}/batch</directory> + <filtering>true</filtering> + </resource> + </resources> + </configuration> + </execution> + </executions> + </plugin> <plugin> <groupId>org.eclipse.tycho.extras</groupId> <artifactId>tycho-custom-bundle-plugin</artifactId> @@ -86,7 +103,7 @@ <archive> <addMavenDescriptor>false</addMavenDescriptor> </archive> - <bundleLocation>${project.basedir}/scripts/source</bundleLocation> + <bundleLocation>${project.build.directory}/scripts/source</bundleLocation> <classifier>batch-compiler-src</classifier> <fileSets> <fileSet> diff --git a/org.eclipse.jdt.core/scripts/source/META-INF/MANIFEST.MF b/org.eclipse.jdt.core/scripts/source/META-INF/MANIFEST.MF index 142289ee92..2e28c8e008 100644 --- a/org.eclipse.jdt.core/scripts/source/META-INF/MANIFEST.MF +++ b/org.eclipse.jdt.core/scripts/source/META-INF/MANIFEST.MF @@ -4,4 +4,4 @@ Bundle-Name: Source of Eclipse Compiler for Java(TM) Bundle-SymbolicName: org.eclipse.jdt.core.compiler.batch.source Bundle-Version: 3.10.0.qualifier Bundle-Vendor: Eclipse.org -Eclipse-SourceBundle: org.eclipse.jdt.core.compiler.batch;version="3.10.0.qualifier";roots:="." +Eclipse-SourceBundle: org.eclipse.jdt.core.compiler.batch;version="3.10.0.${buildQualifier}";roots:="." |