Skip to content

Commit

Permalink
Merge pull request #451 from ClearTK/refactoring/448-Update-dependencies
Browse files Browse the repository at this point in the history 
#448 - Update dependencies
  • Loading branch information
@reckart
reckart authored Nov 4, 2022
2 parents 1bc283b + 9b01477 commit a482d55
Show file tree
Hide file tree
Showing 15 changed files with 280 additions and 232 deletions.
79 changes: 43 additions & 36 deletions cleartk-corpus/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,37 +1,44 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>cleartk-corpus</artifactId>
<packaging>jar</packaging>
<name>ClearTK Corpus</name>
<description>ClearTK annotators and readers for various corpora</description>
<parent>
<artifactId>cleartk</artifactId>
<groupId>org.cleartk</groupId>
<version>2.1.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<dependencies>
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-document-annotation</artifactId>
</dependency>
<dependency>
<groupId>org.cleartk</groupId>
<artifactId>cleartk-util</artifactId>
</dependency>
<dependency>
<groupId>org.cleartk</groupId>
<artifactId>cleartk-type-system</artifactId>
</dependency>
<dependency>
<groupId>org.jdom</groupId>
<artifactId>jdom</artifactId>
</dependency>
<!-- test only -->
<dependency>
<groupId>org.cleartk</groupId>
<artifactId>cleartk-test-util</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>cleartk-corpus</artifactId>
<packaging>jar</packaging>
<name>ClearTK Corpus</name>
<description>ClearTK annotators and readers for various corpora</description>
<parent>
<artifactId>cleartk</artifactId>
<groupId>org.cleartk</groupId>
<version>2.1.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<dependencies>
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-document-annotation</artifactId>
</dependency>
<dependency>
<groupId>org.cleartk</groupId>
<artifactId>cleartk-util</artifactId>
</dependency>
<dependency>
<groupId>org.cleartk</groupId>
<artifactId>cleartk-type-system</artifactId>
</dependency>
<dependency>
<groupId>org.jdom</groupId>
<artifactId>jdom</artifactId>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</dependency>

<!-- test only -->
<dependency>
<groupId>org.cleartk</groupId>
<artifactId>cleartk-test-util</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
</project>
16 changes: 10 additions & 6 deletions cleartk-corpus/src/main/java/org/cleartk/corpus/timeml/TempEval2013Writer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,10 @@

import com.google.common.base.Function;
import com.google.common.base.Objects;
import com.google.common.base.Objects.ToStringHelper;
import com.google.common.collect.Ordering;
import com.google.common.primitives.Ints;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;

/**
* Write events, times and temporal relations in the TempEval 2013 format.
Expand Down Expand Up @@ -286,11 +287,7 @@ public Span(AnnotationFS annotation) {
this(annotation.getBegin(), annotation.getEnd());
}

@Override
public String toString() {
ToStringHelper helper = Objects.toStringHelper(this.getClass());
return helper.add("begin", this.begin).add("end", this.end).toString();
}


@Override
public int hashCode() {
Expand Down Expand Up @@ -329,6 +326,13 @@ public int compare(Span left, Span right) {
return Ints.compare(left.end, right.end);
}
};

@Override
public String toString()
{
return new ToStringBuilder(this, ToStringStyle.SIMPLE_STYLE).append("begin", begin)
.append("end", end).toString();
}
}

private static class MakeInstance extends FakeAnnotation<Event> {
Expand Down
58 changes: 34 additions & 24 deletions cleartk-eval/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,25 +1,35 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>cleartk-eval</artifactId>
<packaging>jar</packaging>
<name>ClearTK Eval</name>
<description>ClearTK annotator evaluation library</description>
<parent>
<artifactId>cleartk</artifactId>
<groupId>org.cleartk</groupId>
<version>2.1.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<dependencies>
<dependency>
<groupId>org.cleartk</groupId>
<artifactId>cleartk-util</artifactId>
</dependency>
<!-- test only -->
<dependency>
<groupId>org.cleartk</groupId>
<artifactId>cleartk-test-util</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<artifactId>cleartk</artifactId>
<groupId>org.cleartk</groupId>
<version>2.1.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

<artifactId>cleartk-eval</artifactId>

<name>ClearTK Eval</name>
<description>ClearTK annotator evaluation library</description>

<dependencies>
<dependency>
<groupId>org.cleartk</groupId>
<artifactId>cleartk-util</artifactId>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</dependency>

<!-- test only -->
<dependency>
<groupId>org.cleartk</groupId>
<artifactId>cleartk-test-util</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
</project>
12 changes: 6 additions & 6 deletions cleartk-eval/src/main/java/org/cleartk/eval/AnnotationStatistics.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,10 @@

import com.google.common.base.Function;
import com.google.common.base.Objects;
import com.google.common.base.Objects.ToStringHelper;
import com.google.common.collect.HashMultiset;
import com.google.common.collect.Multiset;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;

/**
* Stores statistics for comparing {@link Annotation}s extracted by a system to gold
Expand Down Expand Up @@ -461,11 +462,10 @@ public boolean equals(Object obj) {
}

@Override
public String toString() {
ToStringHelper helper = Objects.toStringHelper(this);
helper.add("begin", this.begin);
helper.add("end", this.end);
return helper.toString();
public String toString()
{
return new ToStringBuilder(this, ToStringStyle.SIMPLE_STYLE).append("end", end)
.append("begin", begin).toString();
}
}
}
15 changes: 10 additions & 5 deletions cleartk-eval/src/main/java/org/cleartk/eval/util/ConfusionMatrix.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,11 @@
import java.util.SortedSet;
import java.util.TreeSet;

import com.google.common.base.Objects;
import com.google.common.collect.HashMultiset;
import com.google.common.collect.Multiset;
import com.google.common.collect.Ordering;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;

/**
* This data structure provides an easy way to build and output a confusion matrix. A confusion
Expand Down Expand Up @@ -156,10 +157,7 @@ public int getActualTotal(T actual) {
}
}

@Override
public String toString() {
return Objects.toStringHelper(this).add("matrix", this.matrix).toString();
}


/**
* Outputs the ConfusionMatrix as comma-separated values for easy import into spreadsheets
Expand Down Expand Up @@ -287,4 +285,11 @@ public static void main(String[] args) {
System.out.println(confusionMatrix2.toHTML());
System.out.println(confusionMatrix2.toCSV());
}

@Override
public String toString()
{
return new ToStringBuilder(this, ToStringStyle.SIMPLE_STYLE).append("matrix", matrix)
.toString();
}
}
148 changes: 75 additions & 73 deletions cleartk-maltparser/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,75 +1,77 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>cleartk-maltparser</artifactId>
<packaging>jar</packaging>
<name>ClearTK MaltParser</name>
<description>ClearTK wrapper for MaltParser</description>
<parent>
<artifactId>cleartk</artifactId>
<groupId>org.cleartk</groupId>
<version>2.1.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<dependencies>
<dependency>
<groupId>org.maltparser</groupId>
<artifactId>maltparser</artifactId>
<version>1.8</version>
<!-- MaltParser is using old versions -->
<exclusions>
<exclusion>
<groupId>de.bwaldvogel</groupId>
<artifactId>liblinear</artifactId>
</exclusion>
<exclusion>
<groupId>tw.edu.ntu.csie</groupId>
<artifactId>libsvm</artifactId>
</exclusion>
<exclusion>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>de.bwaldvogel</groupId>
<artifactId>liblinear</artifactId>
<version>1.94</version>
</dependency>
<dependency>
<groupId>tw.edu.ntu.csie</groupId>
<artifactId>libsvm</artifactId>
<version>3.17</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.17</version>
</dependency>
<dependency>
<groupId>org.cleartk</groupId>
<artifactId>cleartk-util</artifactId>
</dependency>
<dependency>
<groupId>org.cleartk</groupId>
<artifactId>cleartk-type-system</artifactId>
</dependency>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>cleartk-maltparser</artifactId>
<packaging>jar</packaging>
<name>ClearTK MaltParser</name>
<description>ClearTK wrapper for MaltParser</description>
<parent>
<artifactId>cleartk</artifactId>
<groupId>org.cleartk</groupId>
<version>2.1.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<dependencies>
<dependency>
<groupId>org.maltparser</groupId>
<artifactId>maltparser</artifactId>
<version>1.9.2</version>
<!-- MaltParser is using old versions -->
<exclusions>
<exclusion>
<groupId>de.bwaldvogel</groupId>
<artifactId>liblinear</artifactId>
</exclusion>
<exclusion>
<groupId>tw.edu.ntu.csie</groupId>
<artifactId>libsvm</artifactId>
</exclusion>
<exclusion>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>de.bwaldvogel</groupId>
<artifactId>liblinear</artifactId>
<version>1.94</version>
</dependency>
<dependency>
<groupId>tw.edu.ntu.csie</groupId>
<artifactId>libsvm</artifactId>
<version>3.17</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.17</version>
</dependency>
<dependency>
<groupId>org.cleartk</groupId>
<artifactId>cleartk-util</artifactId>
</dependency>
<dependency>
<groupId>org.cleartk</groupId>
<artifactId>cleartk-type-system</artifactId>
</dependency>
<!-- test only -->
<dependency>
<groupId>org.cleartk</groupId>
<artifactId>cleartk-test-util</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<plugins>
<!-- increase max memory for tests since model must be loaded -->
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine>-Xmx2g</argLine>
</configuration>
</plugin>
</plugins>
</build>
<dependency>
<groupId>org.cleartk</groupId>
<artifactId>cleartk-test-util</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<plugins>
<!-- increase max memory for tests since model must be loaded -->
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine>-Xmx2g</argLine>
</configuration>
</plugin>
</plugins>
</build>
</project>
Loading

0 comments on commit a482d55

Please sign in to comment.