JBoss Tools SVN: r40731 - trunk/build/target-platform.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-05-02 16:53:07 -0400 (Wed, 02 May 2012)
New Revision: 40731
Modified:
trunk/build/target-platform/jbds.target
trunk/build/target-platform/multiple.target
trunk/build/target-platform/unified.target
Log:
fix versions of m2e 1.0 (not 1.1) and related IUs
Modified: trunk/build/target-platform/jbds.target
===================================================================
--- trunk/build/target-platform/jbds.target 2012-05-02 20:49:09 UTC (rev 40730)
+++ trunk/build/target-platform/jbds.target 2012-05-02 20:53:07 UTC (rev 40731)
@@ -16,15 +16,15 @@
<!-- <repository location="http://www.qa.jboss.com/binaries/RHDS/updates/indigo/SR2/"/> -->
<!-- m2e, m2e-wtp + deps -->
- <unit id="org.eclipse.m2e.sdk.feature.feature.group" version="1.1.0.20120320-0058"/>
- <unit id="org.eclipse.m2e.feature.feature.group" version="1.1.0.20120320-0058"/>
+ <unit id="org.eclipse.m2e.sdk.feature.feature.group" version="1.0.100.20110804-1717"/>
+ <unit id="org.eclipse.m2e.feature.feature.group" version="1.0.100.20110804-1717"/>
<unit id="org.maven.ide.eclipse.wtp.feature.feature.group" version="0.15.2.20120306-2040"/>
<unit id="org.sonatype.m2e.mavenarchiver.feature.feature.group" version="0.15.0.201109290002"/>
- <unit id="org.jboss.tools.maven.apt.feature.feature.group" version="1.0.0.201204280012"/>
+ <unit id="org.jboss.tools.maven.apt.feature.feature.group" version="1.0.0.201205021739"/>
<unit id="ch.qos.logback.classic" version="0.9.27.v20110224-1110"/>
- <unit id="ch.qos.logback.core" version="1.0.0.v20111214-2030"/>
+ <unit id="ch.qos.logback.core" version="0.9.27.v20110224-1110"/>
<unit id="ch.qos.logback.slf4j" version="0.9.27.v20110224-1110"/>
- <unit id="org.slf4j.api" version="1.6.4.v20120130-2120"/>
+ <unit id="org.slf4j.api" version="1.6.1.v20100831-0715"/>
<unit id="com.ning.async-http-client" version="1.6.3.201112281337"/>
<unit id="org.jboss.netty" version="3.2.4.Final-201112281337"/>
<unit id="org.eclipse.equinox.p2.discovery.compatibility" version="1.0.1.v20110502-1955"/>
Modified: trunk/build/target-platform/multiple.target
===================================================================
--- trunk/build/target-platform/multiple.target 2012-05-02 20:49:09 UTC (rev 40730)
+++ trunk/build/target-platform/multiple.target 2012-05-02 20:53:07 UTC (rev 40731)
@@ -18,11 +18,11 @@
<repository location="http://download.jboss.org/jbosstools/updates/indigo/SR2/"/>
<!-- m2e, m2e-wtp + deps -->
- <unit id="org.eclipse.m2e.sdk.feature.feature.group" version="1.1.0.20120320-0058"/>
- <unit id="org.eclipse.m2e.feature.feature.group" version="1.1.0.20120320-0058"/>
+ <unit id="org.eclipse.m2e.sdk.feature.feature.group" version="1.0.100.20110804-1717"/>
+ <unit id="org.eclipse.m2e.feature.feature.group" version="1.0.100.20110804-1717"/>
<unit id="org.maven.ide.eclipse.wtp.feature.feature.group" version="0.15.2.20120306-2040"/>
- <unit id="org.sonatype.m2e.mavenarchiver.feature.feature.group" version="0.15.0.201202141716"/>
- <unit id="org.jboss.tools.maven.apt.feature.feature.group" version="1.0.0.201204280012"/>
+ <unit id="org.sonatype.m2e.mavenarchiver.feature.feature.group" version="0.15.0.201109290002"/>
+ <unit id="org.jboss.tools.maven.apt.feature.feature.group" version="1.0.0.201205021739"/>
<unit id="ch.qos.logback.classic" version="0.9.27.v20110224-1110"/>
<unit id="ch.qos.logback.core" version="0.9.27.v20110224-1110"/>
<unit id="ch.qos.logback.slf4j" version="0.9.27.v20110224-1110"/>
Modified: trunk/build/target-platform/unified.target
===================================================================
--- trunk/build/target-platform/unified.target 2012-05-02 20:49:09 UTC (rev 40730)
+++ trunk/build/target-platform/unified.target 2012-05-02 20:53:07 UTC (rev 40731)
@@ -18,11 +18,11 @@
<repository location="http://download.jboss.org/jbosstools/updates/target-platform_3.3.indigo.S..."/>
<!-- m2e, m2e-wtp + deps -->
- <unit id="org.eclipse.m2e.sdk.feature.feature.group" version="1.1.0.20120320-0058"/>
- <unit id="org.eclipse.m2e.feature.feature.group" version="1.1.0.20120320-0058"/>
+ <unit id="org.eclipse.m2e.sdk.feature.feature.group" version="1.0.100.20110804-1717"/>
+ <unit id="org.eclipse.m2e.feature.feature.group" version="1.0.100.20110804-1717"/>
<unit id="org.maven.ide.eclipse.wtp.feature.feature.group" version="0.15.2.20120306-2040"/>
- <unit id="org.sonatype.m2e.mavenarchiver.feature.feature.group" version="0.15.0.201202141716"/>
- <unit id="org.jboss.tools.maven.apt.feature.feature.group" version="1.0.0.201204280012"/>
+ <unit id="org.sonatype.m2e.mavenarchiver.feature.feature.group" version="0.15.0.201109290002"/>
+ <unit id="org.jboss.tools.maven.apt.feature.feature.group" version="1.0.0.201205021739"/>
<unit id="ch.qos.logback.classic" version="0.9.27.v20110224-1110"/>
<unit id="ch.qos.logback.core" version="0.9.27.v20110224-1110"/>
<unit id="ch.qos.logback.slf4j" version="0.9.27.v20110224-1110"/>
@@ -337,4 +337,4 @@
<feature id="org.mozilla.xpcom.feature"/>
</includeBundles>
<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-</target>
+</target>
\ No newline at end of file
12 years, 8 months
JBoss Tools SVN: r40730 - trunk/maven/plugins/org.jboss.tools.maven.sourcelookup.core/META-INF.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-05-02 16:49:09 -0400 (Wed, 02 May 2012)
New Revision: 40730
Modified:
trunk/maven/plugins/org.jboss.tools.maven.sourcelookup.core/META-INF/MANIFEST.MF
Log:
revert JBDS-2114 patch; should not use using m2e 1.1
Modified: trunk/maven/plugins/org.jboss.tools.maven.sourcelookup.core/META-INF/MANIFEST.MF
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.sourcelookup.core/META-INF/MANIFEST.MF 2012-05-02 20:49:01 UTC (rev 40729)
+++ trunk/maven/plugins/org.jboss.tools.maven.sourcelookup.core/META-INF/MANIFEST.MF 2012-05-02 20:49:09 UTC (rev 40730)
@@ -10,9 +10,9 @@
org.jboss.ide.eclipse.as.core;visibility:=reexport,
org.eclipse.wst.server.core;bundle-version="1.1.302";visibility:=reexport,
org.eclipse.jdt.launching;bundle-version="3.6.0",
- org.eclipse.m2e.jdt;bundle-version="[1.0.0,1.2.0)";visibility:=reexport,
- org.eclipse.m2e.core;bundle-version="[1.0.0,1.2.0)";visibility:=reexport,
- org.eclipse.m2e.maven.runtime;bundle-version="[1.0.0,1.2.0)";visibility:=reexport,
+ org.eclipse.m2e.jdt;bundle-version="[1.0.0,1.1.0)";visibility:=reexport,
+ org.eclipse.m2e.core;bundle-version="[1.0.0,1.1.0)";visibility:=reexport,
+ org.eclipse.m2e.maven.runtime;bundle-version="[1.0.0,1.1.0)";visibility:=reexport,
org.apache.commons.codec;bundle-version="1.3.0",
org.eclipse.ui;bundle-version="3.7.0"
Bundle-ActivationPolicy: lazy
12 years, 8 months
JBoss Tools SVN: r40728 - branches/jbosstools-3.3.0.Beta3/maven/plugins/org.jboss.tools.maven.sourcelookup.core/META-INF.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-05-02 16:48:23 -0400 (Wed, 02 May 2012)
New Revision: 40728
Modified:
branches/jbosstools-3.3.0.Beta3/maven/plugins/org.jboss.tools.maven.sourcelookup.core/META-INF/MANIFEST.MF
Log:
revert JBDS-2114 patch; should not use using m2e 1.1
Modified: branches/jbosstools-3.3.0.Beta3/maven/plugins/org.jboss.tools.maven.sourcelookup.core/META-INF/MANIFEST.MF
===================================================================
--- branches/jbosstools-3.3.0.Beta3/maven/plugins/org.jboss.tools.maven.sourcelookup.core/META-INF/MANIFEST.MF 2012-05-02 20:36:50 UTC (rev 40727)
+++ branches/jbosstools-3.3.0.Beta3/maven/plugins/org.jboss.tools.maven.sourcelookup.core/META-INF/MANIFEST.MF 2012-05-02 20:48:23 UTC (rev 40728)
@@ -10,9 +10,9 @@
org.jboss.ide.eclipse.as.core;visibility:=reexport,
org.eclipse.wst.server.core;bundle-version="1.1.302";visibility:=reexport,
org.eclipse.jdt.launching;bundle-version="3.6.0",
- org.eclipse.m2e.jdt;bundle-version="[1.0.0,1.2.0)";visibility:=reexport,
- org.eclipse.m2e.core;bundle-version="[1.0.0,1.2.0)";visibility:=reexport,
- org.eclipse.m2e.maven.runtime;bundle-version="[1.0.0,1.2.0)";visibility:=reexport,
+ org.eclipse.m2e.jdt;bundle-version="[1.0.0,1.1.0)";visibility:=reexport,
+ org.eclipse.m2e.core;bundle-version="[1.0.0,1.1.0)";visibility:=reexport,
+ org.eclipse.m2e.maven.runtime;bundle-version="[1.0.0,1.1.0)";visibility:=reexport,
org.apache.commons.codec;bundle-version="1.3.0",
org.eclipse.ui;bundle-version="3.7.0"
Bundle-ActivationPolicy: lazy
12 years, 8 months
JBoss Tools SVN: r40727 - in trunk/download.jboss.org/jbosstools/updates/indigo: SR2 and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-05-02 16:36:50 -0400 (Wed, 02 May 2012)
New Revision: 40727
Modified:
trunk/download.jboss.org/jbosstools/updates/indigo/SR2/compositeArtifacts...
trunk/download.jboss.org/jbosstools/updates/indigo/SR2/compositeContent.xml
trunk/download.jboss.org/jbosstools/updates/indigo/compositeArtifacts.xml
trunk/download.jboss.org/jbosstools/updates/indigo/compositeContent.xml
Log:
point at new site w/ m2e 1.0, not 1.1 (OOPS)
Modified: trunk/download.jboss.org/jbosstools/updates/indigo/SR2/compositeArtifacts...
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/indigo/SR2/compositeArtifacts... 2012-05-02 20:16:32 UTC (rev 40726)
+++ trunk/download.jboss.org/jbosstools/updates/indigo/SR2/compositeArtifacts... 2012-05-02 20:36:50 UTC (rev 40727)
@@ -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='1335985882000'/>
+<property name='p2.timestamp' value='1335990278000'/>
</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/20120502-1415/'/>
+<child location='../../requirements/m2eclipse/20120502-1600/'/>
<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 20:16:32 UTC (rev 40726)
+++ trunk/download.jboss.org/jbosstools/updates/indigo/SR2/compositeContent.xml 2012-05-02 20:36:50 UTC (rev 40727)
@@ -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='1335985885000'/>
+<property name='p2.timestamp' value='1335990281000'/>
</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/20120502-1415/'/>
+<child location='../../requirements/m2eclipse/20120502-1600/'/>
<child location='../../requirements/mylyn/3.6.5.v20120215-0100/'/>
<child location='../../requirements/orbit/R20120119162704/'/>
Modified: trunk/download.jboss.org/jbosstools/updates/indigo/compositeArtifacts.xml
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/indigo/compositeArtifacts.xml 2012-05-02 20:16:32 UTC (rev 40726)
+++ trunk/download.jboss.org/jbosstools/updates/indigo/compositeArtifacts.xml 2012-05-02 20:36:50 UTC (rev 40727)
@@ -12,7 +12,7 @@
endfun
nnoremap <Leader>ts :call ReplaceTimestamp()<CR>
-->
-<property name='p2.timestamp' value='1335985863000'/>
+<property name='p2.timestamp' value='1335990247000'/>
</properties>
<children size='1'>
<child location='SR2/'/>
Modified: trunk/download.jboss.org/jbosstools/updates/indigo/compositeContent.xml
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/indigo/compositeContent.xml 2012-05-02 20:16:32 UTC (rev 40726)
+++ trunk/download.jboss.org/jbosstools/updates/indigo/compositeContent.xml 2012-05-02 20:36:50 UTC (rev 40727)
@@ -12,7 +12,7 @@
endfun
nnoremap <Leader>ts :call ReplaceTimestamp()<CR>
-->
-<property name='p2.timestamp' value='1335985866000'/>
+<property name='p2.timestamp' value='1335990250000'/>
</properties>
<children size='1'>
<child location='SR2/'/>
12 years, 8 months
JBoss Tools SVN: r40726 - trunk/download.jboss.org/jbosstools/updates/requirements/m2eclipse.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-05-02 16:16:32 -0400 (Wed, 02 May 2012)
New Revision: 40726
Removed:
trunk/download.jboss.org/jbosstools/updates/requirements/m2eclipse/pom.xml
Modified:
trunk/download.jboss.org/jbosstools/updates/requirements/m2eclipse/build-...
Log:
update build.xml to point at m2e 1.0, not 1.1
Modified: trunk/download.jboss.org/jbosstools/updates/requirements/m2eclipse/build-...
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/m2eclipse/build-... 2012-05-02 20:16:19 UTC (rev 40725)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/m2eclipse/build-... 2012-05-02 20:16:32 UTC (rev 40726)
@@ -18,7 +18,6 @@
<target name="mirror">
<property name="URL1" value="http://download.jboss.org/jbosstools/updates/m2eclipse-wtp/"/>
<property name="URL2" value="http://download.jboss.org/jbosstools/updates/m2e-jdt-compiler/"/>
- <property name="URL3" value="http://download.jboss.org/jbosstools/updates/requirements/m2eclipse/m2ecl..."/>
<!--
<property name="URL1" value="http://download.eclipse.org/technology/m2e/releases/"/>
@@ -33,7 +32,6 @@
<source>
<repository location="${URL1}" />
<repository location="${URL2}" />
- <repository location="${URL3}" />
</source>
<slicingOptions includeFeatures="true" followStrict="true" />
Deleted: trunk/download.jboss.org/jbosstools/updates/requirements/m2eclipse/pom.xml
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/m2eclipse/pom.xml 2012-05-02 20:16:19 UTC (rev 40725)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/m2eclipse/pom.xml 2012-05-02 20:16:32 UTC (rev 40726)
@@ -1,112 +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.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...</URL2>
- <URL3>http://download.jboss.org/jbosstools/updates/requirements/m2eclipse/m2ecl...</URL3>
- <URL4>http://download.jboss.org/jbosstools/updates/m2e-jdt-compiler/</URL4>
- <URL5>http://download.jboss.org/jbosstools/updates/requirements/m2eclipse/m2e-a...</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>
12 years, 8 months
JBoss Tools SVN: r40725 - trunk/download.jboss.org/jbosstools/updates/requirements/m2eclipse.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-05-02 16:16:19 -0400 (Wed, 02 May 2012)
New Revision: 40725
Added:
trunk/download.jboss.org/jbosstools/updates/requirements/m2eclipse/build-...
trunk/download.jboss.org/jbosstools/updates/requirements/m2eclipse/pom-ju...
Modified:
trunk/download.jboss.org/jbosstools/updates/requirements/m2eclipse/build.xml
Log:
update build.xml to point at m2e 1.0, not 1.1.
Copied: trunk/download.jboss.org/jbosstools/updates/requirements/m2eclipse/build-... (from rev 40723, trunk/download.jboss.org/jbosstools/updates/requirements/m2eclipse/build.xml)
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/m2eclipse/build-... (rev 0)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/m2eclipse/build-... 2012-05-02 20:16:19 UTC (rev 40725)
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project default="mirror">
+ <!-- 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/m2eclipse/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/m2eclipse/build.xml -Ddestination=/tmp/m2eclipse-repo
+ -->
+ <target name="mirror">
+ <!-- <property name="URL1" value="http://download.jboss.org/jbosstools/updates/m2eclipse-wtp/"/> -->
+ <property name="URL1" value="file:///home/hudson/RHDS/updates/requirements/m2eclipse/1.1.0.20120320-0058/"/>
+ <!-- <property name="URL1" value="http://download.eclipse.org/technology/m2e/milestones/1.1/1.1.0.20120320-..."/> -->
+ <property name="URL2" value="https://repository.sonatype.org/content/sites/forge-sites/m2e-extras/0.15..."/>
+ <property name="URL3" value="http://download.jboss.org/jbosstools/updates/requirements/m2eclipse/m2ecl..."/>
+ <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-a..."/>
+
+ <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}/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}" />
+ <repository location="${URL3}" />
+ <repository location="${URL4}" />
+ <repository location="${URL5}" />
+ </source>
+
+ <slicingOptions includeFeatures="true" followStrict="true" />
+ </p2.mirror>
+
+ <p2.publish.featuresAndBundles metadataRepository="file:${destination}/20120502-1415/" artifactRepository="file:${destination}/20120502-1415/"
+ publishartifacts="true" source="${destination}/20120502-1415/" compress="${compress}" />
+ </target>
+</project>
Modified: trunk/download.jboss.org/jbosstools/updates/requirements/m2eclipse/build.xml
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/m2eclipse/build.xml 2012-05-02 19:55:57 UTC (rev 40724)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/m2eclipse/build.xml 2012-05-02 20:16:19 UTC (rev 40725)
@@ -16,31 +16,30 @@
-f ~/RHDS/updates/requirements/m2eclipse/build.xml -Ddestination=/tmp/m2eclipse-repo
-->
<target name="mirror">
- <!-- <property name="URL1" value="http://download.jboss.org/jbosstools/updates/m2eclipse-wtp/"/> -->
- <property name="URL1" value="file:///home/hudson/RHDS/updates/requirements/m2eclipse/1.1.0.20120320-0058/"/>
- <!-- <property name="URL1" value="http://download.eclipse.org/technology/m2e/milestones/1.1/1.1.0.20120320-..."/> -->
- <property name="URL2" value="https://repository.sonatype.org/content/sites/forge-sites/m2e-extras/0.15..."/>
- <property name="URL3" value="http://download.jboss.org/jbosstools/updates/requirements/m2eclipse/m2ecl..."/>
- <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-a..."/>
+ <property name="URL1" value="http://download.jboss.org/jbosstools/updates/m2eclipse-wtp/"/>
+ <property name="URL2" value="http://download.jboss.org/jbosstools/updates/m2e-jdt-compiler/"/>
+ <property name="URL3" value="http://download.jboss.org/jbosstools/updates/requirements/m2eclipse/m2e-a..."/>
+ <!--
+ <property name="URL1" value="http://download.eclipse.org/technology/m2e/releases/"/>
+ <property name="URL2" value="http://repository.sonatype.org/content/repositories/forge-sites/m2e-extra..."/>
+ -->
+
<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}/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)" />
+ <repository location="file:${destination}/20120502-1600" name="m2e 1.0, m2e-wtp 0.15.2, m2e-extras 0.15, m2e-jdt-compiler 1.0, m2e-apt 1.0 (mirrored 20120502-1600)" />
<source>
<repository location="${URL1}" />
<repository location="${URL2}" />
<repository location="${URL3}" />
- <repository location="${URL4}" />
- <repository location="${URL5}" />
</source>
<slicingOptions includeFeatures="true" followStrict="true" />
</p2.mirror>
- <p2.publish.featuresAndBundles metadataRepository="file:${destination}/20120502-1415/" artifactRepository="file:${destination}/20120502-1415/"
- publishartifacts="true" source="${destination}/20120502-1415/" compress="${compress}" />
+ <p2.publish.featuresAndBundles metadataRepository="file:${destination}/20120502-1600/" artifactRepository="file:${destination}/20120502-1600/"
+ publishartifacts="true" source="${destination}/20120502-1600/" compress="${compress}" />
</target>
</project>
Added: trunk/download.jboss.org/jbosstools/updates/requirements/m2eclipse/pom-ju...
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/m2eclipse/pom-ju... (rev 0)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/m2eclipse/pom-ju... 2012-05-02 20:16:19 UTC (rev 40725)
@@ -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...</URL2>
+ <URL3>http://download.jboss.org/jbosstools/updates/requirements/m2eclipse/m2ecl...</URL3>
+ <URL4>http://download.jboss.org/jbosstools/updates/m2e-jdt-compiler/</URL4>
+ <URL5>http://download.jboss.org/jbosstools/updates/requirements/m2eclipse/m2e-a...</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>
12 years, 8 months
JBoss Tools SVN: r40724 - branches/jbosstools-3.3.0.Beta3/maven/plugins/org.jboss.tools.maven.sourcelookup.core/META-INF.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-05-02 15:55:57 -0400 (Wed, 02 May 2012)
New Revision: 40724
Modified:
branches/jbosstools-3.3.0.Beta3/maven/plugins/org.jboss.tools.maven.sourcelookup.core/META-INF/MANIFEST.MF
Log:
apply JBDS2114.patch2.txt re: JBDS 2114 - newer m2e dependency
Modified: branches/jbosstools-3.3.0.Beta3/maven/plugins/org.jboss.tools.maven.sourcelookup.core/META-INF/MANIFEST.MF
===================================================================
--- branches/jbosstools-3.3.0.Beta3/maven/plugins/org.jboss.tools.maven.sourcelookup.core/META-INF/MANIFEST.MF 2012-05-02 19:36:34 UTC (rev 40723)
+++ branches/jbosstools-3.3.0.Beta3/maven/plugins/org.jboss.tools.maven.sourcelookup.core/META-INF/MANIFEST.MF 2012-05-02 19:55:57 UTC (rev 40724)
@@ -10,9 +10,9 @@
org.jboss.ide.eclipse.as.core;visibility:=reexport,
org.eclipse.wst.server.core;bundle-version="1.1.302";visibility:=reexport,
org.eclipse.jdt.launching;bundle-version="3.6.0",
- org.eclipse.m2e.jdt;bundle-version="[1.0.0,1.1.0)";visibility:=reexport,
- org.eclipse.m2e.core;bundle-version="[1.0.0,1.1.0)";visibility:=reexport,
- org.eclipse.m2e.maven.runtime;bundle-version="[1.0.0,1.1.0)";visibility:=reexport,
+ org.eclipse.m2e.jdt;bundle-version="[1.0.0,1.2.0)";visibility:=reexport,
+ org.eclipse.m2e.core;bundle-version="[1.0.0,1.2.0)";visibility:=reexport,
+ org.eclipse.m2e.maven.runtime;bundle-version="[1.0.0,1.2.0)";visibility:=reexport,
org.apache.commons.codec;bundle-version="1.3.0",
org.eclipse.ui;bundle-version="3.7.0"
Bundle-ActivationPolicy: lazy
12 years, 8 months
JBoss Tools SVN: r40723 - trunk/maven/plugins/org.jboss.tools.maven.sourcelookup.core/META-INF.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-05-02 15:36:34 -0400 (Wed, 02 May 2012)
New Revision: 40723
Modified:
trunk/maven/plugins/org.jboss.tools.maven.sourcelookup.core/META-INF/MANIFEST.MF
Log:
bump acceptable range of org.eclipse.m2e.* to [1.0.0,1.2.0) because TP has a newer m2e on it now
Modified: trunk/maven/plugins/org.jboss.tools.maven.sourcelookup.core/META-INF/MANIFEST.MF
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.sourcelookup.core/META-INF/MANIFEST.MF 2012-05-02 19:31:48 UTC (rev 40722)
+++ trunk/maven/plugins/org.jboss.tools.maven.sourcelookup.core/META-INF/MANIFEST.MF 2012-05-02 19:36:34 UTC (rev 40723)
@@ -10,9 +10,9 @@
org.jboss.ide.eclipse.as.core;visibility:=reexport,
org.eclipse.wst.server.core;bundle-version="1.1.302";visibility:=reexport,
org.eclipse.jdt.launching;bundle-version="3.6.0",
- org.eclipse.m2e.jdt;bundle-version="[1.0.0,1.1.0)";visibility:=reexport,
- org.eclipse.m2e.core;bundle-version="[1.0.0,1.1.0)";visibility:=reexport,
- org.eclipse.m2e.maven.runtime;bundle-version="[1.0.0,1.1.0)";visibility:=reexport,
+ org.eclipse.m2e.jdt;bundle-version="[1.0.0,1.2.0)";visibility:=reexport,
+ org.eclipse.m2e.core;bundle-version="[1.0.0,1.2.0)";visibility:=reexport,
+ org.eclipse.m2e.maven.runtime;bundle-version="[1.0.0,1.2.0)";visibility:=reexport,
org.apache.commons.codec;bundle-version="1.3.0",
org.eclipse.ui;bundle-version="3.7.0"
Bundle-ActivationPolicy: lazy
12 years, 8 months