Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitignore6
-rw-r--r--admin/pom-build.xml16
-rw-r--r--admin/pom-config.xml15
-rw-r--r--features/org.eclipse.tcf.repo/pom.xml9
4 files changed, 38 insertions, 8 deletions
diff --git a/.gitignore b/.gitignore
index 85092af50..593bba4a5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -68,6 +68,8 @@ tests/plugins/org.eclipse.tcf.debug.test/bin
# Target Explorer
/target_explorer/coverage/
+/target_explorer/plugins/org.eclipse.tcf.te/target
+/target_explorer/plugins/org.eclipse.tcf.te/bin
/target_explorer/plugins/org.eclipse.tcf.te.core/target
/target_explorer/plugins/org.eclipse.tcf.te.core/bin
/target_explorer/plugins/org.eclipse.tcf.te.core.cdt/target
@@ -150,6 +152,10 @@ tests/plugins/org.eclipse.tcf.debug.test/bin
/target_explorer/features/org.eclipse.tcf.te.feature/bin
/target_explorer/features/org.eclipse.tcf.te.sdk.feature/target
/target_explorer/features/org.eclipse.tcf.te.sdk.feature/bin
+/target_explorer/features/org.eclipse.tcf.te.tcf.core.feature/target
+/target_explorer/features/org.eclipse.tcf.te.tcf.core.feature/bin
+/target_explorer/features/org.eclipse.tcf.te.tcf.core.sdk.feature/target
+/target_explorer/features/org.eclipse.tcf.te.tcf.core.sdk.feature/bin
/target_explorer/features/org.eclipse.tcf.te.tcf.feature/target
/target_explorer/features/org.eclipse.tcf.te.tcf.feature/bin
/target_explorer/features/org.eclipse.tcf.te.tcf.sdk.feature/target
diff --git a/admin/pom-build.xml b/admin/pom-build.xml
index 98012fe2e..925e5602f 100644
--- a/admin/pom-build.xml
+++ b/admin/pom-build.xml
@@ -36,6 +36,22 @@
<profiles>
<profile>
+ <id>sign-new</id>
+ <!-- Uses the new jarsigner from the CBI platform -->
+ <!-- Not deployed to nexus yet. Must be build locally -->
+ <!-- before running this profile. -->
+ <!-- See http://wiki.eclipse.org/Platform-releng/Platform_Build#Building for details -->
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.cbi.maven.plugins</groupId>
+ <artifactId>eclipse-jarsigner-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <profile>
<id>findbugs</id>
<build>
diff --git a/admin/pom-config.xml b/admin/pom-config.xml
index 3d2374c19..239d5e658 100644
--- a/admin/pom-config.xml
+++ b/admin/pom-config.xml
@@ -37,6 +37,7 @@
<findbugs-version>2.5.2</findbugs-version>
<!-- Check available versions at https://repository.sonatype.org/content/repositories/public/org/jacoco/jacoco-maven-plugin -->
<jacoco-version>0.5.9.201207300726</jacoco-version>
+ <eclipse-jarsigner-version>1.0.2-SNAPSHOT</eclipse-jarsigner-version>
<!-- Common global properties -->
<adminDir>${env.WORKSPACE}/admin</adminDir>
@@ -242,6 +243,20 @@
<artifactId>jacoco-maven-plugin</artifactId>
<version>${jacoco-version}</version>
</plugin>
+ <plugin>
+ <groupId>org.eclipse.cbi.maven.plugins</groupId>
+ <artifactId>eclipse-jarsigner-plugin</artifactId>
+ <version>${eclipse-jarsigner-version}</version>
+ <executions>
+ <execution>
+ <id>sign</id>
+ <phase>package</phase>
+ <goals>
+ <goal>sign</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</pluginManagement>
</build>
diff --git a/features/org.eclipse.tcf.repo/pom.xml b/features/org.eclipse.tcf.repo/pom.xml
index 29eab14c7..9ba35dece 100644
--- a/features/org.eclipse.tcf.repo/pom.xml
+++ b/features/org.eclipse.tcf.repo/pom.xml
@@ -16,11 +16,8 @@
<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>
@@ -41,8 +38,6 @@
<id>pack</id>
<phase>package</phase>
<configuration>
- <pack200>${pack200}</pack200>
- <javaExecutable>${javaExecutable}</javaExecutable>
<inputFile>${project.build.directory}/${tcf-zipfile}</inputFile>
</configuration>
<goals>
@@ -54,7 +49,7 @@
<id>sign</id>
<configuration>
<inputFile>${project.build.directory}/${tcf-zipfile}</inputFile>
- <signerInputDirectory>${tcf-signerInputDirector}</signerInputDirectory>
+ <signerInputDirectory>/home/data/httpd/download-staging.priv/tools/tcf/hudson</signerInputDirectory>
</configuration>
<phase>package</phase>
<goals>
@@ -65,8 +60,6 @@
<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>

Back to the top