Issue #390: Merge uimaFIT modules into UIMAJ repository

- Consolidate dependencies
apache · Sep 23, 2024 · c2143a4 · c2143a4
1 parent bf0d4cc
commit c2143a4
Show file tree

Hide file tree

Showing 17 changed files with 95 additions and 194 deletions.
diff --git a/jVinci/pom.xml b/jVinci/pom.xml
@@ -17,47 +17,50 @@
    specific language governing permissions and limitations
    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>
+<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>uimaj-parent</artifactId>
-		<version>3.6.0-SNAPSHOT</version>
-		<relativePath>../uimaj-parent/pom.xml</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>jVinci</artifactId>
-	<packaging>bundle</packaging>
+  <artifactId>jVinci</artifactId>
+  <packaging>bundle</packaging>
 
-	<name>Apache UIMA Base: ${project.artifactId}: Vinci Transport Library</name>
-	<description>This is a protocol used by the base UIMA Collection processing manager for supporting
-    networked deployment.  See UIMA-AS as a more modern alternative supporting
+  <name>Apache UIMA Base: ${project.artifactId}: Vinci Transport Library</name>
+  <description>This is a protocol used by the base UIMA Collection processing
+    manager for supporting
+    networked deployment. See UIMA-AS as a more modern alternative supporting
     more standard protocols.</description>
-	<url>${uimaWebsiteUrl}</url>
+  <url>${uimaWebsiteUrl}</url>
 
-	<properties>
-		<postNoticeText>${ibmNoticeText}</postNoticeText>
-	</properties>
+  <properties>
+    <postNoticeText>${ibmNoticeText}</postNoticeText>
+  </properties>
 
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.felix</groupId>
-				<artifactId>maven-bundle-plugin</artifactId>
-				<configuration>
-					<instructions>
-						<Bundle-RequiredExecutionEnvironment>${execution.environment}</Bundle-RequiredExecutionEnvironment>
-						<_dsannotations>*</_dsannotations>
-						<_metatypeannotations>*</_metatypeannotations>
-						<Export-Package>
-							org.apache.vinci.debug,
-							org.apache.vinci.transport,
-							org.apache.vinci.transport.*
-						</Export-Package>
-					</instructions>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <configuration>
+          <instructions>
+            <Bundle-RequiredExecutionEnvironment>${execution.environment}</Bundle-RequiredExecutionEnvironment>
+            <_dsannotations>*</_dsannotations>
+            <_metatypeannotations>*</_metatypeannotations>
+            <Export-Package>
+              org.apache.vinci.debug,
+              org.apache.vinci.transport,
+              org.apache.vinci.transport.*
+            </Export-Package>
+          </instructions>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
 </project>
diff --git a/uimafit-assertj/pom.xml b/uimafit-assertj/pom.xml
@@ -17,8 +17,10 @@
   specific language governing permissions and limitations
   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/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
+<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>
@@ -27,44 +29,44 @@
     <relativePath>../uimaj-parent/pom.xml</relativePath>
   </parent>
 
-	<artifactId>uimafit-assertj</artifactId>
-	<packaging>bundle</packaging>
+  <artifactId>uimafit-assertj</artifactId>
+  <packaging>bundle</packaging>
 
-	<name>Apache UIMA uimaFIT - AssertJ support</name>
+  <name>Apache UIMA uimaFIT - AssertJ support</name>
 
-	<dependencies>
-		<dependency>
-			<groupId>org.apache.uima</groupId>
-			<artifactId>uimafit-core</artifactId>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.uima</groupId>
+      <artifactId>uimafit-core</artifactId>
       <version>${project.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.uima</groupId>
-			<artifactId>uimaj-core</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.uima</groupId>
+      <artifactId>uimaj-core</artifactId>
       <version>${project.version}</version>
-		</dependency>
+    </dependency>
 
-		<dependency>
-			<groupId>org.assertj</groupId>
-			<artifactId>assertj-core</artifactId>
-		</dependency>
-	</dependencies>
+    <dependency>
+      <groupId>org.assertj</groupId>
+      <artifactId>assertj-core</artifactId>
+    </dependency>
+  </dependencies>
 
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.felix</groupId>
-				<artifactId>maven-bundle-plugin</artifactId>
-				<configuration>
-					<instructions>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <configuration>
+          <instructions>
             <Bundle-RequiredExecutionEnvironment>${execution.environment}</Bundle-RequiredExecutionEnvironment>
-						<Require-Capability>
-							osgi.extender;filter:="(osgi.extender=osgi.serviceloader.processor)";resolution:=optional,
-							osgi.serviceloader;filter:="(osgi.serviceloader=org.apache.uima.fit.validation.ValidationCheck)";cardinality:=multiple;resolution:=optional
-						</Require-Capability>
-					</instructions>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
+            <Require-Capability>
+              osgi.extender;filter:="(osgi.extender=osgi.serviceloader.processor)";resolution:=optional,
+              osgi.serviceloader;filter:="(osgi.serviceloader=org.apache.uima.fit.validation.ValidationCheck)";cardinality:=multiple;resolution:=optional
+            </Require-Capability>
+          </instructions>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
 </project>
diff --git a/uimafit-benchmark/pom.xml b/uimafit-benchmark/pom.xml
@@ -66,16 +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>
+<!--    <dependency>-->
+<!--      <groupId>org.junit.jupiter</groupId>-->
+<!--      <artifactId>junit-jupiter-engine</artifactId>-->
+<!--      <scope>test</scope>-->
+<!--    </dependency>-->
   </dependencies>
 
   <build>

diff --git a/uimafit-core/pom.xml b/uimafit-core/pom.xml
@@ -96,6 +96,7 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
+
   <build>
     <plugins>
       <plugin>

diff --git a/uimafit-documentation/pom.xml b/uimafit-documentation/pom.xml
@@ -105,6 +105,7 @@
       </plugin>
     </plugins>
   </build>
+
   <profiles>
     <profile>
       <id>m2e</id>
@@ -148,5 +149,5 @@
         </pluginManagement>
       </build>
     </profile>
-  </profiles>  
+  </profiles>
 </project>
diff --git a/uimafit-examples/pom.xml b/uimafit-examples/pom.xml
@@ -51,6 +51,7 @@
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-simple</artifactId>
+      <scope>compile</scope>
     </dependency>
   </dependencies>
 

diff --git a/uimafit-junit/pom.xml b/uimafit-junit/pom.xml
@@ -47,11 +47,14 @@
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-api</artifactId>
+      <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.junit.platform</groupId>
       <artifactId>junit-platform-commons</artifactId>
+      <scope>compile</scope>
     </dependency>
+
     <dependency>
       <groupId>org.opentest4j</groupId>
       <artifactId>opentest4j</artifactId>

diff --git a/uimaj-adapter-vinci/pom.xml b/uimaj-adapter-vinci/pom.xml
@@ -46,34 +46,11 @@
       <groupId>org.apache.uima</groupId>
       <artifactId>uimaj-core</artifactId>
       <version>${project.parent.version}</version>
-      <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.uima</groupId>
       <artifactId>jVinci</artifactId>
       <version>${project.parent.version}</version>
-      <scope>compile</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.junit.jupiter</groupId>
-      <artifactId>junit-jupiter-api</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.assertj</groupId>
-      <artifactId>assertj-core</artifactId>
-      <scope>test</scope>
-    </dependency>
-<!--    <dependency>-->
-<!--      <groupId>org.slf4j</groupId>-->
-<!--      <artifactId>slf4j-jdk14</artifactId>-->
-<!--      <scope>test</scope>-->
-<!--    </dependency>-->
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-simple</artifactId>
-      <scope>test</scope>
     </dependency>
   </dependencies>
 

diff --git a/uimaj-bootstrap/pom.xml b/uimaj-bootstrap/pom.xml
@@ -28,7 +28,6 @@
   </parent>
 
   <artifactId>uimaj-bootstrap</artifactId>
-  <packaging>jar</packaging>
   <name>Apache UIMA Base: ${project.artifactId}</name>
   <description>Configures a classpath from directories, and runs
     a Java application using that</description>

diff --git a/uimaj-core/pom.xml b/uimaj-core/pom.xml
@@ -73,21 +73,11 @@
       <artifactId>junit</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.junit.jupiter</groupId>
-      <artifactId>junit-jupiter-api</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-params</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.assertj</groupId>
-      <artifactId>assertj-core</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.xmlunit</groupId>
       <artifactId>xmlunit-assertj3</artifactId>
@@ -288,11 +278,6 @@
             <additionalClasspathElement>${settings.localRepository}/org/apache/logging/log4j/log4j-api/${log4j-version}/log4j-api-${log4j-version}.jar</additionalClasspathElement>
             <additionalClasspathElement>${settings.localRepository}/org/apache/logging/log4j/log4j-slf4j-impl/${log4j-version}/log4j-slf4j-impl-${log4j-version}.jar</additionalClasspathElement>
           </additionalClasspathElements>
-          <!-- exclude log4j slf bridge for testing 
-          <classpathDependencyExcludes>
-            <classpathDependencyExclude>org.apache.logging.log4j:log4j-slf4j-impl</classpathDependencyExclude>
-          </classpathDependencyExcludes>
-          -->
         </configuration>
       </plugin>
     </plugins>

diff --git a/uimaj-cpe/pom.xml b/uimaj-cpe/pom.xml
@@ -45,36 +45,23 @@
       <groupId>org.apache.uima</groupId>
       <artifactId>uimaj-core</artifactId>
       <version>${project.parent.version}</version>
-      <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.uima</groupId>
       <artifactId>uimaj-adapter-vinci</artifactId>
       <version>${project.parent.version}</version>
-      <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.uima</groupId>
       <artifactId>jVinci</artifactId>
       <version>${project.parent.version}</version>
-      <scope>compile</scope>
     </dependency>
 
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.assertj</groupId>
-      <artifactId>assertj-core</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.junit.jupiter</groupId>
-      <artifactId>junit-jupiter-api</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.apache.uima</groupId>
       <artifactId>uimaj-test-util</artifactId>

diff --git a/uimaj-ep-cas-editor/pom.xml b/uimaj-ep-cas-editor/pom.xml
@@ -126,17 +126,6 @@
       <artifactId>org.eclipse.jdt.core</artifactId>
       <scope>provided</scope>
     </dependency>
-
-    <dependency>
-      <groupId>org.junit.jupiter</groupId>
-      <artifactId>junit-jupiter-api</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.assertj</groupId>
-      <artifactId>assertj-core</artifactId>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 
   <build>

diff --git a/uimaj-ep-jcasgen/pom.xml b/uimaj-ep-jcasgen/pom.xml
@@ -44,7 +44,6 @@
       <groupId>org.apache.uima</groupId>
       <artifactId>uimaj-tools</artifactId>
       <version>${project.parent.version}</version>
-      <scope>compile</scope>
     </dependency>
 
     <!-- Eclipse dependencies -->