diff options
author | David Williams | 2014-11-18 23:01:56 +0000 |
---|---|---|
committer | David Williams | 2014-11-18 23:01:56 +0000 |
commit | 915bb75a44c3fac22d23a1561aa303158792b005 (patch) | |
tree | 486c293a5c0fabef8ad8f1986d461007a63fe3a6 /eclipse-platform-parent/pom.xml | |
parent | 87e6b7550f5598b5d1123c42928d29bf9939e9c7 (diff) | |
download | eclipse.platform.releng.aggregator-915bb75a44c3fac22d23a1561aa303158792b005.tar.gz eclipse.platform.releng.aggregator-915bb75a44c3fac22d23a1561aa303158792b005.tar.xz eclipse.platform.releng.aggregator-915bb75a44c3fac22d23a1561aa303158792b005.zip |
Bug 451347 - Issues with Maintenance Build publication - static files
not copied into place
Make sure all of master is formatted consistently, before formating
and synchronizing maintenance.
Diffstat (limited to 'eclipse-platform-parent/pom.xml')
-rw-r--r-- | eclipse-platform-parent/pom.xml | 123 |
1 files changed, 63 insertions, 60 deletions
diff --git a/eclipse-platform-parent/pom.xml b/eclipse-platform-parent/pom.xml index 30e82227b..f40113a5a 100644 --- a/eclipse-platform-parent/pom.xml +++ b/eclipse-platform-parent/pom.xml @@ -12,7 +12,10 @@ David Williams - improvements and maintenance Lars Vogel - Bug 442042 --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project + xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <groupId>org.eclipse</groupId> <artifactId>eclipse-platform-parent</artifactId> @@ -333,11 +336,11 @@ <configuration> <compilerArgument>${code.ignoredWarnings}</compilerArgument> <compilerArguments> - <verbose/> - <inlineJSR/> - <enableJavadoc/> + <verbose /> + <inlineJSR /> + <enableJavadoc /> <encoding>${project.build.sourceEncoding}</encoding> - <proceedOnError/> + <proceedOnError /> <log>${project.build.directory}/@dot.xml</log> </compilerArguments> <showWarnings>true</showWarnings> @@ -728,67 +731,67 @@ the "template" file be part of the 'saveproperties' directory. Its only purpose is to "fill in" the property values named in that file. --> - <resource> - <directory>saveproperties</directory> - <filtering>true</filtering> - </resource> - </resources> + <resource> + <directory>saveproperties</directory> + <filtering>true</filtering> + </resource> + </resources> - </build> -</profile> + </build> + </profile> -<profile> - <id>update-branding-plugins-about.mappings</id> - <activation> - <file> - <exists>${basedir}/about.mappings</exists> - </file> - </activation> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-resources-plugin</artifactId> - <executions> - <execution> - <id>process-about.mappings</id> - <phase>prepare-package</phase> + <profile> + <id>update-branding-plugins-about.mappings</id> + <activation> + <file> + <exists>${basedir}/about.mappings</exists> + </file> + </activation> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-resources-plugin</artifactId> + <executions> + <execution> + <id>process-about.mappings</id> + <phase>prepare-package</phase> + <configuration> + <outputDirectory>${project.build.directory}</outputDirectory> + <overwrite>true</overwrite> + <resources> + <resource> + <directory>${basedir}</directory> + <includes> + <include>about.mappings</include> + </includes> + <filtering>true</filtering> + </resource> + </resources> + </configuration> + <goals> + <goal>copy-resources</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-packaging-plugin</artifactId> + <version>${tycho.version}</version> <configuration> - <outputDirectory>${project.build.directory}</outputDirectory> - <overwrite>true</overwrite> - <resources> - <resource> - <directory>${basedir}</directory> + <additionalFileSets> + <fileSet> + <directory>${project.build.directory}</directory> <includes> <include>about.mappings</include> </includes> - <filtering>true</filtering> - </resource> - </resources> + </fileSet> + </additionalFileSets> </configuration> - <goals> - <goal>copy-resources</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.eclipse.tycho</groupId> - <artifactId>tycho-packaging-plugin</artifactId> - <version>${tycho.version}</version> - <configuration> - <additionalFileSets> - <fileSet> - <directory>${project.build.directory}</directory> - <includes> - <include>about.mappings</include> - </includes> - </fileSet> - </additionalFileSets> - </configuration> - </plugin> - </plugins> - </build> -</profile> + </plugin> + </plugins> + </build> + </profile> </profiles> </project> |