|
 |
e794fa |
--- rt.equinox.framework/features/org.eclipse.equinox.executable.feature/pom.xml.orig 2015-03-02 09:49:40.000000000 +0000
|
|
|
e794fa |
+++ rt.equinox.framework/features/org.eclipse.equinox.executable.feature/pom.xml 2015-05-12 16:08:11.264159105 +0100
|
|
|
e794fa |
@@ -78,27 +78,25 @@
|
|
|
e794fa |
</plugin>
|
|
|
e794fa |
<plugin>
|
|
|
e794fa |
<groupId>org.codehaus.mojo</groupId>
|
|
|
e794fa |
- <artifactId>xml-maven-plugin</artifactId>
|
|
|
e794fa |
- <version>1.0</version>
|
|
|
e794fa |
+ <artifactId>exec-maven-plugin</artifactId>
|
|
|
e794fa |
+ <version>1.2.1</version>
|
|
|
e794fa |
<executions>
|
|
|
e794fa |
<execution>
|
|
|
e794fa |
<id>generate-extra-iu</id>
|
|
|
e794fa |
<phase>verify</phase>
|
|
|
e794fa |
<goals>
|
|
|
e794fa |
- <goal>transform</goal>
|
|
|
e794fa |
+ <goal>exec</goal>
|
|
|
e794fa |
</goals>
|
|
|
e794fa |
</execution>
|
|
|
e794fa |
</executions>
|
|
|
e794fa |
<configuration>
|
|
|
e794fa |
- <transformationSets>
|
|
|
e794fa |
- <transformationSet>
|
|
|
e794fa |
- <dir>target</dir>
|
|
|
e794fa |
- <includes>
|
|
|
e794fa |
- <include>p2content.xml</include>
|
|
|
e794fa |
- </includes>
|
|
|
e794fa |
- <stylesheet>cp-content.xsl</stylesheet>
|
|
|
e794fa |
- </transformationSet>
|
|
|
e794fa |
- </transformationSets>
|
|
|
e794fa |
+ <executable>xsltproc</executable>
|
|
|
e794fa |
+ <arguments>
|
|
|
e794fa |
+ <argument>-o</argument>
|
|
|
e794fa |
+ <argument>${basedir}/target/generated-resources/xml/xslt/p2content.xml</argument>
|
|
|
e794fa |
+ <argument>cp-content.xsl</argument>
|
|
|
e794fa |
+ <argument>target/p2content.xml</argument>
|
|
|
e794fa |
+ </arguments>
|
|
|
e794fa |
</configuration>
|
|
|
e794fa |
</plugin>
|
|
|
e794fa |
<plugin>
|
|
|
e794fa |
@@ -112,6 +110,7 @@
|
|
|
e794fa |
<goal>copy-resources</goal>
|
|
|
e794fa |
</goals>
|
|
|
e794fa |
<configuration>
|
|
|
e794fa |
+ <overwrite>true</overwrite>
|
|
|
e794fa |
<outputDirectory>${basedir}/target</outputDirectory>
|
|
|
e794fa |
<resources>
|
|
|
e794fa |
<resource>
|
|
|
e794fa |
--- eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/pom.xml.orig 2015-05-12 16:41:16.024179917 +0100
|
|
|
e794fa |
+++ eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/pom.xml 2015-05-12 16:44:20.515776881 +0100
|
|
|
e794fa |
@@ -39,27 +39,25 @@
|
|
|
e794fa |
</plugin>
|
|
|
e794fa |
<plugin>
|
|
|
e794fa |
<groupId>org.codehaus.mojo</groupId>
|
|
|
e794fa |
- <artifactId>xml-maven-plugin</artifactId>
|
|
|
e794fa |
- <version>1.0</version>
|
|
|
e794fa |
+ <artifactId>exec-maven-plugin</artifactId>
|
|
|
e794fa |
+ <version>1.2.1</version>
|
|
|
e794fa |
<executions>
|
|
|
e794fa |
<execution>
|
|
|
e794fa |
<id>generate-extra-iu</id>
|
|
|
e794fa |
<phase>package</phase>
|
|
|
e794fa |
<goals>
|
|
|
e794fa |
- <goal>transform</goal>
|
|
|
e794fa |
+ <goal>exec</goal>
|
|
|
e794fa |
</goals>
|
|
|
e794fa |
</execution>
|
|
|
e794fa |
</executions>
|
|
|
e794fa |
<configuration>
|
|
|
e794fa |
- <transformationSets>
|
|
|
e794fa |
- <transformationSet>
|
|
|
e794fa |
- <dir>target/repository</dir>
|
|
|
e794fa |
- <includes>
|
|
|
e794fa |
- <include>content.xml</include>
|
|
|
e794fa |
- </includes>
|
|
|
e794fa |
- <stylesheet>cp-content.xsl</stylesheet>
|
|
|
e794fa |
- </transformationSet>
|
|
|
e794fa |
- </transformationSets>
|
|
|
e794fa |
+ <executable>xsltproc</executable>
|
|
|
e794fa |
+ <arguments>
|
|
|
e794fa |
+ <argument>-o</argument>
|
|
|
e794fa |
+ <argument>${basedir}/target/generated-resources/xml/xslt/content.xml</argument>
|
|
|
e794fa |
+ <argument>cp-content.xsl</argument>
|
|
|
e794fa |
+ <argument>target/repository/content.xml</argument>
|
|
|
e794fa |
+ </arguments>
|
|
|
e794fa |
</configuration>
|
|
|
e794fa |
</plugin>
|
|
|
e794fa |
<plugin>
|
|
|
e794fa |
@@ -73,6 +71,7 @@
|
|
|
e794fa |
<goal>copy-resources</goal>
|
|
|
e794fa |
</goals>
|
|
|
e794fa |
<configuration>
|
|
|
e794fa |
+ <overwrite>true</overwrite>
|
|
|
e794fa |
<outputDirectory>${basedir}/target/repository</outputDirectory>
|
|
|
e794fa |
<resources>
|
|
|
e794fa |
<resource>
|