ctakes-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vjapa...@apache.org
Subject svn commit: r1590551 - in /ctakes/trunk: ctakes-type-system/ ctakes-type-system/pom.xml ctakes-type-system/src/main/resources/org/apache/ctakes/typesystem/types/TypeSystem.xml pom.xml
Date Mon, 28 Apr 2014 02:45:03 GMT
Author: vjapache
Date: Mon Apr 28 02:45:03 2014
New Revision: 1590551

URL: http://svn.apache.org/r1590551
Log:
#CTAKES-253, CTAKES-292 ytex merge

Modified:
    ctakes/trunk/ctakes-type-system/   (props changed)
    ctakes/trunk/ctakes-type-system/pom.xml
    ctakes/trunk/ctakes-type-system/src/main/resources/org/apache/ctakes/typesystem/types/TypeSystem.xml
    ctakes/trunk/pom.xml

Propchange: ctakes/trunk/ctakes-type-system/
------------------------------------------------------------------------------
  Merged /ctakes/branches/ytex/ctakes-type-system:r1551246-1590545

Modified: ctakes/trunk/ctakes-type-system/pom.xml
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-type-system/pom.xml?rev=1590551&r1=1590550&r2=1590551&view=diff
==============================================================================
--- ctakes/trunk/ctakes-type-system/pom.xml (original)
+++ ctakes/trunk/ctakes-type-system/pom.xml Mon Apr 28 02:45:03 2014
@@ -38,6 +38,11 @@
 			<groupId>org.uimafit</groupId>
 			<artifactId>uimafit</artifactId>
 		</dependency>
+		<!-- we excluded spring-context in the parent pom, include it here -->
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-context</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>tw.edu.ntu.csie</groupId>
 			<artifactId>libsvm</artifactId>

Modified: ctakes/trunk/ctakes-type-system/src/main/resources/org/apache/ctakes/typesystem/types/TypeSystem.xml
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-type-system/src/main/resources/org/apache/ctakes/typesystem/types/TypeSystem.xml?rev=1590551&r1=1590550&r2=1590551&view=diff
==============================================================================
Binary files - no diff available.

Modified: ctakes/trunk/pom.xml
URL: http://svn.apache.org/viewvc/ctakes/trunk/pom.xml?rev=1590551&r1=1590550&r2=1590551&view=diff
==============================================================================
--- ctakes/trunk/pom.xml (original)
+++ ctakes/trunk/pom.xml Mon Apr 28 02:45:03 2014
@@ -108,7 +108,9 @@
 		<module>ctakes-relation-extractor</module>
 		<module>ctakes-assertion</module>
 		<module>ctakes-assertion-zoner</module>
+		<!--
 		<module>ctakes-temporal</module>
+		-->
 		<module>ctakes-clinical-pipeline</module>
 		<module>ctakes-distribution</module>
 		<module>ctakes-regression-test</module>
@@ -124,12 +126,18 @@
 		<module>ctakes-relation-extractor-res</module>
 		<module>ctakes-side-effect-res</module>
 		<module>ctakes-smoking-status-res</module>
+		<!--
 		<module>ctakes-temporal-res</module>
+		-->
 		<module>ctakes-assertion-zoner-res</module>
 		<module>ctakes-drug-ner-res</module>
 		<module>ctakes-ne-contexts-res</module>
 		<module>ctakes-template-filler</module>
 		<module>ctakes-examples</module>
+		<module>ctakes-ytex-res</module>
+		<module>ctakes-ytex</module>
+		<module>ctakes-ytex-uima</module>
+		<module>ctakes-ytex-web</module>	
 	</modules>
 	<dependencyManagement>
 		<dependencies>
@@ -212,7 +220,7 @@
 					ctakes-clinical-pipeline
 				</artifactId>
 				<version>${ctakes.version}</version>
-			</dependency>		
+			</dependency>
 			<dependency>
 				<groupId>org.apache.ctakes</groupId>
 				<artifactId>
@@ -366,7 +374,27 @@
 					ctakes-temporal-res
 				</artifactId>
 				<version>${ctakes.version}</version>
-			</dependency>			
+			</dependency>
+			<dependency>
+				<groupId>org.apache.ctakes</groupId>
+				<artifactId>
+					ctakes-ytex-res
+				</artifactId>
+				<version>${ctakes.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.ctakes</groupId>
+				<artifactId>
+					ctakes-ytex
+				</artifactId>
+				<version>${ctakes.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.ctakes</groupId>
+				<artifactId>
+					ctakes-ytex-uima
+				</artifactId>
+				<version>${ctakes.version}</version>			</dependency>			
 			<dependency>
 				<groupId>org.apache.ctakes</groupId>
 				<artifactId>
@@ -447,6 +475,11 @@
 						<groupId>commons-io</groupId>
 						<artifactId>commons-io</artifactId>
 					</exclusion>
+					<!--  uima fit is pulling in spring 3.1.0, we want spring 3.1.2 -->
+					<exclusion>
+						<groupId>org.springframework</groupId>
+						<artifactId>spring-context</artifactId>
+					</exclusion>
 				</exclusions>
 			</dependency>
 			<dependency>
@@ -513,6 +546,16 @@
 				<version>3.1.2.RELEASE</version>
 			</dependency>
 			<dependency>
+				<groupId>org.springframework</groupId>
+				<artifactId>spring-context</artifactId>
+				<version>3.1.2.RELEASE</version>
+			</dependency>
+			<dependency>
+				<groupId>org.springframework</groupId>
+				<artifactId>spring-web</artifactId>
+				<version>3.1.2.RELEASE</version>
+			</dependency>
+			<dependency>
 				<groupId>edu.mit.findstruct</groupId>
 				<artifactId>structmulti</artifactId>
 				<version>0.0.1</version>
@@ -716,6 +759,7 @@
 						    <additionalClasspathElement>ctakes-side-effect-res/src/main/resources</additionalClasspathElement>
 						    <additionalClasspathElement>ctakes-smoking-status-res/src/main/resources</additionalClasspathElement>
 						    <additionalClasspathElement>ctakes-temporal-res/src/main/resources</additionalClasspathElement>
					    						    						    						    						    						    						    
+							<additionalClasspathElement>ctakes-ytex-res/src/main/resources</additionalClasspathElement>
 						</additionalClasspathElements>						
 					</configuration>
 				</plugin>



Mime
View raw message