Issue #390: Merge uimaFIT modules into UIMAJ repository

- Consolidate dependencies and test logging
apache · Sep 23, 2024 · 44a47c9 · 44a47c9
1 parent 533df53
commit 44a47c9
Show file tree

Hide file tree

Showing 27 changed files with 540 additions and 270 deletions.
diff --git a/aggregate-uimaj/pom.xml b/aggregate-uimaj/pom.xml
@@ -59,7 +59,6 @@
     <module>../uimafit-documentation</module>
     <module>../uimafit-cpe</module>
     <module>../uimafit-benchmark</module>
-    <module>../uimafit-parent</module>
 
     <!-- the internal tools project is not part of any release 
          and can't be built automatically - to build it,

diff --git a/uimafit-assertj/pom.xml b/uimafit-assertj/pom.xml
@@ -19,12 +19,13 @@
 -->
 <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>
-	<parent>
-		<groupId>org.apache.uima</groupId>
-		<artifactId>uimafit-parent</artifactId>
-		<version>3.6.0-SNAPSHOT</version>
-		<relativePath>../uimafit-parent</relativePath>
-	</parent>
+
+  <parent>
+    <groupId>org.apache.uima</groupId>
+    <artifactId>uimaj-parent</artifactId>
+    <version>3.6.0-SNAPSHOT</version>
+    <relativePath>../uimaj-parent/pom.xml</relativePath>
+  </parent>
 
 	<artifactId>uimafit-assertj</artifactId>
 	<packaging>bundle</packaging>
@@ -35,12 +36,14 @@
 		<dependency>
 			<groupId>org.apache.uima</groupId>
 			<artifactId>uimafit-core</artifactId>
-			<version>3.6.0-SNAPSHOT</version>
+      <version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.uima</groupId>
 			<artifactId>uimaj-core</artifactId>
+      <version>${project.version}</version>
 		</dependency>
+
 		<dependency>
 			<groupId>org.assertj</groupId>
 			<artifactId>assertj-core</artifactId>

diff --git a/uimafit-benchmark/pom.xml b/uimafit-benchmark/pom.xml
@@ -19,42 +19,47 @@
 -->
 <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>
+
+  <parent>
+    <groupId>org.apache.uima</groupId>
+    <artifactId>uimaj-parent</artifactId>
+    <version>3.6.0-SNAPSHOT</version>
+    <relativePath>../uimaj-parent/pom.xml</relativePath>
+  </parent>
+
   <artifactId>uimafit-benchmark</artifactId>
   <packaging>jar</packaging>
   <name>Apache UIMA uimaFIT - Benchmark</name>
   <description>Factories, Injection, and Testing library for UIMA</description>
   <url>${uimaWebsiteUrl}</url>
-  <parent>
-    <groupId>org.apache.uima</groupId>
-    <artifactId>uimafit-parent</artifactId>
-    <version>3.6.0-SNAPSHOT</version>
-    <relativePath>../uimafit-parent</relativePath>
-  </parent>
+
   <licenses>
     <license>
       <name>Apache License, Version 2.0</name>
       <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
       <distribution>repo</distribution>
     </license>
   </licenses>
+
   <properties>
     <maven.deploy.skip>true</maven.deploy.skip>
   </properties>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.uima</groupId>
       <artifactId>uimafit-core</artifactId>
-      <version>3.6.0-SNAPSHOT</version>
+      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.uima</groupId>
       <artifactId>uimaj-core</artifactId>
+      <version>${project.version}</version>
     </dependency>
 
     <dependency>
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-math3</artifactId>
-      <version>3.6.1</version>
     </dependency>
     <dependency>
       <groupId>org.apache.commons</groupId>

diff --git a/uimafit-benchmark/src/test/resources/simplelogger.properties b/uimafit-benchmark/src/test/resources/simplelogger.properties
@@ -1 +1,18 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 org.slf4j.simpleLogger.defaultLogLevel=warn
diff --git a/uimafit-core/pom.xml b/uimafit-core/pom.xml
@@ -22,9 +22,9 @@
 
   <parent>
     <groupId>org.apache.uima</groupId>
-    <artifactId>uimafit-parent</artifactId>
+    <artifactId>uimaj-parent</artifactId>
     <version>3.6.0-SNAPSHOT</version>
-    <relativePath>../uimafit-parent</relativePath>
+    <relativePath>../uimaj-parent/pom.xml</relativePath>
   </parent>
 
   <artifactId>uimafit-core</artifactId>
@@ -41,7 +41,14 @@
       <distribution>repo</distribution>
     </license>
   </licenses>
+
   <dependencies>
+    <dependency>
+      <groupId>org.apache.uima</groupId>
+      <artifactId>uimaj-core</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+
     <dependency>
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-lang3</artifactId>
@@ -50,10 +57,6 @@
       <groupId>commons-io</groupId>
       <artifactId>commons-io</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.apache.uima</groupId>
-      <artifactId>uimaj-core</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-core</artifactId>

diff --git a/uimafit-core/src/test/resources/simplelogger.properties b/uimafit-core/src/test/resources/simplelogger.properties
@@ -1 +1,18 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 org.slf4j.simpleLogger.defaultLogLevel=warn
diff --git a/uimafit-cpe/pom.xml b/uimafit-cpe/pom.xml
@@ -19,11 +19,12 @@
 -->
 <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>
+
   <parent>
     <groupId>org.apache.uima</groupId>
-    <artifactId>uimafit-parent</artifactId>
+    <artifactId>uimaj-parent</artifactId>
     <version>3.6.0-SNAPSHOT</version>
-    <relativePath>../uimafit-parent</relativePath>
+    <relativePath>../uimaj-parent/pom.xml</relativePath>
   </parent>
 
   <artifactId>uimafit-cpe</artifactId>
@@ -35,16 +36,17 @@
     <dependency>
       <groupId>org.apache.uima</groupId>
       <artifactId>uimafit-core</artifactId>
-      <version>3.6.0-SNAPSHOT</version>
+      <version>${project.version}</version>
     </dependency>
-
     <dependency>
       <groupId>org.apache.uima</groupId>
       <artifactId>uimaj-cpe</artifactId>
+      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.uima</groupId>
       <artifactId>uimaj-core</artifactId>
+      <version>${project.version}</version>
     </dependency>
   </dependencies>
 

diff --git a/uimafit-cpe/src/test/resources/simplelogger.properties b/uimafit-cpe/src/test/resources/simplelogger.properties
@@ -1 +1,18 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 org.slf4j.simpleLogger.defaultLogLevel=warn
diff --git a/uimafit-documentation/pom.xml b/uimafit-documentation/pom.xml
@@ -19,11 +19,12 @@
 -->
 <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>
+
   <parent>
     <groupId>org.apache.uima</groupId>
-    <artifactId>uimafit-parent</artifactId>
+    <artifactId>uimaj-parent</artifactId>
     <version>3.6.0-SNAPSHOT</version>
-    <relativePath>../uimafit-parent</relativePath>
+    <relativePath>../uimaj-parent/pom.xml</relativePath>
   </parent>
 
   <artifactId>uimafit-documentation</artifactId>

diff --git a/uimafit-examples/pom.xml b/uimafit-examples/pom.xml
@@ -18,27 +18,32 @@
   under the License.
 -->
 <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>
     <groupId>org.apache.uima</groupId>
-    <artifactId>uimafit-parent</artifactId>
+    <artifactId>uimaj-parent</artifactId>
     <version>3.6.0-SNAPSHOT</version>
-    <relativePath>../uimafit-parent</relativePath>
+    <relativePath>../uimaj-parent/pom.xml</relativePath>
   </parent>
-  <modelVersion>4.0.0</modelVersion>
+
   <artifactId>uimafit-examples</artifactId>
   <name>Apache UIMA uimaFIT - Examples</name>
   <description>Factories, Injection, and Testing library for UIMA</description>
   <url>${uimaWebsiteUrl}</url>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.uima</groupId>
       <artifactId>uimafit-core</artifactId>
-      <version>3.6.0-SNAPSHOT</version>
+      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.uima</groupId>
       <artifactId>uimaj-core</artifactId>
+      <version>${project.version}</version>
     </dependency>
+
     <dependency>
       <groupId>commons-io</groupId>
       <artifactId>commons-io</artifactId>
@@ -48,13 +53,15 @@
       <artifactId>slf4j-simple</artifactId>
     </dependency>
   </dependencies>
+
   <licenses>
     <license>
       <name>Apache License, Version 2.0</name>
       <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
       <distribution>repo</distribution>
     </license>
   </licenses>
+
   <build>
     <plugins>
       <plugin>

diff --git a/uimafit-junit/pom.xml b/uimafit-junit/pom.xml
@@ -19,11 +19,12 @@
 -->
 <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>
+
   <parent>
     <groupId>org.apache.uima</groupId>
-    <artifactId>uimafit-parent</artifactId>
+    <artifactId>uimaj-parent</artifactId>
     <version>3.6.0-SNAPSHOT</version>
-    <relativePath>../uimafit-parent</relativePath>
+    <relativePath>../uimaj-parent/pom.xml</relativePath>
   </parent>
 
   <artifactId>uimafit-junit</artifactId>
@@ -35,12 +36,14 @@
     <dependency>
       <groupId>org.apache.uima</groupId>
       <artifactId>uimafit-core</artifactId>
-      <version>3.6.0-SNAPSHOT</version>
+      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.uima</groupId>
       <artifactId>uimaj-core</artifactId>
+      <version>${project.version}</version>
     </dependency>
+
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-api</artifactId>

diff --git a/uimafit-maven-plugin/pom.xml b/uimafit-maven-plugin/pom.xml
@@ -19,11 +19,12 @@
 -->
 <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>
+
   <parent>
     <groupId>org.apache.uima</groupId>
-    <artifactId>uimafit-parent</artifactId>
+    <artifactId>uimaj-parent</artifactId>
     <version>3.6.0-SNAPSHOT</version>
-    <relativePath>../uimafit-parent</relativePath>
+    <relativePath>../uimaj-parent/pom.xml</relativePath>
   </parent>
 
   <artifactId>uimafit-maven-plugin</artifactId>
@@ -42,23 +43,25 @@
   </licenses>
 
   <dependencies>
-    <dependency>
-      <groupId>commons-io</groupId>
-      <artifactId>commons-io</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-lang3</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.apache.uima</groupId>
       <artifactId>uimaj-core</artifactId>
+      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.uima</groupId>
       <artifactId>uimafit-core</artifactId>
       <version>${project.version}</version>
     </dependency>
+
+    <dependency>
+      <groupId>commons-io</groupId>
+      <artifactId>commons-io</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.javassist</groupId>
       <artifactId>javassist</artifactId>