diff options
| author | Thanh Ha | 2014-01-27 23:12:21 +0000 |
|---|---|---|
| committer | Jayaprakash Arthanareeswaran | 2014-01-28 02:43:18 +0000 |
| commit | 8fb5c0832ac502a7e1f2ffd4f5041e3e2cd28240 (patch) | |
| tree | f179d782733772b76c5b57f5e36331cf7e175ed2 /org.eclipse.jdt.core/pom.xml | |
| parent | 7ecf476151fd414f2e58ef486c061bb1fd255dec (diff) | |
| download | eclipse.jdt.core-8fb5c0832ac502a7e1f2ffd4f5041e3e2cd28240.tar.gz eclipse.jdt.core-8fb5c0832ac502a7e1f2ffd4f5041e3e2cd28240.tar.xz eclipse.jdt.core-8fb5c0832ac502a7e1f2ffd4f5041e3e2cd28240.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>
Diffstat (limited to 'org.eclipse.jdt.core/pom.xml')
| -rw-r--r-- | org.eclipse.jdt.core/pom.xml | 61 |
1 files changed, 39 insertions, 22 deletions
diff --git a/org.eclipse.jdt.core/pom.xml b/org.eclipse.jdt.core/pom.xml index 23603e6669..27a85c0a76 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> @@ -85,7 +102,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> |