ctakes-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vjapa...@apache.org
Subject svn commit: r1555305 - in /ctakes/branches/ytex/ctakes-ytex: pom.xml scripts/build-nonasf.xml
Date Sat, 04 Jan 2014 01:34:29 GMT
Author: vjapache
Date: Sat Jan  4 01:34:29 2014
New Revision: 1555305

URL: http://svn.apache.org/r1555305
Log:
clean up dependencies - explicitly add asf compliant transitive dependencies of hibernate

Modified:
    ctakes/branches/ytex/ctakes-ytex/pom.xml
    ctakes/branches/ytex/ctakes-ytex/scripts/build-nonasf.xml

Modified: ctakes/branches/ytex/ctakes-ytex/pom.xml
URL: http://svn.apache.org/viewvc/ctakes/branches/ytex/ctakes-ytex/pom.xml?rev=1555305&r1=1555304&r2=1555305&view=diff
==============================================================================
--- ctakes/branches/ytex/ctakes-ytex/pom.xml (original)
+++ ctakes/branches/ytex/ctakes-ytex/pom.xml Sat Jan  4 01:34:29 2014
@@ -63,6 +63,27 @@
 			<version>12.1.0.1.0</version> </dependency> -->
 		<!-- end non ASF compliant dependencies -->
 
+		<!-- begin ASF compliant hibernate dependencies. we need to explicitly 
+			include them so that get distributed with ctakes -->
+		<!-- public domain -->
+		<dependency>
+			<groupId>antlr</groupId>
+			<artifactId>antlr</artifactId>
+			<version>2.7.7</version>
+		</dependency>
+		<!-- bsd -->
+		<dependency>
+			<groupId>dom4j</groupId>
+			<artifactId>dom4j</artifactId>
+			<version>1.6.1</version>
+		</dependency>
+		<!-- triple license including ASF -->
+		<dependency>
+			<groupId>org.javassist</groupId>
+			<artifactId>javassist</artifactId>
+			<version>3.15.0-GA</version>
+		</dependency>
+		<!-- end ASF compliant hibernate dependencies -->
 		<dependency>
 			<groupId>ant-contrib</groupId>
 			<artifactId>ant-contrib</artifactId>
@@ -242,34 +263,6 @@
 							<overWriteIfNewer>true</overWriteIfNewer>
 						</configuration>
 					</execution>
-					<execution>
-						<id>copy</id>
-						<phase>package</phase>
-						<goals>
-							<goal>copy</goal>
-						</goals>
-						<configuration>
-							<artifactItems>
-								<artifactItem>
-									<groupId>org.hibernate</groupId>
-									<artifactId>hibernate-core</artifactId>
-								</artifactItem>
-								<artifactItem>
-									<groupId>org.hibernate</groupId>
-									<artifactId>hibernate-ehcache</artifactId>
-								</artifactItem>
-								<artifactItem>
-									<groupId>nz.ac.waikato.cms.weka</groupId>
-									<artifactId>weka-stable</artifactId>
-								</artifactItem>
-								<artifactItem>
-									<groupId>mysql</groupId>
-									<artifactId>mysql-connector-java</artifactId>
-								</artifactItem>
-							</artifactItems>
-							<outputDirectory>${project.build.directory}/nonasf-lib</outputDirectory>
-						</configuration>
-					</execution>
 				</executions>
 			</plugin>
 			<plugin>

Modified: ctakes/branches/ytex/ctakes-ytex/scripts/build-nonasf.xml
URL: http://svn.apache.org/viewvc/ctakes/branches/ytex/ctakes-ytex/scripts/build-nonasf.xml?rev=1555305&r1=1555304&r2=1555305&view=diff
==============================================================================
--- ctakes/branches/ytex/ctakes-ytex/scripts/build-nonasf.xml (original)
+++ ctakes/branches/ytex/ctakes-ytex/scripts/build-nonasf.xml Sat Jan  4 01:34:29 2014
@@ -28,7 +28,7 @@ Before running this:
 		<delete file="../target/ctakes-ytex-lib.zip" quiet="yes" />
 		<zip destfile="../target/ctakes-ytex-lib.zip">
 			<!-- non-asf libraries -->
-			<zipfileset prefix="lib" dir="../target/nonasf-lib" includes="*.jar" />
+			<zipfileset prefix="lib" dir="../target/lib" includes="hibernate-*.jar,jboss-*.jar,weka-*.jar,mysql-*.jar"
/>
 			<!-- mssql jdbc driver and authentication dlls -->
 			<zipfileset prefix="lib" dir="${sqljdbc.home}" includes="sqljdbc4.jar,auth/**/*.*"
/>
 			<!-- mssql jdbc readmes -->



Mime
View raw message