You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by sc...@apache.org on 2013/09/24 20:00:34 UTC
svn commit: r1525954 - /uima/build/trunk/parent-pom/pom.xml
Author: schor
Date: Tue Sep 24 18:00:34 2013
New Revision: 1525954
URL: http://svn.apache.org/r1525954
Log:
[UIMA-3247] [UIMA-3300] only run sign for source-release if the source-release.zip exists. (It's not built except at the executionRoot). Upgrade Antrun plugin version, including its ant-apache-regex dependency. Upgrade enforcer plugin to more recent version. add RAT exclusion for .ppt (powerpoint) files used to hold some sources for pictures in documentation.
Modified:
uima/build/trunk/parent-pom/pom.xml
Modified: uima/build/trunk/parent-pom/pom.xml
URL: http://svn.apache.org/viewvc/uima/build/trunk/parent-pom/pom.xml?rev=1525954&r1=1525953&r2=1525954&view=diff
==============================================================================
--- uima/build/trunk/parent-pom/pom.xml (original)
+++ uima/build/trunk/parent-pom/pom.xml Tue Sep 24 18:00:34 2013
@@ -321,6 +321,12 @@ Copyright (c) 2003, 2006 IBM Corporation
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <version>1.3</version>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
<configuration>
<skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
@@ -432,24 +438,35 @@ Copyright (c) 2003, 2006 IBM Corporation
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
+ <version>1.7</version>
+
<dependencies>
+ <!-- 1.8.2 is used by v 1.7 of this plugin
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
- <!-- version 1.8.0 seems to be incompatible with some part of maven or m2eclipse -->
+ version 1.8.0 seems to be incompatible with some part of maven or m2eclipse
<version>1.7.1</version>
</dependency>
+ -->
<dependency> <!-- for ant extension supporting "if" -->
<groupId>ant-contrib</groupId>
<artifactId>ant-contrib</artifactId>
<version>1.0b3</version>
<scope>runtime</scope>
+ <exclusions>
+ <exclusion> <!-- is dragging in ant 1.5 -->
+ <groupId>ant</groupId>
+ <artifactId>ant</artifactId>
+ </exclusion>
+ </exclusions>
+
</dependency>
<!-- next two enable <containsregexp> form for filesets -->
<dependency>
- <groupId>ant</groupId>
+ <groupId>org.apache.ant</groupId>
<artifactId>ant-apache-regexp</artifactId>
- <version>1.6.5</version>
+ <version>1.9.2</version>
</dependency>
<dependency>
<groupId>jakarta-regexp</groupId>
@@ -505,7 +522,8 @@ Copyright (c) 2003, 2006 IBM Corporation
<exclude>src/main/resources/docbook-shared/titlepage/*.xsl</exclude>
<exclude>marker-file-identifying-*</exclude> <!-- empty file -->
<exclude>DEPENDENCIES</exclude> <!-- generated file -->
- <exclude>**/*/MANIFEST.MF</exclude> <!-- MANIFEST.MF files cannot have comments -->
+ <exclude>**/MANIFEST.MF</exclude> <!-- MANIFEST.MF files cannot have comments -->
+ <exclude>**/*.ppt</exclude> <!-- power point sources -->
</excludes>
</configuration>
</execution>
@@ -784,18 +802,26 @@ Copyright (c) 2003, 2006 IBM Corporation
<goals><goal>run</goal></goals>
<configuration>
<target>
- <echo message="Generating checksums for source-release.zip" />
- <checksum format="MD5SUM" algorithm="sha1"
- file="${project.build.directory}/${project.artifactId}-${project.version}-source-release.zip"/>
- <checksum format="MD5SUM" algorithm="md5"
- file="${project.build.directory}/${project.artifactId}-${project.version}-source-release.zip"/>
- <echo message="Generating gpg signatures for source-release.zip" />
- <exec executable="gpg">
- <arg value="--detach-sign" />
- <arg value="--armor" />
- <arg value="--batch" />
- <arg value="${project.build.directory}/${project.artifactId}-${project.version}-source-release.zip" />
- </exec>
+ <taskdef name="if" classname="net.sf.antcontrib.logic.IfTask" />
+ <property name="source-release"
+ location="${project.build.directory}/${project.artifactId}-${project.version}-source-release.zip"/>
+ <if>
+ <available file="${source-release}"/>
+ <then>
+ <echo message="Generating checksums for source-release.zip" />
+ <checksum format="MD5SUM" algorithm="sha1"
+ file="${source-release}"/>
+ <checksum format="MD5SUM" algorithm="md5"
+ file="${source-release}"/>
+ <echo message="Generating gpg signatures for source-release.zip" />
+ <exec executable="gpg">
+ <arg value="--detach-sign" />
+ <arg value="--armor" />
+ <arg value="--batch" />
+ <arg value="${source-release}" />
+ </exec>
+ </then>
+ </if>
</target>
</configuration>
</execution>