Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnna Dushistova2013-10-30 20:23:04 -0400
committerAnna Dushistova2013-10-30 20:23:04 -0400
commit7022e38ff5dcfddabc6882394a408344e8f1ed57 (patch)
tree9a34ad0623c5ab3fecf19cfd4f8f6258047bd441
parent6d270ff0b77d3858e574b9c7415e41a746cbc142 (diff)
downloadorg.eclipse.tcf-7022e38ff5dcfddabc6882394a408344e8f1ed57.tar.gz
org.eclipse.tcf-7022e38ff5dcfddabc6882394a408344e8f1ed57.tar.xz
org.eclipse.tcf-7022e38ff5dcfddabc6882394a408344e8f1ed57.zip
Replaced the signing method with the one used in master now.
Signed-off-by: Anna Dushistova <anna.dushistova@gmail.com>
-rw-r--r--admin/pom-config.xml505
-rw-r--r--features/org.eclipse.tcf.repo/pom.xml50
2 files changed, 268 insertions, 287 deletions
diff --git a/admin/pom-config.xml b/admin/pom-config.xml
index df46e899b..b5aefdb6b 100644
--- a/admin/pom-config.xml
+++ b/admin/pom-config.xml
@@ -1,239 +1,270 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
-
- <prerequisites>
- <maven>3.0</maven>
- </prerequisites>
-
- <groupId>org.eclipse.tcf</groupId>
- <artifactId>org.eclipse.tcf.maven-config</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- <packaging>pom</packaging>
- <name>TCF and Target Explorer, Maven Configuration Master</name>
-
- <licenses>
- <license>
- <name>Eclipse Public License</name>
- <url>http://www.eclipse.org/legal/epl-v10.html</url>
- <distribution>repo</distribution>
- </license>
- </licenses>
-
- <organization>
- <name>Eclipse Foundation</name>
- <url>http://www.eclipse.org/</url>
- </organization>
-
- <properties>
- <!-- Define version id's to be used in the plugins section -->
- <tycho-version>0.14.1</tycho-version>
- <maven-resources-version>2.5</maven-resources-version>
- <maven-antrun-version>1.7</maven-antrun-version>
- <gmaven-version>1.4</gmaven-version>
- <exec-maven-version>1.2.1</exec-maven-version>
- <findbugs-version>2.4.1-SNAPSHOT</findbugs-version>
- <jacoco-version>0.5.6.201201232323</jacoco-version>
-
- <!-- Common global properties -->
- <adminDir>${env.WORKSPACE}/admin</adminDir>
-
- <!-- JaCoCo global properties -->
- <jacoco.skip>false</jacoco.skip>
- <jacoco.output>file</jacoco.output>
- <jacoco.dumpOnExit>true</jacoco.dumpOnExit>
-
- <!-- 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>
- <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>
- </properties>
-
- <repositories>
- <repository>
- <id>platform</id>
- <url>${platform-site}</url>
- <layout>p2</layout>
- </repository>
- <repository>
- <id>orbit</id>
- <url>${orbit-site}</url>
- <layout>p2</layout>
- </repository>
- <repository>
- <id>cdt</id>
- <url>${cdt-site}</url>
- <layout>p2</layout>
- </repository>
- <repository>
- <id>tm</id>
- <url>${tm-site}</url>
- <layout>p2</layout>
- </repository>
- <repository>
- <id>rxtx</id>
- <url>${rxtx-site}</url>
- <layout>p2</layout>
- </repository>
- </repositories>
-
- <pluginRepositories>
- <pluginRepository>
- <id>repo.eclipse.org</id>
- <url>https://repo.eclipse.org/content/repositories/cbi-releases/</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- </pluginRepository>
- <pluginRepository>
- <id>sonatype</id>
- <url>https://repository.sonatype.org/content/repositories/public</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- </pluginRepository>
- </pluginRepositories>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-maven-plugin</artifactId>
- <version>${tycho-version}</version>
- <extensions>true</extensions>
- </plugin>
- </plugins>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-maven-plugin</artifactId>
- <version>${tycho-version}</version>
- <extensions>true</extensions>
- </plugin>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>target-platform-configuration</artifactId>
- <version>${tycho-version}</version>
- <configuration>
- <environments>
- <environment>
- <os>linux</os>
- <ws>gtk</ws>
- <arch>x86</arch>
- </environment>
- <environment>
- <os>linux</os>
- <ws>gtk</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>
- </environments>
- <resolver>p2</resolver>
- <ignoreTychoRepositories>true</ignoreTychoRepositories>
- <pomDependencies>consider</pomDependencies>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-compiler-plugin</artifactId>
- <version>${tycho-version}</version>
- <configuration>
- <encoding>UTF-8</encoding>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-source-plugin</artifactId>
- <version>${tycho-version}</version>
- <configuration>
- <encoding>UTF-8</encoding>
- </configuration>
- <executions>
- <execution>
- <id>plugin-source</id>
- <goals>
- <goal>plugin-source</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-packaging-plugin</artifactId>
- <version>${tycho-version}</version>
- <configuration>
- <strictBinIncludes>false</strictBinIncludes>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
- <version>${maven-resources-version}</version>
- <configuration>
- <encoding>ISO-8859-1</encoding>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <version>${maven-antrun-version}</version>
- </plugin>
- <plugin>
- <groupId>org.codehaus.gmaven</groupId>
- <artifactId>gmaven-plugin</artifactId>
- <version>${gmaven-version}</version>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>exec-maven-plugin</artifactId>
- <version>${exec-maven-version}</version>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>findbugs-maven-plugin</artifactId>
- <version>${findbugs-version}</version>
- <configuration>
- <encoding>UTF-8</encoding>
- <effort>Max</effort>
- <threshold>Low</threshold>
- <xmlOutput>true</xmlOutput>
- <failOnError>false</failOnError>
- <excludeFilterFile>${adminDir}/findbugs-exclude.xml</excludeFilterFile>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.jacoco</groupId>
- <artifactId>jacoco-maven-plugin</artifactId>
- <version>${jacoco-version}</version>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <prerequisites>
+ <maven>3.0</maven>
+ </prerequisites>
+ <groupId>org.eclipse.tcf</groupId>
+ <artifactId>org.eclipse.tcf.maven-config</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+ <name>TCF and Target Explorer, Maven Configuration Master</name>
+ <licenses>
+ <license>
+ <name>Eclipse Public License</name>
+ <url>http://www.eclipse.org/legal/epl-v10.html</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+ <organization>
+ <name>Eclipse Foundation</name>
+ <url>http://www.eclipse.org/</url>
+ </organization>
+ <properties>
+ <!-- Define version id's to be used in the plugins section -->
+ <tycho-version>0.14.1</tycho-version>
+ <maven-resources-version>2.5</maven-resources-version>
+ <maven-antrun-version>1.7</maven-antrun-version>
+ <gmaven-version>1.4</gmaven-version>
+ <exec-maven-version>1.2.1</exec-maven-version>
+ <findbugs-version>2.4.1-SNAPSHOT</findbugs-version>
+ <jacoco-version>0.5.6.201201232323</jacoco-version>
+ <eclipse-jarsigner-version>1.0.4</eclipse-jarsigner-version>
+ <!-- Common global properties -->
+ <adminDir>${env.WORKSPACE}/admin</adminDir>
+ <!-- JaCoCo global properties -->
+ <jacoco.skip>false</jacoco.skip>
+ <jacoco.output>file</jacoco.output>
+ <jacoco.dumpOnExit>true</jacoco.dumpOnExit>
+ <!-- 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>
+ <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>
+ </properties>
+ <repositories>
+ <repository>
+ <id>platform</id>
+ <url>${platform-site}</url>
+ <layout>p2</layout>
+ </repository>
+ <repository>
+ <id>orbit</id>
+ <url>${orbit-site}</url>
+ <layout>p2</layout>
+ </repository>
+ <repository>
+ <id>cdt</id>
+ <url>${cdt-site}</url>
+ <layout>p2</layout>
+ </repository>
+ <repository>
+ <id>tm</id>
+ <url>${tm-site}</url>
+ <layout>p2</layout>
+ </repository>
+ <repository>
+ <id>rxtx</id>
+ <url>${rxtx-site}</url>
+ <layout>p2</layout>
+ </repository>
+ </repositories>
+ <pluginRepositories>
+ <pluginRepository>
+ <id>repo.eclipse.org</id>
+ <url>https://repo.eclipse.org/content/repositories/cbi-releases/</url>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </pluginRepository>
+ <pluginRepository>
+ <id>sonatype</id>
+ <url>https://repository.sonatype.org/content/repositories/public</url>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </pluginRepository>
+ </pluginRepositories>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-maven-plugin</artifactId>
+ <version>${tycho-version}</version>
+ <extensions>true</extensions>
+ </plugin>
+ </plugins>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-maven-plugin</artifactId>
+ <version>${tycho-version}</version>
+ <extensions>true</extensions>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>target-platform-configuration</artifactId>
+ <version>${tycho-version}</version>
+ <configuration>
+ <environments>
+ <environment>
+ <os>linux</os>
+ <ws>gtk</ws>
+ <arch>x86</arch>
+ </environment>
+ <environment>
+ <os>linux</os>
+ <ws>gtk</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>
+ </environments>
+ <resolver>p2</resolver>
+ <ignoreTychoRepositories>true</ignoreTychoRepositories>
+ <pomDependencies>consider</pomDependencies>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-compiler-plugin</artifactId>
+ <version>${tycho-version}</version>
+ <configuration>
+ <encoding>UTF-8</encoding>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-source-plugin</artifactId>
+ <version>${tycho-version}</version>
+ <configuration>
+ <encoding>UTF-8</encoding>
+ </configuration>
+ <executions>
+ <execution>
+ <id>plugin-source</id>
+ <goals>
+ <goal>plugin-source</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-packaging-plugin</artifactId>
+ <version>${tycho-version}</version>
+ <configuration>
+ <strictBinIncludes>false</strictBinIncludes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>${maven-resources-version}</version>
+ <configuration>
+ <encoding>ISO-8859-1</encoding>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>${maven-antrun-version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.gmaven</groupId>
+ <artifactId>gmaven-plugin</artifactId>
+ <version>${gmaven-version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <version>${exec-maven-version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>findbugs-maven-plugin</artifactId>
+ <version>${findbugs-version}</version>
+ <configuration>
+ <encoding>UTF-8</encoding>
+ <effort>Max</effort>
+ <threshold>Low</threshold>
+ <xmlOutput>true</xmlOutput>
+ <failOnError>false</failOnError>
+ <excludeFilterFile>${adminDir}/findbugs-exclude.xml</excludeFilterFile>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.jacoco</groupId>
+ <artifactId>jacoco-maven-plugin</artifactId>
+ <version>${jacoco-version}</version>
+ </plugin>
+ <!-- Pack200 and Signing -->
+ <plugin>
+ <groupId>org.eclipse.tycho.extras</groupId>
+ <artifactId>tycho-pack200a-plugin</artifactId>
+ <version>${tycho-version}</version>
+ <executions>
+ <execution>
+ <id>pack200-normalize</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>normalize</goal>
+ </goals>
+ </execution>
+ </executions>
+ </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>verify</phase>
+ <goals>
+ <goal>sign</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.tycho.extras</groupId>
+ <artifactId>tycho-pack200b-plugin</artifactId>
+ <version>${tycho-version}</version>
+ <executions>
+ <execution>
+ <id>pack200-pack</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>pack</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
</project>
diff --git a/features/org.eclipse.tcf.repo/pom.xml b/features/org.eclipse.tcf.repo/pom.xml
index 4d9b95fa2..cc6dfb0b2 100644
--- a/features/org.eclipse.tcf.repo/pom.xml
+++ b/features/org.eclipse.tcf.repo/pom.xml
@@ -28,56 +28,6 @@
<id>sign</id>
<build>
<plugins>
- <plugin>
- <groupId>org.eclipse.cbi.maven.plugins</groupId>
- <artifactId>eclipse-jarsigner-plugin</artifactId>
- <version>1.0.3</version>
- <executions>
- <!-- Pack the p2 repository. -->
- <execution>
- <id>pack</id>
- <phase>package</phase>
- <configuration>
- <inputFile>${project.build.directory}/${tcf-zipfile}</inputFile>
- </configuration>
- <goals>
- <goal>pack</goal>
- </goals>
- </execution>
- <!-- Sign the p2 repository -->
- <execution>
- <id>sign</id>
- <configuration>
- <inputFile>${project.build.directory}/${tcf-zipfile}</inputFile>
- <signerInputDirectory>/home/data/httpd/download-staging.priv/tools/tcf/hudson</signerInputDirectory>
- </configuration>
- <phase>package</phase>
- <goals>
- <goal>sign</goal>
- </goals>
- </execution>
- <!-- Repack the p2 repository -->
- <execution>
- <id>repack</id>
- <configuration>
- <!-- this is output from signer mojo -->
- <inputFile>${project.build.directory}/signed/site_assembly.zip</inputFile>
- </configuration>
- <phase>package</phase>
- <goals>
- <goal>pack</goal>
- </goals>
- </execution>
- <!-- Signing and packing alters checksums so fix them -->
- <execution>
- <id>fixCheckSums</id>
- <phase>package</phase>
- <goals>
- <goal>fixCheckSums</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
<!--
This is what I use to deploy a p2 repository someplace to test from before manually making active.
-->

Back to the top