Author: mickael_istria Date: 2012-10-09 09:47:21 -0400 (Tue, 09 Oct 2012) New Revision: 44376 Removed: trunk/build/target-platforms/scripts/ Modified: trunk/build/target-platforms/jbdevstudio-JunoSR0b/local/pom.xml trunk/build/target-platforms/jbdevstudio-JunoSR1/local/pom.xml trunk/build/target-platforms/jbosstools-JunoSR0b/local/pom.xml trunk/build/target-platforms/jbosstools-JunoSR1/local/pom.xml Log: Use a Mojo instead of scripts to mirror target platform. Modified: trunk/build/target-platforms/jbdevstudio-JunoSR0b/local/pom.xml =================================================================== --- trunk/build/target-platforms/jbdevstudio-JunoSR0b/local/pom.xml 2012-10-09 13:20:18 UTC (rev 44375) +++ trunk/build/target-platforms/jbdevstudio-JunoSR0b/local/pom.xml 2012-10-09 13:47:21 UTC (rev 44376) @@ -14,10 +14,6 @@ <properties> <repoDir>${project.build.directory}/REPO</repoDir> - <eclipse.type>platform</eclipse.type> - - <eclipse.version>4.2</eclipse.version> - <eclipse.URL>http://www.eclipse.org/downloads/download.php?r=1&amp;... <!-- Temporary before release of Tycho 0.16 --> <!-- JBIDE-12003 --> <tychoVersion>0.16.0-SNAPSHOT</tychoVersion> @@ -27,6 +23,14 @@ <build> <plugins> <plugin> + <!-- Workaround for https://bugs.eclipse.org/bugs/show_bug.cgi?id=391397 --> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-maven-plugin</artifactId> + <version>${tychoVersion}</version> + <extensions>true</extensions> + </plugin> + + <plugin> <groupId>org.jboss.tools.tycho-plugins</groupId> <artifactId>target-platform-utils</artifactId> <version>0.0.1-SNAPSHOT</version> @@ -95,82 +99,39 @@ <profiles> <profile> - <id>get.local.target</id> + <id>multiple2repo</id> <activation> <activeByDefault>true</activeByDefault> </activation> <build> <plugins> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <version>2.5.1</version> + <!-- Workaround for https://bugs.eclipse.org/bugs/show_bug.cgi?id=389052 --> + <groupId>org.jboss.tools.tycho-plugins</groupId> + <artifactId>target-platform-utils</artifactId> + <version>0.0.1-SNAPSHOT</version> <executions> <execution> - <id>get-multiple</id> + <phase>package</phase> <goals> - <goal>get</goal> + <goal>mirror-target-to-repo</goal> </goals> - <phase>package</phase> <configuration> - <groupId>${project.groupId}</groupId> - <artifactId>multiple</artifactId> - <version>${project.version}</version> - <classifier>multiple</classifier> - <packaging>target</packaging> - <destination>${project.build.directory}/multiple.target</destination> + <sourceTargetArtifact> + <groupId>${project.groupId}</groupId> + <artifactId>multiple</artifactId> + <version>${project.version}</version> + </sourceTargetArtifact> + <outputRepository>${repoDir}</outputRepository> </configuration> </execution> </executions> </plugin> - <plugin> - <!-- Workaround for https://bugs.eclipse.org/bugs/show_bug.cgi?id=389052 --> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-antrun-plugin</artifactId> - <version>1.6</version> - <executions> - <execution> - <phase>package</phase> - <configuration> - <tasks> - <!-- build the local.target file --> - <ant antfile="../../scripts/build.xml"> - <!-- target File is the reference target file (multiple) --> - <property name="targetFile" value="${project.build.directory}/multiple.target" /> - <property name="eclipse.version" value="${eclipse.version}" /> - <property name="eclipse.type" value="${eclipse.type}" /> - <property name="eclipse.URL" value="${eclipse.URL}"/> - <property name="repoDir" value="${repoDir}"/> - <!-- <property name="repoDir" value="/path/to/where/to/provision/repo"/> --> - </ant> - </tasks> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> - </executions> - <dependencies> - <dependency> - <groupId>commons-net</groupId> - <artifactId>commons-net</artifactId> - <version>1.4.1</version> - </dependency> - <dependency> - <groupId>org.apache.ant</groupId> - <artifactId>ant-commons-net</artifactId> - <version>1.7.1</version> - </dependency> - <dependency> - <groupId>org.apache.ant</groupId> - <artifactId>ant-trax</artifactId> - <version>1.7.1</version> - </dependency> - </dependencies> - </plugin> </plugins> </build> </profile> </profiles> </project> + +</project> Modified: trunk/build/target-platforms/jbdevstudio-JunoSR1/local/pom.xml =================================================================== --- trunk/build/target-platforms/jbdevstudio-JunoSR1/local/pom.xml 2012-10-09 13:20:18 UTC (rev 44375) +++ trunk/build/target-platforms/jbdevstudio-JunoSR1/local/pom.xml 2012-10-09 13:47:21 UTC (rev 44376) @@ -14,10 +14,6 @@ <properties> <repoDir>${project.build.directory}/REPO</repoDir> - <eclipse.type>platform</eclipse.type> - - <eclipse.version>4.2.1</eclipse.version> - <eclipse.URL>http://www.eclipse.org/downloads/download.php?r=1&amp;... <!-- Temporary before release of Tycho 0.16 --> <!-- JBIDE-12003 --> <tychoVersion>0.16.0-SNAPSHOT</tychoVersion> @@ -27,6 +23,14 @@ <build> <plugins> <plugin> + <!-- Workaround for https://bugs.eclipse.org/bugs/show_bug.cgi?id=391397 --> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-maven-plugin</artifactId> + <version>${tychoVersion}</version> + <extensions>true</extensions> + </plugin> + + <plugin> <groupId>org.jboss.tools.tycho-plugins</groupId> <artifactId>target-platform-utils</artifactId> <version>0.0.1-SNAPSHOT</version> @@ -95,82 +99,40 @@ <profiles> <profile> - <id>get.local.target</id> + <id>multiple2repo</id> <activation> <activeByDefault>true</activeByDefault> </activation> <build> <plugins> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <version>2.5.1</version> + <!-- Workaround for https://bugs.eclipse.org/bugs/show_bug.cgi?id=389052 --> + <groupId>org.jboss.tools.tycho-plugins</groupId> + <artifactId>target-platform-utils</artifactId> + <version>0.0.1-SNAPSHOT</version> <executions> <execution> - <id>get-multiple</id> + <phase>package</phase> <goals> - <goal>get</goal> + <goal>mirror-target-to-repo</goal> </goals> - <phase>package</phase> <configuration> - <groupId>${project.groupId}</groupId> - <artifactId>multiple</artifactId> - <version>${project.version}</version> - <classifier>multiple</classifier> - <packaging>target</packaging> - <destination>${project.build.directory}/multiple.target</destination> + <sourceTargetArtifact> + <groupId>${project.groupId}</groupId> + <artifactId>multiple</artifactId> + <version>${project.version}</version> + </sourceTargetArtifact> + <outputRepository>${repoDir}</outputRepository> </configuration> </execution> </executions> </plugin> - <plugin> - <!-- Workaround for https://bugs.eclipse.org/bugs/show_bug.cgi?id=389052 --> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-antrun-plugin</artifactId> - <version>1.6</version> - <executions> - <execution> - <phase>package</phase> - <configuration> - <tasks> - <!-- build the local.target file --> - <ant antfile="../../scripts/build.xml"> - <!-- target File is the reference target file (multiple) --> - <property name="targetFile" value="${project.build.directory}/multiple.target" /> - <property name="eclipse.version" value="${eclipse.version}" /> - <property name="eclipse.type" value="${eclipse.type}" /> - <property name="eclipse.URL" value="${eclipse.URL}"/> - <property name="repoDir" value="${repoDir}"/> - <!-- <property name="repoDir" value="/path/to/where/to/provision/repo"/> --> - </ant> - </tasks> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> - </executions> - <dependencies> - <dependency> - <groupId>commons-net</groupId> - <artifactId>commons-net</artifactId> - <version>1.4.1</version> - </dependency> - <dependency> - <groupId>org.apache.ant</groupId> - <artifactId>ant-commons-net</artifactId> - <version>1.7.1</version> - </dependency> - <dependency> - <groupId>org.apache.ant</groupId> - <artifactId>ant-trax</artifactId> - <version>1.7.1</version> - </dependency> - </dependencies> - </plugin> </plugins> </build> </profile> </profiles> </project> + + +</project> Modified: trunk/build/target-platforms/jbosstools-JunoSR0b/local/pom.xml =================================================================== --- trunk/build/target-platforms/jbosstools-JunoSR0b/local/pom.xml 2012-10-09 13:20:18 UTC (rev 44375) +++ trunk/build/target-platforms/jbosstools-JunoSR0b/local/pom.xml 2012-10-09 13:47:21 UTC (rev 44376) @@ -14,10 +14,6 @@ <properties> <repoDir>${project.build.directory}/REPO</repoDir> - <eclipse.type>platform</eclipse.type> - - <eclipse.version>4.2</eclipse.version> - <eclipse.URL>http://www.eclipse.org/downloads/download.php?r=1&amp;... <!-- Temporary before release of Tycho 0.16 --> <!-- JBIDE-12003 --> <tychoVersion>0.16.0-SNAPSHOT</tychoVersion> @@ -27,6 +23,14 @@ <build> <plugins> <plugin> + <!-- Workaround for https://bugs.eclipse.org/bugs/show_bug.cgi?id=391397 --> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-maven-plugin</artifactId> + <version>${tychoVersion}</version> + <extensions>true</extensions> + </plugin> + + <plugin> <groupId>org.jboss.tools.tycho-plugins</groupId> <artifactId>target-platform-utils</artifactId> <version>0.0.1-SNAPSHOT</version> @@ -95,79 +99,34 @@ <profiles> <profile> - <id>get.local.target</id> + <id>multiple2repo</id> <activation> <activeByDefault>true</activeByDefault> </activation> <build> <plugins> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <version>2.5.1</version> + <!-- Workaround for https://bugs.eclipse.org/bugs/show_bug.cgi?id=389052 --> + <groupId>org.jboss.tools.tycho-plugins</groupId> + <artifactId>target-platform-utils</artifactId> + <version>0.0.1-SNAPSHOT</version> <executions> <execution> - <id>get-multiple</id> + <phase>package</phase> <goals> - <goal>get</goal> + <goal>mirror-target-to-repo</goal> </goals> - <phase>package</phase> <configuration> - <groupId>${project.groupId}</groupId> - <artifactId>multiple</artifactId> - <version>${project.version}</version> - <classifier>multiple</classifier> - <packaging>target</packaging> - <destination>${project.build.directory}/multiple.target</destination> + <sourceTargetArtifact> + <groupId>${project.groupId}</groupId> + <artifactId>multiple</artifactId> + <version>${project.version}</version> + </sourceTargetArtifact> + <outputRepository>${repoDir}</outputRepository> </configuration> </execution> </executions> </plugin> - <plugin> - <!-- Workaround for https://bugs.eclipse.org/bugs/show_bug.cgi?id=389052 --> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-antrun-plugin</artifactId> - <version>1.6</version> - <executions> - <execution> - <phase>package</phase> - <configuration> - <tasks> - <!-- build the local.target file --> - <ant antfile="../../scripts/build.xml"> - <!-- target File is the reference target file (multiple) --> - <property name="targetFile" value="${project.build.directory}/multiple.target" /> - <property name="eclipse.version" value="${eclipse.version}" /> - <property name="eclipse.type" value="${eclipse.type}" /> - <property name="eclipse.URL" value="${eclipse.URL}"/> - <property name="repoDir" value="${repoDir}"/> - <!-- <property name="repoDir" value="/path/to/where/to/provision/repo"/> --> - </ant> - </tasks> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> - </executions> - <dependencies> - <dependency> - <groupId>commons-net</groupId> - <artifactId>commons-net</artifactId> - <version>1.4.1</version> - </dependency> - <dependency> - <groupId>org.apache.ant</groupId> - <artifactId>ant-commons-net</artifactId> - <version>1.7.1</version> - </dependency> - <dependency> - <groupId>org.apache.ant</groupId> - <artifactId>ant-trax</artifactId> - <version>1.7.1</version> - </dependency> - </dependencies> - </plugin> </plugins> </build> </profile> Modified: trunk/build/target-platforms/jbosstools-JunoSR1/local/pom.xml =================================================================== --- trunk/build/target-platforms/jbosstools-JunoSR1/local/pom.xml 2012-10-09 13:20:18 UTC (rev 44375) +++ trunk/build/target-platforms/jbosstools-JunoSR1/local/pom.xml 2012-10-09 13:47:21 UTC (rev 44376) @@ -14,10 +14,6 @@ <properties> <repoDir>${project.build.directory}/REPO</repoDir> - <eclipse.type>platform</eclipse.type> - - <eclipse.version>4.2.1</eclipse.version> - <eclipse.URL>http://www.eclipse.org/downloads/download.php?r=1&amp;... <!-- Temporary before release of Tycho 0.16 --> <!-- JBIDE-12003 --> <tychoVersion>0.16.0-SNAPSHOT</tychoVersion> @@ -27,6 +23,14 @@ <build> <plugins> <plugin> + <!-- Workaround for https://bugs.eclipse.org/bugs/show_bug.cgi?id=391397 --> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-maven-plugin</artifactId> + <version>${tychoVersion}</version> + <extensions>true</extensions> + </plugin> + + <plugin> <groupId>org.jboss.tools.tycho-plugins</groupId> <artifactId>target-platform-utils</artifactId> <version>0.0.1-SNAPSHOT</version> @@ -95,82 +99,40 @@ <profiles> <profile> - <id>get.local.target</id> + <id>multiple2repo</id> <activation> <activeByDefault>true</activeByDefault> </activation> <build> <plugins> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <version>2.5.1</version> + <!-- Workaround for https://bugs.eclipse.org/bugs/show_bug.cgi?id=389052 --> + <groupId>org.jboss.tools.tycho-plugins</groupId> + <artifactId>target-platform-utils</artifactId> + <version>0.0.1-SNAPSHOT</version> <executions> <execution> - <id>get-multiple</id> + <phase>package</phase> <goals> - <goal>get</goal> + <goal>mirror-target-to-repo</goal> </goals> - <phase>package</phase> <configuration> - <groupId>${project.groupId}</groupId> - <artifactId>multiple</artifactId> - <version>${project.version}</version> - <classifier>multiple</classifier> - <packaging>target</packaging> - <destination>${project.build.directory}/multiple.target</destination> + <sourceTargetArtifact> + <groupId>${project.groupId}</groupId> + <artifactId>multiple</artifactId> + <version>${project.version}</version> + </sourceTargetArtifact> + <outputRepository>${repoDir}</outputRepository> </configuration> </execution> </executions> </plugin> - <plugin> - <!-- Workaround for https://bugs.eclipse.org/bugs/show_bug.cgi?id=389052 --> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-antrun-plugin</artifactId> - <version>1.6</version> - <executions> - <execution> - <phase>package</phase> - <configuration> - <tasks> - <!-- build the local.target file --> - <ant antfile="../../scripts/build.xml"> - <!-- target File is the reference target file (multiple) --> - <property name="targetFile" value="${project.build.directory}/multiple.target" /> - <property name="eclipse.version" value="${eclipse.version}" /> - <property name="eclipse.type" value="${eclipse.type}" /> - <property name="eclipse.URL" value="${eclipse.URL}"/> - <property name="repoDir" value="${repoDir}"/> - <!-- <property name="repoDir" value="/path/to/where/to/provision/repo"/> --> - </ant> - </tasks> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> - </executions> - <dependencies> - <dependency> - <groupId>commons-net</groupId> - <artifactId>commons-net</artifactId> - <version>1.4.1</version> - </dependency> - <dependency> - <groupId>org.apache.ant</groupId> - <artifactId>ant-commons-net</artifactId> - <version>1.7.1</version> - </dependency> - <dependency> - <groupId>org.apache.ant</groupId> - <artifactId>ant-trax</artifactId> - <version>1.7.1</version> - </dependency> - </dependencies> - </plugin> </plugins> </build> </profile> </profiles> </project> + + +</project>