JBoss Tools SVN: r30200 - trunk/build/target-platform.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-04-01 02:53:57 -0400 (Fri, 01 Apr 2011)
New Revision: 30200
Modified:
trunk/build/target-platform/multiple.target
trunk/build/target-platform/multiple.target.p2mirror.xml
trunk/build/target-platform/unified.target
trunk/build/target-platform/unified.target.p2mirror.xml
Log:
add com.google.gdt.eclipse.suite.e36.feature.feature.group 2.2.0.v201102111811 to TP
Modified: trunk/build/target-platform/multiple.target
===================================================================
--- trunk/build/target-platform/multiple.target 2011-04-01 06:19:23 UTC (rev 30199)
+++ trunk/build/target-platform/multiple.target 2011-04-01 06:53:57 UTC (rev 30200)
@@ -196,6 +196,7 @@
<unit id="com.google.gdt.eclipse.suite.e36.feature.feature.group" version="1.4.2.v201012211742"/>
<unit id="com.google.gwt.eclipse.sdkbundle.e36.feature.2.2.0.feature.group" version="2.2.0.v201102111811"/>
+ <unit id="com.google.gdt.eclipse.suite.e36.feature.feature.group" version="2.2.0.v201102111811"/>
</location>
</locations>
Modified: trunk/build/target-platform/multiple.target.p2mirror.xml
===================================================================
--- trunk/build/target-platform/multiple.target.p2mirror.xml 2011-04-01 06:19:23 UTC (rev 30199)
+++ trunk/build/target-platform/multiple.target.p2mirror.xml 2011-04-01 06:53:57 UTC (rev 30200)
@@ -181,6 +181,7 @@
<iu id="org.eclipse.wst.xml_core.feature.feature.group" version=""/>
<iu id="com.google.gdt.eclipse.suite.e36.feature.feature.group" version=""/>
<iu id="com.google.gwt.eclipse.sdkbundle.e36.feature.2.2.0.feature.group" version=""/>
+<iu id="com.google.gdt.eclipse.suite.e36.feature.feature.group" version=""/>
<iu id="org.drools.eclipse.feature.feature.group" version=""/>
<iu id="org.drools.eclipse.task.feature.feature.group" version=""/>
<iu id="org.guvnor.tools.feature.feature.group" version=""/>
Modified: trunk/build/target-platform/unified.target
===================================================================
--- trunk/build/target-platform/unified.target 2011-04-01 06:19:23 UTC (rev 30199)
+++ trunk/build/target-platform/unified.target 2011-04-01 06:53:57 UTC (rev 30200)
@@ -196,6 +196,7 @@
<unit id="com.google.gdt.eclipse.suite.e36.feature.feature.group" version="1.4.2.v201012211742"/>
<unit id="com.google.gwt.eclipse.sdkbundle.e36.feature.2.2.0.feature.group" version="2.2.0.v201102111811"/>
+ <unit id="com.google.gdt.eclipse.suite.e36.feature.feature.group" version="2.2.0.v201102111811"/>
</location>
</locations>
Modified: trunk/build/target-platform/unified.target.p2mirror.xml
===================================================================
--- trunk/build/target-platform/unified.target.p2mirror.xml 2011-04-01 06:19:23 UTC (rev 30199)
+++ trunk/build/target-platform/unified.target.p2mirror.xml 2011-04-01 06:53:57 UTC (rev 30200)
@@ -181,6 +181,7 @@
<iu id="org.eclipse.wst.xml_core.feature.feature.group" version=""/>
<iu id="com.google.gdt.eclipse.suite.e36.feature.feature.group" version=""/>
<iu id="com.google.gwt.eclipse.sdkbundle.e36.feature.2.2.0.feature.group" version=""/>
+<iu id="com.google.gdt.eclipse.suite.e36.feature.feature.group" version=""/>
<iu id="org.drools.eclipse.feature.feature.group" version=""/>
<iu id="org.drools.eclipse.task.feature.feature.group" version=""/>
<iu id="org.guvnor.tools.feature.feature.group" version=""/>
13 years, 1 month
- 1
- 0
JBoss Tools SVN: r30199 - trunk/build/parent.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-04-01 02:19:23 -0400 (Fri, 01 Apr 2011)
New Revision: 30199
Modified:
trunk/build/parent/pom.xml
Log:
enable all activeByDefault=true sites to be active w/o needing to specify via -P flag
Modified: trunk/build/parent/pom.xml
===================================================================
--- trunk/build/parent/pom.xml 2011-04-01 05:50:34 UTC (rev 30198)
+++ trunk/build/parent/pom.xml 2011-04-01 06:19:23 UTC (rev 30199)
@@ -23,8 +23,6 @@
<!-- target files available for building: multiple sites, 1 unified site,
1 local mirrored site -->
- <target.platform.classifier.multiple>mutiple
- </target.platform.classifier.multiple>
<target.platform.classifier.unified>unified
</target.platform.classifier.unified>
<target.platform.classifier.local>local
@@ -95,6 +93,16 @@
<configuration>
<resolver>p2</resolver>
<ignoreTychoRepositories>true</ignoreTychoRepositories>
+ <target>
+ <!-- Target platform file pointing at a single update site from which
+ to resolve. -->
+ <artifact>
+ <groupId>org.jboss.tools</groupId>
+ <artifactId>org.jboss.tools.target.platform</artifactId>
+ <version>0.0.2-SNAPSHOT</version>
+ <classifier>${target.platform.classifier.unified}</classifier>
+ </artifact>
+ </target>
<environments>
<environment>
<os>macosx</os>
@@ -207,91 +215,6 @@
</issueManagement>
<profiles>
- <profile>
- <id>jbosstools-nightly</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <repositories>
- <repository>
- <id>jbosstools-nightly</id>
- <url>${jbosstools-nightly}</url>
- <layout>p2</layout>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- </repository>
- </repositories>
- </profile>
- <profile>
- <id>jbosstools-nightly-staging-composite</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <repositories>
- <repository>
- <id>jbosstools-nightly-staging-composite</id>
- <url>http://download.jboss.org/jbosstools/builds/staging/_composite_/3.3.indigo/</url>
- <layout>p2</layout>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- </repository>
- </repositories>
- </profile>
- <profile>
- <id>jboss-requirements-composite-mirror</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <repositories>
- <repository>
- <id>jboss-requirements-composite-mirror</id>
- <url>http://download.jboss.org/jbosstools/updates/indigo/</url>
- <layout>p2</layout>
- <snapshots> <enabled>true</enabled> </snapshots>
- <releases> <enabled>true</enabled> </releases>
- </repository>
- </repositories>
- </profile>
-
- <!-- Target platform file pointing at a single update site from which to
- resolve. See unified.site if you want to resolve against a site w/o using
- the unified.target file -->
- <profile>
- <id>unified.target</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <properties>
- </properties>
- <build>
- <plugins>
- <plugin>
- <groupId>org.sonatype.tycho</groupId>
- <artifactId>target-platform-configuration</artifactId>
- <version>${tychoVersion}</version>
- <configuration>
- <target>
- <artifact>
- <groupId>org.jboss.tools</groupId>
- <artifactId>org.jboss.tools.target.platform</artifactId>
- <version>0.0.2-SNAPSHOT</version>
- <classifier>${target.platform.classifier.unified}</classifier>
- </artifact>
- </target>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
-
<!-- To use this profile, must have first created a local.target file,
which points to a local repo. You can do this by hand or generate it from
multiple.target using: cd ~/trunk/build/target-platform; ant See also the
@@ -301,9 +224,6 @@
mvn clean install -Pget.local.target -f /path/to/target-platform/pom.xml -->
<profile>
<id>local.target</id>
- <activation>
- <activeByDefault>false</activeByDefault>
- </activation>
<build>
<plugins>
<plugin>
@@ -330,9 +250,6 @@
without needing to use a local.site file -->
<profile>
<id>local.site</id>
- <activation>
- <activeByDefault>false</activeByDefault>
- </activation>
<repositories>
<repository>
<id>local.site</id>
@@ -348,31 +265,7 @@
</repositories>
</profile>
- <!-- Time saver: to build everything from scratch from a single repo containing
- all deps in unified.target, but without using the target file to filter site
- contents (may end up using a different version of a dependency if site contains
- multiple versions) -->
<profile>
- <id>unified.site</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <repositories>
- <repository>
- <id>jbosstools-target-site</id>
- <url>${jbosstools-target-site}</url>
- <layout>p2</layout>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- </repository>
- </repositories>
- </profile>
-
- <profile>
<id>osx</id>
<activation>
<property>
@@ -630,7 +523,61 @@
</profiles>
<repositories>
+ <!-- Contains all the Eclipse.org deps, mirrored onto download.jboss.org.
+ This is the superset of sites from which the TP is created. Should be
+ disabled closer to GA so we're only using the TP contents exclusively. -->
<repository>
+ <id>jboss-requirements-composite-mirror</id>
+ <url>http://download.jboss.org/jbosstools/updates/indigo/</url>
+ <layout>p2</layout>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+
+ <!-- Single repo containing contents of unified.target, but without using the target file -->
+ <repository>
+ <id>jbosstools-target-site</id>
+ <url>${jbosstools-target-site}</url>
+ <layout>p2</layout>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+
+ <!-- Latest JBT nightly published update site (nightly builds) -->
+ <repository>
+ <id>jbosstools-nightly</id>
+ <url>${jbosstools-nightly}</url>
+ <layout>p2</layout>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+
+ <!-- Latest JBT work-in-progress component builds (CI builds), not yet pushed to the above nightly update site -->
+ <repository>
+ <id>jbosstools-nightly-staging-composite</id>
+ <url>http://download.jboss.org/jbosstools/builds/staging/_composite_/3.3.indigo/</url>
+ <layout>p2</layout>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+
+ <repository>
<id>jboss-public-repository-group</id>
<name>JBoss Public Repository Group</name>
<url>http://repository.jboss.org/nexus/content/groups/public/</url>
13 years, 1 month
- 1
- 0
JBoss Tools SVN: r30197 - trunk/build/target-platform.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-04-01 01:29:25 -0400 (Fri, 01 Apr 2011)
New Revision: 30197
Modified:
trunk/build/target-platform/multiple.target
trunk/build/target-platform/multiple.target.p2mirror.xml
trunk/build/target-platform/unified.target
trunk/build/target-platform/unified.target.p2mirror.xml
Log:
add org.slf4j.api 1.6.1.v20100831-0715 to TP (needed by m2e 0.13)
Modified: trunk/build/target-platform/multiple.target
===================================================================
--- trunk/build/target-platform/multiple.target 2011-03-31 22:16:06 UTC (rev 30196)
+++ trunk/build/target-platform/multiple.target 2011-04-01 05:29:25 UTC (rev 30197)
@@ -15,8 +15,9 @@
<repository location="http://download.jboss.org/jbosstools/updates/indigo/"/>
<!-- m2e -->
- <unit version="0.13.0.201103291237" id="org.eclipse.m2e.feature.feature.group"/>
- <unit version="0.13.0.201103231111" id="org.maven.ide.eclipse.wtp.feature.feature.group"/>
+ <unit id="org.eclipse.m2e.feature.feature.group" version="0.13.0.201103291237"/>
+ <unit id="org.maven.ide.eclipse.wtp.feature.feature.group" version="0.13.0.201103231111"/>
+ <unit id="org.slf4j.api" version="1.6.1.v20100831-0715"/>
<unit id="javax.wsdl" version="1.6.2.v201012040545"/>
<unit id="org.apache.oro" version="2.0.8.v201005080400"/>
Modified: trunk/build/target-platform/multiple.target.p2mirror.xml
===================================================================
--- trunk/build/target-platform/multiple.target.p2mirror.xml 2011-03-31 22:16:06 UTC (rev 30196)
+++ trunk/build/target-platform/multiple.target.p2mirror.xml 2011-04-01 05:29:25 UTC (rev 30197)
@@ -33,6 +33,7 @@
</source>
<iu id="org.eclipse.m2e.feature.feature.group" version=""/>
<iu id="org.maven.ide.eclipse.wtp.feature.feature.group" version=""/>
+<iu id="org.slf4j.api" version=""/>
<iu id="javax.wsdl" version=""/>
<iu id="org.apache.oro" version=""/>
<iu id="org.jdom" version=""/>
Modified: trunk/build/target-platform/unified.target
===================================================================
--- trunk/build/target-platform/unified.target 2011-03-31 22:16:06 UTC (rev 30196)
+++ trunk/build/target-platform/unified.target 2011-04-01 05:29:25 UTC (rev 30197)
@@ -14,9 +14,10 @@
<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
<repository location="http://download.jboss.org/jbosstools/updates/target-platform_3.3.indigo/l..."/>
- <!-- m2e -->
- <unit version="0.13.0.201103291237" id="org.eclipse.m2e.feature.feature.group"/>
- <unit version="0.13.0.201103231111" id="org.maven.ide.eclipse.wtp.feature.feature.group"/>
+ <!-- m2e -->
+ <unit id="org.eclipse.m2e.feature.feature.group" version="0.13.0.201103291237"/>
+ <unit id="org.maven.ide.eclipse.wtp.feature.feature.group" version="0.13.0.201103231111"/>
+ <unit id="org.slf4j.api" version="1.6.1.v20100831-0715"/>
<unit id="javax.wsdl" version="1.6.2.v201012040545"/>
<unit id="org.apache.oro" version="2.0.8.v201005080400"/>
Modified: trunk/build/target-platform/unified.target.p2mirror.xml
===================================================================
--- trunk/build/target-platform/unified.target.p2mirror.xml 2011-03-31 22:16:06 UTC (rev 30196)
+++ trunk/build/target-platform/unified.target.p2mirror.xml 2011-04-01 05:29:25 UTC (rev 30197)
@@ -33,6 +33,7 @@
</source>
<iu id="org.eclipse.m2e.feature.feature.group" version=""/>
<iu id="org.maven.ide.eclipse.wtp.feature.feature.group" version=""/>
+<iu id="org.slf4j.api" version=""/>
<iu id="javax.wsdl" version=""/>
<iu id="org.apache.oro" version=""/>
<iu id="org.jdom" version=""/>
13 years, 1 month
- 1
- 0