Author: schor
Date: Fri Apr 19 19:04:05 2013
New Revision: 1469990
URL: http://svn.apache.org/r1469990
Log:
[UIMA-2560] upgrade build for current m2e levels
Modified:
uima/build/trunk/parent-pom/pom.xml
uima/build/trunk/uima-build-helper-maven-plugin/pom.xml
uima/build/trunk/uima-build-resources/pom.xml
uima/build/trunk/uima-docbook-olink/pom.xml
uima/build/trunk/uima-eclipse-composite-update-site/ (props changed)
uima/build/trunk/uima-eclipse-composite-update-site/pom.xml
Modified: uima/build/trunk/parent-pom/pom.xml
URL:
http://svn.apache.org/viewvc/uima/build/trunk/parent-pom/pom.xml?rev=1469990&r1=1469989&r2=1469990&view=diff
==============================================================================
--- uima/build/trunk/parent-pom/pom.xml (original)
+++ uima/build/trunk/parent-pom/pom.xml Fri Apr 19 19:04:05 2013
@@ -298,16 +298,20 @@ Copyright (c) 2003, 2006 IBM Corporation
<!--This plugin's configuration is used to store Eclipse m2e settings
only. It has no influence on the Maven build itself. -->
- <!--plugin>
+ <plugin>
<groupId>org.eclipse.m2e</groupId>
<artifactId>lifecycle-mapping</artifactId>
<version>1.0.0</version>
<configuration>
<lifecycleMappingMetadata>
<pluginExecutions>
+
+ <!-- ***************************** -->
+ <!-- IGNORE remote resources -->
+ <!-- ***************************** -->
<pluginExecution>
<pluginExecutionFilter>
- <groupId>org.apache.uima</groupId>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>
maven-remote-resources-plugin
</artifactId>
@@ -321,6 +325,10 @@ Copyright (c) 2003, 2006 IBM Corporation
<ignore />
</action>
</pluginExecution>
+
+ <!-- ***************************** -->
+ <!-- EXECUTE parse-date-time -->
+ <!-- ***************************** -->
<pluginExecution>
<pluginExecutionFilter>
<groupId>org.apache.uima</groupId>
@@ -336,8 +344,12 @@ Copyright (c) 2003, 2006 IBM Corporation
<execute />
</action>
</pluginExecution>
- <pluginExecution>
- <pluginExecutionFilter>
+
+ <!-- ******************************* -->
+ <!-- IGNORE dependency copy / unpack -->
+ <!-- ******************************* -->
+ <pluginExecution>
+ <pluginExecutionFilter>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<versionRange>[2,)</versionRange>
@@ -348,15 +360,15 @@ Copyright (c) 2003, 2006 IBM Corporation
</goals>
</pluginExecutionFilter>
<action>
- <execute />
+ <ignore />
</action>
</pluginExecution>
+
</pluginExecutions>
</lifecycleMappingMetadata>
</configuration>
- </plugin-->
+ </plugin>
-
<!-- assembly plugin
Disable running assembly:assembly with
warning message to use install instead -->
@@ -512,7 +524,7 @@ Copyright (c) 2003, 2006 IBM Corporation
<!-- version 2.0.0 fails -->
<!-- version 2.3.4 eliminates spurious warning messages -->
<!-- version 2.5 has accidental dependency on Java 6 -->
- <version>2.3.4</version>
+ <version>2.3.7</version>
<extensions>true</extensions>
<executions>
<execution>
@@ -591,7 +603,7 @@ Copyright (c) 2003, 2006 IBM Corporation
<groupId>org.apache.uima</groupId>
<artifactId>uima-build-helper-maven-plugin</artifactId>
<version>4</version>
- </plugin>
+ </plugin>
</plugins>
</pluginManagement>
@@ -1644,8 +1656,6 @@ Copyright (c) 2003, 2006 IBM Corporation
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <!-- 2.3.5 accidentally required Java 6 -->
- <version>2.3.4</version>
<executions>
<execution>
<id>uima-bundle</id>
Modified: uima/build/trunk/uima-build-helper-maven-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/uima/build/trunk/uima-build-helper-maven-plugin/pom.xml?rev=1469990&r1=1469989&r2=1469990&view=diff
==============================================================================
--- uima/build/trunk/uima-build-helper-maven-plugin/pom.xml (original)
+++ uima/build/trunk/uima-build-helper-maven-plugin/pom.xml Fri Apr 19 19:04:05
2013
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.uima</groupId>
<artifactId>parent-pom</artifactId>
- <version>3</version>
+ <version>5-SNAPSHOT</version>
<relativePath>../parent-pom</relativePath>
</parent>
@@ -84,7 +84,6 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.1</version>
<scope>test</scope>
</dependency>
</dependencies>
@@ -94,7 +93,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
- <version>2.9</version>
<configuration>
<!-- drop maven-plugin per maven conventions -->
<goalPrefix>uima-build-helper</goalPrefix>
Modified: uima/build/trunk/uima-build-resources/pom.xml
URL:
http://svn.apache.org/viewvc/uima/build/trunk/uima-build-resources/pom.xml?rev=1469990&r1=1469989&r2=1469990&view=diff
==============================================================================
--- uima/build/trunk/uima-build-resources/pom.xml (original)
+++ uima/build/trunk/uima-build-resources/pom.xml Fri Apr 19 19:04:05 2013
@@ -23,11 +23,10 @@
<parent>
<groupId>org.apache.uima</groupId>
<artifactId>parent-pom</artifactId>
- <version>3</version>
- <relativePath />
+ <version>5-SNAPSHOT</version>
+ <relativePath>../parent-pom</relativePath>
</parent>
- <groupId>org.apache.uima</groupId>
<artifactId>uima-build-resources</artifactId>
<version>5-SNAPSHOT</version>
@@ -92,8 +91,8 @@
</execution>
</executions>
- </plugin>
-
+ </plugin>
+
</plugins>
</pluginManagement>
Modified: uima/build/trunk/uima-docbook-olink/pom.xml
URL:
http://svn.apache.org/viewvc/uima/build/trunk/uima-docbook-olink/pom.xml?rev=1469990&r1=1469989&r2=1469990&view=diff
==============================================================================
--- uima/build/trunk/uima-docbook-olink/pom.xml (original)
+++ uima/build/trunk/uima-docbook-olink/pom.xml Fri Apr 19 19:04:05 2013
@@ -22,8 +22,8 @@
<parent>
<artifactId>parent-pom</artifactId>
<groupId>org.apache.uima</groupId>
- <version>2</version>
- <relativePath/>
+ <version>5-SNAPSHOT</version>
+ <relativePath>../parent-pom</relativePath>
</parent>
<artifactId>uima-docbook-olink</artifactId>
Propchange: uima/build/trunk/uima-eclipse-composite-update-site/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Apr 19 19:04:05 2013
@@ -1,2 +1,3 @@
target
.project
+.settings
Modified: uima/build/trunk/uima-eclipse-composite-update-site/pom.xml
URL:
http://svn.apache.org/viewvc/uima/build/trunk/uima-eclipse-composite-update-site/pom.xml?rev=1469990&r1=1469989&r2=1469990&view=diff
==============================================================================
--- uima/build/trunk/uima-eclipse-composite-update-site/pom.xml (original)
+++ uima/build/trunk/uima-eclipse-composite-update-site/pom.xml Fri Apr 19
19:04:05 2013
@@ -24,8 +24,8 @@
<parent>
<groupId>org.apache.uima</groupId>
<artifactId>parent-pom</artifactId>
- <version>4</version>
- <relativePath />
+ <version>5-SNAPSHOT</version>
+ <relativePath>../parent-pom</relativePath>
</parent>
<artifactId>uima-eclipse-composite-update-site</artifactId>
