[jbosstools-commits] JBoss Tools SVN: r41874 - in workspace/dgolovin/new-releng: features/org.jboss.tools.tp.dependencies and 2 other directories.

jbosstools-commits at lists.jboss.org jbosstools-commits at lists.jboss.org
Mon Jun 11 21:34:16 EDT 2012


Author: dgolovin
Date: 2012-06-11 21:34:15 -0400 (Mon, 11 Jun 2012)
New Revision: 41874

Modified:
   workspace/dgolovin/new-releng/.project
   workspace/dgolovin/new-releng/features/org.jboss.tools.tp.dependencies/feature.xml
   workspace/dgolovin/new-releng/features/org.jboss.tools.tp.dependencies/pom.xml
   workspace/dgolovin/new-releng/parent/pom.xml
   workspace/dgolovin/new-releng/target-platform/jboss.tools.tp.product
   workspace/dgolovin/new-releng/target-platform/pom.xml
Log:
target platform build for juno

Modified: workspace/dgolovin/new-releng/.project
===================================================================
--- workspace/dgolovin/new-releng/.project	2012-06-12 01:03:50 UTC (rev 41873)
+++ workspace/dgolovin/new-releng/.project	2012-06-12 01:34:15 UTC (rev 41874)
@@ -8,4 +8,16 @@
 	</buildSpec>
 	<natures>
 	</natures>
+	<linkedResources>
+		<link>
+			<name>jbdevstudio-beta3</name>
+			<type>2</type>
+			<location>/home/eskimo/jbdevstudio-beta3</location>
+		</link>
+		<link>
+			<name>jbdevstudio-beta3-maven</name>
+			<type>2</type>
+			<location>/home/eskimo/jbdevstudio-beta3-maven</location>
+		</link>
+	</linkedResources>
 </projectDescription>

Modified: workspace/dgolovin/new-releng/features/org.jboss.tools.tp.dependencies/feature.xml
===================================================================
--- workspace/dgolovin/new-releng/features/org.jboss.tools.tp.dependencies/feature.xml	2012-06-12 01:03:50 UTC (rev 41873)
+++ workspace/dgolovin/new-releng/features/org.jboss.tools.tp.dependencies/feature.xml	2012-06-12 01:34:15 UTC (rev 41874)
@@ -23,12 +23,12 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
+   <!--plugin
          id="com.ning.async-http-client"
          download-size="0"
          install-size="0"
          version="0.0.0"
-         unpack="false"/>
+         unpack="false"/-->
 
    <plugin
          id="org.slf4j.api"
@@ -37,11 +37,18 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
+   <!--plugin
          id="org.jboss.netty"
          download-size="0"
          install-size="0"
          version="0.0.0"
+         unpack="false"/-->
+          
+	<plugin
+         id="javax.el"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
          unpack="false"/>
-
+         
 </feature>

Modified: workspace/dgolovin/new-releng/features/org.jboss.tools.tp.dependencies/pom.xml
===================================================================
--- workspace/dgolovin/new-releng/features/org.jboss.tools.tp.dependencies/pom.xml	2012-06-12 01:03:50 UTC (rev 41873)
+++ workspace/dgolovin/new-releng/features/org.jboss.tools.tp.dependencies/pom.xml	2012-06-12 01:34:15 UTC (rev 41874)
@@ -8,7 +8,7 @@
 		<version>1.0.0-SNAPSHOT</version>
 	</parent>
 	<groupId>com.jboss.tools.releng.features</groupId>
-	<artifactId>org.jboss.tools.releng.dependencies</artifactId>
+	<artifactId>org.jboss.tools.tp.dependencies</artifactId>
 	<name>org.jboss.tools.releng.dependencies feature</name>
 	
 	<packaging>eclipse-feature</packaging>

Modified: workspace/dgolovin/new-releng/parent/pom.xml
===================================================================
--- workspace/dgolovin/new-releng/parent/pom.xml	2012-06-12 01:03:50 UTC (rev 41873)
+++ workspace/dgolovin/new-releng/parent/pom.xml	2012-06-12 01:34:15 UTC (rev 41874)
@@ -9,7 +9,7 @@
 	<packaging>pom</packaging>
 
 	<properties>
-		<tychoVersion>0.10.0</tychoVersion>
+		<tychoVersion>0.15.0</tychoVersion>
 		<eclipse.update.url>http://mirrors.xmission.com/eclipse/releases/indigo/201105200900</eclipse.update.url>
 	</properties>
 
@@ -20,14 +20,34 @@
 				<version>1.3</version>
 			</plugin>
 			<plugin>
-				<groupId>org.sonatype.tycho</groupId>
-				<artifactId>maven-osgi-packaging-plugin</artifactId>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-packaging-plugin</artifactId>
 				<version>${tychoVersion}</version>
 				<configuration>
 					<format>'v'yyyyMMddHHmm</format>
 					<archiveSite>true</archiveSite>
 					<environments>
 						<environment>
+							<os>macosx</os>
+							<ws>cocoa</ws>
+							<arch>x86</arch>
+						</environment>
+						<environment>
+							<os>macosx</os>
+							<ws>cocoa</ws>
+							<arch>x86_64</arch>
+						</environment>
+						<environment>
+							<os>win32</os>
+							<ws>win32</ws>
+							<arch>x86</arch>
+						</environment>
+						<environment>
+							<os>win32</os>
+							<ws>win32</ws>
+							<arch>x86_64</arch>
+						</environment>
+						<environment>
 							<os>linux</os>
 							<ws>gtk</ws>
 							<arch>x86</arch>
@@ -42,14 +62,14 @@
 			</plugin>
 
 			<plugin>
-				<groupId>org.sonatype.tycho</groupId>
+				<groupId>org.eclipse.tycho</groupId>
 				<artifactId>tycho-maven-plugin</artifactId>
 				<version>${tychoVersion}</version>
 				<extensions>true</extensions>
 			</plugin>
 
 			<plugin>
-				<groupId>org.sonatype.tycho</groupId>
+				<groupId>org.eclipse.tycho</groupId>
 				<artifactId>target-platform-configuration</artifactId>
 				<version>${tychoVersion}</version>
 				<configuration>
@@ -57,6 +77,26 @@
 					<ignoreTychoRepositories>true</ignoreTychoRepositories>
 					<environments>
 						<environment>
+							<os>macosx</os>
+							<ws>cocoa</ws>
+							<arch>x86</arch>
+						</environment>
+						<environment>
+							<os>macosx</os>
+							<ws>cocoa</ws>
+							<arch>x86_64</arch>
+						</environment>
+						<environment>
+							<os>win32</os>
+							<ws>win32</ws>
+							<arch>x86</arch>
+						</environment>
+						<environment>
+							<os>win32</os>
+							<ws>win32</ws>
+							<arch>x86_64</arch>
+						</environment>
+						<environment>
 							<os>linux</os>
 							<ws>gtk</ws>
 							<arch>x86</arch>
@@ -74,8 +114,8 @@
 				To allow all tests in a pom to pass/fail, use commandline flag: -fae (fail 
 				at end) -->
 			<plugin>
-				<groupId>org.sonatype.tycho</groupId>
-				<artifactId>maven-osgi-test-plugin</artifactId>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-surefire-plugin</artifactId>
 				<version>${tychoVersion}</version>
 				<configuration>
 					<useUIHarness>true</useUIHarness>
@@ -98,8 +138,8 @@
 				</configuration>
 			</plugin>
 			<plugin>
-				<groupId>org.sonatype.tycho</groupId>
-				<artifactId>maven-osgi-compiler-plugin</artifactId>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-compiler-plugin</artifactId>
 				<version>${tychoVersion}</version>
 				<configuration>
 					<encoding>UTF-8</encoding>
@@ -144,8 +184,8 @@
 						</configuration>
 					</plugin>
 					<plugin>
-						<groupId>org.sonatype.tycho</groupId>
-						<artifactId>maven-osgi-test-plugin</artifactId>
+						<groupId>org.eclipse.tycho</groupId>
+						<artifactId>tycho-surefire-plugin</artifactId>
 						<version>${tychoVersion}</version>
 						<configuration>
 							<systemProperties combine.children="append">
@@ -508,19 +548,8 @@
 		eclipse -->
 	<repositories>
 		<repository>
-			<id>eclipse-indigo</id>
-			<url>http://mirrors.xmission.com/eclipse/releases/indigo</url>
-			<layout>p2</layout>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-			<releases>
-				<enabled>true</enabled>
-			</releases>
-		</repository>	
-		<repository>
 			<id>eclipse-juno</id>
-			<url>http://mirrors.xmission.com/eclipse/releases/juno</url>
+			<url>http://download.eclipse.org/releases/juno</url>
 			<layout>p2</layout>
 			<snapshots>
 				<enabled>true</enabled>
@@ -564,7 +593,7 @@
 		</repository>
 		<repository>
 			<id>eclipse.wtp</id>
-			<url>http://download.eclipse.org/webtools/repository/juno/</url>
+			<url>http://download.eclipse.org/webtools/downloads/drops/R3.4.0/S-3.4.0RC2-20120530010904/repository/</url>
 			<layout>p2</layout>
 			<snapshots>
 				<enabled>true</enabled>
@@ -617,9 +646,9 @@
 				<enabled>true</enabled>
 			</releases>
 		</repository>
-		<repository>
-			<id>gwt</id>
-			<url>http://dl.google.com/eclipse/plugin/3.7</url>
+<!-- 		<repository>
+			<id>emf</id>
+			<url>http://download.eclipse.org/modeling/emf/emf/</url>
 			<layout>p2</layout>
 			<snapshots>
 				<enabled>true</enabled>
@@ -627,10 +656,10 @@
 			<releases>
 				<enabled>true</enabled>
 			</releases>
-		</repository>
+		</repository> -->
 		<repository>
-			<id>jetty</id>
-			<url>http://download.eclipse.org/jetty/updates/jetty-bundles-8.x</url>
+			<id>eclipse-4</id>
+			<url>http://download.eclipse.org/eclipse/updates/4.2milestones</url>
 			<layout>p2</layout>
 			<snapshots>
 				<enabled>true</enabled>
@@ -640,5 +669,4 @@
 			</releases>
 		</repository>
 	</repositories>
-	
 </project>

Modified: workspace/dgolovin/new-releng/target-platform/jboss.tools.tp.product
===================================================================
--- workspace/dgolovin/new-releng/target-platform/jboss.tools.tp.product	2012-06-12 01:03:50 UTC (rev 41873)
+++ workspace/dgolovin/new-releng/target-platform/jboss.tools.tp.product	2012-06-12 01:34:15 UTC (rev 41874)
@@ -112,8 +112,9 @@
       <feature id="org.eclipse.uml2.sdk"/>
       <feature id="org.eclipse.jgit"/>
       <feature id="org.eclipse.egit"/>
-      <feature id="com.google.gdt.eclipse.suite.e37.feature"/>
-      <feature id="com.google.gwt.eclipse.sdkbundle.e37.feature"/>
+      <feature id="org.jboss.tools.tp.dependencies"/>
+      <!--feature id="com.google.gdt.eclipse.suite.e37.feature"/>
+      <feature id="com.google.gwt.eclipse.sdkbundle.e37.feature"/-->
    </features>
 
 

Modified: workspace/dgolovin/new-releng/target-platform/pom.xml
===================================================================
--- workspace/dgolovin/new-releng/target-platform/pom.xml	2012-06-12 01:03:50 UTC (rev 41873)
+++ workspace/dgolovin/new-releng/target-platform/pom.xml	2012-06-12 01:34:15 UTC (rev 41874)
@@ -14,7 +14,7 @@
 	<build>
 		<plugins>
 			<plugin>
-				<groupId>org.sonatype.tycho</groupId>
+				<groupId>org.eclipse.tycho</groupId>
 				<artifactId>tycho-p2-publisher-plugin</artifactId>
 				<version>${tychoVersion}</version>
 				<configuration>
@@ -22,7 +22,15 @@
 				</configuration>
 			</plugin>
 			<plugin>
-				<groupId>org.sonatype.tycho</groupId>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-p2-repository-plugin</artifactId>
+				<version>${tychoVersion}</version>
+				<configuration>
+					<includeAllDependencies>true</includeAllDependencies>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
 				<artifactId>tycho-p2-director-plugin</artifactId>
 				<version>${tychoVersion}</version>
 				<executions>



More information about the jbosstools-commits mailing list