You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by re...@apache.org on 2014/06/10 14:06:46 UTC

svn commit: r1601614 - in /uima: build/trunk/parent-pom/pom.xml uimafit/trunk/uimafit-maven-plugin/pom.xml uimaj/trunk/PearPackagingMavenPlugin/pom.xml uimaj/trunk/jcasgen-maven-plugin/pom.xml

Author: rec
Date: Tue Jun 10 12:06:46 2014
New Revision: 1601614

URL: http://svn.apache.org/r1601614
Log:
[UIMA-3869] Better maven-plugin-plugin configuration
- Configure extractors in parent-pom
- Configure helpmojo in parent-pom
- Now all maven-plugin-plugin configuration can be removed in the modules

Modified:
    uima/build/trunk/parent-pom/pom.xml
    uima/uimafit/trunk/uimafit-maven-plugin/pom.xml
    uima/uimaj/trunk/PearPackagingMavenPlugin/pom.xml
    uima/uimaj/trunk/jcasgen-maven-plugin/pom.xml

Modified: uima/build/trunk/parent-pom/pom.xml
URL: http://svn.apache.org/viewvc/uima/build/trunk/parent-pom/pom.xml?rev=1601614&r1=1601613&r2=1601614&view=diff
==============================================================================
--- uima/build/trunk/parent-pom/pom.xml (original)
+++ uima/build/trunk/parent-pom/pom.xml Tue Jun 10 12:06:46 2014
@@ -319,19 +319,19 @@ Copyright (c) 2003, 2006 IBM Corporation
           <artifactId>build-helper-maven-plugin</artifactId>
           <version>1.8</version>
         </plugin>
-<!--         
+        <!--         
         <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>
-			<!-- Version 3.3 required for Java 8 builds -->
-			<!-- http://jira.codehaus.org/browse/MPLUGIN-244 -->
-			<version>3.3</version>
+    			<!-- Version 3.3 required for Java 8 builds -->
+		    	<!-- http://jira.codehaus.org/browse/MPLUGIN-244 -->
+		    	<version>3.3</version>
 	        <executions>
 	          <execution>
 	            <!-- force to use process-classes phase so runs after Java Annotations are available -->
@@ -339,7 +339,19 @@ Copyright (c) 2003, 2006 IBM Corporation
 	            <id>default-descriptor</id>
 	            <phase>process-classes</phase>
 	          </execution>
+            <execution>
+              <id>generate-helpmojo</id>
+              <goals><goal>helpmojo</goal></goals>
+              <configuration>
+                <!-- The following line can be removed when upgrading to maven-plugin-plugin:3.4 -->
+                <!-- https://jira.codehaus.org/browse/MPLUGIN-238 -->
+                <skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
+              </configuration>             
+            </execution>
 	        </executions>
+          <configuration>
+            <extractors><extractor>java-annotations</extractor></extractors>
+          </configuration>    
         </plugin>
         
         <!-- set Java 1.5 as the source and target of compilation -->

Modified: uima/uimafit/trunk/uimafit-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/uima/uimafit/trunk/uimafit-maven-plugin/pom.xml?rev=1601614&r1=1601613&r2=1601614&view=diff
==============================================================================
--- uima/uimafit/trunk/uimafit-maven-plugin/pom.xml (original)
+++ uima/uimafit/trunk/uimafit-maven-plugin/pom.xml Tue Jun 10 12:06:46 2014
@@ -120,19 +120,6 @@
 	<build>
 		<plugins>
 			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-plugin-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>help-goal</id>
-						<phase>process-classes</phase>
-						<goals>
-							<goal>helpmojo</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
 				<artifactId>maven-invoker-plugin</artifactId>
 				<configuration>
 					<debug>true</debug>
@@ -182,36 +169,6 @@
 				</configuration>
 			</plugin>
 		</plugins>
-		<pluginManagement>
-			<plugins>
-				<!--This plugin's configuration is used to store Eclipse m2e settings
-					only. It has no influence on the Maven build itself. -->
-				<plugin>
-					<groupId>org.eclipse.m2e</groupId>
-					<artifactId>lifecycle-mapping</artifactId>
-					<version>1.0.0</version>
-					<configuration>
-						<lifecycleMappingMetadata>
-							<pluginExecutions>
-								<pluginExecution>
-									<pluginExecutionFilter>
-										<groupId>org.apache.maven.plugins</groupId>
-										<artifactId>maven-plugin-plugin</artifactId>
-										<versionRange>[3.2,)</versionRange>
-										<goals>
-											<goal>helpmojo</goal>
-										</goals>
-									</pluginExecutionFilter>
-									<action>
-										<ignore />
-									</action>
-								</pluginExecution>
-							</pluginExecutions>
-						</lifecycleMappingMetadata>
-					</configuration>
-				</plugin>
-			</plugins>
-		</pluginManagement>
 	</build>
 	<url>${uimaWebsiteUrl}</url>
 	<inceptionYear>2012</inceptionYear>

Modified: uima/uimaj/trunk/PearPackagingMavenPlugin/pom.xml
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/PearPackagingMavenPlugin/pom.xml?rev=1601614&r1=1601613&r2=1601614&view=diff
==============================================================================
--- uima/uimaj/trunk/PearPackagingMavenPlugin/pom.xml (original)
+++ uima/uimaj/trunk/PearPackagingMavenPlugin/pom.xml Tue Jun 10 12:06:46 2014
@@ -100,23 +100,5 @@
 	
 	<build>
 		<finalName>uima-pear-maven-plugin</finalName>
-    
-    <plugins>
-      <plugin>
-        <artifactId>maven-plugin-plugin</artifactId>
-        <configuration>
-          <goalPrefix>uimaPear</goalPrefix>
-          <extractors><extractor>java-annotations</extractor></extractors>
-        </configuration>
-        <executions>
-          <execution>
-            <id>generate-helpmojo</id>
-            <goals><goal>helpmojo</goal></goals>
-          </execution>
-        </executions>
-        
-      </plugin>
-    </plugins>
-    
 	</build>
 </project>

Modified: uima/uimaj/trunk/jcasgen-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/jcasgen-maven-plugin/pom.xml?rev=1601614&r1=1601613&r2=1601614&view=diff
==============================================================================
--- uima/uimaj/trunk/jcasgen-maven-plugin/pom.xml (original)
+++ uima/uimaj/trunk/jcasgen-maven-plugin/pom.xml Tue Jun 10 12:06:46 2014
@@ -120,21 +120,6 @@
 					</execution>
 				</executions>
 			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-plugin-plugin</artifactId>
-				<configuration>
-          <extractors><extractor>java-annotations</extractor></extractors>
- 				</configuration>				
-				<executions>
-					<execution>
-						<id>generated-helpmojo</id>
-						<goals>
-							<goal>helpmojo</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
 		</plugins>
 	</build>
 </project>