ctakes-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chen...@apache.org
Subject svn commit: r1676870 - in /ctakes/trunk: ./ ctakes-assertion-zoner/ ctakes-assertion/ ctakes-constituency-parser/ ctakes-coreference/ ctakes-drug-ner/ ctakes-side-effect/ ctakes-smoking-status/ ctakes-type-system/ ctakes-ytex-uima/
Date Wed, 29 Apr 2015 21:46:04 GMT
Author: chenpei
Date: Wed Apr 29 21:46:04 2015
New Revision: 1676870

URL: http://svn.apache.org/r1676870
Log:
CTAKES-283 - Avoid duplicate generation of JCas classes
Update to use the uima jcasgen maven plugin instead of cleartk's version.

Modified:
    ctakes/trunk/ctakes-assertion-zoner/pom.xml
    ctakes/trunk/ctakes-assertion/pom.xml
    ctakes/trunk/ctakes-constituency-parser/pom.xml
    ctakes/trunk/ctakes-coreference/pom.xml
    ctakes/trunk/ctakes-drug-ner/pom.xml
    ctakes/trunk/ctakes-side-effect/pom.xml
    ctakes/trunk/ctakes-smoking-status/pom.xml
    ctakes/trunk/ctakes-type-system/pom.xml
    ctakes/trunk/ctakes-ytex-uima/pom.xml
    ctakes/trunk/pom.xml

Modified: ctakes/trunk/ctakes-assertion-zoner/pom.xml
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-assertion-zoner/pom.xml?rev=1676870&r1=1676869&r2=1676870&view=diff
==============================================================================
--- ctakes/trunk/ctakes-assertion-zoner/pom.xml (original)
+++ ctakes/trunk/ctakes-assertion-zoner/pom.xml Wed Apr 29 21:46:04 2015
@@ -58,13 +58,22 @@
 	</dependencies>
 	<build>
 		<plugins>
-			<plugin>
-				<groupId>org.cleartk</groupId>
-				<artifactId>jcasgen-maven-plugin</artifactId>
-				<configuration>
-					<typeSystem>src/main/resources/org/apache/ctakes/assertion/zoner/types/TypeSystem.xml</typeSystem>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>  
+				<plugin>
+				  <groupId>org.apache.uima</groupId>
+				  <artifactId>jcasgen-maven-plugin</artifactId>
+				  <version>2.5.0</version>				  
+				  <executions>
+				    <execution>
+				      <goals><goal>generate</goal></goals>
+				      <configuration>
+				        <typeSystemIncludes>
+				          <typeSystemInclude>src/main/resources/org/apache/ctakes/**/types/TypeSystem.xml</typeSystemInclude>
			          
+				        </typeSystemIncludes>
+				        <limitToProject>false</limitToProject>
+				      </configuration>
+				    </execution>
+				    </executions>
+				</plugin>
+		</plugins>				
+ 	</build>	
 </project>

Modified: ctakes/trunk/ctakes-assertion/pom.xml
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-assertion/pom.xml?rev=1676870&r1=1676869&r2=1676870&view=diff
==============================================================================
--- ctakes/trunk/ctakes-assertion/pom.xml (original)
+++ ctakes/trunk/ctakes-assertion/pom.xml Wed Apr 29 21:46:04 2015
@@ -225,16 +225,25 @@
 			<groupId>org.cleartk</groupId>
 			<artifactId>cleartk-ml-liblinear</artifactId>
 		</dependency>
-	</dependencies>	
+	</dependencies>	 	
 	<build>
 		<plugins>
-			<plugin>
-				<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>    	
+				<plugin>
+				  <groupId>org.apache.uima</groupId>
+				  <artifactId>jcasgen-maven-plugin</artifactId>
+				  <version>2.5.0</version>				  
+				  <executions>
+				    <execution>
+				      <goals><goal>generate</goal></goals>
+				      <configuration>
+				        <typeSystemIncludes>
+				          <typeSystemInclude>src/main/resources/org/apache/ctakes/**/types/TypeSystem.xml</typeSystemInclude>
			          
+				        </typeSystemIncludes>
+				        <limitToProject>false</limitToProject>
+				      </configuration>
+				    </execution>
+				    </executions>
+				</plugin>
+		</plugins>				
+ 	</build>	
 </project>

Modified: ctakes/trunk/ctakes-constituency-parser/pom.xml
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-constituency-parser/pom.xml?rev=1676870&r1=1676869&r2=1676870&view=diff
==============================================================================
--- ctakes/trunk/ctakes-constituency-parser/pom.xml (original)
+++ ctakes/trunk/ctakes-constituency-parser/pom.xml Wed Apr 29 21:46:04 2015
@@ -64,13 +64,22 @@
 	</dependencies>
 	<build>
 		<plugins>
-			<plugin>
-				<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>  	
+				<plugin>
+				  <groupId>org.apache.uima</groupId>
+				  <artifactId>jcasgen-maven-plugin</artifactId>
+				  <version>2.5.0</version>				  
+				  <executions>
+				    <execution>
+				      <goals><goal>generate</goal></goals>
+				      <configuration>
+				        <typeSystemIncludes>
+				          <typeSystemInclude>src/main/resources/org/apache/ctakes/**/types/LabeledTree.xml</typeSystemInclude>
			          
+				        </typeSystemIncludes>
+				        <limitToProject>false</limitToProject>
+				      </configuration>
+				    </execution>
+				    </executions>
+				</plugin>
+		</plugins>				
+ 	</build>	
 </project>

Modified: ctakes/trunk/ctakes-coreference/pom.xml
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-coreference/pom.xml?rev=1676870&r1=1676869&r2=1676870&view=diff
==============================================================================
--- ctakes/trunk/ctakes-coreference/pom.xml (original)
+++ ctakes/trunk/ctakes-coreference/pom.xml Wed Apr 29 21:46:04 2015
@@ -79,16 +79,24 @@
 			<version>3.1.1</version>
 		</dependency>
 	</dependencies>
-	
-		<build>
+	<build>
 		<plugins>
-			<plugin>
-				<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>
+				<plugin>
+				  <groupId>org.apache.uima</groupId>
+				  <artifactId>jcasgen-maven-plugin</artifactId>
+				  <version>2.5.0</version>				  
+				  <executions>
+				    <execution>
+				      <goals><goal>generate</goal></goals>
+				      <configuration>
+				        <typeSystemIncludes>
+				          <typeSystemInclude>src/main/resources/org/apache/ctakes/**/types/TypeSystem.xml</typeSystemInclude>
			          
+				        </typeSystemIncludes>
+				        <limitToProject>false</limitToProject>
+				      </configuration>
+				    </execution>
+				    </executions>
+				</plugin>
+		</plugins>				
+ 	</build>
 </project>

Modified: ctakes/trunk/ctakes-drug-ner/pom.xml
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-drug-ner/pom.xml?rev=1676870&r1=1676869&r2=1676870&view=diff
==============================================================================
--- ctakes/trunk/ctakes-drug-ner/pom.xml (original)
+++ ctakes/trunk/ctakes-drug-ner/pom.xml Wed Apr 29 21:46:04 2015
@@ -94,15 +94,24 @@
 			<artifactId>ctakes-lvg</artifactId>
 		</dependency>
 	</dependencies>
-    <build>
+	<build>
 		<plugins>
-			<plugin>
-				<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>	
+				<plugin>
+				  <groupId>org.apache.uima</groupId>
+				  <artifactId>jcasgen-maven-plugin</artifactId>
+				  <version>2.5.0</version>				  
+				  <executions>
+				    <execution>
+				      <goals><goal>generate</goal></goals>
+				      <configuration>
+				        <typeSystemIncludes>
+				          <typeSystemInclude>src/main/resources/org/apache/ctakes/**/types/TypeSystem.xml</typeSystemInclude>
			          
+				        </typeSystemIncludes>
+				        <limitToProject>false</limitToProject>
+				      </configuration>
+				    </execution>
+				    </executions>
+				</plugin>
+		</plugins>				
+ 	</build>	
 </project>

Modified: ctakes/trunk/ctakes-side-effect/pom.xml
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-side-effect/pom.xml?rev=1676870&r1=1676869&r2=1676870&view=diff
==============================================================================
--- ctakes/trunk/ctakes-side-effect/pom.xml (original)
+++ ctakes/trunk/ctakes-side-effect/pom.xml Wed Apr 29 21:46:04 2015
@@ -77,13 +77,22 @@
 	</dependencies>
 	<build>
 		<plugins>
-			<plugin>
-				<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>  	
+				<plugin>
+				  <groupId>org.apache.uima</groupId>
+				  <artifactId>jcasgen-maven-plugin</artifactId>
+				  <version>2.5.0</version>				  
+				  <executions>
+				    <execution>
+				      <goals><goal>generate</goal></goals>
+				      <configuration>
+				        <typeSystemIncludes>
+				          <typeSystemInclude>src/main/resources/org/apache/ctakes/**/types/TypeSystem.xml</typeSystemInclude>
			          
+				        </typeSystemIncludes>
+				        <limitToProject>false</limitToProject>
+				      </configuration>
+				    </execution>
+				    </executions>
+				</plugin>
+		</plugins>				
+ 	</build>	
 </project>

Modified: ctakes/trunk/ctakes-smoking-status/pom.xml
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-smoking-status/pom.xml?rev=1676870&r1=1676869&r2=1676870&view=diff
==============================================================================
--- ctakes/trunk/ctakes-smoking-status/pom.xml (original)
+++ ctakes/trunk/ctakes-smoking-status/pom.xml Wed Apr 29 21:46:04 2015
@@ -77,13 +77,22 @@
 	</dependencies>	
 	<build>
 		<plugins>
-			<plugin>
-				<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> 	
+				<plugin>
+				  <groupId>org.apache.uima</groupId>
+				  <artifactId>jcasgen-maven-plugin</artifactId>
+				  <version>2.5.0</version>				  
+				  <executions>
+				    <execution>
+				      <goals><goal>generate</goal></goals>
+				      <configuration>
+				        <typeSystemIncludes>
+				          <typeSystemInclude>src/main/resources/org/apache/ctakes/**/types/TypeSystem.xml</typeSystemInclude>
			          
+				        </typeSystemIncludes>
+				        <limitToProject>false</limitToProject>
+				      </configuration>
+				    </execution>
+				    </executions>
+				</plugin>
+		</plugins>				
+ 	</build>		
 </project>

Modified: ctakes/trunk/ctakes-type-system/pom.xml
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-type-system/pom.xml?rev=1676870&r1=1676869&r2=1676870&view=diff
==============================================================================
--- ctakes/trunk/ctakes-type-system/pom.xml (original)
+++ ctakes/trunk/ctakes-type-system/pom.xml Wed Apr 29 21:46:04 2015
@@ -53,16 +53,24 @@
 			<artifactId>uimafit-core</artifactId>
 		</dependency>
 	</dependencies>
-
 	<build>
 		<plugins>
-			<plugin>
-				<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>
+				<plugin>
+				  <groupId>org.apache.uima</groupId>
+				  <artifactId>jcasgen-maven-plugin</artifactId>
+				  <version>2.5.0</version>				  
+				  <executions>
+				    <execution>
+				      <goals><goal>generate</goal></goals>
+				      <configuration>
+				        <typeSystemIncludes>
+				          <typeSystemInclude>src/main/resources/org/apache/ctakes/**/types/TypeSystem.xml</typeSystemInclude>
			          
+				        </typeSystemIncludes>
+				        <limitToProject>false</limitToProject>
+				      </configuration>
+				    </execution>
+				    </executions>
+				</plugin>
+		</plugins>				
+ 	</build>
 </project>

Modified: ctakes/trunk/ctakes-ytex-uima/pom.xml
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-ytex-uima/pom.xml?rev=1676870&r1=1676869&r2=1676870&view=diff
==============================================================================
--- ctakes/trunk/ctakes-ytex-uima/pom.xml (original)
+++ ctakes/trunk/ctakes-ytex-uima/pom.xml Wed Apr 29 21:46:04 2015
@@ -108,13 +108,23 @@
 	</dependencies>
 	<build>
 		<plugins>
-			<plugin>
-				<groupId>org.cleartk</groupId>
-				<artifactId>jcasgen-maven-plugin</artifactId>
-				<configuration>
-					<typeSystem>src/main/resources/org/apache/ctakes/ytex/types/TypeSystem.xml</typeSystem>
-				</configuration>
-			</plugin>
+				<plugin>
+				  <groupId>org.apache.uima</groupId>
+				  <artifactId>jcasgen-maven-plugin</artifactId>
+				  <version>2.5.0</version>				  
+				  <executions>
+				    <execution>
+				      <goals><goal>generate</goal></goals>
+				      <configuration>
+				        <typeSystemIncludes>
+				          <typeSystemInclude>src/main/resources/org/apache/ctakes/**/types/TypeSystem.xml</typeSystemInclude>
			          
+				        </typeSystemIncludes>
+				        <limitToProject>false</limitToProject>
+				      </configuration>
+				    </execution>
+				    </executions>
+				</plugin>
+	
 			<!-- ant scripts need project dependencies in the target/lib directory -->
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>

Modified: ctakes/trunk/pom.xml
URL: http://svn.apache.org/viewvc/ctakes/trunk/pom.xml?rev=1676870&r1=1676869&r2=1676870&view=diff
==============================================================================
--- ctakes/trunk/pom.xml (original)
+++ ctakes/trunk/pom.xml Wed Apr 29 21:46:04 2015
@@ -602,22 +602,6 @@
 		<pluginManagement>
 			<plugins>
 				<plugin>
-				  <groupId>org.apache.uima</groupId>
-				  <artifactId>jcasgen-maven-plugin</artifactId>
-				  <version>2.5.0</version>
-				  <executions>
-				    <execution>
-				      <goals><goal>generate</goal></goals>
-				      <configuration>
-				        <typeSystemIncludes>
-				          <typeSystemInclude>src/main/resources/org/apache/ctakes/**/types/TypeSystem.xml</typeSystemInclude>
-				        </typeSystemIncludes>
-				        <limitToProject>true</limitToProject>
-				      </configuration>
-				    </execution>
-				    </executions>
-				</plugin>
-				<plugin>
 					<groupId>com.mycila.maven-license-plugin</groupId>
 					<artifactId>maven-license-plugin</artifactId>
 					<version>1.9.0</version>



Mime
View raw message