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 2013/01/13 22:20:00 UTC

svn commit: r1432745 - in /uima: build/branches/UIMA-2560/parent-pom/pom.xml uimaj/branches/UIMA-2560/uimaj-ep-runtime/pom.xml uimaj/branches/UIMA-2560/uimaj-parent/pom.xml

Author: rec
Date: Sun Jan 13 21:20:00 2013
New Revision: 1432745

URL: http://svn.apache.org/viewvc?rev=1432745&view=rev
Log:
[UIMA-2560] Eclipse m2e complains about unmapped maven plugins 
https://issues.apache.org/jira/browse/UIMA-2560
* Upgraded maven-bundle-plugin to 2.3.7 which is required for m2e to support the *Embed-Dependency* directive (see FELIX-3061). Note this may require the m2e tycho plugin to work properly. I tried running the CAS Editor before this change and got ClassNotFound exceptions. After the upgrade, the classes were found.
* Removed *inline* from the *Embed-Dependency* directive in uimaj-ep-runtime, because inlined artifacts are not supported by FELIX-3061.
* Removed maven-dependeny-plugin/unpack-dependencies execution from uimaj-ep-runtime.
* Ignoring any runs of the maven-dependency-plugin in the master pom. Affects *docbook processing* and profiles *build simple project binary assembly* and *build OSGi bundle for annotator*. Docbook processing is probably not required in Eclipse builds.
* Goals for plugins *maven-remote-resources-plugin* and *uima-build-helper-maven-plugin* activated per m2e configuration in master pom.

Modified:
    uima/build/branches/UIMA-2560/parent-pom/pom.xml
    uima/uimaj/branches/UIMA-2560/uimaj-ep-runtime/pom.xml
    uima/uimaj/branches/UIMA-2560/uimaj-parent/pom.xml

Modified: uima/build/branches/UIMA-2560/parent-pom/pom.xml
URL: http://svn.apache.org/viewvc/uima/build/branches/UIMA-2560/parent-pom/pom.xml?rev=1432745&r1=1432744&r2=1432745&view=diff
==============================================================================
--- uima/build/branches/UIMA-2560/parent-pom/pom.xml (original)
+++ uima/build/branches/UIMA-2560/parent-pom/pom.xml Sun Jan 13 21:20:00 2013
@@ -298,7 +298,7 @@ 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>
@@ -337,6 +337,8 @@ Copyright (c) 2003, 2006 IBM Corporation
 	                </action>
 	              </pluginExecution>
 	              <pluginExecution>
+	                <!-- dependency plugin expects JARs, does not work with m2e workspace resolution
+	                 -->
 	                <pluginExecutionFilter>
 	                  <groupId>org.apache.maven.plugins</groupId>
 	                  <artifactId>maven-dependency-plugin</artifactId>
@@ -348,13 +350,14 @@ Copyright (c) 2003, 2006 IBM Corporation
 	                  </goals>
 	                </pluginExecutionFilter>
 	                <action>
-	                  <execute />
+                      <ignore />
+	                  <!-- execute / -->
 	                </action>
 	              </pluginExecution>
 	            </pluginExecutions>
 	          </lifecycleMappingMetadata>
 	        </configuration>
-	      </plugin-->
+	      </plugin>
       
         
         <!-- assembly plugin 
@@ -511,7 +514,8 @@ 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.6 has better support for m2e (FELIX-3061) -->
+          <version>2.3.7</version>
           <extensions>true</extensions>
           <executions>
             <execution>

Modified: uima/uimaj/branches/UIMA-2560/uimaj-ep-runtime/pom.xml
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/UIMA-2560/uimaj-ep-runtime/pom.xml?rev=1432745&r1=1432744&r2=1432745&view=diff
==============================================================================
--- uima/uimaj/branches/UIMA-2560/uimaj-ep-runtime/pom.xml (original)
+++ uima/uimaj/branches/UIMA-2560/uimaj-ep-runtime/pom.xml Sun Jan 13 21:20:00 2013
@@ -228,7 +228,7 @@
                      dependencies, at the proper version, to be
                      included in this, and also sets up the bundle
                      classpath to include them -->
-                <Embed-Dependency>*;scope=compile;inline=true</Embed-Dependency>
+                <Embed-Dependency>*;scope=compile</Embed-Dependency>
     
                 <!-- These just get made into the corresponding manifest entries -->
                 <Bundle-SymbolicName>org.apache.uima.runtime;singleton:=true</Bundle-SymbolicName>
@@ -241,6 +241,7 @@
         </executions>
       </plugin>
       
+      <!-- 
       <plugin>
         <artifactId>maven-dependency-plugin</artifactId>
         <executions>
@@ -253,6 +254,7 @@
           </execution>
         </executions>
       </plugin>      
+      -->
     </plugins>
   </build>
 </project>

Modified: uima/uimaj/branches/UIMA-2560/uimaj-parent/pom.xml
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/UIMA-2560/uimaj-parent/pom.xml?rev=1432745&r1=1432744&r2=1432745&view=diff
==============================================================================
--- uima/uimaj/branches/UIMA-2560/uimaj-parent/pom.xml (original)
+++ uima/uimaj/branches/UIMA-2560/uimaj-parent/pom.xml Sun Jan 13 21:20:00 2013
@@ -31,8 +31,8 @@
   <parent>
     <groupId>org.apache.uima</groupId>
     <artifactId>parent-pom</artifactId>
-    <version>4</version>
     <relativePath />
+    <version>5-SNAPSHOT</version>
   </parent>
 
   <groupId>org.apache.uima</groupId>