Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUwe Stieber2012-10-07 14:33:06 +0000
committerUwe Stieber2012-10-07 14:33:06 +0000
commit36bf6af2940963b131c89b89ff29585353fe5c85 (patch)
tree16caff40d0437a04caa83cfabd1a747629317f20
parent22f044871308576080d32e63f1d2f560c4c460f8 (diff)
downloadorg.eclipse.tcf-36bf6af2940963b131c89b89ff29585353fe5c85.tar.gz
org.eclipse.tcf-36bf6af2940963b131c89b89ff29585353fe5c85.tar.xz
org.eclipse.tcf-36bf6af2940963b131c89b89ff29585353fe5c85.zip
Releng: Fix repository deploy step, remove old "sign" profile, rename profile "sign-new" into "sign"
-rw-r--r--admin/pom-build.xml2
-rw-r--r--features/org.eclipse.tcf.repo/pom.xml114
2 files changed, 2 insertions, 114 deletions
diff --git a/admin/pom-build.xml b/admin/pom-build.xml
index 5a6fe7ee7..87fabe764 100644
--- a/admin/pom-build.xml
+++ b/admin/pom-build.xml
@@ -36,7 +36,7 @@
<profiles>
<profile>
- <id>sign-new</id>
+ <id>sign</id>
<!-- Uses the new jarsigner from the CBI platform -->
<!-- Not deployed to nexus yet. Must be build locally -->
<!-- before running this profile. -->
diff --git a/features/org.eclipse.tcf.repo/pom.xml b/features/org.eclipse.tcf.repo/pom.xml
index d7452d72e..a64477463 100644
--- a/features/org.eclipse.tcf.repo/pom.xml
+++ b/features/org.eclipse.tcf.repo/pom.xml
@@ -29,59 +29,6 @@
<build>
<plugins>
<plugin>
- <groupId>org.eclipse.dash.maven</groupId>
- <artifactId>eclipse-signing-maven-plugin</artifactId>
- <version>1.0.5</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.
- -->
- <plugin>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
@@ -96,68 +43,9 @@
<fileset dir="${tcf-install}">
<include name="**" />
</fileset>
- <fileset dir="target">
- <include name="${tcf-zipfile}"/>
- </fileset>
</delete>
- <zip destfile="target/${tcf-zipfile}">
- <fileset dir="target/checksumFix">
- <include name="**"/>
- </fileset>
- </zip>
- <copy includeemptydirs="false" todir="${tcf-install}">
- <fileset dir="target/checksumFix">
- <include name="**"/>
- </fileset>
- <fileset dir="target">
- <include name="${tcf-zipfile}"/>
- </fileset>
- </copy>
- <chmod perm="g+w">
- <fileset dir="${tcf-install}">
- <include name="**"/>
- </fileset>
- </chmod>
- </target>
-
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- <profile>
- <id>sign-new</id>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>deploy</id>
- <phase>install</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <target>
- <delete includeemptydirs="false">
- <fileset dir="${tcf-install}">
- <include name="**" />
- </fileset>
- <fileset dir="target">
- <include name="${tcf-zipfile}"/>
- </fileset>
- </delete>
- <zip destfile="target/${tcf-zipfile}">
- <fileset dir="target/checksumFix">
- <include name="**"/>
- </fileset>
- </zip>
<copy includeemptydirs="false" todir="${tcf-install}">
- <fileset dir="target/checksumFix">
+ <fileset dir="target/repository">
<include name="**"/>
</fileset>
<fileset dir="target">

Back to the top