Author: mickael_istria Date: 2012-10-04 14:11:04 -0400 (Thu, 04 Oct 2012) New Revision: 44306 Removed: trunk/build/target-platforms/scripts/multiple2other.xsl Modified: trunk/build/target-platforms/jbdevstudio-JunoSR0b/jenkins/pom.xml trunk/build/target-platforms/jbdevstudio-JunoSR0b/local/pom.xml trunk/build/target-platforms/jbdevstudio-JunoSR0b/unified/pom.xml trunk/build/target-platforms/jbdevstudio-JunoSR1/jenkins/pom.xml trunk/build/target-platforms/jbdevstudio-JunoSR1/local/pom.xml trunk/build/target-platforms/jbdevstudio-JunoSR1/unified/pom.xml trunk/build/target-platforms/jbosstools-JunoSR0b/jenkins/pom.xml trunk/build/target-platforms/jbosstools-JunoSR0b/local/pom.xml trunk/build/target-platforms/jbosstools-JunoSR0b/unified/pom.xml trunk/build/target-platforms/jbosstools-JunoSR1/jenkins/pom.xml trunk/build/target-platforms/jbosstools-JunoSR1/local/pom.xml trunk/build/target-platforms/jbosstools-JunoSR1/unified/pom.xml Log: JBIDE-12773: Use new target-platform-utils plugin to "flatten" targets from multiple Modified: trunk/build/target-platforms/jbdevstudio-JunoSR0b/jenkins/pom.xml =================================================================== --- trunk/build/target-platforms/jbdevstudio-JunoSR0b/jenkins/pom.xml 2012-10-04 17:56:27 UTC (rev 44305) +++ trunk/build/target-platforms/jbdevstudio-JunoSR0b/jenkins/pom.xml 2012-10-04 18:11:04 UTC (rev 44306) @@ -12,73 +12,31 @@ <name>jbdevstudio-JunoSR0b Unified (Aggregate) Target Platform for Jenkins</name> <packaging>pom</packaging> - <properties> - <unified.URL>file:///home/hudson/static_build_env/jbds/jbds-target-platform_4.0.juno.SR0b/jbds600-e420-wtp340.target/</unified.URL> - </properties> - <build> <plugins> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <version>2.5.1</version> + <groupId>org.jboss.tools.tycho-plugins</groupId> + <artifactId>target-platform-utils</artifactId> + <version>0.0.1-SNAPSHOT</version> <executions> <execution> - <id>get-multiple-target</id> + <id>create-target</id> <phase>generate-resources</phase> <goals> - <goal>get</goal> + <goal>flatten-target</goal> </goals> <configuration> - <groupId>${project.groupId}</groupId> - <artifactId>multiple</artifactId> - <version>${project.version}</version> - <packaging>target</packaging> - <classifier>multiple</classifier> - <destination>${project.build.directory}/multiple.target</destination> + <sourceTargetArtifact> + <groupId>${project.groupId}</groupId> + <artifactId>multiple</artifactId> + <version>${project.version}</version> + </sourceTargetArtifact> + <targetRepositoryUrl>file:///home/hudson/static_build_env/jbds/jbds-target-platform_4.0.juno.SR0b/jbds600-e420-wtp340.target/</targetRepositoryUrl> </configuration> </execution> </executions> </plugin> <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>xml-maven-plugin</artifactId> - <version>1.0</version> - <executions> - <execution> - <id>generate-unified.target</id> - <phase>generate-resources</phase> <!-- Should be generate-resources --> - <goals> - <goal>transform</goal> - </goals> - <configuration> - <transformationSets> - <transformationSet> - <dir>${project.build.directory}</dir> - <includes> - <include>multiple.target</include> - </includes> - <stylesheet>../../scripts/multiple2other.xsl</stylesheet> - <outputDir>${project.build.directory}/${project.artifactId}</outputDir> - <outputProperties> - <outputPropertie> - <name>indent</name> - <value>yes</value> - </outputPropertie> - </outputProperties> - <parameters> - <parameter> - <name>destinationUrl</name> - <value>${unified.URL}</value> - </parameter> - </parameters> - </transformationSet> - </transformationSets> - </configuration> - </execution> - </executions> - </plugin> - <plugin> <groupId>org.eclipse.tycho.extras</groupId> <artifactId>target-platform-validation-plugin</artifactId> <version>${tychoExtrasVersion}</version> @@ -90,7 +48,7 @@ </goals> <configuration> <targetFiles> - <param>${project.build.directory}/${project.artifactId}/multiple.target</param> + <param>${project.build.directory}/${project.artifactId}.target</param> </targetFiles> <failOnError>true</failOnError> </configuration> @@ -111,7 +69,7 @@ <configuration> <artifacts> <artifact> - <file>${project.build.directory}/${project.artifactId}/multiple.target</file> + <file>${project.build.directory}/${project.artifactId}.target</file> <type>target</type> <classifier>${project.artifactId}</classifier> </artifact> Modified: trunk/build/target-platforms/jbdevstudio-JunoSR0b/local/pom.xml =================================================================== --- trunk/build/target-platforms/jbdevstudio-JunoSR0b/local/pom.xml 2012-10-04 17:56:27 UTC (rev 44305) +++ trunk/build/target-platforms/jbdevstudio-JunoSR0b/local/pom.xml 2012-10-04 18:11:04 UTC (rev 44306) @@ -27,66 +27,28 @@ <build> <plugins> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <version>2.5.1</version> + <groupId>org.jboss.tools.tycho-plugins</groupId> + <artifactId>target-platform-utils</artifactId> + <version>0.0.1-SNAPSHOT</version> <executions> <execution> - <id>get-multiple-target</id> + <id>create-target</id> <phase>generate-resources</phase> <goals> - <goal>get</goal> + <goal>flatten-target</goal> </goals> <configuration> - <groupId>${project.groupId}</groupId> - <artifactId>multiple</artifactId> - <version>${project.version}</version> - <packaging>target</packaging> - <classifier>multiple</classifier> - <destination>${project.build.directory}/multiple.target</destination> + <sourceTargetArtifact> + <groupId>${project.groupId}</groupId> + <artifactId>multiple</artifactId> + <version>${project.version}</version> + </sourceTargetArtifact> + <targetRepositoryUrl>file://${repoDir}</targetRepositoryUrl> </configuration> </execution> </executions> </plugin> <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>xml-maven-plugin</artifactId> - <version>1.0</version> - <executions> - <execution> - <id>generate-unified.target</id> - <phase>generate-resources</phase> <!-- Should be generate-resources --> - <goals> - <goal>transform</goal> - </goals> - <configuration> - <transformationSets> - <transformationSet> - <dir>${project.build.directory}</dir> - <includes> - <include>multiple.target</include> - </includes> - <stylesheet>../../scripts/multiple2other.xsl</stylesheet> - <outputDir>${project.build.directory}/${project.artifactId}</outputDir> - <outputProperties> - <outputPropertie> - <name>indent</name> - <value>yes</value> - </outputPropertie> - </outputProperties> - <parameters> - <parameter> - <name>destinationUrl</name> - <value>file://${repoDir}</value> - </parameter> - </parameters> - </transformationSet> - </transformationSets> - </configuration> - </execution> - </executions> - </plugin> - <plugin> <groupId>org.eclipse.tycho.extras</groupId> <artifactId>target-platform-validation-plugin</artifactId> <version>${tychoExtrasVersion}</version> @@ -98,7 +60,7 @@ </goals> <configuration> <targetFiles> - <param>${project.build.directory}/${project.artifactId}/multiple.target</param> + <param>${project.build.directory}/${project.artifactId}.target</param> </targetFiles> <failOnError>true</failOnError> </configuration> @@ -119,7 +81,7 @@ <configuration> <artifacts> <artifact> - <file>${project.build.directory}/${project.artifactId}/multiple.target</file> + <file>${project.build.directory}/${project.artifactId}.target</file> <type>target</type> <classifier>${project.artifactId}</classifier> </artifact> Modified: trunk/build/target-platforms/jbdevstudio-JunoSR0b/unified/pom.xml =================================================================== --- trunk/build/target-platforms/jbdevstudio-JunoSR0b/unified/pom.xml 2012-10-04 17:56:27 UTC (rev 44305) +++ trunk/build/target-platforms/jbdevstudio-JunoSR0b/unified/pom.xml 2012-10-04 18:11:04 UTC (rev 44306) @@ -12,73 +12,31 @@ <name>jbdevstudio-JunoSR0b Unified (Aggregate) Target Platform</name> <packaging>pom</packaging> - <properties> - <unified.URL>http://www.qa.jboss.com/binaries/RHDS/updates/jbds-target-... - </properties> - <build> <plugins> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <version>2.5.1</version> + <groupId>org.jboss.tools.tycho-plugins</groupId> + <artifactId>target-platform-utils</artifactId> + <version>0.0.1-SNAPSHOT</version> <executions> <execution> - <id>get-multiple-target</id> + <id>create-target</id> <phase>generate-resources</phase> <goals> - <goal>get</goal> + <goal>flatten-target</goal> </goals> <configuration> - <groupId>${project.groupId}</groupId> - <artifactId>multiple</artifactId> - <version>${project.version}</version> - <packaging>target</packaging> - <classifier>multiple</classifier> - <destination>${project.build.directory}/multiple.target</destination> + <sourceTargetArtifact> + <groupId>${project.groupId}</groupId> + <artifactId>multiple</artifactId> + <version>${project.version}</version> + </sourceTargetArtifact> + <targetRepositoryUrl>http://www.qa.jboss.com/binaries/RHDS/updates/jbds... </configuration> </execution> </executions> </plugin> <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>xml-maven-plugin</artifactId> - <version>1.0</version> - <executions> - <execution> - <id>generate-unified.target</id> - <phase>generate-resources</phase> <!-- Should be generate-resources --> - <goals> - <goal>transform</goal> - </goals> - <configuration> - <transformationSets> - <transformationSet> - <dir>${project.build.directory}</dir> - <includes> - <include>multiple.target</include> - </includes> - <stylesheet>../../scripts/multiple2other.xsl</stylesheet> - <outputDir>${project.build.directory}/${project.artifactId}</outputDir> - <outputProperties> - <outputPropertie> - <name>indent</name> - <value>yes</value> - </outputPropertie> - </outputProperties> - <parameters> - <parameter> - <name>destinationUrl</name> - <value>${unified.URL}</value> - </parameter> - </parameters> - </transformationSet> - </transformationSets> - </configuration> - </execution> - </executions> - </plugin> - <plugin> <groupId>org.eclipse.tycho.extras</groupId> <artifactId>target-platform-validation-plugin</artifactId> <version>${tychoExtrasVersion}</version> @@ -90,7 +48,7 @@ </goals> <configuration> <targetFiles> - <param>${project.build.directory}/${project.artifactId}/multiple.target</param> + <param>${project.build.directory}/${project.artifactId}.target</param> </targetFiles> <failOnError>true</failOnError> </configuration> @@ -111,7 +69,7 @@ <configuration> <artifacts> <artifact> - <file>${project.build.directory}/${project.artifactId}/multiple.target</file> + <file>${project.build.directory}/${project.artifactId}.target</file> <type>target</type> <classifier>${project.artifactId}</classifier> </artifact> Modified: trunk/build/target-platforms/jbdevstudio-JunoSR1/jenkins/pom.xml =================================================================== --- trunk/build/target-platforms/jbdevstudio-JunoSR1/jenkins/pom.xml 2012-10-04 17:56:27 UTC (rev 44305) +++ trunk/build/target-platforms/jbdevstudio-JunoSR1/jenkins/pom.xml 2012-10-04 18:11:04 UTC (rev 44306) @@ -12,73 +12,31 @@ <name>jbdevstudio-JunoSR1 Unified (Aggregate) Target Platform for Jenkins</name> <packaging>pom</packaging> - <properties> - <unified.URL>file:///home/hudson/static_build_env/jbds/jbds-target-platform_4.0.juno.SR1/jbds600-e421-wtp341.target/</unified.URL> - </properties> - <build> <plugins> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <version>2.5.1</version> + <groupId>org.jboss.tools.tycho-plugins</groupId> + <artifactId>target-platform-utils</artifactId> + <version>0.0.1-SNAPSHOT</version> <executions> <execution> - <id>get-multiple-target</id> + <id>create-target</id> <phase>generate-resources</phase> <goals> - <goal>get</goal> + <goal>flatten-target</goal> </goals> <configuration> - <groupId>${project.groupId}</groupId> - <artifactId>multiple</artifactId> - <version>${project.version}</version> - <packaging>target</packaging> - <classifier>multiple</classifier> - <destination>${project.build.directory}/multiple.target</destination> + <sourceTargetArtifact> + <groupId>${project.groupId}</groupId> + <artifactId>multiple</artifactId> + <version>${project.version}</version> + </sourceTargetArtifact> + <targetRepositoryUrl>file:///home/hudson/static_build_env/jbds/jbds-target-platform_4.0.juno.SR1/jbds600-e421-wtp341.target/</targetRepositoryUrl> </configuration> </execution> </executions> </plugin> <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>xml-maven-plugin</artifactId> - <version>1.0</version> - <executions> - <execution> - <id>generate-unified.target</id> - <phase>generate-resources</phase> <!-- Should be generate-resources --> - <goals> - <goal>transform</goal> - </goals> - <configuration> - <transformationSets> - <transformationSet> - <dir>${project.build.directory}</dir> - <includes> - <include>multiple.target</include> - </includes> - <stylesheet>../../scripts/multiple2other.xsl</stylesheet> - <outputDir>${project.build.directory}/${project.artifactId}</outputDir> - <outputProperties> - <outputPropertie> - <name>indent</name> - <value>yes</value> - </outputPropertie> - </outputProperties> - <parameters> - <parameter> - <name>destinationUrl</name> - <value>${unified.URL}</value> - </parameter> - </parameters> - </transformationSet> - </transformationSets> - </configuration> - </execution> - </executions> - </plugin> - <plugin> <groupId>org.eclipse.tycho.extras</groupId> <artifactId>target-platform-validation-plugin</artifactId> <version>${tychoExtrasVersion}</version> @@ -90,7 +48,7 @@ </goals> <configuration> <targetFiles> - <param>${project.build.directory}/${project.artifactId}/multiple.target</param> + <param>${project.build.directory}/${project.artifactId}.target</param> </targetFiles> <failOnError>true</failOnError> </configuration> @@ -111,7 +69,7 @@ <configuration> <artifacts> <artifact> - <file>${project.build.directory}/${project.artifactId}/multiple.target</file> + <file>${project.build.directory}/${project.artifactId}.target</file> <type>target</type> <classifier>${project.artifactId}</classifier> </artifact> Modified: trunk/build/target-platforms/jbdevstudio-JunoSR1/local/pom.xml =================================================================== --- trunk/build/target-platforms/jbdevstudio-JunoSR1/local/pom.xml 2012-10-04 17:56:27 UTC (rev 44305) +++ trunk/build/target-platforms/jbdevstudio-JunoSR1/local/pom.xml 2012-10-04 18:11:04 UTC (rev 44306) @@ -27,66 +27,28 @@ <build> <plugins> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <version>2.5.1</version> + <groupId>org.jboss.tools.tycho-plugins</groupId> + <artifactId>target-platform-utils</artifactId> + <version>0.0.1-SNAPSHOT</version> <executions> <execution> - <id>get-multiple-target</id> + <id>create-target</id> <phase>generate-resources</phase> <goals> - <goal>get</goal> + <goal>flatten-target</goal> </goals> <configuration> - <groupId>${project.groupId}</groupId> - <artifactId>multiple</artifactId> - <version>${project.version}</version> - <packaging>target</packaging> - <classifier>multiple</classifier> - <destination>${project.build.directory}/multiple.target</destination> + <sourceTargetArtifact> + <groupId>${project.groupId}</groupId> + <artifactId>multiple</artifactId> + <version>${project.version}</version> + </sourceTargetArtifact> + <targetRepositoryUrl>file://${repoDir}</targetRepositoryUrl> </configuration> </execution> </executions> </plugin> <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>xml-maven-plugin</artifactId> - <version>1.0</version> - <executions> - <execution> - <id>generate-unified.target</id> - <phase>generate-resources</phase> <!-- Should be generate-resources --> - <goals> - <goal>transform</goal> - </goals> - <configuration> - <transformationSets> - <transformationSet> - <dir>${project.build.directory}</dir> - <includes> - <include>multiple.target</include> - </includes> - <stylesheet>../../scripts/multiple2other.xsl</stylesheet> - <outputDir>${project.build.directory}/${project.artifactId}</outputDir> - <outputProperties> - <outputPropertie> - <name>indent</name> - <value>yes</value> - </outputPropertie> - </outputProperties> - <parameters> - <parameter> - <name>destinationUrl</name> - <value>file://${repoDir}</value> - </parameter> - </parameters> - </transformationSet> - </transformationSets> - </configuration> - </execution> - </executions> - </plugin> - <plugin> <groupId>org.eclipse.tycho.extras</groupId> <artifactId>target-platform-validation-plugin</artifactId> <version>${tychoExtrasVersion}</version> @@ -98,7 +60,7 @@ </goals> <configuration> <targetFiles> - <param>${project.build.directory}/${project.artifactId}/multiple.target</param> + <param>${project.build.directory}/${project.artifactId}.target</param> </targetFiles> <failOnError>true</failOnError> </configuration> @@ -119,7 +81,7 @@ <configuration> <artifacts> <artifact> - <file>${project.build.directory}/${project.artifactId}/multiple.target</file> + <file>${project.build.directory}/${project.artifactId}.target</file> <type>target</type> <classifier>${project.artifactId}</classifier> </artifact> Modified: trunk/build/target-platforms/jbdevstudio-JunoSR1/unified/pom.xml =================================================================== --- trunk/build/target-platforms/jbdevstudio-JunoSR1/unified/pom.xml 2012-10-04 17:56:27 UTC (rev 44305) +++ trunk/build/target-platforms/jbdevstudio-JunoSR1/unified/pom.xml 2012-10-04 18:11:04 UTC (rev 44306) @@ -12,73 +12,31 @@ <name>jbdevstudio-JunoSR1 Unified (Aggregate) Target Platform</name> <packaging>pom</packaging> - <properties> - <unified.URL>http://www.qa.jboss.com/binaries/RHDS/updates/jbds-target-... - </properties> - <build> <plugins> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <version>2.5.1</version> + <groupId>org.jboss.tools.tycho-plugins</groupId> + <artifactId>target-platform-utils</artifactId> + <version>0.0.1-SNAPSHOT</version> <executions> <execution> - <id>get-multiple-target</id> + <id>create-target</id> <phase>generate-resources</phase> <goals> - <goal>get</goal> + <goal>flatten-target</goal> </goals> <configuration> - <groupId>${project.groupId}</groupId> - <artifactId>multiple</artifactId> - <version>${project.version}</version> - <packaging>target</packaging> - <classifier>multiple</classifier> - <destination>${project.build.directory}/multiple.target</destination> + <sourceTargetArtifact> + <groupId>${project.groupId}</groupId> + <artifactId>multiple</artifactId> + <version>${project.version}</version> + </sourceTargetArtifact> + <targetRepositoryUrl>http://www.qa.jboss.com/binaries/RHDS/updates/jbds... </configuration> </execution> </executions> </plugin> <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>xml-maven-plugin</artifactId> - <version>1.0</version> - <executions> - <execution> - <id>generate-unified.target</id> - <phase>generate-resources</phase> <!-- Should be generate-resources --> - <goals> - <goal>transform</goal> - </goals> - <configuration> - <transformationSets> - <transformationSet> - <dir>${project.build.directory}</dir> - <includes> - <include>multiple.target</include> - </includes> - <stylesheet>../../scripts/multiple2other.xsl</stylesheet> - <outputDir>${project.build.directory}/${project.artifactId}</outputDir> - <outputProperties> - <outputPropertie> - <name>indent</name> - <value>yes</value> - </outputPropertie> - </outputProperties> - <parameters> - <parameter> - <name>destinationUrl</name> - <value>${unified.URL}</value> - </parameter> - </parameters> - </transformationSet> - </transformationSets> - </configuration> - </execution> - </executions> - </plugin> - <plugin> <groupId>org.eclipse.tycho.extras</groupId> <artifactId>target-platform-validation-plugin</artifactId> <version>${tychoExtrasVersion}</version> @@ -90,7 +48,7 @@ </goals> <configuration> <targetFiles> - <param>${project.build.directory}/${project.artifactId}/multiple.target</param> + <param>${project.build.directory}/${project.artifactId}.target</param> </targetFiles> <failOnError>true</failOnError> </configuration> @@ -111,7 +69,7 @@ <configuration> <artifacts> <artifact> - <file>${project.build.directory}/${project.artifactId}/multiple.target</file> + <file>${project.build.directory}/${project.artifactId}.target</file> <type>target</type> <classifier>${project.artifactId}</classifier> </artifact> Modified: trunk/build/target-platforms/jbosstools-JunoSR0b/jenkins/pom.xml =================================================================== --- trunk/build/target-platforms/jbosstools-JunoSR0b/jenkins/pom.xml 2012-10-04 17:56:27 UTC (rev 44305) +++ trunk/build/target-platforms/jbosstools-JunoSR0b/jenkins/pom.xml 2012-10-04 18:11:04 UTC (rev 44306) @@ -12,73 +12,31 @@ <name>jbosstools-JunoSR0b Unified (Aggregate) Target Platform for Jenkins</name> <packaging>pom</packaging> - <properties> - <unified.URL>file:///home/hudson/static_build_env/jbds/target-platform_4.0.juno.SR0b/e420-wtp340.target/</unified.URL> - </properties> - <build> <plugins> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <version>2.5.1</version> + <groupId>org.jboss.tools.tycho-plugins</groupId> + <artifactId>target-platform-utils</artifactId> + <version>0.0.1-SNAPSHOT</version> <executions> <execution> - <id>get-multiple-target</id> + <id>create-target</id> <phase>generate-resources</phase> <goals> - <goal>get</goal> + <goal>flatten-target</goal> </goals> <configuration> - <groupId>${project.groupId}</groupId> - <artifactId>multiple</artifactId> - <version>${project.version}</version> - <packaging>target</packaging> - <classifier>multiple</classifier> - <destination>${project.build.directory}/multiple.target</destination> + <sourceTargetArtifact> + <groupId>${project.groupId}</groupId> + <artifactId>multiple</artifactId> + <version>${project.version}</version> + </sourceTargetArtifact> + <targetRepositoryUrl>file:///home/hudson/static_build_env/jbds/target-platform_4.0.juno.SR0b/e420-wtp340.target/</targetRepositoryUrl> </configuration> </execution> </executions> </plugin> <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>xml-maven-plugin</artifactId> - <version>1.0</version> - <executions> - <execution> - <id>generate-unified.target</id> - <phase>generate-resources</phase> <!-- Should be generate-resources --> - <goals> - <goal>transform</goal> - </goals> - <configuration> - <transformationSets> - <transformationSet> - <dir>${project.build.directory}</dir> - <includes> - <include>multiple.target</include> - </includes> - <stylesheet>../../scripts/multiple2other.xsl</stylesheet> - <outputDir>${project.build.directory}/${project.artifactId}</outputDir> - <outputProperties> - <outputPropertie> - <name>indent</name> - <value>yes</value> - </outputPropertie> - </outputProperties> - <parameters> - <parameter> - <name>destinationUrl</name> - <value>${unified.URL}</value> - </parameter> - </parameters> - </transformationSet> - </transformationSets> - </configuration> - </execution> - </executions> - </plugin> - <plugin> <groupId>org.eclipse.tycho.extras</groupId> <artifactId>target-platform-validation-plugin</artifactId> <version>${tychoExtrasVersion}</version> @@ -90,7 +48,7 @@ </goals> <configuration> <targetFiles> - <param>${project.build.directory}/${project.artifactId}/multiple.target</param> + <param>${project.build.directory}/${project.artifactId}.target</param> </targetFiles> <failOnError>true</failOnError> </configuration> @@ -111,7 +69,7 @@ <configuration> <artifacts> <artifact> - <file>${project.build.directory}/${project.artifactId}/multiple.target</file> + <file>${project.build.directory}/${project.artifactId}.target</file> <type>target</type> <classifier>${project.artifactId}</classifier> </artifact> Modified: trunk/build/target-platforms/jbosstools-JunoSR0b/local/pom.xml =================================================================== --- trunk/build/target-platforms/jbosstools-JunoSR0b/local/pom.xml 2012-10-04 17:56:27 UTC (rev 44305) +++ trunk/build/target-platforms/jbosstools-JunoSR0b/local/pom.xml 2012-10-04 18:11:04 UTC (rev 44306) @@ -27,66 +27,28 @@ <build> <plugins> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <version>2.5.1</version> + <groupId>org.jboss.tools.tycho-plugins</groupId> + <artifactId>target-platform-utils</artifactId> + <version>0.0.1-SNAPSHOT</version> <executions> <execution> - <id>get-multiple-target</id> + <id>create-target</id> <phase>generate-resources</phase> <goals> - <goal>get</goal> + <goal>flatten-target</goal> </goals> <configuration> - <groupId>${project.groupId}</groupId> - <artifactId>multiple</artifactId> - <version>${project.version}</version> - <packaging>target</packaging> - <classifier>multiple</classifier> - <destination>${project.build.directory}/multiple.target</destination> + <sourceTargetArtifact> + <groupId>${project.groupId}</groupId> + <artifactId>multiple</artifactId> + <version>${project.version}</version> + </sourceTargetArtifact> + <targetRepositoryUrl>file://${repoDir}</targetRepositoryUrl> </configuration> </execution> </executions> </plugin> <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>xml-maven-plugin</artifactId> - <version>1.0</version> - <executions> - <execution> - <id>generate-unified.target</id> - <phase>generate-resources</phase> <!-- Should be generate-resources --> - <goals> - <goal>transform</goal> - </goals> - <configuration> - <transformationSets> - <transformationSet> - <dir>${project.build.directory}</dir> - <includes> - <include>multiple.target</include> - </includes> - <stylesheet>../../scripts/multiple2other.xsl</stylesheet> - <outputDir>${project.build.directory}/${project.artifactId}</outputDir> - <outputProperties> - <outputPropertie> - <name>indent</name> - <value>yes</value> - </outputPropertie> - </outputProperties> - <parameters> - <parameter> - <name>destinationUrl</name> - <value>file://${repoDir}</value> - </parameter> - </parameters> - </transformationSet> - </transformationSets> - </configuration> - </execution> - </executions> - </plugin> - <plugin> <groupId>org.eclipse.tycho.extras</groupId> <artifactId>target-platform-validation-plugin</artifactId> <version>${tychoExtrasVersion}</version> @@ -98,7 +60,7 @@ </goals> <configuration> <targetFiles> - <param>${project.build.directory}/${project.artifactId}/multiple.target</param> + <param>${project.build.directory}/${project.artifactId}.target</param> </targetFiles> <failOnError>true</failOnError> </configuration> @@ -119,7 +81,7 @@ <configuration> <artifacts> <artifact> - <file>${project.build.directory}/${project.artifactId}/multiple.target</file> + <file>${project.build.directory}/${project.artifactId}.target</file> <type>target</type> <classifier>${project.artifactId}</classifier> </artifact> Modified: trunk/build/target-platforms/jbosstools-JunoSR0b/unified/pom.xml =================================================================== --- trunk/build/target-platforms/jbosstools-JunoSR0b/unified/pom.xml 2012-10-04 17:56:27 UTC (rev 44305) +++ trunk/build/target-platforms/jbosstools-JunoSR0b/unified/pom.xml 2012-10-04 18:11:04 UTC (rev 44306) @@ -12,73 +12,31 @@ <name>jbosstools-JunoSR0b Unified (Aggregate) Target Platform</name> <packaging>pom</packaging> - <properties> - <unified.URL>http://download.jboss.org/jbosstools/updates/juno/SR0b/lat... - </properties> - <build> <plugins> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <version>2.5.1</version> + <groupId>org.jboss.tools.tycho-plugins</groupId> + <artifactId>target-platform-utils</artifactId> + <version>0.0.1-SNAPSHOT</version> <executions> <execution> - <id>get-multiple-target</id> + <id>create-target</id> <phase>generate-resources</phase> <goals> - <goal>get</goal> + <goal>flatten-target</goal> </goals> <configuration> - <groupId>${project.groupId}</groupId> - <artifactId>multiple</artifactId> - <version>${project.version}</version> - <packaging>target</packaging> - <classifier>multiple</classifier> - <destination>${project.build.directory}/multiple.target</destination> + <sourceTargetArtifact> + <groupId>${project.groupId}</groupId> + <artifactId>multiple</artifactId> + <version>${project.version}</version> + </sourceTargetArtifact> + <targetRepositoryUrl>http://download.jboss.org/jbosstools/updates/juno/... </configuration> </execution> </executions> </plugin> <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>xml-maven-plugin</artifactId> - <version>1.0</version> - <executions> - <execution> - <id>generate-unified.target</id> - <phase>generate-resources</phase> <!-- Should be generate-resources --> - <goals> - <goal>transform</goal> - </goals> - <configuration> - <transformationSets> - <transformationSet> - <dir>${project.build.directory}</dir> - <includes> - <include>multiple.target</include> - </includes> - <stylesheet>../../scripts/multiple2other.xsl</stylesheet> - <outputDir>${project.build.directory}/${project.artifactId}</outputDir> - <outputProperties> - <outputPropertie> - <name>indent</name> - <value>yes</value> - </outputPropertie> - </outputProperties> - <parameters> - <parameter> - <name>destinationUrl</name> - <value>${unified.URL}</value> - </parameter> - </parameters> - </transformationSet> - </transformationSets> - </configuration> - </execution> - </executions> - </plugin> - <plugin> <groupId>org.eclipse.tycho.extras</groupId> <artifactId>target-platform-validation-plugin</artifactId> <version>${tychoExtrasVersion}</version> @@ -90,7 +48,7 @@ </goals> <configuration> <targetFiles> - <param>${project.build.directory}/${project.artifactId}/multiple.target</param> + <param>${project.build.directory}/${project.artifactId}.target</param> </targetFiles> <failOnError>true</failOnError> </configuration> @@ -111,7 +69,7 @@ <configuration> <artifacts> <artifact> - <file>${project.build.directory}/${project.artifactId}/multiple.target</file> + <file>${project.build.directory}/${project.artifactId}.target</file> <type>target</type> <classifier>${project.artifactId}</classifier> </artifact> Modified: trunk/build/target-platforms/jbosstools-JunoSR1/jenkins/pom.xml =================================================================== --- trunk/build/target-platforms/jbosstools-JunoSR1/jenkins/pom.xml 2012-10-04 17:56:27 UTC (rev 44305) +++ trunk/build/target-platforms/jbosstools-JunoSR1/jenkins/pom.xml 2012-10-04 18:11:04 UTC (rev 44306) @@ -12,73 +12,31 @@ <name>jbosstools-JunoSR1 Unified (Aggregate) Target Platform for Jenkins</name> <packaging>pom</packaging> - <properties> - <unified.URL>file:///home/hudson/static_build_env/jbds/target-platform_4.0.juno.SR1/e421-wtp341.target/</unified.URL> - </properties> - <build> <plugins> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <version>2.5.1</version> + <groupId>org.jboss.tools.tycho-plugins</groupId> + <artifactId>target-platform-utils</artifactId> + <version>0.0.1-SNAPSHOT</version> <executions> <execution> - <id>get-multiple-target</id> + <id>create-target</id> <phase>generate-resources</phase> <goals> - <goal>get</goal> + <goal>flatten-target</goal> </goals> <configuration> - <groupId>${project.groupId}</groupId> - <artifactId>multiple</artifactId> - <version>${project.version}</version> - <packaging>target</packaging> - <classifier>multiple</classifier> - <destination>${project.build.directory}/multiple.target</destination> + <sourceTargetArtifact> + <groupId>${project.groupId}</groupId> + <artifactId>multiple</artifactId> + <version>${project.version}</version> + </sourceTargetArtifact> + <targetRepositoryUrl>file:///home/hudson/static_build_env/jbds/target-platform_4.0.juno.SR1/e421-wtp341.target/</targetRepositoryUrl> </configuration> </execution> </executions> </plugin> <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>xml-maven-plugin</artifactId> - <version>1.0</version> - <executions> - <execution> - <id>generate-unified.target</id> - <phase>generate-resources</phase> <!-- Should be generate-resources --> - <goals> - <goal>transform</goal> - </goals> - <configuration> - <transformationSets> - <transformationSet> - <dir>${project.build.directory}</dir> - <includes> - <include>multiple.target</include> - </includes> - <stylesheet>../../scripts/multiple2other.xsl</stylesheet> - <outputDir>${project.build.directory}/${project.artifactId}</outputDir> - <outputProperties> - <outputPropertie> - <name>indent</name> - <value>yes</value> - </outputPropertie> - </outputProperties> - <parameters> - <parameter> - <name>destinationUrl</name> - <value>${unified.URL}</value> - </parameter> - </parameters> - </transformationSet> - </transformationSets> - </configuration> - </execution> - </executions> - </plugin> - <plugin> <groupId>org.eclipse.tycho.extras</groupId> <artifactId>target-platform-validation-plugin</artifactId> <version>${tychoExtrasVersion}</version> @@ -90,7 +48,7 @@ </goals> <configuration> <targetFiles> - <param>${project.build.directory}/${project.artifactId}/multiple.target</param> + <param>${project.build.directory}/${project.artifactId}.target</param> </targetFiles> <failOnError>true</failOnError> </configuration> @@ -111,7 +69,7 @@ <configuration> <artifacts> <artifact> - <file>${project.build.directory}/${project.artifactId}/multiple.target</file> + <file>${project.build.directory}/${project.artifactId}.target</file> <type>target</type> <classifier>${project.artifactId}</classifier> </artifact> Modified: trunk/build/target-platforms/jbosstools-JunoSR1/local/pom.xml =================================================================== --- trunk/build/target-platforms/jbosstools-JunoSR1/local/pom.xml 2012-10-04 17:56:27 UTC (rev 44305) +++ trunk/build/target-platforms/jbosstools-JunoSR1/local/pom.xml 2012-10-04 18:11:04 UTC (rev 44306) @@ -27,66 +27,28 @@ <build> <plugins> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <version>2.5.1</version> + <groupId>org.jboss.tools.tycho-plugins</groupId> + <artifactId>target-platform-utils</artifactId> + <version>0.0.1-SNAPSHOT</version> <executions> <execution> - <id>get-multiple-target</id> + <id>create-target</id> <phase>generate-resources</phase> <goals> - <goal>get</goal> + <goal>flatten-target</goal> </goals> <configuration> - <groupId>${project.groupId}</groupId> - <artifactId>multiple</artifactId> - <version>${project.version}</version> - <packaging>target</packaging> - <classifier>multiple</classifier> - <destination>${project.build.directory}/multiple.target</destination> + <sourceTargetArtifact> + <groupId>${project.groupId}</groupId> + <artifactId>multiple</artifactId> + <version>${project.version}</version> + </sourceTargetArtifact> + <targetRepositoryUrl>file://${repoDir}</targetRepositoryUrl> </configuration> </execution> </executions> </plugin> <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>xml-maven-plugin</artifactId> - <version>1.0</version> - <executions> - <execution> - <id>generate-unified.target</id> - <phase>generate-resources</phase> <!-- Should be generate-resources --> - <goals> - <goal>transform</goal> - </goals> - <configuration> - <transformationSets> - <transformationSet> - <dir>${project.build.directory}</dir> - <includes> - <include>multiple.target</include> - </includes> - <stylesheet>../../scripts/multiple2other.xsl</stylesheet> - <outputDir>${project.build.directory}/${project.artifactId}</outputDir> - <outputProperties> - <outputPropertie> - <name>indent</name> - <value>yes</value> - </outputPropertie> - </outputProperties> - <parameters> - <parameter> - <name>destinationUrl</name> - <value>file://${repoDir}</value> - </parameter> - </parameters> - </transformationSet> - </transformationSets> - </configuration> - </execution> - </executions> - </plugin> - <plugin> <groupId>org.eclipse.tycho.extras</groupId> <artifactId>target-platform-validation-plugin</artifactId> <version>${tychoExtrasVersion}</version> @@ -98,7 +60,7 @@ </goals> <configuration> <targetFiles> - <param>${project.build.directory}/${project.artifactId}/multiple.target</param> + <param>${project.build.directory}/${project.artifactId}.target</param> </targetFiles> <failOnError>true</failOnError> </configuration> @@ -119,7 +81,7 @@ <configuration> <artifacts> <artifact> - <file>${project.build.directory}/${project.artifactId}/multiple.target</file> + <file>${project.build.directory}/${project.artifactId}.target</file> <type>target</type> <classifier>${project.artifactId}</classifier> </artifact> Modified: trunk/build/target-platforms/jbosstools-JunoSR1/unified/pom.xml =================================================================== --- trunk/build/target-platforms/jbosstools-JunoSR1/unified/pom.xml 2012-10-04 17:56:27 UTC (rev 44305) +++ trunk/build/target-platforms/jbosstools-JunoSR1/unified/pom.xml 2012-10-04 18:11:04 UTC (rev 44306) @@ -12,73 +12,31 @@ <name>jbosstools-JunoSR1 Unified (Aggregate) Target Platform</name> <packaging>pom</packaging> - <properties> - <unified.URL>http://download.jboss.org/jbosstools/updates/juno/SR1/late... - </properties> - <build> <plugins> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <version>2.5.1</version> + <groupId>org.jboss.tools.tycho-plugins</groupId> + <artifactId>target-platform-utils</artifactId> + <version>0.0.1-SNAPSHOT</version> <executions> <execution> - <id>get-multiple-target</id> + <id>create-target</id> <phase>generate-resources</phase> <goals> - <goal>get</goal> + <goal>flatten-target</goal> </goals> <configuration> - <groupId>${project.groupId}</groupId> - <artifactId>multiple</artifactId> - <version>${project.version}</version> - <packaging>target</packaging> - <classifier>multiple</classifier> - <destination>${project.build.directory}/multiple.target</destination> + <sourceTargetArtifact> + <groupId>${project.groupId}</groupId> + <artifactId>multiple</artifactId> + <version>${project.version}</version> + </sourceTargetArtifact> + <targetRepositoryUrl>http://download.jboss.org/jbosstools/updates/juno/... </configuration> </execution> </executions> </plugin> <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>xml-maven-plugin</artifactId> - <version>1.0</version> - <executions> - <execution> - <id>generate-unified.target</id> - <phase>generate-resources</phase> <!-- Should be generate-resources --> - <goals> - <goal>transform</goal> - </goals> - <configuration> - <transformationSets> - <transformationSet> - <dir>${project.build.directory}</dir> - <includes> - <include>multiple.target</include> - </includes> - <stylesheet>../../scripts/multiple2other.xsl</stylesheet> - <outputDir>${project.build.directory}/${project.artifactId}</outputDir> - <outputProperties> - <outputPropertie> - <name>indent</name> - <value>yes</value> - </outputPropertie> - </outputProperties> - <parameters> - <parameter> - <name>destinationUrl</name> - <value>${unified.URL}</value> - </parameter> - </parameters> - </transformationSet> - </transformationSets> - </configuration> - </execution> - </executions> - </plugin> - <plugin> <groupId>org.eclipse.tycho.extras</groupId> <artifactId>target-platform-validation-plugin</artifactId> <version>${tychoExtrasVersion}</version> @@ -90,7 +48,7 @@ </goals> <configuration> <targetFiles> - <param>${project.build.directory}/${project.artifactId}/multiple.target</param> + <param>${project.build.directory}/${project.artifactId}.target</param> </targetFiles> <failOnError>true</failOnError> </configuration> @@ -111,7 +69,7 @@ <configuration> <artifacts> <artifact> - <file>${project.build.directory}/${project.artifactId}/multiple.target</file> + <file>${project.build.directory}/${project.artifactId}.target</file> <type>target</type> <classifier>${project.artifactId}</classifier> </artifact> Deleted: trunk/build/target-platforms/scripts/multiple2other.xsl =================================================================== --- trunk/build/target-platforms/scripts/multiple2other.xsl 2012-10-04 17:56:27 UTC (rev 44305) +++ trunk/build/target-platforms/scripts/multiple2other.xsl 2012-10-04 18:11:04 UTC (rev 44306) @@ -1,23 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" ?> -<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xs="http://www.w3.org/2001/XMLSchema" - version="2.0"> - - <xsl:output method="xml" encoding="UTF-8" indent="yes"/> - <xsl:param name="destinationUrl"/> - - <xsl:template match="target"> - <target includeMode="feature" name="e42-wtp34-jbds6"> - <locations> - <location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit" includeSource="true"> - <repository location="{$destinationUrl}"/> - <xsl:apply-templates select="//unit" /> - </location> - </locations> - <targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> - </target> - </xsl:template> - - <xsl:template match="//unit"> - <xsl:copy-of select="."/> - </xsl:template> -</xsl:stylesheet>