You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ctakes.apache.org by se...@apache.org on 2017/03/29 04:54:45 UTC
svn commit: r1789273 - in /ctakes/trunk: ctakes-core/pom.xml
ctakes-dictionary-lookup/pom.xml
ctakes-gui-res/src/main/resources/org/apache/ctakes/gui/pipeline/icon/PiperFile.png
ctakes-ne-contexts/pom.xml ctakes-ytex-uima/pom.xml pom.xml
Author: seanfinan
Date: Wed Mar 29 04:54:45 2017
New Revision: 1789273
URL: http://svn.apache.org/viewvc?rev=1789273&view=rev
Log:
Mixed Versions : trying to get rid of version conflicts. 3rd party dependencies are bringing in conflicting 4th-to-3rd party dependencies
Modified:
ctakes/trunk/ctakes-core/pom.xml
ctakes/trunk/ctakes-dictionary-lookup/pom.xml
ctakes/trunk/ctakes-gui-res/src/main/resources/org/apache/ctakes/gui/pipeline/icon/PiperFile.png
ctakes/trunk/ctakes-ne-contexts/pom.xml
ctakes/trunk/ctakes-ytex-uima/pom.xml
ctakes/trunk/pom.xml
Modified: ctakes/trunk/ctakes-core/pom.xml
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-core/pom.xml?rev=1789273&r1=1789272&r2=1789273&view=diff
==============================================================================
--- ctakes/trunk/ctakes-core/pom.xml (original)
+++ ctakes/trunk/ctakes-core/pom.xml Wed Mar 29 04:54:45 2017
@@ -102,10 +102,10 @@
<groupId>net.sourceforge.openai</groupId>
<artifactId>openaifsm</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.uima</groupId>
- <artifactId>uimaj-examples</artifactId> <!-- for XCasWriterCasConsumer -->
- </dependency>
+ <!--<dependency>-->
+ <!--<groupId>org.apache.uima</groupId>-->
+ <!--<artifactId>uimaj-examples</artifactId> <!– for XCasWriterCasConsumer –>-->
+ <!--</dependency>-->
<dependency>
<groupId>com.lexicalscope.jewelcli</groupId>
<artifactId>jewelcli</artifactId>
Modified: ctakes/trunk/ctakes-dictionary-lookup/pom.xml
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-dictionary-lookup/pom.xml?rev=1789273&r1=1789272&r2=1789273&view=diff
==============================================================================
--- ctakes/trunk/ctakes-dictionary-lookup/pom.xml (original)
+++ ctakes/trunk/ctakes-dictionary-lookup/pom.xml Wed Mar 29 04:54:45 2017
@@ -34,10 +34,10 @@
<artifactId>ctakes-dictionary-lookup-res</artifactId>
</dependency>
<dependency>
- <groupId>hsqldb</groupId>
+ <groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
- <version>1.8.0.10</version>
- </dependency>
+ <version>2.3.4</version>
+ </dependency>
<dependency>
<groupId>org.apache.ctakes</groupId>
<artifactId>ctakes-type-system</artifactId>
Modified: ctakes/trunk/ctakes-gui-res/src/main/resources/org/apache/ctakes/gui/pipeline/icon/PiperFile.png
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-gui-res/src/main/resources/org/apache/ctakes/gui/pipeline/icon/PiperFile.png?rev=1789273&r1=1789272&r2=1789273&view=diff
==============================================================================
Binary files - no diff available.
Modified: ctakes/trunk/ctakes-ne-contexts/pom.xml
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-ne-contexts/pom.xml?rev=1789273&r1=1789272&r2=1789273&view=diff
==============================================================================
--- ctakes/trunk/ctakes-ne-contexts/pom.xml (original)
+++ ctakes/trunk/ctakes-ne-contexts/pom.xml Wed Mar 29 04:54:45 2017
@@ -46,6 +46,10 @@
<artifactId>ctakes-utils</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.uima</groupId>
+ <artifactId>uimaj-document-annotation</artifactId>
+ </dependency>
+ <dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</dependency>
Modified: ctakes/trunk/ctakes-ytex-uima/pom.xml
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-ytex-uima/pom.xml?rev=1789273&r1=1789272&r2=1789273&view=diff
==============================================================================
--- ctakes/trunk/ctakes-ytex-uima/pom.xml (original)
+++ ctakes/trunk/ctakes-ytex-uima/pom.xml Wed Mar 29 04:54:45 2017
@@ -107,6 +107,10 @@
<artifactId>cglib</artifactId>
<version>2.2.2</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.uima</groupId>
+ <artifactId>uimaj-tools</artifactId>
+ </dependency>
</dependencies>
<build>
<plugins>
Modified: ctakes/trunk/pom.xml
URL: http://svn.apache.org/viewvc/ctakes/trunk/pom.xml?rev=1789273&r1=1789272&r2=1789273&view=diff
==============================================================================
--- ctakes/trunk/pom.xml (original)
+++ ctakes/trunk/pom.xml Wed Mar 29 04:54:45 2017
@@ -89,6 +89,8 @@
</parent>
<modules>
+ <module>ctakes-gui</module>
+ <module>ctakes-gui-res</module>
<module>ctakes-utils</module>
<module>ctakes-core</module>
<module>ctakes-type-system</module>
@@ -141,9 +143,208 @@
</modules>
<dependencyManagement>
<dependencies>
+ <!-- cTAKES third party dependency versions -->
+ <!-- Remove jdom and refactor code to jdom2 -->
+ <dependency>
+ <groupId>jdom</groupId>
+ <artifactId>jdom</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jdom</groupId>
+ <artifactId>jdom2</artifactId>
+ <version>2.0.6</version>
+ </dependency>
+ <!-- <dependency> <groupId>jama</groupId> <artifactId>jama</artifactId>
+ <version>1.0.2</version> </dependency> -->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.11</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.17</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-core</artifactId>
+ <version>4.0.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-queries</artifactId>
+ <version>4.0.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-queryparser</artifactId>
+ <version>4.0.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-analyzers-common</artifactId>
+ <version>4.0.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.uima</groupId>
+ <artifactId>uimaj-core</artifactId>
+ <version>2.9.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.uima</groupId>
+ <artifactId>uimaj-tools</artifactId>
+ <version>2.9.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.uima</groupId>
+ <artifactId>uimaj-document-annotation</artifactId>
+ <version>2.9.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.uima</groupId>
+ <artifactId>uimafit-core</artifactId>
+ <version>2.2.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.opennlp</groupId>
+ <artifactId>opennlp-tools</artifactId>
+ <version>1.7.2</version>
+ </dependency>
+ <!-- dependency is uima 2.3 -->
+ <dependency>
+ <groupId>org.apache.opennlp</groupId>
+ <artifactId>opennlp-uima</artifactId>
+ <version>1.7.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.opennlp</groupId>
+ <artifactId>opennlp-maxent</artifactId>
+ <version>3.0.3</version>
+ </dependency>
+ <!--<dependency>-->
+ <!--<groupId>org.apache.uima</groupId>-->
+ <!--<artifactId>uimaj-examples</artifactId>-->
+ <!--<version>2.9.0</version>-->
+ <!--</dependency>-->
+ <dependency>
+ <groupId>tw.edu.ntu.csie</groupId>
+ <artifactId>libsvm</artifactId>
+ <version>3.1</version>
+ </dependency>
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>2.10.0</version>
+ </dependency>
+ <!-- import a consistent set of versions for all ClearTK modules -->
+ <dependency>
+ <groupId>org.cleartk</groupId>
+ <artifactId>cleartk</artifactId>
+ <version>2.0.0</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ <dependency>
+ <groupId>args4j</groupId>
+ <artifactId>args4j</artifactId>
+ <version>2.0.16</version>
+ </dependency>
+ <dependency>
+ <groupId>com.lexicalscope.jewelcli</groupId>
+ <artifactId>jewelcli</artifactId>
+ <version>0.8.3</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>2.0.1</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.4</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-cli</groupId>
+ <artifactId>commons-cli</artifactId>
+ <version>1.2</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>10.0</version>
+ </dependency>
+ <dependency>
+ <groupId>com.carrotsearch</groupId>
+ <artifactId>hppc</artifactId>
+ <version>0.4.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ <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>
+ </dependency>
+ <dependency>
+ <groupId>edu.mit.findstruct</groupId>
+ <artifactId>findstructapi</artifactId>
+ <version>0.0.1</version>
+ </dependency>
+ <dependency>
+ <groupId>com.googlecode.armbrust-file-utils</groupId>
+ <artifactId>sqlwrapper</artifactId>
+ <version>0.0.1</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sourceforge.openai</groupId>
+ <artifactId>openaifsm</artifactId>
+ <version>0.0.1</version>
+ </dependency>
+ <dependency>
+ <groupId>gov.nih.nlm.nls.lvg</groupId>
+ <artifactId>lvgdist</artifactId>
+ <version>2016.0</version>
+ </dependency>
+ <dependency>
+ <groupId>com.googlecode.clearnlp</groupId>
+ <artifactId>clearnlp</artifactId>
+ <version>1.3.1</version>
+ </dependency>
<!-- cTAKES module versions -->
<dependency>
<groupId>org.apache.ctakes</groupId>
+ <artifactId>ctakes-gui</artifactId>
+ <version>${ctakes.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ctakes</groupId>
+ <artifactId>ctakes-gui-res</artifactId>
+ <version>${ctakes.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ctakes</groupId>
<artifactId>ctakes-examples</artifactId>
<version>${ctakes.version}</version>
</dependency>
@@ -171,7 +372,7 @@
<groupId>org.apache.ctakes</groupId>
<artifactId>ctakes-core-res</artifactId>
<version>${ctakes.version}</version>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.apache.ctakes</groupId>
<artifactId>ctakes-dictionary-lookup</artifactId>
@@ -181,7 +382,7 @@
<groupId>org.apache.ctakes</groupId>
<artifactId>ctakes-dictionary-lookup-res</artifactId>
<version>${ctakes.version}</version>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.apache.ctakes</groupId>
<artifactId>ctakes-dictionary-lookup-fast</artifactId>
@@ -206,7 +407,7 @@
<groupId>org.apache.ctakes</groupId>
<artifactId>ctakes-pos-tagger-res</artifactId>
<version>${ctakes.version}</version>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.apache.ctakes</groupId>
<artifactId>ctakes-chunker</artifactId>
@@ -216,7 +417,7 @@
<groupId>org.apache.ctakes</groupId>
<artifactId>ctakes-chunker-res</artifactId>
<version>${ctakes.version}</version>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.apache.ctakes</groupId>
<artifactId>ctakes-lvg</artifactId>
@@ -226,7 +427,7 @@
<groupId>org.apache.ctakes</groupId>
<artifactId>ctakes-lvg-res</artifactId>
<version>${ctakes.version}</version>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.apache.ctakes</groupId>
<artifactId>
@@ -261,7 +462,7 @@
ctakes-ne-contexts-res
</artifactId>
<version>${ctakes.version}</version>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.apache.ctakes</groupId>
<artifactId>
@@ -275,21 +476,21 @@
ctakes-assertion-res
</artifactId>
<version>${ctakes.version}</version>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.apache.ctakes</groupId>
<artifactId>
ctakes-assertion-zoner
</artifactId>
<version>${ctakes.version}</version>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.apache.ctakes</groupId>
<artifactId>
ctakes-assertion-zoner-res
</artifactId>
<version>${ctakes.version}</version>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.apache.ctakes</groupId>
<artifactId>
@@ -303,7 +504,7 @@
ctakes-constituency-parser-res
</artifactId>
<version>${ctakes.version}</version>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.apache.ctakes</groupId>
<artifactId>
@@ -317,21 +518,21 @@
ctakes-coreference-res
</artifactId>
<version>${ctakes.version}</version>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.apache.ctakes</groupId>
<artifactId>
ctakes-drug-ner
</artifactId>
<version>${ctakes.version}</version>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.apache.ctakes</groupId>
<artifactId>
ctakes-drug-ner-res
</artifactId>
<version>${ctakes.version}</version>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.apache.ctakes</groupId>
<artifactId>
@@ -345,7 +546,7 @@
ctakes-side-effect-res
</artifactId>
<version>${ctakes.version}</version>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.apache.ctakes</groupId>
<artifactId>
@@ -359,7 +560,7 @@
ctakes-smoking-status-res
</artifactId>
<version>${ctakes.version}</version>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.apache.ctakes</groupId>
<artifactId>
@@ -373,7 +574,7 @@
ctakes-dependency-parser-res
</artifactId>
<version>${ctakes.version}</version>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.apache.ctakes</groupId>
<artifactId>
@@ -387,7 +588,7 @@
ctakes-relation-extractor-res
</artifactId>
<version>${ctakes.version}</version>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.apache.ctakes</groupId>
<artifactId>
@@ -422,14 +623,14 @@
ctakes-ytex-uima
</artifactId>
<version>${ctakes.version}</version>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.apache.ctakes</groupId>
<artifactId>
ctakes-ytex-web
</artifactId>
<version>${ctakes.version}</version>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.apache.ctakes</groupId>
<artifactId>
@@ -437,183 +638,6 @@
</artifactId>
<version>${ctakes.version}</version>
</dependency>
- <!-- cTAKES third party dependency versions -->
- <dependency>
- <groupId>jdom</groupId>
- <artifactId>jdom</artifactId>
- <version>1.0</version>
- </dependency>
- <dependency>
- <groupId>org.jdom</groupId>
- <artifactId>jdom2</artifactId>
- <version>2.0.3</version>
- </dependency>
- <!-- <dependency> <groupId>jama</groupId> <artifactId>jama</artifactId>
- <version>1.0.2</version> </dependency> -->
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.10</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.16</version>
- </dependency>
- <dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-core</artifactId>
- <version>4.0.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-queries</artifactId>
- <version>4.0.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-queryparser</artifactId>
- <version>4.0.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-analyzers-common</artifactId>
- <version>4.0.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.opennlp</groupId>
- <artifactId>opennlp-tools</artifactId>
- <version>1.7.2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.opennlp</groupId>
- <artifactId>opennlp-uima</artifactId>
- <version>1.7.2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.opennlp</groupId>
- <artifactId>opennlp-maxent</artifactId>
- <version>3.0.3</version>
- </dependency>
- <dependency>
- <groupId>org.apache.uima</groupId>
- <artifactId>uimaj-examples</artifactId>
- <version>2.9.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.uima</groupId>
- <artifactId>uimaj-core</artifactId>
- <version>2.9.0</version>
- </dependency>
- <dependency>
- <groupId>tw.edu.ntu.csie</groupId>
- <artifactId>libsvm</artifactId>
- <version>3.1</version>
- </dependency>
- <dependency>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- <version>2.10.0</version>
- </dependency>
- <!-- import a consistent set of versions for all ClearTK modules -->
- <dependency>
- <groupId>org.cleartk</groupId>
- <artifactId>cleartk</artifactId>
- <version>2.0.0</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- <dependency>
- <groupId>args4j</groupId>
- <artifactId>args4j</artifactId>
- <version>2.0.16</version>
- </dependency>
- <dependency>
- <groupId>com.lexicalscope.jewelcli</groupId>
- <artifactId>jewelcli</artifactId>
- <version>0.8.3</version>
- </dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>2.0.1</version>
- </dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.4</version>
- </dependency>
- <dependency>
- <groupId>commons-cli</groupId>
- <artifactId>commons-cli</artifactId>
- <version>1.2</version>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.1.1</version>
- </dependency>
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>10.0</version>
- </dependency>
- <dependency>
- <groupId>com.carrotsearch</groupId>
- <artifactId>hppc</artifactId>
- <version>0.4.1</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-core</artifactId>
- <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>
- </dependency>
- <dependency>
- <groupId>edu.mit.findstruct</groupId>
- <artifactId>findstructapi</artifactId>
- <version>0.0.1</version>
- </dependency>
- <dependency>
- <groupId>com.googlecode.armbrust-file-utils</groupId>
- <artifactId>sqlwrapper</artifactId>
- <version>0.0.1</version>
- </dependency>
- <dependency>
- <groupId>net.sourceforge.openai</groupId>
- <artifactId>openaifsm</artifactId>
- <version>0.0.1</version>
- </dependency>
- <dependency>
- <groupId>gov.nih.nlm.nls.lvg</groupId>
- <artifactId>lvgdist</artifactId>
- <version>2016.0</version>
- </dependency>
- <dependency>
- <groupId>com.googlecode.clearnlp</groupId>
- <artifactId>clearnlp</artifactId>
- <version>1.3.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.uima</groupId>
- <artifactId>uimafit-core</artifactId>
- <version>2.2.0</version>
- </dependency>
</dependencies>
</dependencyManagement>
<build>