You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ctakes.apache.org by st...@apache.org on 2012/10/23 20:23:29 UTC

svn commit: r1401376 - in /incubator/ctakes/trunk: ./ ctakes-assertion/ ctakes-constituency-parser/ ctakes-coreference/ ctakes-drug-ner/ ctakes-pad-term-spotter/ ctakes-side-effect/ ctakes-smoking-status/ ctakes-type-system/

Author: stevenbethard
Date: Tue Oct 23 18:23:29 2012
New Revision: 1401376

URL: http://svn.apache.org/viewvc?rev=1401376&view=rev
Log:
CTAKES-65 #resolve Replaces JCasGenPomFriendly + exec-maven-plugin + build-helper-maven-plugin with jcasgen-maven-plugin 0.9.3

Modified:
    incubator/ctakes/trunk/ctakes-assertion/pom.xml
    incubator/ctakes/trunk/ctakes-constituency-parser/pom.xml
    incubator/ctakes/trunk/ctakes-coreference/pom.xml
    incubator/ctakes/trunk/ctakes-drug-ner/pom.xml
    incubator/ctakes/trunk/ctakes-pad-term-spotter/pom.xml
    incubator/ctakes/trunk/ctakes-side-effect/pom.xml
    incubator/ctakes/trunk/ctakes-smoking-status/pom.xml
    incubator/ctakes/trunk/ctakes-type-system/pom.xml
    incubator/ctakes/trunk/pom.xml

Modified: incubator/ctakes/trunk/ctakes-assertion/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-assertion/pom.xml?rev=1401376&r1=1401375&r2=1401376&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-assertion/pom.xml (original)
+++ incubator/ctakes/trunk/ctakes-assertion/pom.xml Tue Oct 23 18:23:29 2012
@@ -29,9 +29,6 @@
 		<artifactId>ctakes</artifactId>
 		<version>3.0.0-incubating-SNAPSHOT</version>
 	</parent>
-	<properties>
-		<jcasgen.typesystem>org/apache/ctakes/assertion/types/TypeSystem.xml</jcasgen.typesystem>
-	</properties>
 	<dependencies>
 		<dependency>
 			<groupId>org.apache.ctakes</groupId>
@@ -198,14 +195,12 @@
 	</dependencies>
 	<build>
 		<plugins>
-			<!-- Invoke JCasGen on the type system (see properties above) -->
 			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>exec-maven-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>build-helper-maven-plugin</artifactId>
+				<groupId>org.cleartk</groupId>
+				<artifactId>jcasgen-maven-plugin</artifactId>
+				<configuration>
+					<typeSystem>src/main/resources/org/apache/ctakes/assertion/types/TypeSystem.xml</typeSystem>
+				</configuration>
 			</plugin>
 		</plugins>
 	</build>

Modified: incubator/ctakes/trunk/ctakes-constituency-parser/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-constituency-parser/pom.xml?rev=1401376&r1=1401375&r2=1401376&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-constituency-parser/pom.xml (original)
+++ incubator/ctakes/trunk/ctakes-constituency-parser/pom.xml Tue Oct 23 18:23:29 2012
@@ -29,9 +29,6 @@
 		<artifactId>ctakes</artifactId>
 		<version>3.0.0-incubating-SNAPSHOT</version>
 	</parent>
-	<properties>
-		<jcasgen.typesystem>org/apache/ctakes/constituency/parser/types/LabeledTree.xml</jcasgen.typesystem>
-	</properties>	
 	<dependencies>
 		<dependency>
 			<groupId>org.apache.ctakes</groupId>
@@ -64,14 +61,12 @@
 	</dependencies>
 		<build>
 		<plugins>
-			<!-- Invoke JCasGen on the type system (see properties above) -->
 			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>exec-maven-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>build-helper-maven-plugin</artifactId>
+				<groupId>org.cleartk</groupId>
+				<artifactId>jcasgen-maven-plugin</artifactId>
+				<configuration>
+					<typeSystem>src/main/resources/org/apache/ctakes/constituency/parser/types/LabeledTree.xml</typeSystem>
+				</configuration>
 			</plugin>
 		</plugins>
 	</build>

Modified: incubator/ctakes/trunk/ctakes-coreference/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-coreference/pom.xml?rev=1401376&r1=1401375&r2=1401376&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-coreference/pom.xml (original)
+++ incubator/ctakes/trunk/ctakes-coreference/pom.xml Tue Oct 23 18:23:29 2012
@@ -30,10 +30,6 @@
 		<version>3.0.0-incubating-SNAPSHOT</version>
 	</parent>
 	
-	<properties>
-	<jcasgen.typesystem>org/apache/ctakes/coreference/types/TypeSystem.xml</jcasgen.typesystem>
-	</properties>
-		
 	<dependencies>
 		<dependency>
 			<groupId>org.apache.ctakes</groupId>
@@ -71,14 +67,12 @@
 	
 		<build>
 		<plugins>
-			<!-- Invoke JCasGen on the type system (see properties above) -->
 			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>exec-maven-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>build-helper-maven-plugin</artifactId>
+				<groupId>org.cleartk</groupId>
+				<artifactId>jcasgen-maven-plugin</artifactId>
+				<configuration>
+					<typeSystem>src/main/resources/org/apache/ctakes/coreference/types/TypeSystem.xml</typeSystem>
+				</configuration>
 			</plugin>
 		</plugins>
 	</build>

Modified: incubator/ctakes/trunk/ctakes-drug-ner/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-drug-ner/pom.xml?rev=1401376&r1=1401375&r2=1401376&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-drug-ner/pom.xml (original)
+++ incubator/ctakes/trunk/ctakes-drug-ner/pom.xml Tue Oct 23 18:23:29 2012
@@ -30,11 +30,6 @@
 		<version>3.0.0-incubating-SNAPSHOT</version>
 	</parent>
 	
-	
-	<properties>
-		<jcasgen.typesystem>org/apache/ctakes/drugner/types/TypeSystem.xml</jcasgen.typesystem>
-	</properties>
-	
 	<dependencies>
 		<dependency>
 			<groupId>org.apache.ctakes</groupId>
@@ -95,14 +90,12 @@
 	
 	<build>
 		<plugins>
-			<!-- Invoke JCasGen on the type system (see properties above) -->
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>exec-maven-plugin</artifactId>
-			</plugin>
 			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>build-helper-maven-plugin</artifactId>
+				<groupId>org.cleartk</groupId>
+				<artifactId>jcasgen-maven-plugin</artifactId>
+				<configuration>
+					<typeSystem>src/main/resources/org/apache/ctakes/drugner/types/TypeSystem.xml</typeSystem>
+				</configuration>
 			</plugin>
 		</plugins>
 	</build>

Modified: incubator/ctakes/trunk/ctakes-pad-term-spotter/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-pad-term-spotter/pom.xml?rev=1401376&r1=1401375&r2=1401376&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-pad-term-spotter/pom.xml (original)
+++ incubator/ctakes/trunk/ctakes-pad-term-spotter/pom.xml Tue Oct 23 18:23:29 2012
@@ -30,10 +30,6 @@
 		<version>3.0.0-incubating-SNAPSHOT</version>
 	</parent>
 
-	<properties>
-	<jcasgen.typesystem>org/apache/ctakes/padtermspotter/types/TypeSystem.xml</jcasgen.typesystem>
-	</properties>
-		
 	<dependencies>
 		<dependency>
 			<groupId>org.apache.ctakes</groupId>
@@ -67,14 +63,12 @@
 	
 		<build>
 		<plugins>
-			<!-- Invoke JCasGen on the type system (see properties above) -->
 			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>exec-maven-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>build-helper-maven-plugin</artifactId>
+				<groupId>org.cleartk</groupId>
+				<artifactId>jcasgen-maven-plugin</artifactId>
+				<configuration>
+					<typeSystem>src/main/resources/org/apache/ctakes/padtermspotter/types/TypeSystem.xml</typeSystem>
+				</configuration>
 			</plugin>
 		</plugins>
 	</build>

Modified: incubator/ctakes/trunk/ctakes-side-effect/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-side-effect/pom.xml?rev=1401376&r1=1401375&r2=1401376&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-side-effect/pom.xml (original)
+++ incubator/ctakes/trunk/ctakes-side-effect/pom.xml Tue Oct 23 18:23:29 2012
@@ -30,10 +30,6 @@
 		<version>3.0.0-incubating-SNAPSHOT</version>
 	</parent>
 	
-	<properties>
-	<jcasgen.typesystem>org/apache/ctakes/sideeffect/types/TypeSystem.xml</jcasgen.typesystem>
-	</properties>
-
 	<dependencies>
 		<dependency>
 			<groupId>org.apache.ctakes</groupId>
@@ -71,14 +67,12 @@
 	
 	<build>
 		<plugins>
-			<!-- Invoke JCasGen on the type system (see properties above) -->
 			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>exec-maven-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>build-helper-maven-plugin</artifactId>
+				<groupId>org.cleartk</groupId>
+				<artifactId>jcasgen-maven-plugin</artifactId>
+				<configuration>
+					<typeSystem>src/main/resources/org/apache/ctakes/sideeffect/types/TypeSystem.xml</typeSystem>
+				</configuration>
 			</plugin>
 		</plugins>
 	</build>

Modified: incubator/ctakes/trunk/ctakes-smoking-status/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-smoking-status/pom.xml?rev=1401376&r1=1401375&r2=1401376&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-smoking-status/pom.xml (original)
+++ incubator/ctakes/trunk/ctakes-smoking-status/pom.xml Tue Oct 23 18:23:29 2012
@@ -30,10 +30,6 @@
 		<version>3.0.0-incubating-SNAPSHOT</version>
 	</parent>
 	
-	<properties>
-	<jcasgen.typesystem>org/apache/ctakes/smokingstatus/types/TypeSystem.xml</jcasgen.typesystem>
-	</properties>
-
 	<dependencies>
 		<dependency>
 			<groupId>org.apache.ctakes</groupId>
@@ -71,14 +67,12 @@
 	
 	<build>
 		<plugins>
-			<!-- Invoke JCasGen on the type system (see properties above) -->
 			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>exec-maven-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>build-helper-maven-plugin</artifactId>
+				<groupId>org.cleartk</groupId>
+				<artifactId>jcasgen-maven-plugin</artifactId>
+				<configuration>
+					<typeSystem>src/main/resources/org/apache/ctakes/smokingstatus/types/TypeSystem.xml</typeSystem>
+				</configuration>
 			</plugin>
 		</plugins>
 	</build>

Modified: incubator/ctakes/trunk/ctakes-type-system/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-type-system/pom.xml?rev=1401376&r1=1401375&r2=1401376&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-type-system/pom.xml (original)
+++ incubator/ctakes/trunk/ctakes-type-system/pom.xml Tue Oct 23 18:23:29 2012
@@ -30,9 +30,6 @@
 		<artifactId>ctakes</artifactId>
 		<version>3.0.0-incubating-SNAPSHOT</version>
 	</parent>
-	<properties>
-		<jcasgen.typesystem>org/apache/ctakes/typesystem/types/TypeSystem.xml</jcasgen.typesystem>
-	</properties>
 	<dependencies>
 		<dependency>
 			<groupId>org.apache.uima</groupId>
@@ -55,14 +52,12 @@
 
 	<build>
 		<plugins>
-			<!-- Invoke JCasGen on the type system (see properties above) -->
 			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>exec-maven-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>build-helper-maven-plugin</artifactId>
+				<groupId>org.cleartk</groupId>
+				<artifactId>jcasgen-maven-plugin</artifactId>
+				<configuration>
+					<typeSystem>src/main/resources/org/apache/ctakes/typesystem/types/TypeSystem.xml</typeSystem>
+				</configuration>
 			</plugin>
 		</plugins>
 	</build>

Modified: incubator/ctakes/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/pom.xml?rev=1401376&r1=1401375&r2=1401376&view=diff
==============================================================================
--- incubator/ctakes/trunk/pom.xml (original)
+++ incubator/ctakes/trunk/pom.xml Tue Oct 23 18:23:29 2012
@@ -354,6 +354,18 @@
 			<plugins>
 
 				<plugin>
+					<groupId>org.cleartk</groupId>
+					<artifactId>jcasgen-maven-plugin</artifactId>
+					<version>0.9.3</version>
+					<executions>
+						<execution>
+							<goals>
+								<goal>generate</goal>
+							</goals>
+						</execution>
+					</executions>
+				</plugin>
+				<plugin>
 					<groupId>com.mycila.maven-license-plugin</groupId>
 					<artifactId>maven-license-plugin</artifactId>
 					<version>1.9.0</version>
@@ -469,89 +481,6 @@
 						</includes>
 					</configuration>
 				</plugin>
-
-				<!-- All plugins below should really only be in ctakes-type-system. However, 
-					some cTAKES modules still declare their own type systems internally. So until 
-					those are fixed, this needs to stay in the parent pom. -->
-
-				<!-- This plugin generates java files with JCasGen -->
-				<plugin>
-					<groupId>org.codehaus.mojo</groupId>
-					<artifactId>exec-maven-plugin</artifactId>
-					<version>1.2.1</version>
-					<executions>
-						<execution>
-							<id>run-jcasgen-${project.artifactId}</id>
-							<phase>process-resources</phase>
-							<goals>
-								<goal>java</goal>
-							</goals>
-						</execution>
-					</executions>
-					<configuration>
-						<includeProjectDependencies>true</includeProjectDependencies>
-						<includePluginDependencies>true</includePluginDependencies>
-						<mainClass>org.uimafit.util.JCasGenPomFriendly</mainClass>
-						<arguments>
-							<argument>${jcasgen.typesystem}
-							</argument>
-							<argument>${project.build.directory}/generated-sources/jcasgen</argument>
-						</arguments>
-					</configuration>
-				</plugin>
-				<!-- This plugin adds the jcasgen generated source code folder as a project 
-					source folder -->
-				<plugin>
-					<groupId>org.codehaus.mojo</groupId>
-					<artifactId>build-helper-maven-plugin</artifactId>
-					<version>1.7</version>
-					<executions>
-						<execution>
-							<id>add-jcasgen-sources-${project.artifactId}</id>
-							<phase>process-resources</phase>
-							<goals>
-								<goal>add-source</goal>
-							</goals>
-							<configuration>
-								<sources>
-									<source>${project.build.directory}/generated-sources/jcasgen</source>
-								</sources>
-							</configuration>
-						</execution>
-					</executions>
-				</plugin>
-				<!--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.codehaus.mojo
-										</groupId>
-										<artifactId>
-											exec-maven-plugin
-										</artifactId>
-										<versionRange>
-											[1.2.1,)
-										</versionRange>
-										<goals>
-											<goal>java</goal>
-										</goals>
-									</pluginExecutionFilter>
-									<action>
-										<execute />
-									</action>
-								</pluginExecution>
-							</pluginExecutions>
-						</lifecycleMappingMetadata>
-					</configuration>
-				</plugin>
 			</plugins>
 		</pluginManagement>
 	</build>