From 0b9d4c25e082d10bbeb7de203a4bd79df6c8b80f Mon Sep 17 00:00:00 2001
From: Richard Eckart de Castilho <rec@apache.org>
Date: Wed, 25 Sep 2024 16:13:23 +0200
Subject: [PATCH] Issue #390: Merge uimaFIT modules into UIMAJ repository

- UIMA Parent POM 17 -> 18-SNAPSHOT
- Update migration guide a bit
- Added option to skip the docs during the build
- Update the JavaDoc plugin configuration
- Set goal prefix for the pear maven plugin
---
 PearPackagingMavenPlugin/pom.xml              |  20 +-
 pom.xml                                       | 110 ++--
 uimaj-bom/pom.xml                             |   2 +-
 uimaj-documentation/pom.xml                   | 519 +++++++++---------
 .../asciidoc/fit/tools.uimafit.migration.adoc |   7 +
 uimaj-parent/pom.xml                          |   4 +-
 6 files changed, 347 insertions(+), 315 deletions(-)

diff --git a/PearPackagingMavenPlugin/pom.xml b/PearPackagingMavenPlugin/pom.xml
index db4fddd1c..7c972f4d2 100644
--- a/PearPackagingMavenPlugin/pom.xml
+++ b/PearPackagingMavenPlugin/pom.xml
@@ -17,7 +17,9 @@
    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">
+<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>
@@ -55,7 +57,7 @@
       <artifactId>maven-core</artifactId>
       <scope>provided</scope>
     </dependency>
-    
+
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-model</artifactId>
@@ -73,4 +75,18 @@
       <artifactId>commons-io</artifactId>
     </dependency>
   </dependencies>
+
+  <build>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-plugin-plugin</artifactId>
+          <configuration>
+            <goalPrefix>pear</goalPrefix>
+          </configuration>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+  </build>
 </project>
diff --git a/pom.xml b/pom.xml
index cca24a900..6b7d31136 100644
--- a/pom.xml
+++ b/pom.xml
@@ -199,74 +199,74 @@
             <phase>prepare-package</phase>  <!-- must come before package which uses the results -->
             <!--phase>deploy</phase--> <!-- comment above and uncomment to disable javadocs, for testing/experimentation, with assembly:assembly-->
             <goals>
-              <goal>javadoc</goal>
+              <goal>aggregate-no-fork</goal>
             </goals>
+            <inherited>false</inherited>
             <configuration>
               <groups>
                 <group>
-                  <title>Packages</title>
-                  <packages>*</packages>
+                  <title>Core</title>
+                  <packages>
+                    org.apache.uima:org.apache.uima.analysis_component:org.apache.uima.analysis_engine*:org.apache.uima.cas:org.apache.uima.cas_data*:org.apache.uima.cas.*:org.apache.uima.collection*:org.apache.uima.flow*:org.apache.uima.impl*:org.apache.uima.jcas*:org.apache.uima.resource*:org.apache.uima.search*:org.apache.uima.spi*:org.apache.uima.uimacpp*:org.apache.uima.util*
+                  </packages>
                 </group>
                 <group>
                   <title>uimaFIT</title>
-                  <packages>org.apache.uima.fit.component*:org.apache.uima.fit.descriptor*:org.apache.uima.fit.factory*:org.apache.uima.fit.pipeline*:org.apache.uima.fit.testing*:org.apache.uima.fit.util*</packages>
+                  <packages>
+                    org.apache.uima.fit.component*:org.apache.uima.fit.descriptor*:org.apache.uima.fit.factory*:org.apache.uima.fit.pipeline*:org.apache.uima.fit.util*:org.apache.uima.fit.validation
+                  </packages>
+                </group>
+                <group>
+                  <title>CPE</title>
+                  <packages>
+                    org.apache.uima.fit.cpe*:org.apache.uima.collection.impl*
+                  </packages>
+                </group>
+                <group>
+                  <title>IO</title>
+                  <packages>
+                    org.apache.uima.json
+                  </packages>
+                </group>
+                <group>
+                  <title>PEAR</title>
+                  <packages>
+                    org.apache.uima.pear:org.apache.uima.pear.*
+                  </packages>
+                </group>
+                <group>
+                  <title>Spring</title>
+                  <packages>
+                    org.apache.uima.fit.spring:org.apache.uima.fit.spring.*
+                  </packages>
+                </group>
+                <group>
+                  <title>Tools</title>
+                  <packages>
+                    org.apache.uima.tools:org.apache.uima.tools.*:org.apache.uima.jcas.jcasgenp:org.apache.uima.bootstrap:org.apache.uima.migratev3.jcas
+                  </packages>
+                </group>
+                <group>
+                  <title>Testing</title>
+                  <packages>
+                    org.apache.uima.test*:org.apache.uima.fit.testing.*:org.apache.uima.fit.benchmark
+                  </packages>
+                </group>
+                <group>
+                  <title>Examples</title>
+                  <packages>
+                    org.apache.uima.examples:org.apache.uima.fit.examples.*
+                  </packages>
                 </group>
                 <group>
-                  <title>CPE support</title>
-                  <packages>org.apache.uima.fit.cpe*</packages>
+                  <title>Internal</title>
+                  <packages>
+                    *.type:*.internal:*.internal.*:*.impl.*:org.apache.vinci.*:org.apache.uima.adapter.vinci*:org.apache.uima.PearPackagingMavenPlugin:org.apache.uima.fit.maven:org.apache.uima.fit.maven.*:org.apache.uima.it.*:org.apache.uima.taeconfigurator:org.apache.uima.taeconfigurator.*:org.apache.uima.ep*:org.apache.uima.caseditor:org.apache.uima.caseditor.*:org.apache.uima.analysis_engine.service.impl:org.apache.uima.analysis_engine.metadata.impl:org.apache.uima.analysis_engine.impl:org.apache.uima.analysis_engine.asb.impl:org.apache.uima.analysis_engine.asb:org.apache.uima.cas_data.impl:org.apache.uima.impl:org.apache.uima.flow.impl:org.apache.uima.jcas.impl:org.apache.uima.cas.impl:org.apache.uima.util.impl:org.apache.uima.cas_data.impl.vinci:org.apache.uima.analysis_engine.impl.compatibility:org.apache.uima.jcasgen_maven_plugin:org.apache.uima.search.impl:org.apache.uima.resource.impl:org.apache.uima.uimacpp:org.apache.uima.resource.metadata.impl:org.apache.uima.resource.service.impl:org.apache.uima.fit.internal:org.apache.uima.fit.internal.*:org.apache.uima.internal.*:org.apache.uima.json.impl
+                  </packages>
                 </group>
               </groups>
-              <sourcepath>uimaj-core/src/main/java;uimaj-json/src/main/java;uimaj-document-annotation/src/main/java;uimafit-core/src/main/java;uimafit-cpe/src/main/java</sourcepath>
-              <excludePackageNames>*.type:*.internal.*:*.impl.*</excludePackageNames>
               <doctitle>Apache UIMA Java SDK ${project.version} User-Level API Documentation</doctitle>
               <windowtitle>Apache UIMA Java SDK ${project.version} User-Level API Documentation</windowtitle>
-              <additionalDependencies>
-                <additionalDependency>
-                  <groupId>com.fasterxml.jackson.core</groupId>
-                  <artifactId>jackson-core</artifactId>
-                  <version>${jackson-version}</version>
-                </additionalDependency>
-                <additionalDependency>
-                  <groupId>org.slf4j</groupId>
-                  <artifactId>slf4j-api</artifactId>
-                  <version>${slf4j-version}</version>
-                </additionalDependency>
-                <additionalDependency>
-                  <groupId>org.apache.logging.log4j</groupId>
-                  <artifactId>log4j-api</artifactId>
-                  <version>${log4j-version}</version>
-                </additionalDependency>
-                <additionalDependency>
-                  <groupId>org.apache.logging.log4j</groupId>
-                  <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>
         </executions>
diff --git a/uimaj-bom/pom.xml b/uimaj-bom/pom.xml
index 6c747d29e..f78600923 100644
--- a/uimaj-bom/pom.xml
+++ b/uimaj-bom/pom.xml
@@ -24,7 +24,7 @@
     <groupId>org.apache.uima</groupId>
     <artifactId>parent-pom</artifactId>
     <relativePath />
-    <version>17</version>
+    <version>18-SNAPSHOT</version>
   </parent>
 
   <artifactId>uimaj-bom</artifactId>
diff --git a/uimaj-documentation/pom.xml b/uimaj-documentation/pom.xml
index e5b833eaa..657b8e991 100644
--- a/uimaj-documentation/pom.xml
+++ b/uimaj-documentation/pom.xml
@@ -36,265 +36,274 @@
     <maven.deploy.skip>true</maven.deploy.skip>
   </properties>
 
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.asciidoctor</groupId>
-        <artifactId>asciidoctor-maven-plugin</artifactId>
-        <version>${asciidoctor.plugin.version}</version>
-        <configuration>
-          <outputDirectory>${project.build.directory}/site/d</outputDirectory>
-          <attributesChain>webfonts!</attributesChain>
-          <attributes>
-            <experimental>true</experimental>
-            <doctype>book</doctype>
-            <toclevels>8</toclevels>
-            <sectanchors>true</sectanchors>
-            <sectnums>true</sectnums>
-            <docinfo1>true</docinfo1>
-            <project-version>${project.version}</project-version>
-            <revnumber>${project.version}</revnumber>
-            <product-website-url>https://uima.apache.org</product-website-url>
-            <relativeBaseDir>true</relativeBaseDir>
-            <xrefstyle>short</xrefstyle>
-          </attributes>
-          <requires>
-            <require>asciidoctor-pdf</require>
-          </requires>
-        </configuration>
-        <executions>
-          <execution>
-            <id>tug-html</id>
-            <phase>generate-resources</phase>
-            <goals>
-              <goal>process-asciidoc</goal>
-            </goals>
-            <configuration>
-              <sourceDocumentName>tug.adoc</sourceDocumentName>
-              <backend>html5</backend>
-              <attributes>
-                <toc>left</toc>
-                <imagesdir>./tug</imagesdir>
-              </attributes>
-            </configuration>
-          </execution>
-          <execution>
-            <id>tug-pdf</id>
-            <phase>generate-resources</phase>
-            <goals>
-              <goal>process-asciidoc</goal>
-            </goals>
-            <configuration>
-              <sourceDocumentName>tug.adoc</sourceDocumentName>
-              <backend>pdf</backend>
-              <attributes>
-                <toc>preamble</toc>
-                <imagesdir>./tug</imagesdir>
-              </attributes>
-            </configuration>
-          </execution>
-          <execution>
-            <id>oas-html</id>
-            <phase>generate-resources</phase>
-            <goals>
-              <goal>process-asciidoc</goal>
-            </goals>
-            <configuration>
-              <sourceDocumentName>oas.adoc</sourceDocumentName>
-              <backend>html5</backend>
-              <attributes>
-                <toc>left</toc>
-                <imagesdir>./oas</imagesdir>
-              </attributes>
-            </configuration>
-          </execution>
-          <execution>
-            <id>oas-pdf</id>
-            <phase>generate-resources</phase>
-            <goals>
-              <goal>process-asciidoc</goal>
-            </goals>
-            <configuration>
-              <sourceDocumentName>oas.adoc</sourceDocumentName>
-              <backend>pdf</backend>
-              <attributes>
-                <toc>preamble</toc>
-                <imagesdir>./oas</imagesdir>
-              </attributes>
-            </configuration>
-          </execution>
-          <execution>
-            <id>ref-html</id>
-            <phase>generate-resources</phase>
-            <goals>
-              <goal>process-asciidoc</goal>
-            </goals>
-            <configuration>
-              <sourceDocumentName>ref.adoc</sourceDocumentName>
-              <backend>html5</backend>
-              <attributes>
-                <toc>left</toc>
-                <imagesdir>./ref</imagesdir>
-              </attributes>
-            </configuration>
-          </execution>
-          <execution>
-            <id>ref-pdf</id>
-            <phase>generate-resources</phase>
-            <goals>
-              <goal>process-asciidoc</goal>
-            </goals>
-            <configuration>
-              <sourceDocumentName>ref.adoc</sourceDocumentName>
-              <backend>pdf</backend>
-              <attributes>
-                <toc>preamble</toc>
-                <imagesdir>./ref</imagesdir>
-              </attributes>
-            </configuration>
-          </execution>
-          <execution>
-            <id>tools-html</id>
-            <phase>generate-resources</phase>
-            <goals>
-              <goal>process-asciidoc</goal>
-            </goals>
-            <configuration>
-              <sourceDocumentName>tools.adoc</sourceDocumentName>
-              <backend>html5</backend>
-              <attributes>
-                <toc>left</toc>
-                <imagesdir>./tools</imagesdir>
-              </attributes>
-            </configuration>
-          </execution>
-          <execution>
-            <id>tools-pdf</id>
-            <phase>generate-resources</phase>
-            <goals>
-              <goal>process-asciidoc</goal>
-            </goals>
-            <configuration>
-              <sourceDocumentName>tools.adoc</sourceDocumentName>
-              <backend>pdf</backend>
-              <attributes>
-                <toc>preamble</toc>
-                <imagesdir>./tools</imagesdir>
-              </attributes>
-            </configuration>
-          </execution>
-          <execution>
-            <id>maint-html</id>
-            <phase>generate-resources</phase>
-            <goals>
-              <goal>process-asciidoc</goal>
-            </goals>
-            <configuration>
-              <sourceDocumentName>maint.adoc</sourceDocumentName>
-              <backend>html5</backend>
-              <attributes>
-                <toc>left</toc>
-                <imagesdir>./maint</imagesdir>
-              </attributes>
-            </configuration>
-          </execution>
-          <execution>
-            <id>maint-pdf</id>
-            <phase>generate-resources</phase>
-            <goals>
-              <goal>process-asciidoc</goal>
-            </goals>
-            <configuration>
-              <sourceDocumentName>maint.adoc</sourceDocumentName>
-              <backend>pdf</backend>
-              <attributes>
-                <toc>preamble</toc>
-                <imagesdir>./maint</imagesdir>
-              </attributes>
-            </configuration>
-          </execution>
-          <execution>
-            <id>user-html</id>
-            <phase>generate-resources</phase>
-            <goals>
-              <goal>process-asciidoc</goal>
-            </goals>
-            <configuration>
-              <sourceDocumentName>user.adoc</sourceDocumentName>
-              <backend>html5</backend>
-              <attributes>
-                <toc>left</toc>
-                <imagesdir>./user</imagesdir>
-              </attributes>
-            </configuration>
-          </execution>
-          <execution>
-            <id>user-pdf</id>
-            <phase>generate-resources</phase>
-            <goals>
-              <goal>process-asciidoc</goal>
-            </goals>
-            <configuration>
-              <sourceDocumentName>user.adoc</sourceDocumentName>
-              <backend>pdf</backend>
-              <attributes>
-                <toc>preamble</toc>
-                <imagesdir>./user</imagesdir>
-              </attributes>
-            </configuration>
-          </execution>
-          <execution>
-            <id>fit-html</id>
-            <phase>generate-resources</phase>
-            <goals>
-              <goal>process-asciidoc</goal>
-            </goals>
-            <configuration>
-              <sourceDocumentName>fit.adoc</sourceDocumentName>
-              <backend>html5</backend>
-              <attributes>
-                <toc>left</toc>
-                <imagesdir>./fit</imagesdir>
-              </attributes>
-            </configuration>
-          </execution>
-          <execution>
-            <id>fit-pdf</id>
-            <phase>generate-resources</phase>
-            <goals>
-              <goal>process-asciidoc</goal>
-            </goals>
+  <profiles>
+    <profile>
+      <id>docs</id>
+      <activation>
+        <property>
+          <name>!skipDocs</name>
+        </property>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.asciidoctor</groupId>
+            <artifactId>asciidoctor-maven-plugin</artifactId>
+            <version>${asciidoctor.plugin.version}</version>
             <configuration>
-              <sourceDocumentName>fit.adoc</sourceDocumentName>
-              <backend>pdf</backend>
+              <outputDirectory>${project.build.directory}/site/d</outputDirectory>
+              <attributesChain>webfonts!</attributesChain>
               <attributes>
-                <toc>preamble</toc>
-                <imagesdir>./fit</imagesdir>
+                <experimental>true</experimental>
+                <doctype>book</doctype>
+                <toclevels>8</toclevels>
+                <sectanchors>true</sectanchors>
+                <sectnums>true</sectnums>
+                <docinfo1>true</docinfo1>
+                <project-version>${project.version}</project-version>
+                <revnumber>${project.version}</revnumber>
+                <product-website-url>https://uima.apache.org</product-website-url>
+                <relativeBaseDir>true</relativeBaseDir>
+                <xrefstyle>short</xrefstyle>
               </attributes>
+              <requires>
+                <require>asciidoctor-pdf</require>
+              </requires>
             </configuration>
-          </execution>
-        </executions>
-        <dependencies>
-          <dependency>
-              <groupId>org.jruby</groupId>
-              <artifactId>jruby</artifactId>
-              <version>9.4.3.0</version>
-          </dependency>
-          <dependency>
-            <groupId>org.asciidoctor</groupId>
-            <artifactId>asciidoctorj</artifactId>
-            <version>${asciidoctor.version}</version>
-          </dependency>
-          <dependency>
-            <groupId>org.asciidoctor</groupId>
-            <artifactId>asciidoctorj-pdf</artifactId>
-            <version>${asciidoctor.pdf.version}</version>
-          </dependency>
-        </dependencies>
-      </plugin>
-    </plugins>
-  </build>
-  <profiles>
+            <executions>
+              <execution>
+                <id>tug-html</id>
+                <phase>generate-resources</phase>
+                <goals>
+                  <goal>process-asciidoc</goal>
+                </goals>
+                <configuration>
+                  <sourceDocumentName>tug.adoc</sourceDocumentName>
+                  <backend>html5</backend>
+                  <attributes>
+                    <toc>left</toc>
+                    <imagesdir>./tug</imagesdir>
+                  </attributes>
+                </configuration>
+              </execution>
+              <execution>
+                <id>tug-pdf</id>
+                <phase>generate-resources</phase>
+                <goals>
+                  <goal>process-asciidoc</goal>
+                </goals>
+                <configuration>
+                  <sourceDocumentName>tug.adoc</sourceDocumentName>
+                  <backend>pdf</backend>
+                  <attributes>
+                    <toc>preamble</toc>
+                    <imagesdir>./tug</imagesdir>
+                  </attributes>
+                </configuration>
+              </execution>
+              <execution>
+                <id>oas-html</id>
+                <phase>generate-resources</phase>
+                <goals>
+                  <goal>process-asciidoc</goal>
+                </goals>
+                <configuration>
+                  <sourceDocumentName>oas.adoc</sourceDocumentName>
+                  <backend>html5</backend>
+                  <attributes>
+                    <toc>left</toc>
+                    <imagesdir>./oas</imagesdir>
+                  </attributes>
+                </configuration>
+              </execution>
+              <execution>
+                <id>oas-pdf</id>
+                <phase>generate-resources</phase>
+                <goals>
+                  <goal>process-asciidoc</goal>
+                </goals>
+                <configuration>
+                  <sourceDocumentName>oas.adoc</sourceDocumentName>
+                  <backend>pdf</backend>
+                  <attributes>
+                    <toc>preamble</toc>
+                    <imagesdir>./oas</imagesdir>
+                  </attributes>
+                </configuration>
+              </execution>
+              <execution>
+                <id>ref-html</id>
+                <phase>generate-resources</phase>
+                <goals>
+                  <goal>process-asciidoc</goal>
+                </goals>
+                <configuration>
+                  <sourceDocumentName>ref.adoc</sourceDocumentName>
+                  <backend>html5</backend>
+                  <attributes>
+                    <toc>left</toc>
+                    <imagesdir>./ref</imagesdir>
+                  </attributes>
+                </configuration>
+              </execution>
+              <execution>
+                <id>ref-pdf</id>
+                <phase>generate-resources</phase>
+                <goals>
+                  <goal>process-asciidoc</goal>
+                </goals>
+                <configuration>
+                  <sourceDocumentName>ref.adoc</sourceDocumentName>
+                  <backend>pdf</backend>
+                  <attributes>
+                    <toc>preamble</toc>
+                    <imagesdir>./ref</imagesdir>
+                  </attributes>
+                </configuration>
+              </execution>
+              <execution>
+                <id>tools-html</id>
+                <phase>generate-resources</phase>
+                <goals>
+                  <goal>process-asciidoc</goal>
+                </goals>
+                <configuration>
+                  <sourceDocumentName>tools.adoc</sourceDocumentName>
+                  <backend>html5</backend>
+                  <attributes>
+                    <toc>left</toc>
+                    <imagesdir>./tools</imagesdir>
+                  </attributes>
+                </configuration>
+              </execution>
+              <execution>
+                <id>tools-pdf</id>
+                <phase>generate-resources</phase>
+                <goals>
+                  <goal>process-asciidoc</goal>
+                </goals>
+                <configuration>
+                  <sourceDocumentName>tools.adoc</sourceDocumentName>
+                  <backend>pdf</backend>
+                  <attributes>
+                    <toc>preamble</toc>
+                    <imagesdir>./tools</imagesdir>
+                  </attributes>
+                </configuration>
+              </execution>
+              <execution>
+                <id>maint-html</id>
+                <phase>generate-resources</phase>
+                <goals>
+                  <goal>process-asciidoc</goal>
+                </goals>
+                <configuration>
+                  <sourceDocumentName>maint.adoc</sourceDocumentName>
+                  <backend>html5</backend>
+                  <attributes>
+                    <toc>left</toc>
+                    <imagesdir>./maint</imagesdir>
+                  </attributes>
+                </configuration>
+              </execution>
+              <execution>
+                <id>maint-pdf</id>
+                <phase>generate-resources</phase>
+                <goals>
+                  <goal>process-asciidoc</goal>
+                </goals>
+                <configuration>
+                  <sourceDocumentName>maint.adoc</sourceDocumentName>
+                  <backend>pdf</backend>
+                  <attributes>
+                    <toc>preamble</toc>
+                    <imagesdir>./maint</imagesdir>
+                  </attributes>
+                </configuration>
+              </execution>
+              <execution>
+                <id>user-html</id>
+                <phase>generate-resources</phase>
+                <goals>
+                  <goal>process-asciidoc</goal>
+                </goals>
+                <configuration>
+                  <sourceDocumentName>user.adoc</sourceDocumentName>
+                  <backend>html5</backend>
+                  <attributes>
+                    <toc>left</toc>
+                    <imagesdir>./user</imagesdir>
+                  </attributes>
+                </configuration>
+              </execution>
+              <execution>
+                <id>user-pdf</id>
+                <phase>generate-resources</phase>
+                <goals>
+                  <goal>process-asciidoc</goal>
+                </goals>
+                <configuration>
+                  <sourceDocumentName>user.adoc</sourceDocumentName>
+                  <backend>pdf</backend>
+                  <attributes>
+                    <toc>preamble</toc>
+                    <imagesdir>./user</imagesdir>
+                  </attributes>
+                </configuration>
+              </execution>
+              <execution>
+                <id>fit-html</id>
+                <phase>generate-resources</phase>
+                <goals>
+                  <goal>process-asciidoc</goal>
+                </goals>
+                <configuration>
+                  <sourceDocumentName>fit.adoc</sourceDocumentName>
+                  <backend>html5</backend>
+                  <attributes>
+                    <toc>left</toc>
+                    <imagesdir>./fit</imagesdir>
+                  </attributes>
+                </configuration>
+              </execution>
+              <execution>
+                <id>fit-pdf</id>
+                <phase>generate-resources</phase>
+                <goals>
+                  <goal>process-asciidoc</goal>
+                </goals>
+                <configuration>
+                  <sourceDocumentName>fit.adoc</sourceDocumentName>
+                  <backend>pdf</backend>
+                  <attributes>
+                    <toc>preamble</toc>
+                    <imagesdir>./fit</imagesdir>
+                  </attributes>
+                </configuration>
+              </execution>
+            </executions>
+            <dependencies>
+              <dependency>
+                  <groupId>org.jruby</groupId>
+                  <artifactId>jruby</artifactId>
+                  <version>9.4.3.0</version>
+              </dependency>
+              <dependency>
+                <groupId>org.asciidoctor</groupId>
+                <artifactId>asciidoctorj</artifactId>
+                <version>${asciidoctor.version}</version>
+              </dependency>
+              <dependency>
+                <groupId>org.asciidoctor</groupId>
+                <artifactId>asciidoctorj-pdf</artifactId>
+                <version>${asciidoctor.pdf.version}</version>
+              </dependency>
+            </dependencies>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+
     <profile>
       <id>m2e</id>
       <activation>
diff --git a/uimaj-documentation/src/docs/asciidoc/fit/tools.uimafit.migration.adoc b/uimaj-documentation/src/docs/asciidoc/fit/tools.uimafit.migration.adoc
index c6b11e1d4..f656abb31 100644
--- a/uimaj-documentation/src/docs/asciidoc/fit/tools.uimafit.migration.adoc
+++ b/uimaj-documentation/src/docs/asciidoc/fit/tools.uimafit.migration.adoc
@@ -20,6 +20,13 @@
 
 This section provides helpful information on incompatible changes between versions.
 
+== Version 3.1.x to 3.6.x
+
+uimaFIT has now been integrated into the UIMA Java SDK. 
+
+If you are using the `uimafit-bom` to import managed dependencies, please switch to the `uima-bom` which now also
+manages the version of the `uimafit-*` artifacts.
+
 == Version 3.0.x to 3.1.x
 
 .Changes to ExternalResourceFactory
diff --git a/uimaj-parent/pom.xml b/uimaj-parent/pom.xml
index 6da3f856c..041ec4a98 100644
--- a/uimaj-parent/pom.xml
+++ b/uimaj-parent/pom.xml
@@ -31,7 +31,7 @@
   <parent>
     <groupId>org.apache.uima</groupId>
     <artifactId>parent-pom</artifactId>
-    <version>17</version>
+    <version>18-SNAPSHOT</version>
     <relativePath />
   </parent>
 
@@ -86,6 +86,7 @@
       - The Eclipse Plugin modules use version ranges for their dependencies. These could resolve to
       - SNAPSHOT versions if we have a SNAPSHOT repo declaration here. Thus, this repo should only
       - be enabled when really needed.
+      -->
     <repository>
       <id>apache.snapshots</id>
       <name>Apache Snapshot Repository</name>
@@ -97,7 +98,6 @@
         <enabled>true</enabled>
       </snapshots>
     </repository>
-      -->
 
     <repository>
       <id>${eclipseP2RepoId}</id>