[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [List Home]
[stp-commits] r3651 - in org.eclipse.stp.sca/trunk: parent update-site

Author: vzurczak
Date: 2011-05-24 03:13:27 -0400 (Tue, 24 May 2011)
New Revision: 3651

Modified:
   org.eclipse.stp.sca/trunk/parent/pom.xml
   org.eclipse.stp.sca/trunk/update-site/pom.xml
Log:
Change the Tycho configuration

Modified: org.eclipse.stp.sca/trunk/parent/pom.xml
===================================================================
--- org.eclipse.stp.sca/trunk/parent/pom.xml	2011-05-23 13:31:00 UTC (rev 3650)
+++ org.eclipse.stp.sca/trunk/parent/pom.xml	2011-05-24 07:13:27 UTC (rev 3651)
@@ -21,7 +21,7 @@
 	<build>
 		<plugins>
 			<plugin>
-           		<groupId>org.sonatype.tycho</groupId>
+           		<groupId>org.eclipse.tycho</groupId>
            		<artifactId>tycho-p2-publisher-plugin</artifactId>
            		<version>${tychoVersion}</version>
            		<configuration>
@@ -31,60 +31,35 @@
 
 			<plugin>
 				<groupId>org.eclipse.tycho</groupId>
-				<artifactId>tycho-maven-plugin</artifactId>
+				<artifactId>target-platform-configuration</artifactId>
 				<version>${tychoVersion}</version>
-				<extensions>true</extensions>
+				<configuration>
+					<resolver>p2</resolver>
+				</configuration>
 			</plugin>
-
+		</plugins>
+	</build>
+	
+	<pluginManagement>
+		<plugins>
 			<plugin>
 				<groupId>org.eclipse.tycho</groupId>
-				<artifactId>target-platform-configuration</artifactId>
+				<artifactId>tycho-compiler-plugin</artifactId>
 				<version>${tychoVersion}</version>
 				<configuration>
-					<resolver>p2</resolver>
-					<ignoreTychoRepositories>true</ignoreTychoRepositories>
-					<environments>
-					
-						<!-- Mac OS -->
-						<!-- environment>
-							<os>macosx</os>
-							<ws>cocoa</ws>
-							<arch>x86</arch>
-						</environment>
-						<environment>
-							<os>macosx</os>
-							<ws>carbon</ws>
-							<arch>x86</arch>
-						</environment -->
-						
-						<!-- Win 32 -->
-						<environment>
-							<os>win32</os>
-							<ws>win32</ws>
-							<arch>x86</arch>
-						</environment>
-						<environment>
-							<os>win32</os>
-							<ws>win32</ws>
-							<arch>x86_64</arch>
-						</environment>
-						
-						<!-- Linux -->
-						<environment>
-							<os>linux</os>
-							<ws>gtk</ws>
-							<arch>x86</arch>
-						</environment>
-						<environment>
-							<os>linux</os>
-							<ws>gtk</ws>
-							<arch>x86_64</arch>
-						</environment>
-					</environments>
+					<encoding>UTF-8</encoding>
 				</configuration>
 			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-resources-plugin</artifactId>
+				<version>2.4.1</version>
+				<configuration>
+					<encoding>UTF-8</encoding>
+				</configuration>
+			</plugin>
 		</plugins>
-	</build>
+	</pluginManagement>
 
 	<scm>
 		<connection>scm:svn:http://dev.eclipse.org/svnroot/soa/org.eclipse.stp.sca-tools/org.eclipse.stp.sca/</connection>

Modified: org.eclipse.stp.sca/trunk/update-site/pom.xml
===================================================================
--- org.eclipse.stp.sca/trunk/update-site/pom.xml	2011-05-23 13:31:00 UTC (rev 3650)
+++ org.eclipse.stp.sca/trunk/update-site/pom.xml	2011-05-24 07:13:27 UTC (rev 3651)
@@ -138,7 +138,7 @@
 							<execution>
 								<id>sign</id>
 								<configuration>
-									<inputFile>${project.build.directory}/site.zip</inputFile>
+									<inputFile>${project.build.directory}/packed/site.zip</inputFile>
 									<signerInputDirectory>/home/data/httpd/download-staging.priv/stp/</signerInputDirectory>
 								</configuration>
 								<phase>package</phase>