Release 2.4.

A lot of files have only changed because the imports were optimized for the whole project.
JULIELab · Mar 28, 2019 · b33c86e · b33c86e
1 parent f4d3d94
commit b33c86e
Show file tree

Hide file tree

Showing 796 changed files with 3,081 additions and 4,517 deletions.
diff --git a/jcore-ace-reader/component.meta b/jcore-ace-reader/component.meta
@@ -1,12 +1,11 @@
 {
     "categories": [
-        "ae",
         "reader"
     ],
     "description": "JCoRe ACE Reader. A Collection Reader that converts ACE-XML files to CAS objects.",
     "descriptors": [
         {
-            "category": "ae",
+            "category": "reader",
             "location": "de.julielab.jcore.reader.ace.desc.jcore-ace-reader"
         }
     ],
@@ -15,7 +14,7 @@
     "maven-artifact": {
         "artifactId": "jcore-ace-reader",
         "groupId": "de.julielab",
-        "version": "2.4.0-SNAPSHOT"
+        "version": "2.4.0"
     },
     "name": "JCoRe ACE Reader"
 }
diff --git a/jcore-ace-reader/pom.xml b/jcore-ace-reader/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>de.julielab</groupId>
         <artifactId>jcore-base</artifactId>
-        <version>2.4.0-SNAPSHOT</version>
+        <version>2.4.0</version>
     </parent>
 
     <dependencies>

diff --git a/jcore-ace-reader/src/main/java/de/julielab/jcore/reader/ace/AceReader.java b/jcore-ace-reader/src/main/java/de/julielab/jcore/reader/ace/AceReader.java
@@ -17,21 +17,9 @@
 
 package de.julielab.jcore.reader.ace;
 
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStreamWriter;
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.Hashtable;
-import java.util.List;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-
+import de.julielab.jcore.types.ArgumentMention;
+import de.julielab.jcore.types.ace.*;
+import de.julielab.jcore.utility.JCoReAnnotationTools;
 import org.apache.uima.UimaContext;
 import org.apache.uima.cas.CAS;
 import org.apache.uima.cas.CASException;
@@ -50,17 +38,14 @@
 import org.w3c.dom.NodeList;
 import org.xml.sax.SAXException;
 
-import de.julielab.jcore.types.ArgumentMention;
-import de.julielab.jcore.types.ace.EntityMention;
-import de.julielab.jcore.types.ace.EventMention;
-import de.julielab.jcore.types.ace.EventMentionArgument;
-import de.julielab.jcore.types.ace.RelationMention;
-import de.julielab.jcore.types.ace.RelationMentionArgument;
-import de.julielab.jcore.types.ace.Timex2;
-import de.julielab.jcore.types.ace.Timex2Mention;
-import de.julielab.jcore.types.ace.Value;
-import de.julielab.jcore.types.ace.ValueMention;
-import de.julielab.jcore.utility.JCoReAnnotationTools;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+import java.io.*;
+import java.lang.reflect.InvocationTargetException;
+import java.util.ArrayList;
+import java.util.Hashtable;
+import java.util.List;
 
 // TODO add query if the data elements (e.g. ArrayLists) are null. Only if it is
 // not so, read those elements to prevent exceptions

diff --git a/jcore-ace-reader/src/main/resources/de/julielab/jcore/reader/ace/desc/jcore-ace-reader.xml b/jcore-ace-reader/src/main/resources/de/julielab/jcore/reader/ace/desc/jcore-ace-reader.xml
@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <collectionReaderDescription xmlns="http://uima.apache.org/resourceSpecifier">
     <frameworkImplementation>org.apache.uima.java</frameworkImplementation>
     <implementationName>de.julielab.jcore.reader.ace.AceReader</implementationName>
     <processingResourceMetaData>
-        <name>de.julielab.jcore.reader.ace.AceReader</name>
+        <name>AceReader</name>
         <description>Descriptor automatically generated by uimaFIT</description>
-        <version>unknown</version>
-        <vendor>de.julielab.jcore.reader.ace</vendor>
+        <version>2.4.0</version>
+        <vendor>JULIE Lab Jena, Germany</vendor>
         <configurationParameters>
             <configurationParameter>
                 <name>generateJcoreTypes</name>
@@ -37,8 +37,8 @@
                 <import name="de.julielab.jcore.types.extensions.jcore-semantics-ace-types" />
             </imports>
         </typeSystemDescription>
-        <fsIndexCollection/>
-        <capabilities/>
+        <fsIndexCollection />
+        <capabilities />
         <operationalProperties>
             <modifiesCas>true</modifiesCas>
             <multipleDeploymentAllowed>false</multipleDeploymentAllowed>

diff --git a/jcore-ace-reader/src/test/java/de/julielab/jcore/reader/ace/AceReaderTest.java b/jcore-ace-reader/src/test/java/de/julielab/jcore/reader/ace/AceReaderTest.java
@@ -17,18 +17,11 @@
 
 package de.julielab.jcore.reader.ace;
 
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Iterator;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-
+import de.julielab.jcore.types.Annotation;
+import de.julielab.jcore.types.ArgumentMention;
+import de.julielab.jcore.types.EntityMention;
+import de.julielab.jcore.types.ace.*;
 import junit.framework.TestCase;
-
 import org.apache.uima.UIMAFramework;
 import org.apache.uima.analysis_engine.metadata.AnalysisEngineMetaData;
 import org.apache.uima.cas.CAS;
@@ -48,25 +41,14 @@
 import org.w3c.dom.Node;
 import org.xml.sax.SAXException;
 
-import de.julielab.jcore.types.Annotation;
-import de.julielab.jcore.types.ArgumentMention;
-import de.julielab.jcore.types.EntityMention;
-import de.julielab.jcore.types.ace.GPE;
-import de.julielab.jcore.types.ace.LOC;
-import de.julielab.jcore.types.ace.PART_WHOLE;
-import de.julielab.jcore.types.ace.PART_WHOLE_Inverse;
-import de.julielab.jcore.types.ace.Transaction;
-import de.julielab.jcore.types.ace.Document;
-import de.julielab.jcore.types.ace.Entity;
-import de.julielab.jcore.types.ace.EntityAttribute;
-import de.julielab.jcore.types.ace.Event;
-import de.julielab.jcore.types.ace.EventMention;
-import de.julielab.jcore.types.ace.Relation;
-import de.julielab.jcore.types.ace.RelationMention;
-import de.julielab.jcore.types.ace.SourceFile;
-import de.julielab.jcore.types.ace.Timex2;
-import de.julielab.jcore.types.ace.Value;
-import de.julielab.jcore.utility.JCoReTools;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Iterator;
 
 public class AceReaderTest extends TestCase {
 	/**

diff --git a/jcore-acronym-ae/component.meta b/jcore-acronym-ae/component.meta
@@ -14,7 +14,7 @@
     "maven-artifact": {
         "artifactId": "jcore-acronym-ae",
         "groupId": "de.julielab",
-        "version": "2.4.0-SNAPSHOT"
+        "version": "2.4.0"
     },
     "name": "JCoRe Acronym Tagger"
 }
diff --git a/jcore-acronym-ae/pom.xml b/jcore-acronym-ae/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>de.julielab</groupId>
         <artifactId>jcore-base</artifactId>
-        <version>2.4.0-SNAPSHOT</version>
+        <version>2.4.0</version>
     </parent>
 
     <dependencies>

diff --git a/jcore-acronym-ae/src/main/java/de/julielab/jcore/ae/acronymtagger/entries/AcronymEntry.java b/jcore-acronym-ae/src/main/java/de/julielab/jcore/ae/acronymtagger/entries/AcronymEntry.java
@@ -21,11 +21,7 @@
 package de.julielab.jcore.ae.acronymtagger.entries;
 
 import java.io.Serializable;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-import java.util.TreeMap;
+import java.util.*;
 import java.util.Map.Entry;
 
 

diff --git a/jcore-acronym-ae/src/main/java/de/julielab/jcore/ae/acronymtagger/main/AcronymAnnotator.java b/jcore-acronym-ae/src/main/java/de/julielab/jcore/ae/acronymtagger/main/AcronymAnnotator.java
@@ -28,22 +28,11 @@
 
 package de.julielab.jcore.ae.acronymtagger.main;
 
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
+import de.julielab.jcore.ae.acronymtagger.entries.AcronymEntry;
+import de.julielab.jcore.ae.acronymtagger.entries.FullformEntry;
+import de.julielab.jcore.types.Abbreviation;
+import de.julielab.jcore.types.AbbreviationLongform;
+import de.julielab.jcore.types.Sentence;
 import org.apache.uima.UimaContext;
 import org.apache.uima.analysis_component.JCasAnnotator_ImplBase;
 import org.apache.uima.analysis_engine.annotator.AnnotatorConfigurationException;
@@ -57,12 +46,14 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import de.julielab.jcore.ae.acronymtagger.entries.AcronymEntry;
-import de.julielab.jcore.ae.acronymtagger.entries.FullformEntry;
-import de.julielab.jcore.types.Abbreviation;
-import de.julielab.jcore.types.AbbreviationLongform;
-import de.julielab.jcore.types.Annotation;
-import de.julielab.jcore.types.Sentence;
+import java.io.*;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 /**
  * Finds fullforms for acronyms using the Schwartz/Hearst algorithm if no fullform was found, then the acronym can be

diff --git a/...cronym-ae/src/main/java/de/julielab/jcore/ae/acronymtagger/main/ConsistencyAnnotator.java b/...cronym-ae/src/main/java/de/julielab/jcore/ae/acronymtagger/main/ConsistencyAnnotator.java
@@ -14,14 +14,13 @@
  **/
 package de.julielab.jcore.ae.acronymtagger.main;
 
-import java.util.Stack;
-
+import de.julielab.jcore.types.Abbreviation;
+import de.julielab.jcore.types.AbbreviationLongform;
 import org.apache.uima.cas.FSIterator;
 import org.apache.uima.jcas.JCas;
 import org.apache.uima.jcas.JFSIndexRepository;
 
-import de.julielab.jcore.types.Abbreviation;
-import de.julielab.jcore.types.AbbreviationLongform;
+import java.util.Stack;
 
 /**
  * TODO insert description

diff --git a/jcore-acronym-ae/src/main/java/de/julielab/jcore/ae/acronymtagger/main/Postprocessing.java b/jcore-acronym-ae/src/main/java/de/julielab/jcore/ae/acronymtagger/main/Postprocessing.java
@@ -10,23 +10,20 @@
  **/
 package de.julielab.jcore.ae.acronymtagger.main;
 
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.stream.Stream;
-
-import org.apache.uima.cas.FSIterator;
-import org.apache.uima.jcas.JCas;
-import org.apache.uima.jcas.tcas.Annotation;
-
 import de.julielab.jcore.types.Abbreviation;
 import de.julielab.jcore.types.AbbreviationLongform;
 import de.julielab.jcore.utility.index.Comparators;
 import de.julielab.jcore.utility.index.JCoReTreeMapAnnotationIndex;
 import de.julielab.jcore.utility.index.TermGenerators;
 import de.julielab.jcore.utility.index.TermGenerators.LongOffsetIndexTermGenerator;
+import org.apache.uima.cas.FSIterator;
+import org.apache.uima.jcas.JCas;
+import org.apache.uima.jcas.tcas.Annotation;
+
+import java.util.Comparator;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.stream.Stream;
 
 public class Postprocessing {
 

diff --git a/...cronym-ae/src/main/resources/de/julielab/jcore/ae/acronymtagger/desc/jcore-acronym-ae.xml b/...cronym-ae/src/main/resources/de/julielab/jcore/ae/acronymtagger/desc/jcore-acronym-ae.xml
@@ -6,7 +6,7 @@
   <analysisEngineMetaData>
     <name>JCoRe AcronymAnnotator</name>
     <description />
-    <version>2.3.0</version>
+    <version>2.4.0</version>
     <vendor>JULIE Lab Jena, Germany</vendor>
     <configurationParameters>
       <configurationParameter>

diff --git a/...cronym-ae/src/test/java/de/julielab/jcore/ae/acronymtagger/main/AcronymAnnotatorTest.java b/...cronym-ae/src/test/java/de/julielab/jcore/ae/acronymtagger/main/AcronymAnnotatorTest.java
@@ -15,13 +15,10 @@
 
 package de.julielab.jcore.ae.acronymtagger.main;
 
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Paths;
-import java.util.ArrayList;
-import java.util.Collection;
-
-import org.apache.uima.UIMAException;
+import de.julielab.jcore.types.Abbreviation;
+import de.julielab.jcore.types.AbbreviationLongform;
+import de.julielab.jcore.types.Sentence;
+import junit.framework.TestCase;
 import org.apache.uima.UIMAFramework;
 import org.apache.uima.analysis_engine.AnalysisEngine;
 import org.apache.uima.cas.CAS;
@@ -42,10 +39,11 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import de.julielab.jcore.types.Abbreviation;
-import de.julielab.jcore.types.AbbreviationLongform;
-import de.julielab.jcore.types.Sentence;
-import junit.framework.TestCase;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.Collection;
 
 /**
  * The AcronymAnnotatorTest class

diff --git a/...-ae/src/test/resources/de/julielab/jcore/ae/acronymtagger/desc/JulesToolsAEDescriptor.xml b/...-ae/src/test/resources/de/julielab/jcore/ae/acronymtagger/desc/JulesToolsAEDescriptor.xml
@@ -6,7 +6,7 @@
   <analysisEngineMetaData>
     <name>JulesToolsDescriptor</name>
     <description />
-    <version>2.3.0</version>
+    <version>2.4.0</version>
     <vendor />
     <configurationParameters />
     <configurationParameterSettings />

diff --git a/...e/src/test/resources/de/julielab/jcore/ae/acronymtagger/desc/jcore-acronymtagger-test.xml b/...e/src/test/resources/de/julielab/jcore/ae/acronymtagger/desc/jcore-acronymtagger-test.xml
@@ -6,7 +6,7 @@
   <analysisEngineMetaData>
     <name>JCoRe AcronymAnnotator</name>
     <description />
-    <version>2.3.0</version>
+    <version>2.4.0</version>
     <vendor>JULIE Lab Jena, Germany</vendor>
     <configurationParameters>
       <configurationParameter>

diff --git a/...rc/test/resources/de/julielab/jcore/ae/acronymtagger/types/StemNetSemanticsTypeSystem.xml b/...rc/test/resources/de/julielab/jcore/ae/acronymtagger/types/StemNetSemanticsTypeSystem.xml
@@ -2,7 +2,7 @@
 <typeSystemDescription xmlns="http://uima.apache.org/resourceSpecifier">
 <name>StemNetSemanticsTypeSystem</name>
 <description />
-<version>2.3.0</version>
+<version>2.4.0</version>
 <vendor>http://www.julielab.de</vendor>
 <imports>
 <import location="JulieTypeSystem.xml" />

diff --git a/jcore-acronym-writer/src/main/java/de/julielab/jcore/consumer/acronyms/AcronymWriter.java b/jcore-acronym-writer/src/main/java/de/julielab/jcore/consumer/acronyms/AcronymWriter.java
@@ -15,8 +15,6 @@
 import org.apache.uima.jcas.JCas;
 import org.apache.uima.jcas.tcas.Annotation;
 import org.apache.uima.resource.ResourceInitializationException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import java.io.File;
 import java.io.IOException;