Author: schor
Date: Tue Oct 16 13:49:36 2018
New Revision: 1844016

URL: http://svn.apache.org/viewvc?rev=1844016&view=rev
Log:
[UIMA-5876] rely on moved items in uima-wide parent pom; change some checksums 
to sha512, remove md5 checksum per apache policy

Modified:
    uima/uimaj/trunk/uimaj-eclipse-update-site/pom.xml

Modified: uima/uimaj/trunk/uimaj-eclipse-update-site/pom.xml
URL: 
http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-eclipse-update-site/pom.xml?rev=1844016&r1=1844015&r2=1844016&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-eclipse-update-site/pom.xml (original)
+++ uima/uimaj/trunk/uimaj-eclipse-update-site/pom.xml Tue Oct 16 13:49:36 2018
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.uima</groupId>
     <artifactId>uimaj-parent</artifactId>
-    <version>2.10.1</version>
+    <version>2.10.3-SNAPSHOT</version>  <!-- change to non-snapshot version 
after release of uimaj-parent -->
     <relativePath />
   </parent>
 
@@ -58,15 +58,6 @@
   </properties>
 
   <build>
-
-    <pluginManagement>
-      <plugins>
-        <plugin>
-            <artifactId>maven-release-plugin</artifactId>
-            <version>2.5.3</version>
-        </plugin>
-      </plugins>
-    </pluginManagement>
     
     <plugins>
       <plugin>
@@ -122,164 +113,15 @@
 
       <plugin>
         <artifactId>maven-antrun-plugin</artifactId>
-        <version>1.7</version>
         <executions>
-          <execution>
-            <id>make-subsite-after-signing</id>
-            <configuration>
-              <target>
-                <taskdef classname="net.sf.antcontrib.logic.IfTask" name="if" 
/>
-                <!-- if the property uima-maven-build-eclipse-home is set, use 
it, otherwise don't -->
-                <condition property="eclipse.home" 
value="${uima-maven-build-eclipse-home}">
-                  <not>
-                    <equals arg1="${uima-maven-build-eclipse-home}" 
arg2="$${uima-maven-build-eclipse-home}" />
-                  </not>
-                </condition>
-
-                <property environment="envVar" />
-                <condition property="eclipse.home" 
value="${envVar.ECLIPSE_HOME}">
-                  <isset property="envVar.ECLIPSE_HOME" />
-                </condition>
-                
-                <echo>deleting previous version of packed files from 
work</echo>
-                
<echo>---------------------------------------------------</echo>
-                <delete verbose="true">
-                  <fileset dir="${eusWork}/plugins" includes="*.pack.gz" />
-                </delete>
-                
-                <echo> </echo>
-                <echo>Compressing signed plugin Jars using pack200 - this may 
take a minute or 2</echo>
-                
<echo>==========================================================================</echo>
-                <java jar="${uima-eclipse-jar-processor}" fork="true" 
failonerror="true" maxmemory="256m">
-                  <arg line="-pack" />
-                  <arg line="-verbose" />
-                  <arg line="-outputDir ${eusWork}/plugins" />
-                  <arg line="${eusWork}/plugins" />
-                </java>
-                
-                <echo> </echo>
-                <echo>Resetting the content and artifacts for the site</echo>
-                <echo>------------------------------------------------</echo>
-                
-                <delete verbose="true">
-                  <fileset dir="${eclipseUpdateSubSite}" 
includes="content.jar,artifacts.jar" />
-                </delete>
-                <copy todir="${eclipseUpdateSubSite}" failonerror="false">
-                  <fileset dir="${project.build.directory}/saved" 
includes="content.jar,artifacts.jar" />
-                </copy>
-
-                <echo> </echo>
-                <echo>Generate the p2 metadata and publish new artifacts</echo>
-                <echo>--------------------------------------------------</echo>
-                <!-- Append is needed because category info is incremental 
with each additional release -->
-                <!-- publishArtifacts is needed to generate p2 metadata for 
the pack.gz forms -->
-                <!--   - tried and failed: using ANT to copy artifacts to the 
target - doesn't update metadata
-                         for pack.gz form ! if you don't publish artifacts
-                         - doesn't update artifacts.jar 
-                       - deleting SNAPSHOT jars in the eclipse update subsite 
-                         - fails because the previous metadata has info about 
those jars  
-                           and that isn't deleted, and continues to be used
-                -->
-                <java jar="${eclipse-equinox-launcher}" fork="true" 
failonerror="true" maxmemory="256m">
-                  <arg line="-application 
org.eclipse.equinox.p2.publisher.FeaturesAndBundlesPublisher" />
-                  <arg line="-metadataRepository 
file:///${eclipseUpdateSubSite}" />
-                  <arg line="-artifactRepository 
file:///${eclipseUpdateSubSite}" />
-                  <arg line="-source ${eusWork}" />
-                  <arg line="-configs ANY.ANY.ANY" />
-                  <arg line="-publishArtifacts" />
-                  <arg line="-reusePack200Files" />
-                  <arg line="-compress" />
-                  <arg line="-append" />     
-                </java>
-                
-                <echo> </echo>
-                <echo>Augment p2 metadata with category information</echo>
-                <echo>---------------------------------------------</echo>
-                <java jar="${eclipse-equinox-launcher}" fork="true" 
failonerror="true" maxmemory="256m">
-                  <arg line="-application 
org.eclipse.equinox.p2.publisher.CategoryPublisher" />
-                  <arg line="-metadataRepository 
file:///${eclipseUpdateSubSite}" />
-                  <arg line="-categoryDefinition 
file:///${basedir}/category.xml" />
-                  <arg line="-categoryQualifier apache-uima" />
-                  <arg line="-compress" />
-                </java>  
-      
-                <echo> </echo>
-                <echo>Clearing previous checksums and signatures for eusWork 
plugins</echo>
-                <delete dir="${eusWork}">
-                  <include name="**/*.sha1" />
-                  <include name="**/*.md5" />
-                  <include name="**/*.asc" />
-                </delete>
-      
-                <echo message="Generating checksums for signed plugins" />
-                <checksum algorithm="sha1" format="MD5SUM">
-                  <fileset dir="${eusWork}">
-                    <include name="**/*.gz" />
-                    <include name="**/*.jar" />
-                  </fileset>
-                </checksum>
-                <checksum algorithm="md5" format="MD5SUM">
-                  <fileset dir="${eusWork}">
-                    <include name="**/*.gz" />
-                    <include name="**/*.jar" />
-                  </fileset>
-                </checksum>
-
-                <echo message="Generating gpg signatures for new features and 
plugins" />
-                <apply executable="gpg" dir="${eusWork}" failonerror="true"> 
-                  <arg value="--detach-sign" />
-                  <arg value="--armor" />
-                  <!-- batch flag needed to avoid gpg hang up -->
-                  <arg value="--batch" />
-                  <fileset dir="${eusWork}">
-                    <include name="**/*.jar" />
-                    <include name="**/*.jar.pack.gz" />
-                  </fileset>
-                </apply> 
-                
-                <echo message="Copying the checksums and signatures to the 
update subsite" />
-                <copy todir="${eclipseUpdateSubSite}" failonerror="true" 
overwrite="true">
-                  <fileset dir="${eusWork}">
-                    <include name="**/*.asc" />
-                    <include name="**/*.md5" />
-                    <include name="**/*.sha1" />
-                  </fileset>
-                </copy>
 
-                <echo> </echo>
-                <echo message="Clearing previous checksums and signatures for 
update artifacts.jar and content.jar" />
-                <delete dir="${eclipseUpdateSubSite}">
-                  <include name="*.sha1" />
-                  <include name="*.md5" />
-                  <include name="*.asc" />
-                </delete> 
-                                  
-                <echo message="Generating checksums for updated artifacts.jar 
and content.jar" />
-                <checksum algorithm="sha1" format="MD5SUM">
-                  <fileset dir="${eclipseUpdateSubSite}">
-                     <include name="*.jar" />
-                  </fileset>
-                </checksum>
-
-                <checksum algorithm="md5" format="MD5SUM">
-                  <fileset dir="${eclipseUpdateSubSite}">
-                    <include name="*.jar" />
-                  </fileset>
-                </checksum>
-
-                <echo message="Generating gpg signatures for artifacts.jar and 
content.jar" />
-                <apply executable="gpg" dir="${eclipseUpdateSubSite}" 
failonerror="true"> 
-                  <arg value="--detach-sign" />
-                  <arg value="--armor" />
-                  <!-- batch flag needed to avoid gpg hang up -->
-                  <arg value="--batch" />
-                  <fileset dir="${eclipseUpdateSubSite}">
-                    <include name="*.jar" />
-                  </fileset>
-                </apply> 
-              </target>
-            </configuration>
-          </execution>
+           <!-- ==================================================== -->
+           <!--                                                      -->
+           <!--       P O S T   JAR   S I G N I N G by Digicert      -->
+           <!--                                                      -->
+           <!--       moved to uima-wide parent pom 10/2018          -->
+           <!-- ==================================================== -->
+ 
           <execution>
             <id>BuildUpdateSite-pack-svnget-buildMetadata-commit-to-dev</id>
             <phase>package</phase>
@@ -379,18 +221,13 @@
                   <equals arg2="true" arg1="${isApacheRelease}" />
                   <then>
                     <echo message="Generating checksums for new features and 
plugins" />
-                    <checksum format="MD5SUM" algorithm="sha1">
-                      <fileset dir="${eusWork}">
-                        <include name="**/*.gz" />
-                        <include name="**/*.jar" />
-                      </fileset>
-                    </checksum>
-                    <checksum format="MD5SUM" algorithm="md5">
+                     <checksum algorithm="SHA-512" fileext=".sha512" 
format="MD5SUM" forceoverwrite="yes">
                       <fileset dir="${eusWork}">
                         <include name="**/*.gz" />
                         <include name="**/*.jar" />
                       </fileset>
                     </checksum>
+                    
                     <echo message="Generating gpg signatures for new features 
and plugins" />
                     <apply failonerror="true" dir="${eusWork}" 
executable="gpg">
                       <arg value="--detach-sign" />
@@ -405,23 +242,16 @@
                     <copy todir="${eclipseUpdateSubSite}" failonerror="true">
                       <fileset dir="${eusWork}">
                         <include name="**/*.asc" />
-                        <include name="**/*.md5" />
-                        <include name="**/*.sha1" />
+                        <include name="**/*.sha512" />
                       </fileset>
                     </copy>
                     <echo message="Clearing previous checksums and signatures 
for update artifacts.jar and content.jar" />
                     <delete dir="${eclipseUpdateSubSite}">
-                      <include name="*.sha1" />
-                      <include name="*.md5" />
+                      <include name="*.sha512" />
                       <include name="*.asc" />
                     </delete>
                     <echo message="Generating checksums for updated 
artifacts.jar and content.jar" />
-                    <checksum format="MD5SUM" algorithm="sha1">
-                      <fileset dir="${eclipseUpdateSubSite}">
-                        <include name="*.jar" />
-                      </fileset>
-                    </checksum>
-                    <checksum format="MD5SUM" algorithm="md5">
+                        <checksum algorithm="SHA-512" fileext=".sha512" 
format="MD5SUM" forceoverwrite="yes">
                       <fileset dir="${eclipseUpdateSubSite}">
                         <include name="*.jar" />
                       </fileset>


Reply via email to