Author: nickboldt Date: 2011-11-22 11:25:31 -0500 (Tue, 22 Nov 2011) New Revision: 36533 Added: trunk/download.jboss.org/jbosstools/updates/requirements/springide/build-... trunk/download.jboss.org/jbosstools/updates/requirements/springide/pom-2.... Removed: trunk/download.jboss.org/jbosstools/updates/requirements/springide/pom.xml Modified: trunk/download.jboss.org/jbosstools/updates/requirements/springide/build.xml Log: fetch latest spingide 2.8; update build scripts Copied: trunk/download.jboss.org/jbosstools/updates/requirements/springide/build-... (from rev 36532, trunk/download.jboss.org/jbosstools/updates/requirements/springide/build.xml) =================================================================== --- trunk/download.jboss.org/jbosstools/updates/requirements/springide/build-... (rev 0) +++ trunk/download.jboss.org/jbosstools/updates/requirements/springide/build-... 2011-11-22 16:25:31 UTC (rev 36533) @@ -0,0 +1,95 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project default="default"> + <!-- run locally in Eclipse (to resolve p2 tasks) using these commandline options: + + -os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} + -consoleLog -nosplash -data /tmp + -application org.eclipse.ant.core.antRunner + -f "/home/nboldt/tru/download.jboss.org/jbosstools/updates/requirements/springide/build.xml" + + or, run headless on qa01 server, where Eclipse is installed into ~/eclipse: + + export JAVA_HOME=/opt/jdk1.6.0; \ + ${JAVA_HOME}/bin/java -cp ~/eclipse/plugins/org.eclipse.equinox.launcher_*.jar \ + org.eclipse.equinox.launcher.Main -vm ${JAVA_HOME} -consoleLog -nosplash -data /tmp \ + -application org.eclipse.ant.core.antRunner \ + -f ~/RHDS/updates/requirements/springide/build.xml -Ddestination=/tmp/pmd-repo + + or, run local: + + export JAVA_HOME=/opt/jdk1.6.0; \ + java -cp ~/eclipse/eclipse370/plugins/org.eclipse.equinox.launcher_1.2.0.v20110502.jar \ + org.eclipse.equinox.launcher.Main -vm ${JAVA_HOME} -consoleLog -nosplash -data /tmp \ + -application org.eclipse.ant.core.antRunner -f build.xml + --> + <target name="default" depends="init,mirror,apply.patch,regenerate.metadata" /> + <target name="patch.and.regen" depends="init,apply.patch,regenerate.metadata" /> + + <target name="init"> + <!-- Other URLs: + http://dist.springframework.org/release/IDE/ + http://dist.springframework.org/snapshot/IDE/weekly/ + http://dist.springsource.com/release/TOOLS/update/e3.6/ + --> + <property name="URL" value="http://dist.springsource.com/release/TOOLS/update/e3.6/" /> + <property name="destination" value="/home/nboldt/tru/download.jboss.org/jbosstools/updates/requir... /> + <property name="siteVersion" value="2.6.0.201103160035" /> + <property name="compress" value="true" /> + </target> + + <target name="mirror"> + <p2.mirror> + <repository location="file:${destination}/${siteVersion}/" name="springide plugins for Eclipse 3.6 - 3.7" /> + <source> + <repository location="${URL}" /> + </source> + + <iu id="org.springframework.ide.eclipse.feature.feature.group" /> + <iu id="org.springframework.ide.eclipse.aop.feature.feature.group" /> + <iu id="org.springframework.ide.eclipse.osgi.feature.feature.group" /> + <iu id="org.springframework.ide.eclipse.webflow.feature.feature.group" /> + <iu id="org.springframework.ide.eclipse.batch.feature.feature.group" /> + <iu id="org.springframework.ide.eclipse.integration.feature.feature.group" /> + <iu id="org.springframework.ide.eclipse.security.feature.feature.group" /> + <iu id="org.springframework.ide.eclipse.autowire.feature.feature.group" /> + <iu id="org.springframework.ide.eclipse.mylyn.feature.feature.group" /> + + <slicingoptions includefeatures="true" followstrict="true" latestversiononly="false" platformfilter="true" /> + </p2.mirror> + </target> + + <target name="apply.patch"> + <echo>JBDS-1838 :: Apply patch to disable SpringIDE welcome page</echo> + <!-- unzip jar + replace about.ini + replace MANIFEST.MF + delete welcome.xml META-INF/VMWARE.* + zip jar --> + <copy file="${destination}/${siteVersion}/plugins/org.springframework.ide.eclipse_${siteVersion}-RELEASE.jar" tofile="${destination}/${siteVersion}/plugins/org.springframework.ide.eclipse_${siteVersion}-RELEASE_ORIGINAL.jar" /> + <unzip src="${destination}/${siteVersion}/plugins/org.springframework.ide.eclipse_${siteVersion}-RELEASE.jar" dest="${destination}/${siteVersion}/plugins/org.springframework.ide.eclipse" /> + <echo file="${destination}/${siteVersion}/plugins/org.springframework.ide.eclipse/about.ini"> +aboutText=%title +featureImage=feature_image.png +</echo> + <echo file="${destination}/${siteVersion}/plugins/org.springframework.ide.eclipse/META-INF/MANIFEST.MF">Manifest-Version: 1.0 +Bundle-Name: %pluginName +Bundle-Localization: plugin +Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-Vendor: %providerName +Bundle-Version: ${siteVersion}-RELEASE +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.springframework.ide.eclipse +</echo> + <delete quiet="true"> + <fileset dir="${destination}/${siteVersion}/plugins/org.springframework.ide.eclipse" includes="welcome.xml" /> + <fileset dir="${destination}/${siteVersion}/plugins/org.springframework.ide.eclipse/META-INF" includes="eclipse.inf, VMWARE.RSA, VMWARE.SF" /> + </delete> + <zip destfile="${destination}/${siteVersion}/plugins/org.springframework.ide.eclipse_${siteVersion}-RELEASE.jar" basedir="${destination}/${siteVersion}/plugins/org.springframework.ide.eclipse/" /> + <delete dir="${destination}/${siteVersion}/plugins/org.springframework.ide.eclipse/" quiet="true" /> + </target> + + <target name="regenerate.metadata"> + <p2.publish.featuresAndBundles metadataRepository="file:${destination}/${siteVersion}/" artifactRepository="file:${destination}/${siteVersion}/" publishartifacts="true" source="${destination}/${siteVersion}/" compress="${compress}" /> + </target> + +</project> Modified: trunk/download.jboss.org/jbosstools/updates/requirements/springide/build.xml =================================================================== --- trunk/download.jboss.org/jbosstools/updates/requirements/springide/build.xml 2011-11-22 14:16:15 UTC (rev 36532) +++ trunk/download.jboss.org/jbosstools/updates/requirements/springide/build.xml 2011-11-22 16:25:31 UTC (rev 36533) @@ -29,17 +29,17 @@ <!-- Other URLs: http://dist.springframework.org/release/IDE/ http://dist.springframework.org/snapshot/IDE/weekly/ - http://dist.springsource.com/release/TOOLS/update/e3.6/ + http://dist.springsource.com/release/TOOLS/update/e3.7/ --> - <property name="URL" value="http://dist.springsource.com/release/TOOLS/update/e3.6/" /> + <property name="URL" value="http://dist.springsource.com/release/TOOLS/update/e3.7/" /> <property name="destination" value="/home/nboldt/tru/download.jboss.org/jbosstools/updates/requir... /> - <property name="siteVersion" value="2.6.0.201103160035" /> + <property name="siteVersion" value="2.8.0.201110170010-RELEASE" /> <property name="compress" value="true" /> </target> <target name="mirror"> <p2.mirror> - <repository location="file:${destination}/${siteVersion}/" name="springide plugins for Eclipse 3.6 - 3.7" /> + <repository location="file:${destination}/${siteVersion}/" name="springide plugins for Eclipse 3.7" /> <source> <repository location="${URL}" /> </source> @@ -65,8 +65,8 @@ replace MANIFEST.MF delete welcome.xml META-INF/VMWARE.* zip jar --> - <copy file="${destination}/${siteVersion}/plugins/org.springframework.ide.eclipse_${siteVersion}-RELEASE.jar" tofile="${destination}/${siteVersion}/plugins/org.springframework.ide.eclipse_${siteVersion}-RELEASE_ORIGINAL.jar" /> - <unzip src="${destination}/${siteVersion}/plugins/org.springframework.ide.eclipse_${siteVersion}-RELEASE.jar" dest="${destination}/${siteVersion}/plugins/org.springframework.ide.eclipse" /> + <copy file="${destination}/${siteVersion}/plugins/org.springframework.ide.eclipse_${siteVersion}.jar" tofile="${destination}/${siteVersion}/plugins/org.springframework.ide.eclipse_${siteVersion}_ORIGINAL.jar" /> + <unzip src="${destination}/${siteVersion}/plugins/org.springframework.ide.eclipse_${siteVersion}.jar" dest="${destination}/${siteVersion}/plugins/org.springframework.ide.eclipse" /> <echo file="${destination}/${siteVersion}/plugins/org.springframework.ide.eclipse/about.ini"> aboutText=%title featureImage=feature_image.png @@ -76,7 +76,7 @@ Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-Vendor: %providerName -Bundle-Version: ${siteVersion}-RELEASE +Bundle-Version: ${siteVersion} Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.springframework.ide.eclipse </echo> @@ -84,7 +84,7 @@ <fileset dir="${destination}/${siteVersion}/plugins/org.springframework.ide.eclipse" includes="welcome.xml" /> <fileset dir="${destination}/${siteVersion}/plugins/org.springframework.ide.eclipse/META-INF" includes="eclipse.inf, VMWARE.RSA, VMWARE.SF" /> </delete> - <zip destfile="${destination}/${siteVersion}/plugins/org.springframework.ide.eclipse_${siteVersion}-RELEASE.jar" basedir="${destination}/${siteVersion}/plugins/org.springframework.ide.eclipse/" /> + <zip destfile="${destination}/${siteVersion}/plugins/org.springframework.ide.eclipse_${siteVersion}.jar" basedir="${destination}/${siteVersion}/plugins/org.springframework.ide.eclipse/" /> <delete dir="${destination}/${siteVersion}/plugins/org.springframework.ide.eclipse/" quiet="true" /> </target> Copied: trunk/download.jboss.org/jbosstools/updates/requirements/springide/pom-2.... (from rev 36532, trunk/download.jboss.org/jbosstools/updates/requirements/springide/pom.xml) =================================================================== --- trunk/download.jboss.org/jbosstools/updates/requirements/springide/pom-2.... (rev 0) +++ trunk/download.jboss.org/jbosstools/updates/requirements/springide/pom-2.... 2011-11-22 16:25:31 UTC (rev 36533) @@ -0,0 +1,120 @@ +<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.springide</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.13.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 --> + <sourceURL>http://dist.springsource.com/release/TOOLS/update/e3.7</s... + <siteVersion>2.7.2.201109122348</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>${sourceURL}</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.springframework.ide.eclipse.feature.feature.group</id> + </iu> + <iu> + <id>org.springframework.ide.eclipse.aop.feature.feature.group</id> + </iu> + <iu> + <id>org.springframework.ide.eclipse.osgi.feature.feature.group</id> + </iu> + <iu> + <id>org.springframework.ide.eclipse.webflow.feature.feature.group</id> + </iu> + <iu> + <id>org.springframework.ide.eclipse.batch.feature.feature.group</id> + </iu> + <iu> + <id>org.springframework.ide.eclipse.integration.feature.feature.group</id> + </iu> + <iu> + <id>org.springframework.ide.eclipse.security.feature.feature.group</id> + </iu> + <iu> + <id>org.springframework.ide.eclipse.autowire.feature.feature.group</id> + </iu> + <iu> + <id>org.springframework.ide.eclipse.mylyn.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> + <!-- remove the target/ folder --> + <delete dir="${project.build.directory}" quiet="true" /> + <echo>To apply patch to disable SpringIDE welcome page (JBDS-1838), run build.xml in this folder passing in these parameters: + patch.and.regen -DsiteVersion=${siteVersion} -DURL=${sourceURL} + </echo> + </tasks> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> +</project> Deleted: trunk/download.jboss.org/jbosstools/updates/requirements/springide/pom.xml =================================================================== --- trunk/download.jboss.org/jbosstools/updates/requirements/springide/pom.xml 2011-11-22 14:16:15 UTC (rev 36532) +++ trunk/download.jboss.org/jbosstools/updates/requirements/springide/pom.xml 2011-11-22 16:25:31 UTC (rev 36533) @@ -1,120 +0,0 @@ -<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.springide</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.13.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 --> - <sourceURL>http://dist.springsource.com/release/TOOLS/update/e3.7</s... - <siteVersion>2.7.2.201109122348</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>${sourceURL}</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.springframework.ide.eclipse.feature.feature.group</id> - </iu> - <iu> - <id>org.springframework.ide.eclipse.aop.feature.feature.group</id> - </iu> - <iu> - <id>org.springframework.ide.eclipse.osgi.feature.feature.group</id> - </iu> - <iu> - <id>org.springframework.ide.eclipse.webflow.feature.feature.group</id> - </iu> - <iu> - <id>org.springframework.ide.eclipse.batch.feature.feature.group</id> - </iu> - <iu> - <id>org.springframework.ide.eclipse.integration.feature.feature.group</id> - </iu> - <iu> - <id>org.springframework.ide.eclipse.security.feature.feature.group</id> - </iu> - <iu> - <id>org.springframework.ide.eclipse.autowire.feature.feature.group</id> - </iu> - <iu> - <id>org.springframework.ide.eclipse.mylyn.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> - <!-- remove the target/ folder --> - <delete dir="${project.build.directory}" quiet="true" /> - <echo>To apply patch to disable SpringIDE welcome page (JBDS-1838), run build.xml in this folder passing in these parameters: - patch.and.regen -DsiteVersion=${siteVersion} -DURL=${sourceURL} - </echo> - </tasks> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> -</project>