You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ctakes.apache.org by al...@apache.org on 2017/11/19 17:21:39 UTC
svn commit: r1815748 - in /ctakes/trunk: .gitattributes pom.xml
Author: alexz
Date: Sun Nov 19 17:21:39 2017
New Revision: 1815748
URL: http://svn.apache.org/viewvc?rev=1815748&view=rev
Log:
CTAKES-481: fix uimaj dependencies - add uimaj-cpe to parent pom
Modified:
ctakes/trunk/.gitattributes
ctakes/trunk/pom.xml
Modified: ctakes/trunk/.gitattributes
URL: http://svn.apache.org/viewvc/ctakes/trunk/.gitattributes?rev=1815748&r1=1815747&r2=1815748&view=diff
==============================================================================
--- ctakes/trunk/.gitattributes (original)
+++ ctakes/trunk/.gitattributes Sun Nov 19 17:21:39 2017
@@ -2,18 +2,19 @@
* text=auto
*.cs text diff=csharp eol=lf
-*.java text diff=java eol=lf
-*.html text diff=html eol=lf
+# TODO: Uncomment when files are converted to lf (*NIX is default)
+# *.java text diff=java eol=lf
+# *.html text diff=html eol=lf
*.py text diff=python eol=lf
*.pl text diff=perl eol=lf
*.pm text diff=perl eol=lf
-*.css text eol=lf
+# *.css text eol=lf
*.js text eol=lf
*.sql text eol=lf
*.sh text eol=lf
-*.bat text eol=crlf
+# *.bat text eol=crlf
*.cmd text eol=crlf
*.vcxproj text merge=union eol=crlf
*.csproj text merge=union eol=crlf
Modified: ctakes/trunk/pom.xml
URL: http://svn.apache.org/viewvc/ctakes/trunk/pom.xml?rev=1815748&r1=1815747&r2=1815748&view=diff
==============================================================================
--- ctakes/trunk/pom.xml (original)
+++ ctakes/trunk/pom.xml Sun Nov 19 17:21:39 2017
@@ -238,7 +238,7 @@
</dependency>
<dependency>
<groupId>org.apache.uima</groupId>
- <artifactId>uimaj-tools</artifactId>
+ <artifactId>uimaj-cpe</artifactId>
<version>${uimaj.version}</version>
</dependency>
<dependency>
@@ -247,6 +247,11 @@
<version>${uimaj.version}</version>
</dependency>
<dependency>
+ <groupId>org.apache.uima</groupId>
+ <artifactId>uimaj-tools</artifactId>
+ <version>${uimaj.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimafit-core</artifactId>
<version>2.2.0</version>