From 7016463caaff26b6651b410360667c34709340ce Mon Sep 17 00:00:00 2001 From: Richard Eckart de Castilho Date: Mon, 18 Nov 2024 17:39:30 +0100 Subject: [PATCH 1/2] 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) --- PearPackagingMavenPlugin/pom.xml | 4 +- aggregate-uimaj-eclipse-plugins/pom.xml | 4 +- aggregate-uimaj/pom.xml | 4 +- jVinci/pom.xml | 4 +- jcasgen-maven-plugin/pom.xml | 4 +- jcasgen-maven-plugin/src/it/simple/pom.xml | 71 +- pom.xml | 7 +- uima-bnd-plugin/pom.xml | 4 +- uimafit-assertj/pom.xml | 6 +- uimafit-benchmark/pom.xml | 6 +- uimafit-core/pom.xml | 6 +- uimafit-cpe/pom.xml | 6 +- uimafit-examples/pom.xml | 6 +- uimafit-junit/pom.xml | 6 +- uimafit-maven-plugin/pom.xml | 6 +- uimafit-spring/pom.xml | 6 +- uimaj-adapter-vinci/pom.xml | 4 +- uimaj-bom/pom.xml | 2 +- uimaj-bootstrap/pom.xml | 4 +- uimaj-component-test-util/pom.xml | 4 +- uimaj-core/pom.xml | 4 +- uimaj-cpe/pom.xml | 4 +- uimaj-document-annotation/pom.xml | 4 +- uimaj-documentation/pom.xml | 4 +- uimaj-eclipse-feature-runtime/pom.xml | 4 +- uimaj-eclipse-feature-tools/pom.xml | 4 +- uimaj-eclipse-maven-p2-site/pom.xml | 4 +- uimaj-eclipse-update-site/pom.xml | 4 +- uimaj-ep-cas-editor-ide/pom.xml | 4 +- uimaj-ep-cas-editor/pom.xml | 4 +- uimaj-ep-configurator/pom.xml | 4 +- uimaj-ep-debug/pom.xml | 4 +- uimaj-ep-jcasgen/pom.xml | 4 +- uimaj-ep-launcher/pom.xml | 4 +- uimaj-ep-pear-packager/pom.xml | 4 +- uimaj-ep-runtime/pom.xml | 4 +- uimaj-examples/pom.xml | 4 +- uimaj-it-pear-with-typesystem/pom.xml | 4 +- uimaj-json/pom.xml | 5 +- uimaj-parent-internal/pom.xml | 841 +++++++++++++++++++++ uimaj-parent/pom.xml | 797 ------------------- uimaj-test-util/pom.xml | 4 +- uimaj-tools/pom.xml | 4 +- uimaj-v3migration-jcas/pom.xml | 4 +- 44 files changed, 969 insertions(+), 922 deletions(-) create mode 100644 uimaj-parent-internal/pom.xml diff --git a/PearPackagingMavenPlugin/pom.xml b/PearPackagingMavenPlugin/pom.xml index cfe455998..f4426ae76 100644 --- a/PearPackagingMavenPlugin/pom.xml +++ b/PearPackagingMavenPlugin/pom.xml @@ -24,9 +24,9 @@ org.apache.uima - uimaj-parent + uimaj-parent-internal 3.6.0-SNAPSHOT - ../uimaj-parent/pom.xml + ../uimaj-parent-internal/pom.xml PearPackagingMavenPlugin diff --git a/aggregate-uimaj-eclipse-plugins/pom.xml b/aggregate-uimaj-eclipse-plugins/pom.xml index a5a5d9d0f..911dfd679 100644 --- a/aggregate-uimaj-eclipse-plugins/pom.xml +++ b/aggregate-uimaj-eclipse-plugins/pom.xml @@ -22,9 +22,9 @@ org.apache.uima - uimaj-parent + uimaj-parent-internal 3.6.0-SNAPSHOT - ../uimaj-parent/pom.xml + ../uimaj-parent-internal/pom.xml aggregate-uimaj-eclipse-plugins diff --git a/aggregate-uimaj/pom.xml b/aggregate-uimaj/pom.xml index 6c4f31ecc..cfeaab876 100644 --- a/aggregate-uimaj/pom.xml +++ b/aggregate-uimaj/pom.xml @@ -22,9 +22,9 @@ org.apache.uima - uimaj-parent + uimaj-parent-internal 3.6.0-SNAPSHOT - ../uimaj-parent/pom.xml + ../uimaj-parent-internal/pom.xml aggregate-uimaj diff --git a/jVinci/pom.xml b/jVinci/pom.xml index cfa8a182b..27680ea12 100644 --- a/jVinci/pom.xml +++ b/jVinci/pom.xml @@ -24,9 +24,9 @@ org.apache.uima - uimaj-parent + uimaj-parent-internal 3.6.0-SNAPSHOT - ../uimaj-parent/pom.xml + ../uimaj-parent-internal/pom.xml jVinci diff --git a/jcasgen-maven-plugin/pom.xml b/jcasgen-maven-plugin/pom.xml index a3199f8ed..bc432c4b3 100644 --- a/jcasgen-maven-plugin/pom.xml +++ b/jcasgen-maven-plugin/pom.xml @@ -20,9 +20,9 @@ 4.0.0 org.apache.uima - uimaj-parent + uimaj-parent-internal 3.6.0-SNAPSHOT - ../uimaj-parent/pom.xml + ../uimaj-parent-internal/pom.xml - - 4.0.0 + + 4.0.0 - test - simple - 1.0.0-SNAPSHOT - + test + simple + 1.0.0-SNAPSHOT + 1.8 1.8 - - - - org.apache.uima - jcasgen-maven-plugin - @project.version@ - - - src/main/resources/TypeSystem.xml - - - - - - generate - - - - - - - - - org.apache.uima - uimaj-core - @project.version@ - - + + + + org.apache.uima + jcasgen-maven-plugin + @project.version@ + + + src/main/resources/TypeSystem.xml + + + + + + generate + + + + + + + + + org.apache.uima + uimaj-core + @project.version@ + + \ No newline at end of file diff --git a/pom.xml b/pom.xml index 2dae7e622..4fd25c429 100644 --- a/pom.xml +++ b/pom.xml @@ -28,9 +28,9 @@ org.apache.uima - uimaj-parent + uimaj-parent-internal 3.6.0-SNAPSHOT - uimaj-parent/pom.xml + uimaj-parent-internal/pom.xml uimaj @@ -52,8 +52,9 @@ - uimaj-bom uimaj-parent + uimaj-bom + uimaj-parent-internal aggregate-uimaj diff --git a/uima-bnd-plugin/pom.xml b/uima-bnd-plugin/pom.xml index 34d185247..dec90e7df 100644 --- a/uima-bnd-plugin/pom.xml +++ b/uima-bnd-plugin/pom.xml @@ -24,9 +24,9 @@ org.apache.uima - uimaj-parent + uimaj-parent-internal 3.6.0-SNAPSHOT - ../uimaj-parent/pom.xml + ../uimaj-parent-internal/pom.xml uima-bnd-plugin diff --git a/uimafit-assertj/pom.xml b/uimafit-assertj/pom.xml index e9f7e4096..dc84f693f 100644 --- a/uimafit-assertj/pom.xml +++ b/uimafit-assertj/pom.xml @@ -24,15 +24,15 @@ org.apache.uima - uimaj-parent + uimaj-parent-internal 3.6.0-SNAPSHOT - ../uimaj-parent/pom.xml + ../uimaj-parent-internal/pom.xml uimafit-assertj bundle - Apache UIMA uimaFIT - AssertJ support + Apache UIMA uimaFIT: AssertJ support diff --git a/uimafit-benchmark/pom.xml b/uimafit-benchmark/pom.xml index a70b911ef..c3b1925b1 100644 --- a/uimafit-benchmark/pom.xml +++ b/uimafit-benchmark/pom.xml @@ -22,14 +22,14 @@ org.apache.uima - uimaj-parent + uimaj-parent-internal 3.6.0-SNAPSHOT - ../uimaj-parent/pom.xml + ../uimaj-parent-internal/pom.xml uimafit-benchmark jar - Apache UIMA uimaFIT - Benchmark + Apache UIMA uimaFIT: Benchmark Factories, Injection, and Testing library for UIMA ${uimaWebsiteUrl} diff --git a/uimafit-core/pom.xml b/uimafit-core/pom.xml index b6ebb02c0..43300c80b 100644 --- a/uimafit-core/pom.xml +++ b/uimafit-core/pom.xml @@ -22,15 +22,15 @@ org.apache.uima - uimaj-parent + uimaj-parent-internal 3.6.0-SNAPSHOT - ../uimaj-parent/pom.xml + ../uimaj-parent-internal/pom.xml uimafit-core bundle - Apache UIMA uimaFIT - Core + Apache UIMA uimaFIT: Core Factories, Injection, and Testing library for UIMA ${uimaWebsiteUrl} diff --git a/uimafit-cpe/pom.xml b/uimafit-cpe/pom.xml index 65391f645..f7521df57 100644 --- a/uimafit-cpe/pom.xml +++ b/uimafit-cpe/pom.xml @@ -22,15 +22,15 @@ org.apache.uima - uimaj-parent + uimaj-parent-internal 3.6.0-SNAPSHOT - ../uimaj-parent/pom.xml + ../uimaj-parent-internal/pom.xml uimafit-cpe bundle - Apache UIMA uimaFIT - Collection Processing Engine support + Apache UIMA uimaFIT: Collection Processing Engine support diff --git a/uimafit-examples/pom.xml b/uimafit-examples/pom.xml index cfd97c9ba..ef6b12c53 100644 --- a/uimafit-examples/pom.xml +++ b/uimafit-examples/pom.xml @@ -22,13 +22,13 @@ org.apache.uima - uimaj-parent + uimaj-parent-internal 3.6.0-SNAPSHOT - ../uimaj-parent/pom.xml + ../uimaj-parent-internal/pom.xml uimafit-examples - Apache UIMA uimaFIT - Examples + Apache UIMA uimaFIT: Examples Factories, Injection, and Testing library for UIMA ${uimaWebsiteUrl} diff --git a/uimafit-junit/pom.xml b/uimafit-junit/pom.xml index 31701e54b..cce35ad07 100644 --- a/uimafit-junit/pom.xml +++ b/uimafit-junit/pom.xml @@ -22,15 +22,15 @@ org.apache.uima - uimaj-parent + uimaj-parent-internal 3.6.0-SNAPSHOT - ../uimaj-parent/pom.xml + ../uimaj-parent-internal/pom.xml uimafit-junit bundle - Apache UIMA uimaFIT - JUnit support + Apache UIMA uimaFIT: JUnit support diff --git a/uimafit-maven-plugin/pom.xml b/uimafit-maven-plugin/pom.xml index f07b642a9..7b168b3cc 100644 --- a/uimafit-maven-plugin/pom.xml +++ b/uimafit-maven-plugin/pom.xml @@ -22,15 +22,15 @@ org.apache.uima - uimaj-parent + uimaj-parent-internal 3.6.0-SNAPSHOT - ../uimaj-parent/pom.xml + ../uimaj-parent-internal/pom.xml uimafit-maven-plugin maven-plugin - Apache UIMA uimaFIT - Maven Plugin + Apache UIMA uimaFIT: Maven Plugin ${uimaWebsiteUrl} 2012 diff --git a/uimafit-spring/pom.xml b/uimafit-spring/pom.xml index ac32a66b2..08ed1e3f3 100644 --- a/uimafit-spring/pom.xml +++ b/uimafit-spring/pom.xml @@ -22,14 +22,14 @@ org.apache.uima - uimaj-parent + uimaj-parent-internal 3.6.0-SNAPSHOT - ../uimaj-parent/pom.xml + ../uimaj-parent-internal/pom.xml uimafit-spring jar - Apache UIMA uimaFIT - Spring integration + Apache UIMA uimaFIT: Spring integration Factories, Injection, and Testing library for UIMA ${uimaWebsiteUrl} diff --git a/uimaj-adapter-vinci/pom.xml b/uimaj-adapter-vinci/pom.xml index c842d83c4..2cbdf6539 100644 --- a/uimaj-adapter-vinci/pom.xml +++ b/uimaj-adapter-vinci/pom.xml @@ -24,9 +24,9 @@ org.apache.uima - uimaj-parent + uimaj-parent-internal 3.6.0-SNAPSHOT - ../uimaj-parent/pom.xml + ../uimaj-parent-internal/pom.xml uimaj-adapter-vinci diff --git a/uimaj-bom/pom.xml b/uimaj-bom/pom.xml index cfff42855..36d28e251 100644 --- a/uimaj-bom/pom.xml +++ b/uimaj-bom/pom.xml @@ -30,7 +30,7 @@ uimaj-bom pom - Apache UIMA - BOM + Apache UIMA Java SDK: BOM diff --git a/uimaj-bootstrap/pom.xml b/uimaj-bootstrap/pom.xml index 312aaaade..5ce2b6ee9 100644 --- a/uimaj-bootstrap/pom.xml +++ b/uimaj-bootstrap/pom.xml @@ -22,9 +22,9 @@ org.apache.uima - uimaj-parent + uimaj-parent-internal 3.6.0-SNAPSHOT - ../uimaj-parent/pom.xml + ../uimaj-parent-internal/pom.xml uimaj-bootstrap diff --git a/uimaj-component-test-util/pom.xml b/uimaj-component-test-util/pom.xml index f9abd90b8..fe9e2bbfa 100644 --- a/uimaj-component-test-util/pom.xml +++ b/uimaj-component-test-util/pom.xml @@ -22,9 +22,9 @@ org.apache.uima - uimaj-parent + uimaj-parent-internal 3.6.0-SNAPSHOT - ../uimaj-parent/pom.xml + ../uimaj-parent-internal/pom.xml uimaj-component-test-util diff --git a/uimaj-core/pom.xml b/uimaj-core/pom.xml index fd2f2ca5a..cd214df94 100644 --- a/uimaj-core/pom.xml +++ b/uimaj-core/pom.xml @@ -22,9 +22,9 @@ org.apache.uima - uimaj-parent + uimaj-parent-internal 3.6.0-SNAPSHOT - ../uimaj-parent/pom.xml + ../uimaj-parent-internal/pom.xml uimaj-core diff --git a/uimaj-cpe/pom.xml b/uimaj-cpe/pom.xml index 208973af2..acd5fa558 100644 --- a/uimaj-cpe/pom.xml +++ b/uimaj-cpe/pom.xml @@ -22,9 +22,9 @@ org.apache.uima - uimaj-parent + uimaj-parent-internal 3.6.0-SNAPSHOT - ../uimaj-parent/pom.xml + ../uimaj-parent-internal/pom.xml uimaj-cpe diff --git a/uimaj-document-annotation/pom.xml b/uimaj-document-annotation/pom.xml index d80b99fa1..82ebdae6b 100644 --- a/uimaj-document-annotation/pom.xml +++ b/uimaj-document-annotation/pom.xml @@ -22,9 +22,9 @@ org.apache.uima - uimaj-parent + uimaj-parent-internal 3.6.0-SNAPSHOT - ../uimaj-parent/pom.xml + ../uimaj-parent-internal/pom.xml uimaj-document-annotation diff --git a/uimaj-documentation/pom.xml b/uimaj-documentation/pom.xml index 657b8e991..0c6900c24 100644 --- a/uimaj-documentation/pom.xml +++ b/uimaj-documentation/pom.xml @@ -22,9 +22,9 @@ org.apache.uima - uimaj-parent + uimaj-parent-internal 3.6.0-SNAPSHOT - ../uimaj-parent/pom.xml + ../uimaj-parent-internal/pom.xml uimaj-documentation diff --git a/uimaj-eclipse-feature-runtime/pom.xml b/uimaj-eclipse-feature-runtime/pom.xml index 28a901994..ff731c760 100644 --- a/uimaj-eclipse-feature-runtime/pom.xml +++ b/uimaj-eclipse-feature-runtime/pom.xml @@ -22,9 +22,9 @@ org.apache.uima - uimaj-parent + uimaj-parent-internal 3.6.0-SNAPSHOT - ../uimaj-parent/pom.xml + ../uimaj-parent-internal/pom.xml org.apache.uima.runtime diff --git a/uimaj-eclipse-feature-tools/pom.xml b/uimaj-eclipse-feature-tools/pom.xml index 26d88211f..aea9049f5 100644 --- a/uimaj-eclipse-feature-tools/pom.xml +++ b/uimaj-eclipse-feature-tools/pom.xml @@ -22,9 +22,9 @@ org.apache.uima - uimaj-parent + uimaj-parent-internal 3.6.0-SNAPSHOT - ../uimaj-parent/pom.xml + ../uimaj-parent-internal/pom.xml org.apache.uima.tools diff --git a/uimaj-eclipse-maven-p2-site/pom.xml b/uimaj-eclipse-maven-p2-site/pom.xml index 880d0e411..5d0991f2d 100644 --- a/uimaj-eclipse-maven-p2-site/pom.xml +++ b/uimaj-eclipse-maven-p2-site/pom.xml @@ -22,9 +22,9 @@ org.apache.uima - uimaj-parent + uimaj-parent-internal 3.6.0-SNAPSHOT - ../uimaj-parent/pom.xml + ../uimaj-parent-internal/pom.xml uimaj-eclipse-maven-p2-site diff --git a/uimaj-eclipse-update-site/pom.xml b/uimaj-eclipse-update-site/pom.xml index 3611608c2..32651cb66 100644 --- a/uimaj-eclipse-update-site/pom.xml +++ b/uimaj-eclipse-update-site/pom.xml @@ -22,9 +22,9 @@ org.apache.uima - uimaj-parent + uimaj-parent-internal 3.6.0-SNAPSHOT - ../uimaj-parent/pom.xml + ../uimaj-parent-internal/pom.xml uimaj-eclipse-update-site diff --git a/uimaj-ep-cas-editor-ide/pom.xml b/uimaj-ep-cas-editor-ide/pom.xml index 21a4384d0..e12c9631a 100644 --- a/uimaj-ep-cas-editor-ide/pom.xml +++ b/uimaj-ep-cas-editor-ide/pom.xml @@ -22,9 +22,9 @@ org.apache.uima - uimaj-parent + uimaj-parent-internal 3.6.0-SNAPSHOT - ../uimaj-parent/pom.xml + ../uimaj-parent-internal/pom.xml uimaj-ep-cas-editor-ide diff --git a/uimaj-ep-cas-editor/pom.xml b/uimaj-ep-cas-editor/pom.xml index 073446018..09cb077cd 100644 --- a/uimaj-ep-cas-editor/pom.xml +++ b/uimaj-ep-cas-editor/pom.xml @@ -22,9 +22,9 @@ org.apache.uima - uimaj-parent + uimaj-parent-internal 3.6.0-SNAPSHOT - ../uimaj-parent/pom.xml + ../uimaj-parent-internal/pom.xml uimaj-ep-cas-editor diff --git a/uimaj-ep-configurator/pom.xml b/uimaj-ep-configurator/pom.xml index b17b0df78..d5a81379a 100644 --- a/uimaj-ep-configurator/pom.xml +++ b/uimaj-ep-configurator/pom.xml @@ -22,9 +22,9 @@ org.apache.uima - uimaj-parent + uimaj-parent-internal 3.6.0-SNAPSHOT - ../uimaj-parent/pom.xml + ../uimaj-parent-internal/pom.xml uimaj-ep-configurator diff --git a/uimaj-ep-debug/pom.xml b/uimaj-ep-debug/pom.xml index c6c685220..489381647 100644 --- a/uimaj-ep-debug/pom.xml +++ b/uimaj-ep-debug/pom.xml @@ -22,9 +22,9 @@ org.apache.uima - uimaj-parent + uimaj-parent-internal 3.6.0-SNAPSHOT - ../uimaj-parent/pom.xml + ../uimaj-parent-internal/pom.xml uimaj-ep-debug diff --git a/uimaj-ep-jcasgen/pom.xml b/uimaj-ep-jcasgen/pom.xml index be515ee27..0c0c911ce 100644 --- a/uimaj-ep-jcasgen/pom.xml +++ b/uimaj-ep-jcasgen/pom.xml @@ -22,9 +22,9 @@ org.apache.uima - uimaj-parent + uimaj-parent-internal 3.6.0-SNAPSHOT - ../uimaj-parent/pom.xml + ../uimaj-parent-internal/pom.xml uimaj-ep-jcasgen diff --git a/uimaj-ep-launcher/pom.xml b/uimaj-ep-launcher/pom.xml index 708c5f537..d0fe39b2f 100644 --- a/uimaj-ep-launcher/pom.xml +++ b/uimaj-ep-launcher/pom.xml @@ -22,9 +22,9 @@ org.apache.uima - uimaj-parent + uimaj-parent-internal 3.6.0-SNAPSHOT - ../uimaj-parent/pom.xml + ../uimaj-parent-internal/pom.xml uimaj-ep-launcher diff --git a/uimaj-ep-pear-packager/pom.xml b/uimaj-ep-pear-packager/pom.xml index 8ee93bba0..647613113 100644 --- a/uimaj-ep-pear-packager/pom.xml +++ b/uimaj-ep-pear-packager/pom.xml @@ -22,9 +22,9 @@ org.apache.uima - uimaj-parent + uimaj-parent-internal 3.6.0-SNAPSHOT - ../uimaj-parent/pom.xml + ../uimaj-parent-internal/pom.xml uimaj-ep-pear-packager diff --git a/uimaj-ep-runtime/pom.xml b/uimaj-ep-runtime/pom.xml index 75ab8b386..adefeecc1 100644 --- a/uimaj-ep-runtime/pom.xml +++ b/uimaj-ep-runtime/pom.xml @@ -22,9 +22,9 @@ org.apache.uima - uimaj-parent + uimaj-parent-internal 3.6.0-SNAPSHOT - ../uimaj-parent/pom.xml + ../uimaj-parent-internal/pom.xml uimaj-ep-runtime diff --git a/uimaj-examples/pom.xml b/uimaj-examples/pom.xml index 83ab1c5db..195250f72 100644 --- a/uimaj-examples/pom.xml +++ b/uimaj-examples/pom.xml @@ -22,9 +22,9 @@ org.apache.uima - uimaj-parent + uimaj-parent-internal 3.6.0-SNAPSHOT - ../uimaj-parent/pom.xml + ../uimaj-parent-internal/pom.xml uimaj-examples diff --git a/uimaj-it-pear-with-typesystem/pom.xml b/uimaj-it-pear-with-typesystem/pom.xml index ef78b0ce3..074cd2dec 100644 --- a/uimaj-it-pear-with-typesystem/pom.xml +++ b/uimaj-it-pear-with-typesystem/pom.xml @@ -24,9 +24,9 @@ org.apache.uima - uimaj-parent + uimaj-parent-internal 3.6.0-SNAPSHOT - ../uimaj-parent/pom.xml + ../uimaj-parent-internal/pom.xml uimaj-it-pear-with-typesystem diff --git a/uimaj-json/pom.xml b/uimaj-json/pom.xml index d75bffd3d..66ae04c4d 100644 --- a/uimaj-json/pom.xml +++ b/uimaj-json/pom.xml @@ -21,10 +21,11 @@ 4.0.0 org.apache.uima - uimaj-parent + uimaj-parent-internal 3.6.0-SNAPSHOT - ../uimaj-parent/pom.xml + ../uimaj-parent-internal/pom.xml + uimaj-json Apache UIMA Base: ${project.artifactId}: JSON (deprecated) JSON support for UIMA SDK. This module is deprecated. Use https://github.com/apache/uima-uimaj-io-jsoncas instead. diff --git a/uimaj-parent-internal/pom.xml b/uimaj-parent-internal/pom.xml new file mode 100644 index 000000000..ddca3792f --- /dev/null +++ b/uimaj-parent-internal/pom.xml @@ -0,0 +1,841 @@ + + + + + + + 4.0.0 + + + org.apache.uima + uimaj-parent + 3.6.0-SNAPSHOT + ../uimaj-parent/pom.xml + + + uimaj-parent-internal + pom + + Apache UIMA Java SDK: ${project.artifactId} + The internal parent POM for the UIMA Java SDK + ${uimaWebsiteUrl} + + + + 17 + 17 + 17 + none + JavaSE-17 + + 3.8.1 + + 3.1.1 + 3.0.0 + 2.3.19 + 3.26.3 + 7.0.0 + 1.15.10 + 1.12.0 + 4.4 + 2.17.0 + 3.17.0 + 3.6.1 + 2.18.1 + 3.30.2-GA + 5.11.3 + 1.11.3 + 4.13.2 + 2.24.1 + 5.14.2 + 1.3.0 + 2.1.0 + 1.7.36 + 6.0.23 + 4.0.10 + 2.10.0 + + org.eclipse.p2.202209 + + 3.5.0 + + src/main/assembly/src.xml + + + uima-uimaj + main + 3.5.0 + + + + + + org.junit.jupiter + junit-jupiter-api + test + + + org.junit.jupiter + junit-jupiter-engine + test + + + org.assertj + assertj-core + test + + + org.xmlunit + xmlunit-assertj3 + test + + + org.mockito + mockito-core + test + + + + + + + net.bytebuddy + byte-buddy + ${bytebuddy-version} + + + net.bytebuddy + byte-buddy-agent + ${bytebuddy-version} + + + org.junit + junit-bom + ${junit-version} + pom + import + + + org.opentest4j + opentest4j + ${opentest4j-version} + + + junit + junit + ${junit-vintage-version} + + + org.assertj + assertj-bom + ${assertj-version} + pom + import + + + org.mockito + mockito-bom + ${mockito-version} + pom + import + + + org.xmlunit + xmlunit-core + ${xmlunit-version} + + + org.xmlunit + xmlunit-assertj3 + ${xmlunit-version} + + + org.slf4j + slf4j-jdk14 + ${slf4j-version} + + + org.slf4j + slf4j-api + ${slf4j-version} + + + org.slf4j + slf4j-simple + ${slf4j-version} + + + + org.apache.logging.log4j + log4j-bom + ${log4j-version} + pom + import + + + + org.apache.commons + commons-csv + ${commons-csv-version} + + + commons-io + commons-io + ${commons-io-version} + + + org.apache.commons + commons-lang3 + ${commons-lang3-version} + + + org.apache.commons + commons-math3 + ${commons-math3-version} + + + org.apache.commons + commons-collections4 + ${commons-collections4-version} + + + + org.springframework + spring-aop + ${spring-version} + + + org.springframework + spring-beans + ${spring-version} + + + org.springframework + spring-core + ${spring-version} + + + org.springframework + spring-context + ${spring-version} + + + org.springframework + spring-expression + ${spring-version} + + + org.springframework + spring-jcl + ${spring-version} + + + org.springframework + spring-test + ${spring-version} + + + + org.sonatype.plexus + plexus-build-api + 0.0.7 + + + org.codehaus.plexus + plexus-utils + 3.4.1 + + + org.codehaus.plexus + plexus-archiver + 3.7.0 + + + org.apache.maven.plugin-testing + maven-plugin-testing-harness + 3.3.0 + + + org.apache.maven + maven-artifact + ${maven.version} + + + org.apache.maven + maven-model + ${maven.version} + + + org.apache.maven + maven-plugin-api + ${maven.version} + + + org.apache.maven + maven-core + ${maven.version} + + + org.apache.maven + maven-compat + ${maven.version} + + + + org.javassist + javassist + ${javassist-version} + + + com.thoughtworks.qdox + qdox + ${qdox-version} + + + + biz.aQute.bnd + biz.aQute.bndlib + ${bnd-version} + + + + ${eclipseP2RepoId} + org.eclipse.jface + 3.27.0.v20220817-1444 + + + ${eclipseP2RepoId} + org.eclipse.jface.text + 3.21.0.v20220817-1340 + + + ${eclipseP2RepoId} + org.eclipse.swt.win32.win32.x86_64 + 3.121.0.v20220829-1402 + + + ${eclipseP2RepoId} + org.eclipse.core.runtime + 3.26.0.v20220813-0916 + + + ${eclipseP2RepoId} + org.eclipse.core.resources + 3.18.0.v20220828-0546 + + + ${eclipseP2RepoId} + org.eclipse.core.filesystem + 1.9.500.v20220817-1539 + + + ${eclipseP2RepoId} + org.eclipse.debug.core + 3.20.0.v20220811-0741 + + + ${eclipseP2RepoId} + org.eclipse.debug.ui + 3.17.0.v20220817-1312 + + + ${eclipseP2RepoId} + org.eclipse.emf.codegen + 2.22.0.v20210420-0623 + + + ${eclipseP2RepoId} + org.eclipse.equinox.app + 1.6.200.v20220720-2012 + + + ${eclipseP2RepoId} + org.eclipse.equinox.common + 3.16.200.v20220817-1601 + + + ${eclipseP2RepoId} + org.eclipse.equinox.registry + 3.11.200.v20220817-1601 + + + ${eclipseP2RepoId} + org.eclipse.equinox.preferences + 3.10.100.v20220710-1223 + + + ${eclipseP2RepoId} + org.eclipse.osgi + 3.18.100.v20220817-1601 + + + ${eclipseP2RepoId} + org.eclipse.text + 3.12.200.v20220817-1340 + + + ${eclipseP2RepoId} + org.eclipse.ui.editors + 3.14.400.v20220730-1844 + + + ${eclipseP2RepoId} + org.eclipse.ui.forms + 3.11.400.v20220817-1444 + + + ${eclipseP2RepoId} + org.eclipse.ui.ide + 3.19.100.v20220820-0412 + + + ${eclipseP2RepoId} + org.eclipse.ui.views + 3.11.200.v20220817-1444 + + + ${eclipseP2RepoId} + org.eclipse.ui.workbench + 3.126.0.v20220823-0718 + + + ${eclipseP2RepoId} + org.eclipse.ui.workbench.texteditor + 3.16.600.v20220809-1658 + + + ${eclipseP2RepoId} + org.eclipse.jdt.core + 3.31.0.v20220831-1439 + + + ${eclipseP2RepoId} + org.eclipse.jdt.launching + 3.19.700.v20220730-1850 + + + ${eclipseP2RepoId} + org.eclipse.jdt.debug + 3.19.300.v20220812-1529 + + + + ${eclipseP2RepoId} + com.ibm.icu + + + + ${eclipseP2RepoId} + org.eclipse.jdt.debug + + + + + ${eclipseP2RepoId} + org.eclipse.jdt.ui + 3.27.0.v20220824-0714 + + + ${eclipseP2RepoId} + org.eclipse.jdt.debug.ui + 3.12.800.v20220813-1738 + + + + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + + org.junit.jupiter + junit-jupiter-engine + ${junit-version} + + + org.junit.vintage + junit-vintage-engine + ${junit-version} + + + + + org.apache.maven.plugins + maven-javadoc-plugin + + ${maven.compiler.release}} + + + + org.apache.uima + jcasgen-maven-plugin + ${project.version} + + + + + + + org.openntf.maven + p2-layout-resolver + 1.9.0 + true + + + + org.eclipse.tycho + target-platform-configuration + ${tycho-version} + + + + win32 + win32 + x86_64 + + + linux + gtk + x86_64 + + + macosx + cocoa + x86_64 + + + + + + + org.codehaus.gmaven + groovy-maven-plugin + + + + read-notice + generate-sources + + execute + + + + + + + + + + com.github.siom79.japicmp + japicmp-maven-plugin + + + + ${project.build.directory}/${project.build.finalName}.jar + + + + + com\.strobel\..* + org\.apache\.logging\.log4j\..* + + + + + + + org.apache.rat + apache-rat-plugin + + + default-cli + + check + + verify + + + + **/marker-file-maven-plugin-module + **/dependency-reduced-pom.xml + **/.asciidoctorconfig.adoc + + **/run_configuration/*.launch + + + + + + + + + + + maven-plugin-module + + + marker-file-maven-plugin-module + + + + + + org.apache.maven + maven-plugin-api + provided + + + org.apache.maven.plugin-tools + maven-plugin-annotations + provided + + + org.apache.maven + maven-core + provided + + + org.apache.maven + maven-model + provided + + + org.apache.maven + maven-artifact + provided + + + org.apache.maven + maven-compat + provided + + + org.apache.maven.plugin-testing + maven-plugin-testing-harness + test + + + + junit + junit + 4.13.2 + test + + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + org.apache.maven:maven-artifact + org.apache.maven:maven-compat + org.apache.maven:maven-core + org.apache.maven:maven-model + org.apache.maven:maven-plugin-api + org.apache.maven.plugin-tools:maven-plugin-annotations + org.apache.maven.plugin-testing:maven-plugin-testing-harness + junit:junit + + + + + + + + + apache-release + + + + org.apache.maven.plugins + maven-assembly-plugin + + + + source-release-assembly + package + + single + + + true + + + ${assemblySrcDescriptor} + + ${assembly.tarLongFileMode} + + + + + + + + + + jacoco + + + + org.jacoco + jacoco-maven-plugin + + + + **/org/apache/uima/examples/SourceDocumentInformation* + + + + + + + + + dependency-check + + + !disable-dependency-check + + + marker-file-enabling-dependency-check + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + default + verify + + analyze-only + + + + + true + + org.assertj:assertj-core + org.xmlunit:xmlunit-assertj3 + org.slf4j:slf4j-simple + org.mockito:mockito-core + org.junit.jupiter:junit-jupiter-api + org.junit.jupiter:junit-jupiter-engine + org.junit.vintage:junit-vintage-engine + junit:junit + + + + + + + + + + m2e + + + m2e.version + + + + + + + + org.eclipse.m2e + lifecycle-mapping + 1.0.0 + + + + + + + + + + org.apache.felix + maven-bundle-plugin + [3,) + + process + bundle + manifest + + + + + + + + + org.codehaus.gmaven + groovy-maven-plugin + [1.4,) + + execute + + + + + + + + + + + + + + + + diff --git a/uimaj-parent/pom.xml b/uimaj-parent/pom.xml index 9ba634a03..aca582bfc 100644 --- a/uimaj-parent/pom.xml +++ b/uimaj-parent/pom.xml @@ -132,801 +132,4 @@ https://artifactory.openntf.org/openntf - - - - 17 - 17 - 17 - none - JavaSE-17 - - 3.8.1 - - 3.1.1 - 3.0.0 - 2.3.19 - 3.26.3 - 7.0.0 - 1.15.10 - 1.12.0 - 4.4 - 2.17.0 - 3.17.0 - 3.6.1 - 2.18.1 - 3.30.2-GA - 5.11.3 - 1.11.3 - 4.13.2 - 2.24.1 - 5.14.2 - 1.3.0 - 2.1.0 - 1.7.36 - 6.0.23 - 4.0.10 - 2.10.0 - - org.eclipse.p2.202209 - - 3.5.0 - - src/main/assembly/src.xml - - - uima-uimaj - main - 3.5.0 - - - - - - org.junit.jupiter - junit-jupiter-api - test - - - org.junit.jupiter - junit-jupiter-engine - test - - - org.assertj - assertj-core - test - - - org.xmlunit - xmlunit-assertj3 - test - - - org.mockito - mockito-core - test - - - - - - - net.bytebuddy - byte-buddy - ${bytebuddy-version} - - - net.bytebuddy - byte-buddy-agent - ${bytebuddy-version} - - - org.junit - junit-bom - ${junit-version} - pom - import - - - org.opentest4j - opentest4j - ${opentest4j-version} - - - junit - junit - ${junit-vintage-version} - - - org.assertj - assertj-bom - ${assertj-version} - pom - import - - - org.mockito - mockito-bom - ${mockito-version} - pom - import - - - org.xmlunit - xmlunit-core - ${xmlunit-version} - - - org.xmlunit - xmlunit-assertj3 - ${xmlunit-version} - - - org.slf4j - slf4j-jdk14 - ${slf4j-version} - - - org.slf4j - slf4j-api - ${slf4j-version} - - - org.slf4j - slf4j-simple - ${slf4j-version} - - - - org.apache.logging.log4j - log4j-bom - ${log4j-version} - pom - import - - - - org.apache.commons - commons-csv - ${commons-csv-version} - - - commons-io - commons-io - ${commons-io-version} - - - org.apache.commons - commons-lang3 - ${commons-lang3-version} - - - org.apache.commons - commons-math3 - ${commons-math3-version} - - - org.apache.commons - commons-collections4 - ${commons-collections4-version} - - - - org.springframework - spring-aop - ${spring-version} - - - org.springframework - spring-beans - ${spring-version} - - - org.springframework - spring-core - ${spring-version} - - - org.springframework - spring-context - ${spring-version} - - - org.springframework - spring-expression - ${spring-version} - - - org.springframework - spring-jcl - ${spring-version} - - - org.springframework - spring-test - ${spring-version} - - - - org.sonatype.plexus - plexus-build-api - 0.0.7 - - - org.codehaus.plexus - plexus-utils - 3.4.1 - - - org.codehaus.plexus - plexus-archiver - 3.7.0 - - - org.apache.maven.plugin-testing - maven-plugin-testing-harness - 3.3.0 - - - org.apache.maven - maven-artifact - ${maven.version} - - - org.apache.maven - maven-model - ${maven.version} - - - org.apache.maven - maven-plugin-api - ${maven.version} - - - org.apache.maven - maven-core - ${maven.version} - - - org.apache.maven - maven-compat - ${maven.version} - - - - org.javassist - javassist - ${javassist-version} - - - com.thoughtworks.qdox - qdox - ${qdox-version} - - - - biz.aQute.bnd - biz.aQute.bndlib - ${bnd-version} - - - - ${eclipseP2RepoId} - org.eclipse.jface - 3.27.0.v20220817-1444 - - - ${eclipseP2RepoId} - org.eclipse.jface.text - 3.21.0.v20220817-1340 - - - ${eclipseP2RepoId} - org.eclipse.swt.win32.win32.x86_64 - 3.121.0.v20220829-1402 - - - ${eclipseP2RepoId} - org.eclipse.core.runtime - 3.26.0.v20220813-0916 - - - ${eclipseP2RepoId} - org.eclipse.core.resources - 3.18.0.v20220828-0546 - - - ${eclipseP2RepoId} - org.eclipse.core.filesystem - 1.9.500.v20220817-1539 - - - ${eclipseP2RepoId} - org.eclipse.debug.core - 3.20.0.v20220811-0741 - - - ${eclipseP2RepoId} - org.eclipse.debug.ui - 3.17.0.v20220817-1312 - - - ${eclipseP2RepoId} - org.eclipse.emf.codegen - 2.22.0.v20210420-0623 - - - ${eclipseP2RepoId} - org.eclipse.equinox.app - 1.6.200.v20220720-2012 - - - ${eclipseP2RepoId} - org.eclipse.equinox.common - 3.16.200.v20220817-1601 - - - ${eclipseP2RepoId} - org.eclipse.equinox.registry - 3.11.200.v20220817-1601 - - - ${eclipseP2RepoId} - org.eclipse.equinox.preferences - 3.10.100.v20220710-1223 - - - ${eclipseP2RepoId} - org.eclipse.osgi - 3.18.100.v20220817-1601 - - - ${eclipseP2RepoId} - org.eclipse.text - 3.12.200.v20220817-1340 - - - ${eclipseP2RepoId} - org.eclipse.ui.editors - 3.14.400.v20220730-1844 - - - ${eclipseP2RepoId} - org.eclipse.ui.forms - 3.11.400.v20220817-1444 - - - ${eclipseP2RepoId} - org.eclipse.ui.ide - 3.19.100.v20220820-0412 - - - ${eclipseP2RepoId} - org.eclipse.ui.views - 3.11.200.v20220817-1444 - - - ${eclipseP2RepoId} - org.eclipse.ui.workbench - 3.126.0.v20220823-0718 - - - ${eclipseP2RepoId} - org.eclipse.ui.workbench.texteditor - 3.16.600.v20220809-1658 - - - ${eclipseP2RepoId} - org.eclipse.jdt.core - 3.31.0.v20220831-1439 - - - ${eclipseP2RepoId} - org.eclipse.jdt.launching - 3.19.700.v20220730-1850 - - - ${eclipseP2RepoId} - org.eclipse.jdt.debug - 3.19.300.v20220812-1529 - - - - ${eclipseP2RepoId} - com.ibm.icu - - - - ${eclipseP2RepoId} - org.eclipse.jdt.debug - - - - - ${eclipseP2RepoId} - org.eclipse.jdt.ui - 3.27.0.v20220824-0714 - - - ${eclipseP2RepoId} - org.eclipse.jdt.debug.ui - 3.12.800.v20220813-1738 - - - - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - - org.junit.jupiter - junit-jupiter-engine - ${junit-version} - - - org.junit.vintage - junit-vintage-engine - ${junit-version} - - - - - org.apache.maven.plugins - maven-javadoc-plugin - - ${maven.compiler.release}} - - - - org.apache.uima - jcasgen-maven-plugin - ${project.version} - - - - - - - org.openntf.maven - p2-layout-resolver - 1.9.0 - true - - - - org.eclipse.tycho - target-platform-configuration - ${tycho-version} - - - - win32 - win32 - x86_64 - - - linux - gtk - x86_64 - - - macosx - cocoa - x86_64 - - - - - - - org.codehaus.gmaven - groovy-maven-plugin - - - - read-notice - generate-sources - - execute - - - - - - - - - - com.github.siom79.japicmp - japicmp-maven-plugin - - - - ${project.build.directory}/${project.build.finalName}.jar - - - - - com\.strobel\..* - org\.apache\.logging\.log4j\..* - - - - - - - org.apache.rat - apache-rat-plugin - - - default-cli - - check - - verify - - - - **/marker-file-maven-plugin-module - **/dependency-reduced-pom.xml - **/.asciidoctorconfig.adoc - - **/run_configuration/*.launch - - - - - - - - - - - maven-plugin-module - - - marker-file-maven-plugin-module - - - - - - org.apache.maven - maven-plugin-api - provided - - - org.apache.maven.plugin-tools - maven-plugin-annotations - provided - - - org.apache.maven - maven-core - provided - - - org.apache.maven - maven-model - provided - - - org.apache.maven - maven-artifact - provided - - - org.apache.maven - maven-compat - provided - - - org.apache.maven.plugin-testing - maven-plugin-testing-harness - test - - - - junit - junit - 4.13.2 - test - - - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - org.apache.maven:maven-artifact - org.apache.maven:maven-compat - org.apache.maven:maven-core - org.apache.maven:maven-model - org.apache.maven:maven-plugin-api - org.apache.maven.plugin-tools:maven-plugin-annotations - org.apache.maven.plugin-testing:maven-plugin-testing-harness - junit:junit - - - - - - - - - apache-release - - - - org.apache.maven.plugins - maven-assembly-plugin - - - - source-release-assembly - package - - single - - - true - - - ${assemblySrcDescriptor} - - ${assembly.tarLongFileMode} - - - - - - - - - - jacoco - - - - org.jacoco - jacoco-maven-plugin - - - - **/org/apache/uima/examples/SourceDocumentInformation* - - - - - - - - - dependency-check - - - !disable-dependency-check - - - marker-file-enabling-dependency-check - - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - default - verify - - analyze-only - - - - - true - - org.assertj:assertj-core - org.xmlunit:xmlunit-assertj3 - org.slf4j:slf4j-simple - org.mockito:mockito-core - org.junit.jupiter:junit-jupiter-api - org.junit.jupiter:junit-jupiter-engine - org.junit.vintage:junit-vintage-engine - junit:junit - - - - - - - - - - m2e - - - m2e.version - - - - - - - - org.eclipse.m2e - lifecycle-mapping - 1.0.0 - - - - - - - - - - org.apache.felix - maven-bundle-plugin - [3,) - - process - bundle - manifest - - - - - - - - - org.codehaus.gmaven - groovy-maven-plugin - [1.4,) - - execute - - - - - - - - - - - - - - - diff --git a/uimaj-test-util/pom.xml b/uimaj-test-util/pom.xml index fd99f3ae4..a457cd53e 100644 --- a/uimaj-test-util/pom.xml +++ b/uimaj-test-util/pom.xml @@ -22,9 +22,9 @@ org.apache.uima - uimaj-parent + uimaj-parent-internal 3.6.0-SNAPSHOT - ../uimaj-parent/pom.xml + ../uimaj-parent-internal/pom.xml uimaj-test-util diff --git a/uimaj-tools/pom.xml b/uimaj-tools/pom.xml index af05507a4..3910c49a3 100644 --- a/uimaj-tools/pom.xml +++ b/uimaj-tools/pom.xml @@ -22,9 +22,9 @@ org.apache.uima - uimaj-parent + uimaj-parent-internal 3.6.0-SNAPSHOT - ../uimaj-parent/pom.xml + ../uimaj-parent-internal/pom.xml uimaj-tools diff --git a/uimaj-v3migration-jcas/pom.xml b/uimaj-v3migration-jcas/pom.xml index 68081566d..a49c30dbf 100644 --- a/uimaj-v3migration-jcas/pom.xml +++ b/uimaj-v3migration-jcas/pom.xml @@ -22,9 +22,9 @@ org.apache.uima - uimaj-parent + uimaj-parent-internal 3.6.0-SNAPSHOT - ../uimaj-parent/pom.xml + ../uimaj-parent-internal/pom.xml uimaj-v3migration-jcas From dc6ce269d04cb886a8db1ab0ec0295176e89eb66 Mon Sep 17 00:00:00 2001 From: Richard Eckart de Castilho Date: Wed, 20 Nov 2024 15:00:30 +0100 Subject: [PATCH 2/2] Issue #417: BOM should not inherit build setup from parent POM - Need to use UIMA Maven plugins from last release cycle, otherwise build fails - Fix small formatting issue in documentation --- .../tools/jcasgen/maven/JCasGenMojoTest.java | 75 ++++++--------- .../src/docs/asciidoc/ref/ref.config.adoc | 96 ++++++------------- uimaj-it-pear-with-typesystem/pom.xml | 4 +- uimaj-parent-internal/pom.xml | 14 ++- 4 files changed, 68 insertions(+), 121 deletions(-) diff --git a/jcasgen-maven-plugin/src/test/java/org/apache/uima/tools/jcasgen/maven/JCasGenMojoTest.java b/jcasgen-maven-plugin/src/test/java/org/apache/uima/tools/jcasgen/maven/JCasGenMojoTest.java index 8f99a76e0..d05925bec 100644 --- a/jcasgen-maven-plugin/src/test/java/org/apache/uima/tools/jcasgen/maven/JCasGenMojoTest.java +++ b/jcasgen-maven-plugin/src/test/java/org/apache/uima/tools/jcasgen/maven/JCasGenMojoTest.java @@ -19,80 +19,58 @@ package org.apache.uima.tools.jcasgen.maven; import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import java.io.File; import java.util.ArrayList; -import java.util.List; - -import org.apache.maven.execution.DefaultMavenExecutionRequest; -import org.apache.maven.execution.MavenExecutionRequest; -import org.apache.maven.plugin.testing.AbstractMojoTestCase; -import org.apache.maven.project.MavenProject; -import org.apache.maven.project.ProjectBuilder; -import org.apache.maven.project.ProjectBuildingRequest; -import org.apache.maven.repository.internal.MavenRepositorySystemUtils; + +import org.apache.maven.plugin.testing.MojoRule; import org.codehaus.plexus.util.DirectoryScanner; import org.codehaus.plexus.util.FileUtils; -import org.eclipse.aether.RepositorySystemSession; +import org.junit.Rule; import org.junit.Test; -public class JCasGenMojoTest extends AbstractMojoTestCase { +public class JCasGenMojoTest { + + public @Rule MojoRule rule = new MojoRule(); @Test public void testInvalidFeature() throws Exception { - Exception ee = null; - try { + assertThatExceptionOfType(Exception.class).isThrownBy(() -> { this.test("invalidFeature"); - } catch (Exception e) { - ee = e; - } - assertTrue(ee != null); - assertEquals( - "JCasGen: The feature name 'type', specified in Type 'type.span.Sentence' is reserved. Please choose another name.", - ee.getMessage()); + }).withMessage( + "JCasGen: The feature name 'type', specified in Type 'type.span.Sentence' is reserved. Please choose another name."); } @Test public void testSimple() throws Exception { - this.test("simple", "type.span.Sentence", "type.span.Token", "type.relation.Dependency"); + test("simple", "type.span.Sentence", "type.span.Token", "type.relation.Dependency"); } @Test public void testClasspath() throws Exception { - this.test("classpath", "type.span.Sentence", "type.span.Token", "type.relation.Dependency"); + test("classpath", "type.span.Sentence", "type.span.Token", "type.relation.Dependency"); } @Test public void testWildcard() throws Exception { - this.test("wildcard", "type.span.Sentence", "type.span.Token"); + test("wildcard", "type.span.Sentence", "type.span.Token"); } @Test public void testExclude() throws Exception { - this.test("exclude", "type.span.Sentence"); + test("exclude", "type.span.Sentence"); } - @Test - public void test(String projectName, String... types) throws Exception { + private void test(String projectName, String... types) throws Exception { - File projectSourceDirectory = getTestFile("src/test/resources/" + projectName); - File projectDirectory = getTestFile("target/project-" + projectName + "-test"); + var projectSourceDirectory = new File("src/test/resources/" + projectName); + var projectDirectory = new File("target/project-" + projectName + "-test"); // Stage project to target folder FileUtils.copyDirectoryStructure(projectSourceDirectory, projectDirectory); - File pomFile = new File(projectDirectory, "/pom.xml"); - assertNotNull(pomFile); - assertTrue(pomFile.exists()); - - // create the MavenProject from the pom.xml file - RepositorySystemSession session = MavenRepositorySystemUtils.newSession(); - MavenExecutionRequest executionRequest = new DefaultMavenExecutionRequest(); - ProjectBuildingRequest buildingRequest = executionRequest.getProjectBuildingRequest(); - buildingRequest.setRepositorySession(session); - ProjectBuilder projectBuilder = this.lookup(ProjectBuilder.class); - MavenProject project = projectBuilder.build(pomFile, buildingRequest).getProject(); - assertNotNull(project); + var project = rule.readMavenProject(projectDirectory); // copy resources File source = new File(projectDirectory, "src/main/resources"); @@ -101,11 +79,11 @@ public void test(String projectName, String... types) throws Exception { } // load the Mojo - JCasGenMojo generate = (JCasGenMojo) this.lookupConfiguredMojo(project, "generate"); - assertNotNull(generate); + var generate = (JCasGenMojo) rule.lookupConfiguredMojo(project, "generate"); + assertThat(generate).isNotNull(); // set the MavenProject on the Mojo (AbstractMojoTestCase does not do this by default) - setVariableValueToObject(generate, "project", project); + rule.setVariableValueToObject(generate, "project", project); // execute the Mojo generate.execute(); @@ -114,17 +92,18 @@ public void test(String projectName, String... types) throws Exception { File jCasGenDirectory = new File(project.getBasedir(), "target/generated-sources/jcasgen"); // Record all the files that were generated - DirectoryScanner ds = new DirectoryScanner(); + var ds = new DirectoryScanner(); ds.setBasedir(jCasGenDirectory); ds.setIncludes(new String[] { "**/*.java" }); ds.scan(); - List files = new ArrayList<>(); - for (String scannedFile : ds.getIncludedFiles()) { + + var files = new ArrayList(); + for (var scannedFile : ds.getIncludedFiles()) { files.add(new File(ds.getBasedir(), scannedFile)); } - for (String type : types) { - File wrapperFile = new File(jCasGenDirectory + "/" + type.replace('.', '/') + ".java"); + for (var type : types) { + var wrapperFile = new File(jCasGenDirectory + "/" + type.replace('.', '/') + ".java"); // no _type files in v3 // File typeFile = new File(jCasGenDirectory + "/" + type.replace('.', '/') + "_Type.java"); diff --git a/uimaj-documentation/src/docs/asciidoc/ref/ref.config.adoc b/uimaj-documentation/src/docs/asciidoc/ref/ref.config.adoc index 0ef6edbf4..a47f32dbb 100644 --- a/uimaj-documentation/src/docs/asciidoc/ref/ref.config.adoc +++ b/uimaj-documentation/src/docs/asciidoc/ref/ref.config.adoc @@ -53,6 +53,7 @@ It causes the framework to throw a UIMARuntimeException if an update outside of This table describes the various JVM defined properties; specify these on the Java command line using -Dxxxxxx, where the xxxxxx is one of the properties starting with `uima.` from the table below. +.General properties [cols="1,1,1", frame="all"] |=== @@ -60,42 +61,28 @@ This table describes the various JVM defined properties; specify these on the Ja |**Property Name & Description** |**Since Version** -| - -Use built-in Java Logger as default back-end -| - -`uima.use_jul_as_default_uima_logger` +| Use built-in Java Logger as default back-end +| `uima.use_jul_as_default_uima_logger` See https://issues.apache.org/jira/browse/UIMA-5381[UIMA-5381]. The standard UIMA logger uses an slf4j implementation, which, in turn hooks up to a back end implementation based on what can be found in the class path (see slf4j documentation). If no backend implementation is found, the slf4j default is to use a NOP logger back end which discards all logging. When this flag is specified, the behavior of the UIMA logger is altered to use the built-in-to-Java logging implementation as the back end for the UIMA logger. -| - -3.0.0 - -| +| 3.0.0 -XML: enable doctype declarations -| - -`uima.xml.enable.doctype_decl` (default is false) +| XML: enable doctype declarations +| `uima.xml.enable.doctype_decl` (default is false) See https://issues.apache.org/jira/browse/UIMA-6064[UIMA-6064] Normally, this is turned off to avoid exposure to malicious XML; see https://www.owasp.org/index.php/XML_External_Entity_(XXE)_Processing[ XML External Entity processing vulnerability]. -| - -2.10.4, 3.1.0 - -|**Index protection properties** - -| - -Report Illegal Index-key Feature Updates -| +| 2.10.4, 3.1.0 +|=== -`uima.report_fs_update_corrupts_index` (default is not to report) +.Index protection properties +[cols="1,1,1", frame="all"] +|=== +| Report Illegal Index-key Feature Updates +| `uima.report_fs_update_corrupts_index` (default is not to report) See https://issues.apache.org/jira/browse/UIMA-4135[UIMA-4135]. Updating Features which are used in Set and Sorted indexes as "keys" may corrupt the indexes, if the Feature Structure (FS) has been added to the indexes. @@ -107,49 +94,34 @@ To scan the logs for these reports, search for instances of lines having the str Specifying this property overrides ``uima.disable_auto_protect_indexes``. Users would run with this property defined, and then for high performance, would use the report to manually change their code to avoid the problem or to wrap the updates with a `protectIndexes` kind of protection (see the reference manual, in the CAS or JCas chapters, for examples of user code doing this, and then run with the protection turned off (see below). -| - -2.7.0 - -| +| 2.7.0 -Throw exception on illegal Index-key Feature Updates -| - -`uima.exception_when_fs_update_corrupts_index` (default is false) +| Throw exception on illegal Index-key Feature Updates +| `uima.exception_when_fs_update_corrupts_index` (default is false) See https://issues.apache.org/jira/browse/UIMA-4150[UIMA-4150]. Throws a UIMARuntimeException if an Indexed FS feature used as a key in one or more indexes is updated, outside of an explicit `protectIndexes` block.. \ This is intended for use in automated build and test environments, to provide a strong signal if this kind of mistake gets into the build. If it is not set, then the other properties specify if corruption should be checked for, recovered automatically, and / or reported Specifying this property also forces `uima.report_fs_update_corrupts_index` to true even if it was set to false. -| - -2.7.0 - -| - -Disable the index corruption checking -| +| 2.7.0 -`uima.disable_auto_protect_indexes` +| Disable the index corruption checking +| `uima.disable_auto_protect_indexes` See https://issues.apache.org/jira/browse/UIMA-4135[UIMA-4135]. After you have fixed all reported issues identified with the above report, you may set this property to omit this check, which may slightly improve performance. Note that this property is ignored if the `-Dexception_when_fs_update_corrupts_index` or `-Dreport_fs_update_corrupts_index` -| - -2.7.0 - -|**Measurement / Tracing properties** - -| +| 2.7.0 +|=== -Trace Feature Structure Creation/Updating -| +.Measurement / Tracing properties +[cols="1,1,1", frame="all"] +|=== -`uima.trace_fs_creation_and_updating` +| Trace Feature Structure Creation/Updating +| `uima.trace_fs_creation_and_updating` This causes a trace file to be produced in the current working directory. The file has one line for each Feature Structure that is created, and include information on the cas/cas-view, and the features that are set for the Feature Structure. @@ -157,23 +129,15 @@ There is, additionally, one line for each Feature Structure update. Updates that occur next-to trace information for the same Feature Structure are combined. This can generate a lot of output, and definitely slows down execution. -| - -2.10.1 +| 2.10.1 -| - -Measure index flattening optimization -| - -`uima.measure.flatten_index` +| Measure index flattening optimization +| `uima.measure.flatten_index` See https://issues.apache.org/jira/browse/UIMA-4357[UIMA-4357]. This creates a short report to System.out when Java is shutdown. The report has some statistics about the automatic management of flattened index creation and use. -| - -2.8.0 +| 2.8.0 |=== Some additional global flags intended for helping v3 migration are documented in the V3 user's guide. \ No newline at end of file diff --git a/uimaj-it-pear-with-typesystem/pom.xml b/uimaj-it-pear-with-typesystem/pom.xml index 074cd2dec..1fb5a23df 100644 --- a/uimaj-it-pear-with-typesystem/pom.xml +++ b/uimaj-it-pear-with-typesystem/pom.xml @@ -102,7 +102,6 @@ org.apache.uima PearPackagingMavenPlugin - ${project.version} package-pear @@ -111,8 +110,7 @@ package - - desc/org/apache/uima/it/pear_with_typesystem/TestAnnotator.xml + desc/org/apache/uima/it/pear_with_typesystem/TestAnnotator.xml ${project.artifactId} $main_root/resources diff --git a/uimaj-parent-internal/pom.xml b/uimaj-parent-internal/pom.xml index ddca3792f..6c7f2b388 100644 --- a/uimaj-parent-internal/pom.xml +++ b/uimaj-parent-internal/pom.xml @@ -83,8 +83,6 @@ org.eclipse.p2.202209 - 3.5.0 - src/main/assembly/src.xml @@ -92,6 +90,9 @@ main 3.5.0 + + ${previous-release-version} + ${previous-release-version} @@ -497,13 +498,18 @@ org.apache.maven.plugins maven-javadoc-plugin - ${maven.compiler.release}} + ${maven.compiler.release} org.apache.uima jcasgen-maven-plugin - ${project.version} + ${uima-maven-plugins-version} + + + org.apache.uima + PearPackagingMavenPlugin + ${uima-maven-plugins-version}