Author: rec
Date: Fri May 31 19:40:33 2013
New Revision: 1488364
URL: http://svn.apache.org/r1488364
Log:
[UIMA-2871] Remove JCasGenPomFriendly in favor of jcasgen-maven-plugin
- Using jcasgen-maven-plugin now
- Removed dependency on uimaj-tools from main uimafit module
- Removed JCasGenPomFriendly
Removed:
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/util/JCasGenPomFriendly.java
Modified:
uima/sandbox/uimafit/trunk/pom.xml
uima/sandbox/uimafit/trunk/uimafit-legacy-support/pom.xml
uima/sandbox/uimafit/trunk/uimafit/pom.xml
Modified: uima/sandbox/uimafit/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/pom.xml?rev=1488364&r1=1488363&r2=1488364&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/pom.xml (original)
+++ uima/sandbox/uimafit/trunk/pom.xml Fri May 31 19:40:33 2013
@@ -202,6 +202,11 @@
<pluginManagement>
<plugins>
<plugin>
+ <groupId>org.apache.uima</groupId>
+
<artifactId>jcasgen-maven-plugin</artifactId>
+ <version>${uima.version}</version>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-changes-plugin</artifactId>
<version>2.8</version>
Modified: uima/sandbox/uimafit/trunk/uimafit-legacy-support/pom.xml
URL:
http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit-legacy-support/pom.xml?rev=1488364&r1=1488363&r2=1488364&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit-legacy-support/pom.xml (original)
+++ uima/sandbox/uimafit/trunk/uimafit-legacy-support/pom.xml Fri May 31
19:40:33 2013
@@ -65,32 +65,20 @@
<build>
<plugins>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>exec-maven-plugin</artifactId>
+ <groupId>org.apache.uima</groupId>
+ <artifactId>jcasgen-maven-plugin</artifactId>
<executions>
<execution>
-
<phase>generate-test-sources</phase>
<goals>
- <goal>java</goal>
+ <goal>generate</goal>
</goals>
+ <configuration>
+ <typeSystemIncludes>
+
<typeSystemInclude>src/test/resources/org/apache/uima/fit/type/**/*.xml</typeSystemInclude>
+ </typeSystemIncludes>
+ </configuration>
</execution>
</executions>
- <configuration>
-
<mainClass>org.apache.uima.fit.util.JCasGenPomFriendly</mainClass>
- <arguments>
-
<argument>file:${project.basedir}/src/test/resources/org/apache/uima/fit/type/**/*.xml</argument>
-
<argument>${project.build.directory}/generated-sources/jcasgen</argument>
- </arguments>
- <classpathScope>test</classpathScope>
-
<includePluginDependencies>true</includePluginDependencies>
- </configuration>
- <dependencies>
- <dependency>
-
<groupId>org.apache.uima</groupId>
- <artifactId>uimafit</artifactId>
-
<version>2.0.0-SNAPSHOT</version>
- </dependency>
- </dependencies>
</plugin>
<plugin>
<!--
Modified: uima/sandbox/uimafit/trunk/uimafit/pom.xml
URL:
http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit/pom.xml?rev=1488364&r1=1488363&r2=1488364&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit/pom.xml (original)
+++ uima/sandbox/uimafit/trunk/uimafit/pom.xml Fri May 31 19:40:33 2013
@@ -44,10 +44,6 @@
<artifactId>uimaj-core</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.uima</groupId>
- <artifactId>uimaj-tools</artifactId>
- </dependency>
- <dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
</dependency>
@@ -95,24 +91,20 @@
<build>
<plugins>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>exec-maven-plugin</artifactId>
+ <groupId>org.apache.uima</groupId>
+ <artifactId>jcasgen-maven-plugin</artifactId>
<executions>
<execution>
-
<phase>generate-test-sources</phase>
<goals>
- <goal>java</goal>
+ <goal>generate</goal>
</goals>
+ <configuration>
+ <typeSystemIncludes>
+
<typeSystemInclude>src/test/resources/org/apache/uima/fit/type/**/*.xml</typeSystemInclude>
+ </typeSystemIncludes>
+ </configuration>
</execution>
</executions>
- <configuration>
-
<mainClass>org.apache.uima.fit.util.JCasGenPomFriendly</mainClass>
- <arguments>
-
<argument>file:${project.basedir}/src/test/resources/org/apache/uima/fit/type/**/*.xml</argument>
-
<argument>${project.build.directory}/generated-sources/jcasgen</argument>
- </arguments>
- <classpathScope>test</classpathScope>
- </configuration>
</plugin>
<plugin>
<!--
