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
apache · Sep 25, 2024 · 0b9d4c2 · 0b9d4c2
1 parent 7b154a3
commit 0b9d4c2
Show file tree

Hide file tree

Showing 6 changed files with 347 additions and 315 deletions.
diff --git 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
@@ -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
@@ -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>