adding signing of jars to maven package phase

P2Util : added snapshot dir to list of hardocded sites
eu.etaxonomy.taxeditor/pom.xml : added signJars and uploadRepo (from parent pom) profiles
pom.xml : removed uploadRepo (from parent pom) profile
feature.xml : removed update configurator plugin as it clashes with simple configurator

diff --git a/eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/update/P2Util.java b/eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/update/P2Util.java
index 13ecaafddcb8f446724c29be4e815bb979201cbb..f73213854e72a1acd50b58567735a5a93e2038e2 100644 (file)
--- a/eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/update/P2Util.java
+++ b/eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/update/P2Util.java
@@ -44,8 +44,9 @@ import eu.etaxonomy.taxeditor.model.MessagingUtils;
  */
 public class P2Util {
 
  */
 public class P2Util {
 

-    //private static String LOCAL_UPDATE_SITE = "file:///home/cmathew/Development/EDIT/taxeditor/eu.etaxonomy.taxeditor/target/repository/";
+    //private static String LOCAL_UPDATE_SITE = "file:///path/.../to/Development/EDIT/taxeditor/eu.etaxonomy.taxeditor/target/repository/";

     private static String EDIT_NIGHTLY_UPDATE_SITE = "http://cybertaxonomy.eu/download/taxeditor/update/nightly/";
     private static String EDIT_NIGHTLY_UPDATE_SITE = "http://cybertaxonomy.eu/download/taxeditor/update/nightly/";

+    private static String EDIT_SNAPSHOT_UPDATE_SITE = "http://cybertaxonomy.eu/download/taxeditor/update/snapshot/";

     private static String EDIT_STABLE_UPDATE_SITE = "http://cybertaxonomy.eu/download/taxeditor/update/stable/";
 
     public static void setUpdateRepositories(UpdateOperation operation) throws URISyntaxException {
     private static String EDIT_STABLE_UPDATE_SITE = "http://cybertaxonomy.eu/download/taxeditor/update/stable/";
 
     public static void setUpdateRepositories(UpdateOperation operation) throws URISyntaxException {

diff --git a/eu.etaxonomy.taxeditor.feature.platform/feature.xml b/eu.etaxonomy.taxeditor.feature.platform/feature.xml
index 99be545557e7f8e1a45def13210b8c2665ca9767..c9e4f2148fa6a47993c2ec2b79b196c52ffd877a 100644 (file)
--- a/eu.etaxonomy.taxeditor.feature.platform/feature.xml
+++ b/eu.etaxonomy.taxeditor.feature.platform/feature.xml
@@ -300,13 +300,6 @@ Software distributed under the License is distributed on an "AS IS" ba
          version="0.0.0"
          unpack="false"/>
 
          version="0.0.0"
          unpack="false"/>
 

-   <plugin
-         id="org.eclipse.update.configurator"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-

    <plugin
          id="org.eclipse.update.core"
          download-size="0"
    <plugin
          id="org.eclipse.update.core"
          download-size="0"

diff --git a/eu.etaxonomy.taxeditor/pom.xml b/eu.etaxonomy.taxeditor/pom.xml
index 9f1dcc88e0c518d2e3f5ffd836b6c2a1d4daeff4..a40f8c6cffc202fe1ac05bf8320f2cf1fcd3d7a3 100644 (file)
--- a/eu.etaxonomy.taxeditor/pom.xml
+++ b/eu.etaxonomy.taxeditor/pom.xml
@@ -1,49 +1,124 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 <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">
-       <parent>
-               <groupId>eu.etaxonomy</groupId>
-               <artifactId>taxeditor-parent</artifactId>
-               <version>3.3.8-SNAPSHOT</version>
-       </parent>
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <parent>
+    <groupId>eu.etaxonomy</groupId>
+    <artifactId>taxeditor-parent</artifactId>
+    <version>3.3.8-SNAPSHOT</version>
+  </parent>

 
 

-       <modelVersion>4.0.0</modelVersion>
-       <artifactId>eu.etaxonomy.taxeditor</artifactId>
-       <packaging>eclipse-repository</packaging>
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>eu.etaxonomy.taxeditor</artifactId>
+  <packaging>eclipse-repository</packaging>

 
 

-       <name>EDIT Taxonomic Editor Product</name>
-       <description>The EDIT Taxonomic Desktop Editor</description>
-       <url>http://wp5.e-taxonomy.eu/taxeditor</url>
+  <name>EDIT Taxonomic Editor Product</name>
+  <description>The EDIT Taxonomic Desktop Editor</description>
+  <url>http://wp5.e-taxonomy.eu/taxeditor</url>

 
 

-       <build>
-               <plugins>
-                       <plugin>
-                               <groupId>org.eclipse.tycho</groupId>
-                               <artifactId>tycho-p2-director-plugin</artifactId>
-                               <version>${tycho.version}</version>
-                               <executions>
-                                       <execution>
-                                               <id>materialize-products</id>
-                                               <goals>
-                                                       <goal>materialize-products</goal>
-                                               </goals>
-                                       </execution>
-                                       <execution>
-                                               <id>archive-products</id>
-                                               <goals>
-                                                       <goal>archive-products</goal>
-                                               </goals>
-                                       </execution>
-                               </executions>
-                               <configuration>
-                                       <products>
-                                               <product>
-                                                       <id>eu.etaxonomy.taxeditor.product</id>
-                                                       <rootFolder>EDIT Taxonomic Editor</rootFolder>
-                                               </product>
-                                       </products>
-                               </configuration>
-                       </plugin>
-               </plugins>
-       </build>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.eclipse.tycho</groupId>
+        <artifactId>tycho-p2-director-plugin</artifactId>
+        <version>${tycho.version}</version>
+        <executions>
+          <execution>
+            <id>materialize-products</id>
+            <goals>
+              <goal>materialize-products</goal>
+            </goals>
+          </execution>
+          <execution>
+            <id>archive-products</id>
+            <goals>
+              <goal>archive-products</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <products>
+            <product>
+              <id>eu.etaxonomy.taxeditor.product</id>
+              <rootFolder>EDIT Taxonomic Editor</rootFolder>
+            </product>
+          </products>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+  <profiles>
+    <profile>
+      <id>signJars</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-jarsigner-plugin</artifactId>
+            <version>1.3.2</version>
+            <configuration>
+              <keystore>${keystore.path}</keystore>
+              <storepass>${keystore.store.password}</storepass>
+              <alias>editor</alias>
+              <keypass>${keystore.key.password}</keypass>
+              <removeExistingSignatures>true</removeExistingSignatures>
+              <archiveDirectory>${project.build.directory}/repository</archiveDirectory>
+              <includes>
+                <include>**/eu.etaxonomy.taxeditor*.jar</include>
+              </includes>
+              <excludes>
+                <exclude>**/*.zip</exclude>
+              </excludes>
+              <arguments>
+                <!-- Due to bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=378155 
+                     we need to force the signature / digest algorithm to SHA1 since
+                     this is the only one which plays well with Eclipse 3.x -->
+                <argument>-sigalg</argument><argument>SHA1withDSA</argument>
+                <argument>-digestalg</argument><argument>SHA1</argument>
+              </arguments>
+            </configuration>
+            <executions>
+              <execution>
+                <id>sign</id>
+                <goals>
+                  <goal>sign</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+    <profile>
+      <!-- Upload the repo to the server -->
+      <id>uploadRepo</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>wagon-maven-plugin</artifactId>
+            <version>1.0-beta-3</version>
+            <!-- Problems with the wagon-maven-plugin have been encounterd 
+              on Windows, it should work properly on linux though. -->
+            <executions>
+              <execution>
+                <phase>package</phase>
+                <goals>
+                  <goal>upload</goal>
+                </goals>
+              </execution>
+            </executions>
+            <configuration>
+              <fromDir>${project.build.directory}/repository</fromDir>
+              <url>scpexe://wp5.e-taxonomy.eu/var/www/download/taxeditor/update/${update.dir}</url>
+              <includes>binary/*,content.jar,artifacts.jar,**/eu.etaxonomy.*.jar</includes>
+              <!-- Comment out the above and uncomment the below to upload 
+                all jars -->
+              <!-- <includes>**/*</includes> -->
+              <serverId>wp5.e-taxonomy.eu</serverId>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>

 
 </project>
\ No newline at end of file
 
 </project>
\ No newline at end of file

diff --git a/pom.xml b/pom.xml
index 5faf642af1b562b659730fcd70497e37da8036b8..6c7798a66459587a4f99b9f848108a4317cd4c41 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,8 @@
   <artifactId>taxeditor-parent</artifactId>
   <version>3.3.8-SNAPSHOT</version>
   <name>EDIT Taxonomic Editor</name>
   <artifactId>taxeditor-parent</artifactId>
   <version>3.3.8-SNAPSHOT</version>
   <name>EDIT Taxonomic Editor</name>

-  <description>The Taxonomic Editor for EDIT's platform for cybertaxonomy</description>
+  <description>The Taxonomic Editor for EDIT's platform for
+    cybertaxonomy</description>

   <url>http://cybertaxonomy.eu/taxeditor//taxeditor//taxeditor//taxeditor//taxeditor//taxeditor//taxeditor/</url>
   <inceptionYear>2007</inceptionYear>
   <packaging>pom</packaging>
   <url>http://cybertaxonomy.eu/taxeditor//taxeditor//taxeditor//taxeditor//taxeditor//taxeditor//taxeditor/</url>
   <inceptionYear>2007</inceptionYear>
   <packaging>pom</packaging>


@@ -45,11 +46,11 @@
     <mailingList>
       <name>EDIT Taxonomic Editor</name>
       <subscribe>
     <mailingList>
       <name>EDIT Taxonomic Editor</name>
       <subscribe>

-                               edit-taxonomic-editor+subscribe@googlegroups.com
-                       </subscribe>
+        edit-taxonomic-editor+subscribe@googlegroups.com
+      </subscribe>

       <unsubscribe>
       <unsubscribe>

-                               edit-taxonomic-editor+unsubscribe@googlegroups.com
-                       </unsubscribe>
+        edit-taxonomic-editor+unsubscribe@googlegroups.com
+      </unsubscribe>

       <post>edit-taxonomic-editor@googlegroups.com</post>
       <archive>http://groups.google.com/group/edit-taxonomic-editor/topics</archive>
     </mailingList>
       <post>edit-taxonomic-editor@googlegroups.com</post>
       <archive>http://groups.google.com/group/edit-taxonomic-editor/topics</archive>
     </mailingList>


@@ -66,12 +67,12 @@
       <!-- your SVN account id please! -->
       <id>a.kohlbecker</id>
       <name>
       <!-- your SVN account id please! -->
       <id>a.kohlbecker</id>
       <name>

-                       Andreas Kohlbecker
-                       </name>
+        Andreas Kohlbecker
+      </name>

       <email>a.kohlbecker [at] bgbm.org</email>
       <organization>
       <email>a.kohlbecker [at] bgbm.org</email>
       <organization>

-                               Botanic Garden Botanical Museum Berlin
-                       </organization>
+        Botanic Garden Botanical Museum Berlin
+      </organization>

       <organizationUrl>http://www.bgbm.org/BioDivInf/</organizationUrl>
       <timezone>+1</timezone>
       <roles>
       <organizationUrl>http://www.bgbm.org/BioDivInf/</organizationUrl>
       <timezone>+1</timezone>
       <roles>


@@ -84,12 +85,12 @@
       <!-- your SVN account id please! -->
       <id>a.mueller</id>
       <name>
       <!-- your SVN account id please! -->
       <id>a.mueller</id>
       <name>

-                               Andreas Müller
-                       </name>
+        Andreas Müller
+      </name>

       <email>a.mueller [at] bgbm.org</email>
       <organization>
       <email>a.mueller [at] bgbm.org</email>
       <organization>

-                               Botanic Garden Botanical Museum Berlin
-                       </organization>
+        Botanic Garden Botanical Museum Berlin
+      </organization>

       <organizationUrl>http://www.bgbm.org/BioDivInf/</organizationUrl>
       <timezone>+1</timezone>
       <roles>
       <organizationUrl>http://www.bgbm.org/BioDivInf/</organizationUrl>
       <timezone>+1</timezone>
       <roles>


@@ -131,38 +132,6 @@
         </repository>
       </repositories>
     </profile>
         </repository>
       </repositories>
     </profile>

-    <profile>
-      <!-- Upload the repo to the server -->
-      <id>uploadRepo</id>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.codehaus.mojo</groupId>
-            <artifactId>wagon-maven-plugin</artifactId>
-            <version>1.0-beta-3</version>
-            <!-- Problems with the wagon-maven-plugin have been encounterd 
-              on Windows, it should work properly on linux though. -->
-            <executions>
-              <execution>
-                <phase>package</phase>
-                <goals>
-                  <goal>upload</goal>
-                </goals>
-              </execution>
-            </executions>
-            <configuration>
-              <fromDir>eu.etaxonomy.taxeditor/target/repository</fromDir>
-              <url>scpexe://wp5.e-taxonomy.eu/var/www/download/taxeditor/update/${update.dir}</url>
-              <includes>binary/*,content.jar,artifacts.jar,**/eu.etaxonomy.*.jar</includes>
-              <!-- Comment out the above and uncomment the below to upload 
-                all jars -->
-              <!-- <includes>**/*</includes> -->
-              <serverId>wp5.e-taxonomy.eu</serverId>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>

   </profiles>
   <repositories>
     <!-- the cdm internal repository -->
   </profiles>
   <repositories>
     <!-- the cdm internal repository -->