Updating develop poms back to pre merge state

[taxeditor.git] / eu.etaxonomy.taxeditor / pom.xml

diff --git a/eu.etaxonomy.taxeditor/pom.xml b/eu.etaxonomy.taxeditor/pom.xml
index a40f8c6cffc202fe1ac05bf8320f2cf1fcd3d7a3..09c338c76e97538ae64f8ecb946f9b16d03af2c7 100644 (file)
--- a/eu.etaxonomy.taxeditor/pom.xml
+++ b/eu.etaxonomy.taxeditor/pom.xml
@@ -1,9 +1,8 @@
-<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">
+<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>
+    <version>3.8.0-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
@@ -13,7 +12,9 @@
   <name>EDIT Taxonomic Editor Product</name>
   <description>The EDIT Taxonomic Desktop Editor</description>
   <url>http://wp5.e-taxonomy.eu/taxeditor</url>
-
+  <properties>    
+    <product.id>eu.etaxonomy.taxeditor.product</product.id>
+  </properties>
   <build>
     <plugins>
       <plugin>
@@ -37,7 +38,7 @@
         <configuration>
           <products>
             <product>
-              <id>eu.etaxonomy.taxeditor.product</id>
+              <id>${product.id}</id>
               <rootFolder>EDIT Taxonomic Editor</rootFolder>
             </product>
           </products>
@@ -55,24 +56,30 @@
             <artifactId>maven-jarsigner-plugin</artifactId>
             <version>1.3.2</version>
             <configuration>
+              <alias>editor</alias>
+              <removeExistingSignatures>true</removeExistingSignatures>
+              <!-- keystore properties should be set in the ~/.m2/settings.xml -->
               <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>
+              <!-- Following two settings are to ensure that the product 
+                .zip files are not signed -->
+              <processMainArtifact>false</processMainArtifact>
+              <processAttachedArtifacts>false</processAttachedArtifacts>
               <includes>
-                <include>**/eu.etaxonomy.taxeditor*.jar</include>
+                <include>plugins/eu.etaxonomy.taxeditor*.jar</include>
+                <include>features/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>
+                  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>
@@ -89,6 +96,8 @@
     </profile>
     <profile>
       <!-- Upload the repo to the server -->
+      <!-- ATTENTION : This does not work well currently since the file permissions 
+        are set with read permission set to off after upload -->
       <id>uploadRepo</id>
       <build>
         <plugins>
@@ -109,7 +118,9 @@
             <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>
+              <includes>
+                binary/*,content.jar,artifacts.jar,**/eu.etaxonomy.*.jar
+              </includes>
               <!-- Comment out the above and uncomment the below to upload 
                 all jars -->
               <!-- <includes>**/*</includes> -->