From 7b154a3302c37712111e3f7293df1deae547c15c Mon Sep 17 00:00:00 2001
From: Richard Eckart de Castilho <rec@apache.org>
Date: Mon, 23 Sep 2024 18:55:44 +0200
Subject: [PATCH] Issue #390: Merge uimaFIT modules into UIMAJ repository

- Switch back to explicitly using slf4j-simple where needed because in uimaj-core, we need to not have it on the classpath
- Fix dependencies for JavaDoc
---
 pom.xml                           | 25 +++++++++++++++++++++++++
 uimafit-benchmark/pom.xml         | 10 +++++-----
 uimafit-core/pom.xml              | 10 ++--------
 uimafit-cpe/pom.xml               |  6 ++++++
 uimafit-examples/pom.xml          |  2 +-
 uimafit-spring/pom.xml            |  5 +++++
 uimaj-core/pom.xml                |  4 ++--
 uimaj-document-annotation/pom.xml |  5 +++++
 uimaj-json/pom.xml                |  5 +++++
 uimaj-parent/pom.xml              | 12 ++++++++++--
 uimaj-tools/pom.xml               |  5 +++++
 11 files changed, 71 insertions(+), 18 deletions(-)

diff --git a/pom.xml b/pom.xml
index debd0f296..cca24a900 100644
--- a/pom.xml
+++ b/pom.xml
@@ -241,6 +241,31 @@
                   <artifactId>log4j-core</artifactId>
                   <version>${log4j-version}</version>
                 </additionalDependency>
+                <additionalDependency>
+                  <groupId>commons-io</groupId>
+                  <artifactId>commons-io</artifactId>
+                  <version>${commons-io-version}</version>
+                </additionalDependency>
+                <additionalDependency>
+                  <groupId>org.springframework</groupId>
+                  <artifactId>spring-core</artifactId>
+                  <version>${spring-version}</version>
+                </additionalDependency>
+                <additionalDependency>
+                  <groupId>org.springframework</groupId>
+                  <artifactId>spring-beans</artifactId>
+                  <version>${spring-version}</version>
+                </additionalDependency>
+                <additionalDependency>
+                  <groupId>org.springframework</groupId>
+                  <artifactId>spring-context</artifactId>
+                  <version>${spring-version}</version>
+                </additionalDependency>
+                <additionalDependency>
+                  <groupId>org.apache.commons</groupId>
+                  <artifactId>commons-lang3</artifactId>
+                  <version>${commons-lang3-version}</version>
+                </additionalDependency>
               </additionalDependencies>
             </configuration>
           </execution>
diff --git a/uimafit-benchmark/pom.xml b/uimafit-benchmark/pom.xml
index 49dfae47c..a70b911ef 100644
--- a/uimafit-benchmark/pom.xml
+++ b/uimafit-benchmark/pom.xml
@@ -66,11 +66,11 @@
       <artifactId>commons-lang3</artifactId>
     </dependency>
     
-<!--    <dependency>-->
-<!--      <groupId>org.junit.jupiter</groupId>-->
-<!--      <artifactId>junit-jupiter-engine</artifactId>-->
-<!--      <scope>test</scope>-->
-<!--    </dependency>-->
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-simple</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <build>
diff --git a/uimafit-core/pom.xml b/uimafit-core/pom.xml
index d4a685ac1..9a042bfd6 100644
--- a/uimafit-core/pom.xml
+++ b/uimafit-core/pom.xml
@@ -77,7 +77,6 @@
     <dependency>
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-collections4</artifactId>
-      <version>4.4</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -86,13 +85,8 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.xmlunit</groupId>
-      <artifactId>xmlunit-assertj3</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-core</artifactId>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-simple</artifactId>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/uimafit-cpe/pom.xml b/uimafit-cpe/pom.xml
index 97774e9da..65391f645 100644
--- a/uimafit-cpe/pom.xml
+++ b/uimafit-cpe/pom.xml
@@ -48,6 +48,12 @@
       <artifactId>uimaj-core</artifactId>
       <version>${project.version}</version>
     </dependency>
+    
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-simple</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <build>
diff --git a/uimafit-examples/pom.xml b/uimafit-examples/pom.xml
index 0c3c73713..cfd97c9ba 100644
--- a/uimafit-examples/pom.xml
+++ b/uimafit-examples/pom.xml
@@ -48,10 +48,10 @@
       <groupId>commons-io</groupId>
       <artifactId>commons-io</artifactId>
     </dependency>
+
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-simple</artifactId>
-      <scope>compile</scope>
     </dependency>
   </dependencies>
 
diff --git a/uimafit-spring/pom.xml b/uimafit-spring/pom.xml
index 9849589c7..ac32a66b2 100644
--- a/uimafit-spring/pom.xml
+++ b/uimafit-spring/pom.xml
@@ -62,5 +62,10 @@
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-simple</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 </project>
diff --git a/uimaj-core/pom.xml b/uimaj-core/pom.xml
index d75f2d212..3c482f15f 100644
--- a/uimaj-core/pom.xml
+++ b/uimaj-core/pom.xml
@@ -61,7 +61,7 @@
       <artifactId>log4j-slf4j-impl</artifactId>
       <scope>provided</scope>
     </dependency>
-    
+
     <dependency>
       <groupId>org.apache.uima</groupId>
       <artifactId>uimaj-test-util</artifactId>
@@ -109,7 +109,7 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
-
+  
   <build>
     <pluginManagement>
       <plugins>
diff --git a/uimaj-document-annotation/pom.xml b/uimaj-document-annotation/pom.xml
index a08d44eeb..d80b99fa1 100644
--- a/uimaj-document-annotation/pom.xml
+++ b/uimaj-document-annotation/pom.xml
@@ -51,5 +51,10 @@
       <version>${project.parent.version}</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-simple</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 </project>
\ No newline at end of file
diff --git a/uimaj-json/pom.xml b/uimaj-json/pom.xml
index 5ec7514e9..d75bffd3d 100644
--- a/uimaj-json/pom.xml
+++ b/uimaj-json/pom.xml
@@ -48,6 +48,11 @@
       <version>${project.parent.version}</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-simple</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <build>
diff --git a/uimaj-parent/pom.xml b/uimaj-parent/pom.xml
index 0a62b3310..6da3f856c 100644
--- a/uimaj-parent/pom.xml
+++ b/uimaj-parent/pom.xml
@@ -134,6 +134,7 @@
   </pluginRepositories>
 
   <properties>
+    <commons-collections4-version>4.4</commons-collections4-version>
     <tycho-version>4.0.9</tycho-version>
     
     <!-- 
@@ -202,8 +203,8 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-simple</artifactId>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
       <scope>test</scope>
     </dependency>
   </dependencies>
@@ -295,6 +296,12 @@
         <artifactId>commons-math3</artifactId>
         <version>${commons-math3-version}</version>
       </dependency>
+      <dependency>
+        <groupId>org.apache.commons</groupId>
+        <artifactId>commons-collections4</artifactId>
+        <version>${commons-collections4-version}</version>
+      </dependency>
+      
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-core</artifactId>
@@ -749,6 +756,7 @@
                 <ignoredDependency>org.assertj:assertj-core</ignoredDependency>
                 <ignoredDependency>org.xmlunit:xmlunit-assertj3</ignoredDependency>
                 <ignoredDependency>org.slf4j:slf4j-simple</ignoredDependency>
+                <ignoredDependency>org.mockito:mockito-core</ignoredDependency>
                 <ignoredDependency>org.junit.jupiter:junit-jupiter-api</ignoredDependency>
                 <ignoredDependency>org.junit.jupiter:junit-jupiter-engine</ignoredDependency>
                 <ignoredDependency>org.junit.vintage:junit-vintage-engine</ignoredDependency>
diff --git a/uimaj-tools/pom.xml b/uimaj-tools/pom.xml
index e94e0c3ff..af05507a4 100644
--- a/uimaj-tools/pom.xml
+++ b/uimaj-tools/pom.xml
@@ -56,6 +56,11 @@
 			<version>${project.parent.version}</version>
 			<scope>test</scope>
 		</dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-simple</artifactId>
+      <scope>test</scope>
+    </dependency>
 	</dependencies>
 
 	<build>