Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUwe Stieber2012-10-07 11:17:24 +0000
committerUwe Stieber2012-10-07 11:17:24 +0000
commit40dc34359a01dc3de4a7991eb818e783ca6608c1 (patch)
tree050e61129e656368ef6f0ba306156bf2362d4f46
parent4e557a0996f1951f16524f093bbdb30d3059c562 (diff)
downloadorg.eclipse.tcf-40dc34359a01dc3de4a7991eb818e783ca6608c1.tar.gz
org.eclipse.tcf-40dc34359a01dc3de4a7991eb818e783ca6608c1.tar.xz
org.eclipse.tcf-40dc34359a01dc3de4a7991eb818e783ca6608c1.zip
Releng: Switch to CDT official milestones and make signing more configurable
-rw-r--r--admin/pom-config.xml2
-rw-r--r--features/org.eclipse.tcf.repo/pom.xml11
2 files changed, 11 insertions, 2 deletions
diff --git a/admin/pom-config.xml b/admin/pom-config.xml
index e5d1448cb..3d2374c19 100644
--- a/admin/pom-config.xml
+++ b/admin/pom-config.xml
@@ -48,7 +48,7 @@
<!-- P2 repository URL's -->
<platform-site>http://download.eclipse.org/eclipse/updates/3.8</platform-site>
- <cdt-site>http://download.eclipse.org/tools/cdt/builds/juno/nightly</cdt-site>
+ <cdt-site>http://download.eclipse.org/tools/cdt/releases/juno</cdt-site>
<tm-site>http://download.eclipse.org/tm/updates/3.4/</tm-site>
<rxtx-site>http://rxtx.qbang.org/eclipse</rxtx-site>
<orbit-site>http://download.eclipse.org/tools/orbit/downloads/drops/R20120526062928/repository/</orbit-site>
diff --git a/features/org.eclipse.tcf.repo/pom.xml b/features/org.eclipse.tcf.repo/pom.xml
index 9ba35dece..9ce61a853 100644
--- a/features/org.eclipse.tcf.repo/pom.xml
+++ b/features/org.eclipse.tcf.repo/pom.xml
@@ -16,8 +16,11 @@
<packaging>eclipse-repository</packaging>
<properties>
+ <pack200>/shared/common/jdk-1.5.0-22.x86_64/bin</pack200>
+ <javaExecutable>/usr/local/bin/java</javaExecutable>
<tcf-stream>development</tcf-stream>
<tcf-zipfile>org.eclipse.tcf.repo.zip</tcf-zipfile>
+ <tcf-signerInputDirectory>/home/data/httpd/download-staging.priv/tools/tcf/hudson</tcf-signerInputDirectory>
<tcf-install>/home/data/httpd/download.eclipse.org/tools/tcf/builds/${tcf-stream}/nightly</tcf-install>
<jacoco.skip>true</jacoco.skip>
</properties>
@@ -38,6 +41,8 @@
<id>pack</id>
<phase>package</phase>
<configuration>
+ <pack200>${pack200}</pack200>
+ <javaExecutable>${javaExecutable}</javaExecutable>
<inputFile>${project.build.directory}/${tcf-zipfile}</inputFile>
</configuration>
<goals>
@@ -49,7 +54,7 @@
<id>sign</id>
<configuration>
<inputFile>${project.build.directory}/${tcf-zipfile}</inputFile>
- <signerInputDirectory>/home/data/httpd/download-staging.priv/tools/tcf/hudson</signerInputDirectory>
+ <signerInputDirectory>${tcf-signerInputDirector}</signerInputDirectory>
</configuration>
<phase>package</phase>
<goals>
@@ -60,6 +65,8 @@
<execution>
<id>repack</id>
<configuration>
+ <pack200>${pack200}</pack200>
+ <javaExecutable>${javaExecutable}</javaExecutable>
<!-- this is output from signer mojo -->
<inputFile>${project.build.directory}/signed/site_assembly.zip</inputFile>
</configuration>
@@ -81,6 +88,7 @@
<!--
This is what I use to deploy a p2 repository someplace to test from before manually making active.
-->
+<!--
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
@@ -124,6 +132,7 @@
</execution>
</executions>
</plugin>
+-->
</plugins>
</build>
</profile>

Back to the top