Issue #417: BOM should not inherit build setup from parent POM

- Introduced intermediary POM to isolate the BOM (at least until we go for Maven 4)
apache · Nov 18, 2024 · 7016463 · 7016463
1 parent d2a5847
commit 7016463
Show file tree

Hide file tree

Showing 44 changed files with 969 additions and 922 deletions.
diff --git a/PearPackagingMavenPlugin/pom.xml b/PearPackagingMavenPlugin/pom.xml
@@ -24,9 +24,9 @@
 
   <parent>
     <groupId>org.apache.uima</groupId>
-    <artifactId>uimaj-parent</artifactId>
+    <artifactId>uimaj-parent-internal</artifactId>
     <version>3.6.0-SNAPSHOT</version>
-    <relativePath>../uimaj-parent/pom.xml</relativePath>
+    <relativePath>../uimaj-parent-internal/pom.xml</relativePath>
   </parent>
 
   <artifactId>PearPackagingMavenPlugin</artifactId>

diff --git a/aggregate-uimaj-eclipse-plugins/pom.xml b/aggregate-uimaj-eclipse-plugins/pom.xml
@@ -22,9 +22,9 @@
 
   <parent>
     <groupId>org.apache.uima</groupId>
-    <artifactId>uimaj-parent</artifactId>
+    <artifactId>uimaj-parent-internal</artifactId>
     <version>3.6.0-SNAPSHOT</version>
-    <relativePath>../uimaj-parent/pom.xml</relativePath>
+    <relativePath>../uimaj-parent-internal/pom.xml</relativePath>
   </parent>
 
   <artifactId>aggregate-uimaj-eclipse-plugins</artifactId>

diff --git a/aggregate-uimaj/pom.xml b/aggregate-uimaj/pom.xml
@@ -22,9 +22,9 @@
 
   <parent>
     <groupId>org.apache.uima</groupId>
-    <artifactId>uimaj-parent</artifactId>
+    <artifactId>uimaj-parent-internal</artifactId>
     <version>3.6.0-SNAPSHOT</version>
-    <relativePath>../uimaj-parent/pom.xml</relativePath>
+    <relativePath>../uimaj-parent-internal/pom.xml</relativePath>
   </parent>
 
   <artifactId>aggregate-uimaj</artifactId>

diff --git a/jVinci/pom.xml b/jVinci/pom.xml
@@ -24,9 +24,9 @@
 
   <parent>
     <groupId>org.apache.uima</groupId>
-    <artifactId>uimaj-parent</artifactId>
+    <artifactId>uimaj-parent-internal</artifactId>
     <version>3.6.0-SNAPSHOT</version>
-    <relativePath>../uimaj-parent/pom.xml</relativePath>
+    <relativePath>../uimaj-parent-internal/pom.xml</relativePath>
   </parent>
 
   <artifactId>jVinci</artifactId>

diff --git a/jcasgen-maven-plugin/pom.xml b/jcasgen-maven-plugin/pom.xml
@@ -20,9 +20,9 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.uima</groupId>
-    <artifactId>uimaj-parent</artifactId>
+    <artifactId>uimaj-parent-internal</artifactId>
     <version>3.6.0-SNAPSHOT</version>
-    <relativePath>../uimaj-parent/pom.xml</relativePath>
+    <relativePath>../uimaj-parent-internal/pom.xml</relativePath>
   </parent>
 
   <!-- This artifact name follows the conventions described

diff --git a/jcasgen-maven-plugin/src/it/simple/pom.xml b/jcasgen-maven-plugin/src/it/simple/pom.xml
@@ -16,43 +16,44 @@
 	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>
 
-	<groupId>test</groupId>
-	<artifactId>simple</artifactId>
-	<version>1.0.0-SNAPSHOT</version>
-	<properties>
+  <groupId>test</groupId>
+  <artifactId>simple</artifactId>
+  <version>1.0.0-SNAPSHOT</version>
+  <properties>
     <maven.compiler.target>1.8</maven.compiler.target>
     <maven.compiler.source>1.8</maven.compiler.source>
   </properties>
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.uima</groupId>
-				<artifactId>jcasgen-maven-plugin</artifactId>
-				<version>@project.version@</version>
-				<configuration>
-					<typeSystemIncludes>
-						<typeSystemInclude>src/main/resources/TypeSystem.xml</typeSystemInclude>
-					</typeSystemIncludes>
-				</configuration>
-				<executions>
-					<execution>
-						<goals>
-							<goal>generate</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
-	<dependencies>
-		<dependency>
-			<groupId>org.apache.uima</groupId>
-			<artifactId>uimaj-core</artifactId>
-			<version>@project.version@</version>    
-		</dependency>
-	</dependencies>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.uima</groupId>
+        <artifactId>jcasgen-maven-plugin</artifactId>
+        <version>@project.version@</version>
+        <configuration>
+          <typeSystemIncludes>
+            <typeSystemInclude>src/main/resources/TypeSystem.xml</typeSystemInclude>
+          </typeSystemIncludes>
+        </configuration>
+        <executions>
+          <execution>
+            <goals>
+              <goal>generate</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.uima</groupId>
+      <artifactId>uimaj-core</artifactId>
+      <version>@project.version@</version>
+    </dependency>
+  </dependencies>
 </project>
diff --git a/pom.xml b/pom.xml
@@ -28,9 +28,9 @@
 
   <parent>
     <groupId>org.apache.uima</groupId>
-    <artifactId>uimaj-parent</artifactId>
+    <artifactId>uimaj-parent-internal</artifactId>
     <version>3.6.0-SNAPSHOT</version>
-    <relativePath>uimaj-parent/pom.xml</relativePath>
+    <relativePath>uimaj-parent-internal/pom.xml</relativePath>
   </parent>
 
   <artifactId>uimaj</artifactId>
@@ -52,8 +52,9 @@
   </properties>
 
   <modules>
-    <module>uimaj-bom</module>
     <module>uimaj-parent</module>
+    <module>uimaj-bom</module>
+    <module>uimaj-parent-internal</module>
     <module>aggregate-uimaj</module>
   </modules>
 

diff --git a/uima-bnd-plugin/pom.xml b/uima-bnd-plugin/pom.xml
@@ -24,9 +24,9 @@
 
   <parent>
     <groupId>org.apache.uima</groupId>
-    <artifactId>uimaj-parent</artifactId>
+    <artifactId>uimaj-parent-internal</artifactId>
     <version>3.6.0-SNAPSHOT</version>
-    <relativePath>../uimaj-parent/pom.xml</relativePath>
+    <relativePath>../uimaj-parent-internal/pom.xml</relativePath>
   </parent>
 
 	<artifactId>uima-bnd-plugin</artifactId>

diff --git a/uimafit-assertj/pom.xml b/uimafit-assertj/pom.xml
@@ -24,15 +24,15 @@
 
   <parent>
     <groupId>org.apache.uima</groupId>
-    <artifactId>uimaj-parent</artifactId>
+    <artifactId>uimaj-parent-internal</artifactId>
     <version>3.6.0-SNAPSHOT</version>
-    <relativePath>../uimaj-parent/pom.xml</relativePath>
+    <relativePath>../uimaj-parent-internal/pom.xml</relativePath>
   </parent>
 
   <artifactId>uimafit-assertj</artifactId>
   <packaging>bundle</packaging>
 
-  <name>Apache UIMA uimaFIT - AssertJ support</name>
+  <name>Apache UIMA uimaFIT: AssertJ support</name>
 
   <dependencies>
     <dependency>

diff --git a/uimafit-benchmark/pom.xml b/uimafit-benchmark/pom.xml
@@ -22,14 +22,14 @@
 
   <parent>
     <groupId>org.apache.uima</groupId>
-    <artifactId>uimaj-parent</artifactId>
+    <artifactId>uimaj-parent-internal</artifactId>
     <version>3.6.0-SNAPSHOT</version>
-    <relativePath>../uimaj-parent/pom.xml</relativePath>
+    <relativePath>../uimaj-parent-internal/pom.xml</relativePath>
   </parent>
 
   <artifactId>uimafit-benchmark</artifactId>
   <packaging>jar</packaging>
-  <name>Apache UIMA uimaFIT - Benchmark</name>
+  <name>Apache UIMA uimaFIT: Benchmark</name>
   <description>Factories, Injection, and Testing library for UIMA</description>
   <url>${uimaWebsiteUrl}</url>
 

diff --git a/uimafit-core/pom.xml b/uimafit-core/pom.xml
@@ -22,15 +22,15 @@
 
   <parent>
     <groupId>org.apache.uima</groupId>
-    <artifactId>uimaj-parent</artifactId>
+    <artifactId>uimaj-parent-internal</artifactId>
     <version>3.6.0-SNAPSHOT</version>
-    <relativePath>../uimaj-parent/pom.xml</relativePath>
+    <relativePath>../uimaj-parent-internal/pom.xml</relativePath>
   </parent>
 
   <artifactId>uimafit-core</artifactId>
   <packaging>bundle</packaging>
 
-  <name>Apache UIMA uimaFIT - Core</name>
+  <name>Apache UIMA uimaFIT: Core</name>
   <description>Factories, Injection, and Testing library for UIMA</description>
   <url>${uimaWebsiteUrl}</url>
 

diff --git a/uimafit-cpe/pom.xml b/uimafit-cpe/pom.xml
@@ -22,15 +22,15 @@
 
   <parent>
     <groupId>org.apache.uima</groupId>
-    <artifactId>uimaj-parent</artifactId>
+    <artifactId>uimaj-parent-internal</artifactId>
     <version>3.6.0-SNAPSHOT</version>
-    <relativePath>../uimaj-parent/pom.xml</relativePath>
+    <relativePath>../uimaj-parent-internal/pom.xml</relativePath>
   </parent>
 
   <artifactId>uimafit-cpe</artifactId>
   <packaging>bundle</packaging>
 
-  <name>Apache UIMA uimaFIT - Collection Processing Engine support</name>
+  <name>Apache UIMA uimaFIT: Collection Processing Engine support</name>
 
   <dependencies>
     <dependency>

diff --git a/uimafit-examples/pom.xml b/uimafit-examples/pom.xml
@@ -22,13 +22,13 @@
 
   <parent>
     <groupId>org.apache.uima</groupId>
-    <artifactId>uimaj-parent</artifactId>
+    <artifactId>uimaj-parent-internal</artifactId>
     <version>3.6.0-SNAPSHOT</version>
-    <relativePath>../uimaj-parent/pom.xml</relativePath>
+    <relativePath>../uimaj-parent-internal/pom.xml</relativePath>
   </parent>
 
   <artifactId>uimafit-examples</artifactId>
-  <name>Apache UIMA uimaFIT - Examples</name>
+  <name>Apache UIMA uimaFIT: Examples</name>
   <description>Factories, Injection, and Testing library for UIMA</description>
   <url>${uimaWebsiteUrl}</url>
 

diff --git a/uimafit-junit/pom.xml b/uimafit-junit/pom.xml
@@ -22,15 +22,15 @@
 
   <parent>
     <groupId>org.apache.uima</groupId>
-    <artifactId>uimaj-parent</artifactId>
+    <artifactId>uimaj-parent-internal</artifactId>
     <version>3.6.0-SNAPSHOT</version>
-    <relativePath>../uimaj-parent/pom.xml</relativePath>
+    <relativePath>../uimaj-parent-internal/pom.xml</relativePath>
   </parent>
 
   <artifactId>uimafit-junit</artifactId>
   <packaging>bundle</packaging>
 
-  <name>Apache UIMA uimaFIT - JUnit support</name>
+  <name>Apache UIMA uimaFIT: JUnit support</name>
 
   <dependencies>
     <dependency>

diff --git a/uimafit-maven-plugin/pom.xml b/uimafit-maven-plugin/pom.xml
@@ -22,15 +22,15 @@
 
   <parent>
     <groupId>org.apache.uima</groupId>
-    <artifactId>uimaj-parent</artifactId>
+    <artifactId>uimaj-parent-internal</artifactId>
     <version>3.6.0-SNAPSHOT</version>
-    <relativePath>../uimaj-parent/pom.xml</relativePath>
+    <relativePath>../uimaj-parent-internal/pom.xml</relativePath>
   </parent>
 
   <artifactId>uimafit-maven-plugin</artifactId>
   <packaging>maven-plugin</packaging>
 
-  <name>Apache UIMA uimaFIT - Maven Plugin</name>
+  <name>Apache UIMA uimaFIT: Maven Plugin</name>
   <url>${uimaWebsiteUrl}</url>
   <inceptionYear>2012</inceptionYear>
 

diff --git a/uimafit-spring/pom.xml b/uimafit-spring/pom.xml
@@ -22,14 +22,14 @@
 
   <parent>
     <groupId>org.apache.uima</groupId>
-    <artifactId>uimaj-parent</artifactId>
+    <artifactId>uimaj-parent-internal</artifactId>
     <version>3.6.0-SNAPSHOT</version>
-    <relativePath>../uimaj-parent/pom.xml</relativePath>
+    <relativePath>../uimaj-parent-internal/pom.xml</relativePath>
   </parent>
 
   <artifactId>uimafit-spring</artifactId>
   <packaging>jar</packaging>
-  <name>Apache UIMA uimaFIT - Spring integration</name>
+  <name>Apache UIMA uimaFIT: Spring integration</name>
   <description>Factories, Injection, and Testing library for UIMA</description>
   <url>${uimaWebsiteUrl}</url>
 

diff --git a/uimaj-adapter-vinci/pom.xml b/uimaj-adapter-vinci/pom.xml
@@ -24,9 +24,9 @@
 
   <parent>
     <groupId>org.apache.uima</groupId>
-    <artifactId>uimaj-parent</artifactId>
+    <artifactId>uimaj-parent-internal</artifactId>
     <version>3.6.0-SNAPSHOT</version>
-    <relativePath>../uimaj-parent/pom.xml</relativePath>
+    <relativePath>../uimaj-parent-internal/pom.xml</relativePath>
   </parent>
 
   <artifactId>uimaj-adapter-vinci</artifactId>

diff --git a/uimaj-bom/pom.xml b/uimaj-bom/pom.xml
@@ -30,7 +30,7 @@
   <artifactId>uimaj-bom</artifactId>
   <packaging>pom</packaging>
 
-  <name>Apache UIMA - BOM</name>
+  <name>Apache UIMA Java SDK: BOM</name>
 
   <dependencyManagement>
     <dependencies>

diff --git a/uimaj-bootstrap/pom.xml b/uimaj-bootstrap/pom.xml
@@ -22,9 +22,9 @@
 
   <parent>
     <groupId>org.apache.uima</groupId>
-    <artifactId>uimaj-parent</artifactId>
+    <artifactId>uimaj-parent-internal</artifactId>
     <version>3.6.0-SNAPSHOT</version>
-    <relativePath>../uimaj-parent/pom.xml</relativePath>
+    <relativePath>../uimaj-parent-internal/pom.xml</relativePath>
   </parent>
 
   <artifactId>uimaj-bootstrap</artifactId>

diff --git a/uimaj-component-test-util/pom.xml b/uimaj-component-test-util/pom.xml
@@ -22,9 +22,9 @@
 
   <parent>
     <groupId>org.apache.uima</groupId>
-    <artifactId>uimaj-parent</artifactId>
+    <artifactId>uimaj-parent-internal</artifactId>
     <version>3.6.0-SNAPSHOT</version>
-    <relativePath>../uimaj-parent/pom.xml</relativePath>
+    <relativePath>../uimaj-parent-internal/pom.xml</relativePath>
   </parent>
 
   <artifactId>uimaj-component-test-util</artifactId>

diff --git a/uimaj-core/pom.xml b/uimaj-core/pom.xml
@@ -22,9 +22,9 @@
 
   <parent>
     <groupId>org.apache.uima</groupId>
-    <artifactId>uimaj-parent</artifactId>
+    <artifactId>uimaj-parent-internal</artifactId>
     <version>3.6.0-SNAPSHOT</version>
-    <relativePath>../uimaj-parent/pom.xml</relativePath>
+    <relativePath>../uimaj-parent-internal/pom.xml</relativePath>
   </parent>
 
   <artifactId>uimaj-core</artifactId>

diff --git a/uimaj-cpe/pom.xml b/uimaj-cpe/pom.xml
@@ -22,9 +22,9 @@
 
   <parent>
     <groupId>org.apache.uima</groupId>
-    <artifactId>uimaj-parent</artifactId>
+    <artifactId>uimaj-parent-internal</artifactId>
     <version>3.6.0-SNAPSHOT</version>
-    <relativePath>../uimaj-parent/pom.xml</relativePath>
+    <relativePath>../uimaj-parent-internal/pom.xml</relativePath>
   </parent>
 
   <artifactId>uimaj-cpe</artifactId>