[jbosstools-commits] JBoss Tools SVN: r40719 - in trunk/download.jboss.org/jbosstools/updates: requirements/m2eclipse and 1 other directory.

jbosstools-commits at lists.jboss.org jbosstools-commits at lists.jboss.org
Wed May 2 15:03:04 EDT 2012


Author: nickboldt
Date: 2012-05-02 15:03:02 -0400 (Wed, 02 May 2012)
New Revision: 40719

Added:
   trunk/download.jboss.org/jbosstools/updates/requirements/m2eclipse/pom.xml
Modified:
   trunk/download.jboss.org/jbosstools/updates/indigo/SR2/compositeArtifacts.xml
   trunk/download.jboss.org/jbosstools/updates/indigo/SR2/compositeContent.xml
   trunk/download.jboss.org/jbosstools/updates/requirements/m2eclipse/.gitignore
   trunk/download.jboss.org/jbosstools/updates/requirements/m2eclipse/build.xml
Log:
add new m2e-apt build to Indigo SR2 site - m2e-apt-1.0.0-2012-05-02_13-33-26-H9; add maven script for generating site (rather than Eclipse/Ant script)

Modified: trunk/download.jboss.org/jbosstools/updates/indigo/SR2/compositeArtifacts.xml
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/indigo/SR2/compositeArtifacts.xml	2012-05-02 17:14:51 UTC (rev 40718)
+++ trunk/download.jboss.org/jbosstools/updates/indigo/SR2/compositeArtifacts.xml	2012-05-02 19:03:02 UTC (rev 40719)
@@ -3,7 +3,7 @@
 <repository name='JBoss Tools Requirements - Composite Indigo SR2 Mirror' type='org.eclipse.equinox.internal.p2.artifact.repository.CompositeArtifactRepository' version='1.0.0'>
 <properties size='2'>
 <property name='p2.compressed' value='true'/>
-<property name='p2.timestamp' value='1335822399000'/>
+<property name='p2.timestamp' value='1335982720000'/>
 </properties>
 <children size='15'>
 <child location='../../requirements/indigo/201202240900-SR2/'/>
@@ -18,7 +18,7 @@
 <!-- <child location='http://dl.google.com/eclipse/plugin/3.7/'/> -->
 <child location='../../requirements/gwt/2.5.0.v201201120043-rel-r37/'/>
 <!-- includes m2e, m2e-extras, m2e-wtp, m2e-jdt-compiler -->
-<child location='../../requirements/m2eclipse/20120430-1530/'/>
+<child location='../../requirements/m2eclipse/20120502-1415/'/>
 
 <child location='../../requirements/mylyn/3.6.5.v20120215-0100/'/>
 <child location='../../requirements/orbit/R20120119162704/'/>

Modified: trunk/download.jboss.org/jbosstools/updates/indigo/SR2/compositeContent.xml
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/indigo/SR2/compositeContent.xml	2012-05-02 17:14:51 UTC (rev 40718)
+++ trunk/download.jboss.org/jbosstools/updates/indigo/SR2/compositeContent.xml	2012-05-02 19:03:02 UTC (rev 40719)
@@ -3,7 +3,7 @@
 <repository name='JBoss Tools Requirements - Composite Indigo SR2 Mirror' type='org.eclipse.equinox.internal.p2.metadata.repository.CompositeMetadataRepository' version='1.0.0'>
 <properties size='2'>
 <property name='p2.compressed' value='true'/>
-<property name='p2.timestamp' value='1335822395000'/>
+<property name='p2.timestamp' value='1335982722000'/>
 </properties>
 <children size='15'>
 <child location='../../requirements/indigo/201202240900-SR2/'/>
@@ -18,7 +18,7 @@
 <!-- <child location='http://dl.google.com/eclipse/plugin/3.7/'/> -->
 <child location='../../requirements/gwt/2.5.0.v201201120043-rel-r37/'/>
 <!-- includes m2e, m2e-extras, m2e-wtp, m2e-jdt-compiler -->
-<child location='../../requirements/m2eclipse/20120430-1530/'/>
+<child location='../../requirements/m2eclipse/20120502-1415/'/>
 
 <child location='../../requirements/mylyn/3.6.5.v20120215-0100/'/>
 <child location='../../requirements/orbit/R20120119162704/'/>

Modified: trunk/download.jboss.org/jbosstools/updates/requirements/m2eclipse/.gitignore
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/m2eclipse/.gitignore	2012-05-02 17:14:51 UTC (rev 40718)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/m2eclipse/.gitignore	2012-05-02 19:03:02 UTC (rev 40719)
@@ -1,2 +1,3 @@
 2.0.3
 *~
+1.1.0.20120320-0058/

Modified: trunk/download.jboss.org/jbosstools/updates/requirements/m2eclipse/build.xml
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/m2eclipse/build.xml	2012-05-02 17:14:51 UTC (rev 40718)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/m2eclipse/build.xml	2012-05-02 19:03:02 UTC (rev 40719)
@@ -22,13 +22,13 @@
 		<property name="URL2" value="https://repository.sonatype.org/content/sites/forge-sites/m2e-extras/0.15.0/N/0.15.0.201202141716/"/>
 		<property name="URL3" value="http://download.jboss.org/jbosstools/updates/requirements/m2eclipse/m2eclipse-wtp-0.15.2/"/>
 		<property name="URL4" value="http://download.jboss.org/jbosstools/updates/m2e-jdt-compiler/"/>
-		<property name="URL5" value="http://download.jboss.org/jbosstools/updates/requirements/m2eclipse/m2e-apt-1.0.0-2012-04-27_20-09-23-H7/"/>
+		<property name="URL5" value="http://download.jboss.org/jbosstools/updates/requirements/m2eclipse/m2e-apt-1.0.0-2012-05-02_13-33-26-H9/"/>
 	  
 		<property name="destination" value="/home/nboldt/tru/download.jboss.org/jbosstools/updates/requirements/m2eclipse/" />
 		<property name="compress" value="true" />
 
 		<p2.mirror>
-			<repository location="file:${destination}/20120430-1530" name="m2e 1.1, m2e-extras 0.15.0.N, m2e-wtp 0.15.2, m2e-jdt-compiler 1.0 (for use with Juno; mirrored 20120430-1530)" />
+			<repository location="file:${destination}/20120502-1415" name="m2e 1.1, m2e-extras 0.15.0.N, m2e-wtp 0.15.2, m2e-jdt-compiler 1.0 (for use with Indigo + Juno; mirrored 20120502-1415)" />
 			<source>
 				<repository location="${URL1}" />
 				<repository location="${URL2}" />
@@ -40,7 +40,7 @@
 			<slicingOptions includeFeatures="true" followStrict="true" />
 		</p2.mirror>
 
-		<p2.publish.featuresAndBundles metadataRepository="file:${destination}/20120430-1530/" artifactRepository="file:${destination}/20120430-1530/" 
-			publishartifacts="true" source="${destination}/20120430-1530/" compress="${compress}" />
+		<p2.publish.featuresAndBundles metadataRepository="file:${destination}/20120502-1415/" artifactRepository="file:${destination}/20120502-1415/" 
+			publishartifacts="true" source="${destination}/20120502-1415/" compress="${compress}" />
 	</target>
 </project>

Added: trunk/download.jboss.org/jbosstools/updates/requirements/m2eclipse/pom.xml
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/m2eclipse/pom.xml	                        (rev 0)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/m2eclipse/pom.xml	2012-05-02 19:03:02 UTC (rev 40719)
@@ -0,0 +1,112 @@
+<project
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>org.jboss.tools</groupId>
+	<artifactId>org.jboss.tools.requirements.m2e</artifactId>
+	<version>0.0.1-SNAPSHOT</version>
+	<packaging>pom</packaging>
+	<properties>
+		<!-- TODO: when there's enough of these scripts, externalize these to a 
+			parent pom in ../ -->
+		<tychoVersion>0.14.0</tychoVersion>
+		<maven.antrun.plugin.version>1.3</maven.antrun.plugin.version>
+
+		<!-- TODO: update this every time you use this script against a new target 
+			version + resulting folder -->
+		<URL1>file:///home/hudson/RHDS/updates/requirements/m2eclipse/1.1.0.20120320-0058/</URL1>
+		<URL2>https://repository.sonatype.org/content/sites/forge-sites/m2e-extras/0.15.0/N/0.15.0.201202141716/</URL2>
+		<URL3>http://download.jboss.org/jbosstools/updates/requirements/m2eclipse/m2eclipse-wtp-0.15.2/</URL3>
+		<URL4>http://download.jboss.org/jbosstools/updates/m2e-jdt-compiler/</URL4>
+		<URL5>http://download.jboss.org/jbosstools/updates/requirements/m2eclipse/m2e-apt-1.0.0-2012-05-02_13-33-26-H9/</URL5>
+		<siteVersion>20120502-1415</siteVersion>
+		<destination>${project.build.directory}/../${siteVersion}</destination>
+	</properties>
+
+	<build>
+		<plugins>
+			<plugin>
+				<!-- see http://wiki.eclipse.org/Tycho/Additional_Tools -->
+				<groupId>org.eclipse.tycho.extras</groupId>
+				<artifactId>tycho-p2-extras-plugin</artifactId>
+				<version>${tychoVersion}</version>
+				<executions>
+					<execution>
+						<phase>prepare-package</phase>
+						<goals>
+							<goal>mirror</goal>
+						</goals>
+					</execution>
+				</executions>
+				<configuration>
+					<source>
+						<repository>
+							<url>${URL1}</url>
+							<layout>p2</layout>
+						</repository>
+						<repository>
+							<url>${URL2}</url>
+							<layout>p2</layout>
+						</repository>
+						<repository>
+							<url>${URL3}</url>
+							<layout>p2</layout>
+						</repository>
+						<repository>
+							<url>${URL4}</url>
+							<layout>p2</layout>
+						</repository>
+						<repository>
+							<url>${URL5}</url>
+							<layout>p2</layout>
+						</repository>
+					</source>
+
+					<!-- List of IUs to mirror. If omitted, all IUs will be mirrored. -->
+					<!-- Omitted IU version element means latest version of the IU -->
+					<!-- <ius>
+						<iu>
+							<id>org.foo.feature.feature.group</id>
+						</iu>
+					</ius> -->
+					<!-- The destination directory to mirror to. -->
+					<destination>${destination}</destination>
+					<!-- Whether only strict dependencies should be followed. -->
+					<!-- "strict" means perfect version match -->
+					<followStrictOnly>true</followStrictOnly>
+					<!-- Whether or not to follow optional requirements. -->
+					<includeOptional>true</includeOptional>
+					<!-- Whether or not to follow non-greedy requirements. -->
+					<includeNonGreedy>true</includeNonGreedy>
+					<!-- filter properties. E.g. filter only one platform -->
+					<!-- <filter> <osgi.os>linux</osgi.os> <osgi.ws>gtk</osgi.ws> <osgi.arch>x86_64</osgi.arch> 
+						</filter> -->
+					<latestVersionOnly>true</latestVersionOnly>
+					<mirrorMetadataOnly>false</mirrorMetadataOnly>
+					<compress>true</compress>
+					<append>false</append>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-antrun-plugin</artifactId>
+				<version>${maven.antrun.plugin.version}</version>
+				<executions>
+					<execution>
+						<id>install</id>
+						<phase>install</phase>
+						<configuration>
+							<quiet>true</quiet>
+							<tasks>
+								<!-- do stuff w/ ant here -->
+							</tasks>
+						</configuration>
+						<goals>
+							<goal>run</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+</project>



More information about the jbosstools-commits mailing list