11:47 p.m.
Author: nickboldt
Date: 2012-05-02 00:47:05 -0400 (Wed, 02 May 2012)
New Revision: 40694
Modified:
trunk/build/target-platform/jbds.target
trunk/build/target-platform/multiple-junoM6.target
trunk/build/target-platform/multiple.target
trunk/build/target-platform/multiple.target.p2mirror.xml
trunk/build/target-platform/unified-junoM6.target
trunk/build/target-platform/unified.target
Log:
add org.jboss.tools.maven.apt.feature.feature.group and bump up m2e versions; also fix
_composite_/trunk -> _composite_/core/trunk
Modified: trunk/build/target-platform/jbds.target
===================================================================
--- trunk/build/target-platform/jbds.target 2012-05-02 04:46:56 UTC (rev 40693)
+++ trunk/build/target-platform/jbds.target 2012-05-02 04:47:05 UTC (rev 40694)
@@ -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.0.100.20110804-1717"/>
- <unit id="org.eclipse.m2e.feature.feature.group"
version="1.0.200.20111228-1245"/>
+ <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.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"/>
+ <unit id="org.jboss.tools.maven.apt.feature.feature.group"
version="1.0.0.201204280012"/>
<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.core"
version="1.0.0.v20111214-2030"/>
<unit id="ch.qos.logback.slf4j"
version="0.9.27.v20110224-1110"/>
- <unit id="org.slf4j.api" version="1.6.1.v20100831-0715"/>
+ <unit id="org.slf4j.api" version="1.6.4.v20120130-2120"/>
<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"/>
@@ -275,4 +275,4 @@
<unit id="com.google.gwt.eclipse.sdkbundle.e37.feature.feature.group"
version="2.4.0.v201201120043-rel-r37"/>
</location>
</locations>
-</target>
+</target>
\ No newline at end of file
Modified: trunk/build/target-platform/multiple-junoM6.target
===================================================================
--- trunk/build/target-platform/multiple-junoM6.target 2012-05-02 04:46:56 UTC (rev
40693)
+++ trunk/build/target-platform/multiple-junoM6.target 2012-05-02 04:47:05 UTC (rev
40694)
@@ -7,9 +7,9 @@
:%s/.\+\/\(org.\+\)_\(\d\+.\+\)\.jar/\t\t\t<unit id="\1.feature.group"
version="\2"\/>/g
-->
<locations>
- <!-- for trunk use _composite_/trunk; for 3.3_stable_branch, use
_composite_/3.3.indigo -->
+ <!-- for trunk use _composite_/core/trunk; for 3.3_stable_branch, use
_composite_/core/3.3.indigo -->
<!-- <location includeAllPlatforms="false"
includeMode="planner" type="InstallableUnit">
- <repository
location="http://download.jboss.org/jbosstools/builds/staging/_compo...
+ <repository
location="http://download.jboss.org/jbosstools/builds/staging/_compo...
</location> -->
<location includeAllPlatforms="false" includeMode="planner"
type="InstallableUnit">
@@ -341,4 +341,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>
\ No newline at end of file
+</target>
Modified: trunk/build/target-platform/multiple.target
===================================================================
--- trunk/build/target-platform/multiple.target 2012-05-02 04:46:56 UTC (rev 40693)
+++ trunk/build/target-platform/multiple.target 2012-05-02 04:47:05 UTC (rev 40694)
@@ -8,8 +8,8 @@
-->
<locations>
<location includeAllPlatforms="false" includeMode="planner"
type="InstallableUnit">
- <!-- for trunk use _composite_/trunk; for 3.3_stable_branch, use
_composite_/3.3.indigo -->
- <repository
location="http://download.jboss.org/jbosstools/builds/staging/_compo...
+ <!-- for trunk use _composite_/core/trunk; for 3.3_stable_branch, use
_composite_/core/3.3.indigo -->
+ <repository
location="http://download.jboss.org/jbosstools/builds/staging/_compo...
</location>
<location includeAllPlatforms="false" includeMode="planner"
type="InstallableUnit">
@@ -18,11 +18,11 @@
<repository
location="http://download.jboss.org/jbosstools/updates/indigo/SR2/&q...
<!-- m2e, m2e-wtp + deps -->
- <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.200.20111228-1245"/>
+ <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.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"/>
+ <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="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"/>
@@ -340,4 +340,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>
\ No newline at end of file
+</target>
Modified: trunk/build/target-platform/multiple.target.p2mirror.xml
===================================================================
--- trunk/build/target-platform/multiple.target.p2mirror.xml 2012-05-02 04:46:56 UTC (rev
40693)
+++ trunk/build/target-platform/multiple.target.p2mirror.xml 2012-05-02 04:47:05 UTC (rev
40694)
@@ -28,7 +28,7 @@
<p2.mirror destination="file://${repoDir}"
verbose="${verbose}">
<slicingOptions includeFeatures="true"
followStrict="${followStrict}"/>
<source>
-<repository
location="http://download.jboss.org/jbosstools/builds/staging/_compo...
+<repository
location="http://download.jboss.org/jbosstools/builds/staging/_compo...
<repository
location="http://download.jboss.org/jbosstools/updates/indigo/SR2/&q...
</source>
<iu id="org.eclipse.m2e.sdk.feature.feature.group"
version=""/>
Modified: trunk/build/target-platform/unified-junoM6.target
===================================================================
--- trunk/build/target-platform/unified-junoM6.target 2012-05-02 04:46:56 UTC (rev 40693)
+++ trunk/build/target-platform/unified-junoM6.target 2012-05-02 04:47:05 UTC (rev 40694)
@@ -7,7 +7,7 @@
:%s/.\+\/\(org.\+\)_\(\d\+.\+\)\.jar/\t\t\t<unit id="\1.feature.group"
version="\2"\/>/g
-->
<locations>
- <!-- for trunk use _composite_/trunk; for 3.3_stable_branch, use
_composite_/3.3.indigo -->
+ <!-- for trunk use _composite_/core/trunk; for 3.3_stable_branch, use
_composite_/core/3.3.indigo -->
<!-- <location includeAllPlatforms="false"
includeMode="planner" type="InstallableUnit">
<repository
location="http://download.jboss.org/jbosstools/updates/target-platfo...
</location> -->
Modified: trunk/build/target-platform/unified.target
===================================================================
--- trunk/build/target-platform/unified.target 2012-05-02 04:46:56 UTC (rev 40693)
+++ trunk/build/target-platform/unified.target 2012-05-02 04:47:05 UTC (rev 40694)
@@ -8,7 +8,7 @@
-->
<locations>
<location includeAllPlatforms="false" includeMode="planner"
type="InstallableUnit">
- <!-- for trunk use _composite_/trunk; for 3.3_stable_branch, use
_composite_/3.3.indigo -->
+ <!-- for trunk use _composite_/core/trunk; for 3.3_stable_branch, use
_composite_/core/3.3.indigo -->
<repository
location="http://download.jboss.org/jbosstools/updates/target-platfo...
</location>
@@ -18,11 +18,11 @@
<repository
location="http://download.jboss.org/jbosstools/updates/target-platfo...
<!-- m2e, m2e-wtp + deps -->
- <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.200.20111228-1245"/>
+ <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.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"/>
+ <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="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"/>
@@ -340,4 +340,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>
\ No newline at end of file
+</target>