#442 - Upgrade to UIMAv3

- Back to stable UIMAv3 release
- Remove all SNAPSHOT repos

cleartk-ml/pom.xml

@@ -15,6 +15,7 @@
 			<groupId>org.cleartk</groupId>
 			<artifactId>cleartk-util</artifactId>
 		</dependency>
+
 		<!-- test only -->
 		<dependency>
 			<groupId>org.cleartk</groupId>
@@ -26,6 +27,10 @@
 			<artifactId>uimaj-document-annotation</artifactId>
 			<scope>test</scope>
 		</dependency>
-
+    <dependency>
+      <groupId>org.assertj</groupId>
+      <artifactId>assertj-core</artifactId>
+      <scope>test</scope>
+    </dependency>
 	</dependencies>
 </project>

cleartk-ml/src/test/java/org/cleartk/ml/viterbi/ViterbiDataWriterTest.java

@@ -24,6 +24,9 @@
 
 package org.cleartk.ml.viterbi;
 
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.contentOf;
 import static org.junit.Assert.assertTrue;
 
 import java.io.File;
@@ -33,7 +36,6 @@
 import java.util.List;
 import java.util.Set;
 
-import org.apache.commons.io.FileUtils;
 import org.apache.uima.analysis_engine.AnalysisEngine;
 import org.apache.uima.analysis_engine.AnalysisEngineProcessException;
 import org.apache.uima.fit.factory.AnalysisEngineFactory;
@@ -52,7 +54,6 @@
 import org.cleartk.test.util.DefaultTestBase;
 import org.cleartk.test.util.type.Sentence;
 import org.cleartk.test.util.type.Token;
-import org.junit.Assert;
 import org.junit.Test;
 
 /**
@@ -117,15 +118,17 @@ public void testConsumeAll() throws Exception {
     String expectedManifest = "Manifest-Version: 1.0\n"
         + "classifierBuilderClass: org.cleartk.ml.viterbi.ViterbiClassifierBuilde\n" + " r";
 
-    File manifestFile = new File(outputDirectoryName, "MANIFEST.MF");
-    String actualManifest = FileUtils.readFileToString(manifestFile);
-    Assert.assertEquals(expectedManifest, actualManifest.replaceAll("\r", "").trim());
+    assertThat(contentOf(new File(outputDirectoryName, "MANIFEST.MF"), UTF_8).trim()) //
+        .isEqualToNormalizingNewlines(expectedManifest.trim());
+
+    // File manifestFile = new File(outputDirectoryName, "MANIFEST.MF");
+    // String actualManifest = FileUtils.readFileToString(manifestFile);
+    // Assert.assertEquals(expectedManifest, actualManifest.replaceAll("\r", "").trim());
 
     ViterbiClassifierBuilder<String> builder = new ViterbiClassifierBuilder<String>();
     File delegatedOutputDirectory = builder.getDelegatedModelDirectory(outputDirectory);
-    String[] trainingData = FileUtil.loadListOfStrings(new File(
-        delegatedOutputDirectory,
-        "training-data.test"));
+    String[] trainingData = FileUtil.loadListOfStrings(
+        new File(delegatedOutputDirectory, "training-data.test"));
     testFeatures(trainingData[1], "PreviousOutcome_L1_D");
     testFeatures(
         trainingData[2],

pom.xml

@@ -95,6 +95,7 @@
     <uima-jcasgen-version>3.3.0</uima-jcasgen-version>
     <uimafit-version>3.3.0</uimafit-version>
     <slf4j-version>1.7.36</slf4j-version>
+    <assertj-version>3.22.0</assertj-version>
 	</properties>
 	<dependencyManagement>
 		<dependencies>
@@ -145,6 +146,11 @@
 				<artifactId>junit</artifactId>
 				<version>4.13.1</version>
 			</dependency>
+      <dependency>
+        <groupId>org.assertj</groupId>
+        <artifactId>assertj-core</artifactId>
+        <version>${assertj-version}</version>
+      </dependency>
 			<!-- ClearTK modules -->
 			<dependency>
 				<groupId>org.cleartk</groupId>