This is an automated email from the ASF dual-hosted git repository. rec pushed a commit to branch refactoring/417-BOM-should-not-inherit-build-setup-from-parent-POM in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git
commit 7016463caaff26b6651b410360667c34709340ce Author: Richard Eckart de Castilho <[email protected]> AuthorDate: Mon Nov 18 17:39:30 2024 +0100 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 => uimaj-parent-internal}/pom.xml | 101 +-- 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, 133 insertions(+), 1018 deletions(-) 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 @@ <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 index a5a5d9d0f..911dfd679 100644 --- 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 index 6c4f31ecc..cfeaab876 100644 --- 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 index cfa8a182b..27680ea12 100644 --- 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 index a3199f8ed..bc432c4b3 100644 --- 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 index 6395e393f..4fbea36fe 100644 --- 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> \ 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 @@ <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 index 34d185247..dec90e7df 100644 --- 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 index e9f7e4096..dc84f693f 100644 --- 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 index a70b911ef..c3b1925b1 100644 --- 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 index b6ebb02c0..43300c80b 100644 --- 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 index 65391f645..f7521df57 100644 --- 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 index cfd97c9ba..ef6b12c53 100644 --- 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 index 31701e54b..cce35ad07 100644 --- 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 index f07b642a9..7b168b3cc 100644 --- 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 index ac32a66b2..08ed1e3f3 100644 --- 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 index c842d83c4..2cbdf6539 100644 --- 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 index cfff42855..36d28e251 100644 --- 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 index 312aaaade..5ce2b6ee9 100644 --- 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 index f9abd90b8..fe9e2bbfa 100644 --- 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 index fd2f2ca5a..cd214df94 100644 --- 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 index 208973af2..acd5fa558 100644 --- 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> 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 @@ <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-document-annotation</artifactId> 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 @@ <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-documentation</artifactId> 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 @@ <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>org.apache.uima.runtime</artifactId> 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 @@ <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>org.apache.uima.tools</artifactId> 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 @@ <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-eclipse-maven-p2-site</artifactId> 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 @@ <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-eclipse-update-site</artifactId> 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 @@ <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-ep-cas-editor-ide</artifactId> 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 @@ <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-ep-cas-editor</artifactId> 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 @@ <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-ep-configurator</artifactId> 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 @@ <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-ep-debug</artifactId> 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 @@ <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-ep-jcasgen</artifactId> 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 @@ <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-ep-launcher</artifactId> 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 @@ <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-ep-pear-packager</artifactId> 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 @@ <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-ep-runtime</artifactId> 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 @@ <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-examples</artifactId> 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 @@ <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-it-pear-with-typesystem</artifactId> 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 @@ <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> + <artifactId>uimaj-json</artifactId> <name>Apache UIMA Base: ${project.artifactId}: JSON (deprecated)</name> <description>JSON support for UIMA SDK. This module is deprecated. Use https://github.com/apache/uima-uimaj-io-jsoncas instead.</description> diff --git a/uimaj-parent/pom.xml b/uimaj-parent-internal/pom.xml similarity index 90% copy from uimaj-parent/pom.xml copy to uimaj-parent-internal/pom.xml index 9ba634a03..ddca3792f 100644 --- a/uimaj-parent/pom.xml +++ b/uimaj-parent-internal/pom.xml @@ -30,109 +30,18 @@ <parent> <groupId>org.apache.uima</groupId> - <artifactId>parent-pom</artifactId> - <version>18</version> - <relativePath /> + <artifactId>uimaj-parent</artifactId> + <version>3.6.0-SNAPSHOT</version> + <relativePath>../uimaj-parent/pom.xml</relativePath> </parent> - <artifactId>uimaj-parent</artifactId> - <version>3.6.0-SNAPSHOT</version> + <artifactId>uimaj-parent-internal</artifactId> <packaging>pom</packaging> <name>Apache UIMA Java SDK: ${project.artifactId}</name> - <description>The common parent pom for the UIMA Java SDK</description> + <description>The internal parent POM for the UIMA Java SDK</description> <url>${uimaWebsiteUrl}</url> - <issueManagement> - <system>Github</system> - <url>https://github.com/apache/uima-uimaj/issues</url> - </issueManagement> - - <scm> - <tag>uimaj-3.4.0</tag> - <connection>scm:git:https://github.com/apache/uima-uimaj/</connection> - <developerConnection>scm:git:https://github.com/apache/uima-uimaj/</developerConnection> - <url>https://github.com/apache/uima-uimaj/</url> - </scm> - - <!-- The repositories and pluginRepositories section is duplicated from - the parent pom one, and adds the Apache Snapshot Nexus repository - where UIMA snapshots are deployed. This is needed if for instance, - a project depends on some new SNAPSHOT level of a build tool, - where the users hasn't checked out the build tooling. - - This allows maven to find the snapshots when looking for the parent of - this pom --> - <repositories> - <!-- modify central repository access: Turn on checksum checking--> - <repository> - <id>central</id> - <name>Maven Repository Switchboard</name> - <layout>default</layout> - <url>https://repo1.maven.org/maven2</url> - - <releases> - <enabled>true</enabled> - <checksumPolicy>fail</checksumPolicy> - <updatePolicy>never</updatePolicy> - </releases> - - <snapshots> - <enabled>false</enabled> - </snapshots> - </repository> - - <!-- - - 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> - <url>https://repository.apache.org/snapshots</url> - <releases> - <enabled>false</enabled> - </releases> - <snapshots> - <enabled>true</enabled> - </snapshots> - </repository> - - <repository> - <id>${eclipseP2RepoId}</id> - <url>https://download.eclipse.org/releases/2022-09/</url> - <layout>p2</layout> - </repository> - </repositories> - - <pluginRepositories> - <!-- - - 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. - <pluginRepository> - <id>apache.snapshots.plugins</id> - <name>Apache Snapshot Repository - Maven plugins</name> - <url>https://repository.apache.org/snapshots</url> - <layout>default</layout> - <releases> - <enabled>false</enabled> - </releases> - <snapshots> - <enabled>true</enabled> - <checksumPolicy>fail</checksumPolicy> - <updatePolicy>never</updatePolicy> - </snapshots> - </pluginRepository> - --> - <pluginRepository> - <id>artifactory.openntf.org</id> - <name>artifactory.openntf.org</name> - <url>https://artifactory.openntf.org/openntf</url> - </pluginRepository> - </pluginRepositories> - <properties> <!-- Configuring settings is best done through default properties that multiple plugins. 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 @@ <url>https://artifactory.openntf.org/openntf</url> </pluginRepository> </pluginRepositories> - - <properties> - <!-- - Configuring settings is best done through default properties that multiple plugins. - Local configurations within plugins should be avoided. Where plugins do not pick up default - properties already, they should be injected manually into the plugins. - --> - <maven.compiler.target>17</maven.compiler.target> - <maven.compiler.source>17</maven.compiler.source> - <maven.compiler.release>17</maven.compiler.release> - <maven.compiler.proc>none</maven.compiler.proc> - <execution.environment>JavaSE-17</execution.environment> - - <maven.version>3.8.1</maven.version> - - <asciidoctor.plugin.version>3.1.1</asciidoctor.plugin.version> - <asciidoctor.version>3.0.0</asciidoctor.version> - <asciidoctor.pdf.version>2.3.19</asciidoctor.pdf.version> - <assertj-version>3.26.3</assertj-version> - <bnd-version>7.0.0</bnd-version> - <bytebuddy-version>1.15.10</bytebuddy-version> - <commons-csv-version>1.12.0</commons-csv-version> - <commons-collections4-version>4.4</commons-collections4-version> - <commons-io-version>2.17.0</commons-io-version> - <commons-lang3-version>3.17.0</commons-lang3-version> - <commons-math3-version>3.6.1</commons-math3-version> - <jackson-version>2.18.1</jackson-version> - <javassist-version>3.30.2-GA</javassist-version> - <junit-version>5.11.3</junit-version> - <junit-platform-version>1.11.3</junit-platform-version> - <junit-vintage-version>4.13.2</junit-vintage-version> - <log4j-version>2.24.1</log4j-version> - <mockito-version>5.14.2</mockito-version> - <opentest4j-version>1.3.0</opentest4j-version> - <qdox-version>2.1.0</qdox-version> - <slf4j-version>1.7.36</slf4j-version> - <spring-version>6.0.23</spring-version> - <tycho-version>4.0.10</tycho-version> - <xmlunit-version>2.10.0</xmlunit-version> - - <eclipseP2RepoId>org.eclipse.p2.202209</eclipseP2RepoId> - - <api_check_oldVersion>3.5.0</api_check_oldVersion> - - <assemblySrcDescriptor>src/main/assembly/src.xml</assemblySrcDescriptor> - - <!-- BEGIN PROFILE SETTINGS: generate-release-notes--> - <github-repository>uima-uimaj</github-repository> - <git-branch>main</git-branch> - <previous-release-version>3.5.0</previous-release-version> - <!-- END PROFILE SETTINGS: generate-release-notes--> - </properties> - - <dependencies> - <dependency> - <groupId>org.junit.jupiter</groupId> - <artifactId>junit-jupiter-api</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.junit.jupiter</groupId> - <artifactId>junit-jupiter-engine</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.assertj</groupId> - <artifactId>assertj-core</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.xmlunit</groupId> - <artifactId>xmlunit-assertj3</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-core</artifactId> - <scope>test</scope> - </dependency> - </dependencies> - - <dependencyManagement> - <dependencies> - <dependency> - <groupId>net.bytebuddy</groupId> - <artifactId>byte-buddy</artifactId> - <version>${bytebuddy-version}</version> - </dependency> - <dependency> - <groupId>net.bytebuddy</groupId> - <artifactId>byte-buddy-agent</artifactId> - <version>${bytebuddy-version}</version> - </dependency> - <dependency> - <groupId>org.junit</groupId> - <artifactId>junit-bom</artifactId> - <version>${junit-version}</version> - <type>pom</type> - <scope>import</scope> - </dependency> - <dependency> - <groupId>org.opentest4j</groupId> - <artifactId>opentest4j</artifactId> - <version>${opentest4j-version}</version> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>${junit-vintage-version}</version> - </dependency> - <dependency> - <groupId>org.assertj</groupId> - <artifactId>assertj-bom</artifactId> - <version>${assertj-version}</version> - <type>pom</type> - <scope>import</scope> - </dependency> - <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-bom</artifactId> - <version>${mockito-version}</version> - <type>pom</type> - <scope>import</scope> - </dependency> - <dependency> - <groupId>org.xmlunit</groupId> - <artifactId>xmlunit-core</artifactId> - <version>${xmlunit-version}</version> - </dependency> - <dependency> - <groupId>org.xmlunit</groupId> - <artifactId>xmlunit-assertj3</artifactId> - <version>${xmlunit-version}</version> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-jdk14</artifactId> - <version>${slf4j-version}</version> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - <version>${slf4j-version}</version> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-simple</artifactId> - <version>${slf4j-version}</version> - </dependency> - - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-bom</artifactId> - <version>${log4j-version}</version> - <type>pom</type> - <scope>import</scope> - </dependency> - - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-csv</artifactId> - <version>${commons-csv-version}</version> - </dependency> - <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - <version>${commons-io-version}</version> - </dependency> - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-lang3</artifactId> - <version>${commons-lang3-version}</version> - </dependency> - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-math3</artifactId> - <version>${commons-math3-version}</version> - </dependency> - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-collections4</artifactId> - <version>${commons-collections4-version}</version> - </dependency> - - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-aop</artifactId> - <version>${spring-version}</version> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-beans</artifactId> - <version>${spring-version}</version> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-core</artifactId> - <version>${spring-version}</version> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-context</artifactId> - <version>${spring-version}</version> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-expression</artifactId> - <version>${spring-version}</version> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-jcl</artifactId> - <version>${spring-version}</version> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-test</artifactId> - <version>${spring-version}</version> - </dependency> - - <dependency> - <groupId>org.sonatype.plexus</groupId> - <artifactId>plexus-build-api</artifactId> - <version>0.0.7</version> - </dependency> - <dependency> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-utils</artifactId> - <version>3.4.1</version> - </dependency> - <dependency> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-archiver</artifactId> - <version>3.7.0</version> - </dependency> - <dependency> - <groupId>org.apache.maven.plugin-testing</groupId> - <artifactId>maven-plugin-testing-harness</artifactId> - <version>3.3.0</version> - </dependency> - <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-artifact</artifactId> - <version>${maven.version}</version> - </dependency> - <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-model</artifactId> - <version>${maven.version}</version> - </dependency> - <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-plugin-api</artifactId> - <version>${maven.version}</version> - </dependency> - <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-core</artifactId> - <version>${maven.version}</version> - </dependency> - <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-compat</artifactId> - <version>${maven.version}</version> - </dependency> - - <dependency> - <groupId>org.javassist</groupId> - <artifactId>javassist</artifactId> - <version>${javassist-version}</version> - </dependency> - <dependency> - <groupId>com.thoughtworks.qdox</groupId> - <artifactId>qdox</artifactId> - <version>${qdox-version}</version> - </dependency> - - <dependency> - <groupId>biz.aQute.bnd</groupId> - <artifactId>biz.aQute.bndlib</artifactId> - <version>${bnd-version}</version> - </dependency> - - <dependency> - <groupId>${eclipseP2RepoId}</groupId> - <artifactId>org.eclipse.jface</artifactId> - <version>3.27.0.v20220817-1444</version> - </dependency> - <dependency> - <groupId>${eclipseP2RepoId}</groupId> - <artifactId>org.eclipse.jface.text</artifactId> - <version>3.21.0.v20220817-1340</version> - </dependency> - <dependency> - <groupId>${eclipseP2RepoId}</groupId> - <artifactId>org.eclipse.swt.win32.win32.x86_64</artifactId> - <version>3.121.0.v20220829-1402</version> - </dependency> - <dependency> - <groupId>${eclipseP2RepoId}</groupId> - <artifactId>org.eclipse.core.runtime</artifactId> - <version>3.26.0.v20220813-0916</version> - </dependency> - <dependency> - <groupId>${eclipseP2RepoId}</groupId> - <artifactId>org.eclipse.core.resources</artifactId> - <version>3.18.0.v20220828-0546</version> - </dependency> - <dependency> - <groupId>${eclipseP2RepoId}</groupId> - <artifactId>org.eclipse.core.filesystem</artifactId> - <version>1.9.500.v20220817-1539</version> - </dependency> - <dependency> - <groupId>${eclipseP2RepoId}</groupId> - <artifactId>org.eclipse.debug.core</artifactId> - <version>3.20.0.v20220811-0741</version> - </dependency> - <dependency> - <groupId>${eclipseP2RepoId}</groupId> - <artifactId>org.eclipse.debug.ui</artifactId> - <version>3.17.0.v20220817-1312</version> - </dependency> - <dependency> - <groupId>${eclipseP2RepoId}</groupId> - <artifactId>org.eclipse.emf.codegen</artifactId> - <version>2.22.0.v20210420-0623</version> - </dependency> - <dependency> - <groupId>${eclipseP2RepoId}</groupId> - <artifactId>org.eclipse.equinox.app</artifactId> - <version>1.6.200.v20220720-2012</version> - </dependency> - <dependency> - <groupId>${eclipseP2RepoId}</groupId> - <artifactId>org.eclipse.equinox.common</artifactId> - <version>3.16.200.v20220817-1601</version> - </dependency> - <dependency> - <groupId>${eclipseP2RepoId}</groupId> - <artifactId>org.eclipse.equinox.registry</artifactId> - <version>3.11.200.v20220817-1601</version> - </dependency> - <dependency> - <groupId>${eclipseP2RepoId}</groupId> - <artifactId>org.eclipse.equinox.preferences</artifactId> - <version>3.10.100.v20220710-1223</version> - </dependency> - <dependency> - <groupId>${eclipseP2RepoId}</groupId> - <artifactId>org.eclipse.osgi</artifactId> - <version>3.18.100.v20220817-1601</version> - </dependency> - <dependency> - <groupId>${eclipseP2RepoId}</groupId> - <artifactId>org.eclipse.text</artifactId> - <version>3.12.200.v20220817-1340</version> - </dependency> - <dependency> - <groupId>${eclipseP2RepoId}</groupId> - <artifactId>org.eclipse.ui.editors</artifactId> - <version>3.14.400.v20220730-1844</version> - </dependency> - <dependency> - <groupId>${eclipseP2RepoId}</groupId> - <artifactId>org.eclipse.ui.forms</artifactId> - <version>3.11.400.v20220817-1444</version> - </dependency> - <dependency> - <groupId>${eclipseP2RepoId}</groupId> - <artifactId>org.eclipse.ui.ide</artifactId> - <version>3.19.100.v20220820-0412</version> - </dependency> - <dependency> - <groupId>${eclipseP2RepoId}</groupId> - <artifactId>org.eclipse.ui.views</artifactId> - <version>3.11.200.v20220817-1444</version> - </dependency> - <dependency> - <groupId>${eclipseP2RepoId}</groupId> - <artifactId>org.eclipse.ui.workbench</artifactId> - <version>3.126.0.v20220823-0718</version> - </dependency> - <dependency> - <groupId>${eclipseP2RepoId}</groupId> - <artifactId>org.eclipse.ui.workbench.texteditor</artifactId> - <version>3.16.600.v20220809-1658</version> - </dependency> - <dependency> - <groupId>${eclipseP2RepoId}</groupId> - <artifactId>org.eclipse.jdt.core</artifactId> - <version>3.31.0.v20220831-1439</version> - </dependency> - <dependency> - <groupId>${eclipseP2RepoId}</groupId> - <artifactId>org.eclipse.jdt.launching</artifactId> - <version>3.19.700.v20220730-1850</version> - </dependency> - <dependency> - <groupId>${eclipseP2RepoId}</groupId> - <artifactId>org.eclipse.jdt.debug</artifactId> - <version>3.19.300.v20220812-1529</version> - <exclusions> - <exclusion> - <!-- - The p2 resolver appears to have trouble with the "icu-data" classifier - --> - <groupId>${eclipseP2RepoId}</groupId> - <artifactId>com.ibm.icu</artifactId> - </exclusion> - <exclusion> - <!-- - The p2 resolver appears to have trouble with this one and tries to download it with - "tools" as the classifier. - --> - <groupId>${eclipseP2RepoId}</groupId> - <artifactId>org.eclipse.jdt.debug</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>${eclipseP2RepoId}</groupId> - <artifactId>org.eclipse.jdt.ui</artifactId> - <version>3.27.0.v20220824-0714</version> - </dependency> - <dependency> - <groupId>${eclipseP2RepoId}</groupId> - <artifactId>org.eclipse.jdt.debug.ui</artifactId> - <version>3.12.800.v20220813-1738</version> - </dependency> - </dependencies> - </dependencyManagement> - - <build> - <pluginManagement> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <dependencies> - <dependency> - <groupId>org.junit.jupiter</groupId> - <artifactId>junit-jupiter-engine</artifactId> - <version>${junit-version}</version> - </dependency> - <dependency> - <groupId>org.junit.vintage</groupId> - <artifactId>junit-vintage-engine</artifactId> - <version>${junit-version}</version> - </dependency> - </dependencies> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <configuration> - <javadocVersion>${maven.compiler.release}}</javadocVersion> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.uima</groupId> - <artifactId>jcasgen-maven-plugin</artifactId> - <version>${project.version}</version> - </plugin> - </plugins> - </pluginManagement> - - <plugins> - <plugin> - <groupId>org.openntf.maven</groupId> - <artifactId>p2-layout-resolver</artifactId> - <version>1.9.0</version> - <extensions>true</extensions> - </plugin> - - <plugin> - <groupId>org.eclipse.tycho</groupId> - <artifactId>target-platform-configuration</artifactId> - <version>${tycho-version}</version> - <configuration> - <environments> - <environment> - <os>win32</os> - <ws>win32</ws> - <arch>x86_64</arch> - </environment> - <environment> - <os>linux</os> - <ws>gtk</ws> - <arch>x86_64</arch> - </environment> - <environment> - <os>macosx</os> - <ws>cocoa</ws> - <arch>x86_64</arch> - </environment> - </environments> - </configuration> - </plugin> - - <plugin> - <groupId>org.codehaus.gmaven</groupId> - <artifactId>groovy-maven-plugin</artifactId> - <executions> - <execution> - <!-- Load postNoticeText from NOTICE file --> - <id>read-notice</id> - <phase>generate-sources</phase> - <goals> - <goal>execute</goal> - </goals> - <configuration> - <source><![CDATA[ - def noticeFile = new File(project.basedir.path + "/NOTICE"); - if (noticeFile.exists()) { - project.properties.postNoticeText = noticeFile.text; - println "Loaded NOTICE file content into property [postNoticeText]" - } else { - println "No NOTICE file was found - content not loaded into property [postNoticeText]" - } - ]]></source> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <!-- See: https://issues.apache.org/jira/browse/UIMA-6349 --> - <groupId>com.github.siom79.japicmp</groupId> - <artifactId>japicmp-maven-plugin</artifactId> - <configuration> - <newVersion> - <file> - <path>${project.build.directory}/${project.build.finalName}.jar</path> - </file> - </newVersion> - <parameter> - <ignoreMissingClassesByRegularExpressions> - <ignoreMissingClassesByRegularExpression>com\.strobel\..*</ignoreMissingClassesByRegularExpression> - <ignoreMissingClassesByRegularExpression>org\.apache\.logging\.log4j\..*</ignoreMissingClassesByRegularExpression> - </ignoreMissingClassesByRegularExpressions> - </parameter> - </configuration> - </plugin> - - <plugin> - <groupId>org.apache.rat</groupId> - <artifactId>apache-rat-plugin</artifactId> - <executions> - <execution> - <id>default-cli</id> - <goals> - <goal>check</goal> - </goals> - <phase>verify</phase> - <!-- default configuration --> - <configuration> - <excludes combine.children="append"> - <exclude>**/marker-file-maven-plugin-module</exclude> - <exclude>**/dependency-reduced-pom.xml</exclude> - <exclude>**/.asciidoctorconfig.adoc</exclude> - <!-- Eclipse launch files - no need for a license --> - <exclude>**/run_configuration/*.launch</exclude> - </excludes> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - - <profiles> - <profile> - <id>maven-plugin-module</id> - <activation> - <file> - <exists>marker-file-maven-plugin-module</exists> - </file> - </activation> - - <dependencies> - <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-plugin-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.apache.maven.plugin-tools</groupId> - <artifactId>maven-plugin-annotations</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-core</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-model</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-artifact</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-compat</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.apache.maven.plugin-testing</groupId> - <artifactId>maven-plugin-testing-harness</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <!-- Required by maven-plugin-testing-harness --> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.13.2</version> - <scope>test</scope> - </dependency> - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <configuration> - <ignoredDependencies combine.children="append"> - <ignoredDependency>org.apache.maven:maven-artifact</ignoredDependency> - <ignoredDependency>org.apache.maven:maven-compat</ignoredDependency> - <ignoredDependency>org.apache.maven:maven-core</ignoredDependency> - <ignoredDependency>org.apache.maven:maven-model</ignoredDependency> - <ignoredDependency>org.apache.maven:maven-plugin-api</ignoredDependency> - <ignoredDependency>org.apache.maven.plugin-tools:maven-plugin-annotations</ignoredDependency> - <ignoredDependency>org.apache.maven.plugin-testing:maven-plugin-testing-harness</ignoredDependency> - <ignoredDependency>junit:junit</ignoredDependency> - </ignoredDependencies> - </configuration> - </plugin> - </plugins> - </build> - </profile> - - <profile> - <id>apache-release</id> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-assembly-plugin</artifactId> - <executions> - <execution> - <!-- Overriding the execution from the Apache parent POM --> - <id>source-release-assembly</id> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - <configuration> - <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot> - <descriptorRefs combine.self="override" /> - <descriptors> - <descriptor>${assemblySrcDescriptor}</descriptor> - </descriptors> - <tarLongFileMode>${assembly.tarLongFileMode}</tarLongFileMode> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - - <profile> - <id>jacoco</id> - <build> - <plugins> - <plugin> - <groupId>org.jacoco</groupId> - <artifactId>jacoco-maven-plugin</artifactId> - <configuration> - <excludes combine.children="append"> - <!-- Duplicates on classpath cause an exception in JaCoCo report --> - <exclude>**/org/apache/uima/examples/SourceDocumentInformation*</exclude> - </excludes> - </configuration> - </plugin> - </plugins> - </build> - </profile> - - <profile> - <id>dependency-check</id> - <activation> - <property> - <name>!disable-dependency-check</name> - </property> - <file> - <exists>marker-file-enabling-dependency-check</exists> - </file> - </activation> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <id>default</id> - <phase>verify</phase> - <goals> - <goal>analyze-only</goal> - </goals> - </execution> - </executions> - <configuration> - <failOnWarning>true</failOnWarning> - <ignoredDependencies combine.children="append"> - <ignoredDependency>org.assertj:assertj-core</ignoredDependency> - <ignoredDependency>org.xmlunit:xmlunit-assertj3</ignoredDependency> - <ignoredDependency>org.slf4j:slf4j-simple</ignoredDependency> - <ignoredDependency>org.mockito:mockito-core</ignoredDependency> - <ignoredDependency>org.junit.jupiter:junit-jupiter-api</ignoredDependency> - <ignoredDependency>org.junit.jupiter:junit-jupiter-engine</ignoredDependency> - <ignoredDependency>org.junit.vintage:junit-vintage-engine</ignoredDependency> - <ignoredDependency>junit:junit</ignoredDependency> - </ignoredDependencies> - </configuration> - </plugin> - </plugins> - </build> - </profile> - - <!-- ************** m2e profile ************* --> - <profile> - <id>m2e</id> - <activation> - <property> - <name>m2e.version</name> - </property> - </activation> - <build> - <pluginManagement> - <plugins> - <!-- This plugin's configuration is used to store Eclipse m2e settings - only. It has no influence on the Maven build itself. --> - <plugin> - <groupId>org.eclipse.m2e</groupId> - <artifactId>lifecycle-mapping</artifactId> - <version>1.0.0</version> - <configuration> - <lifecycleMappingMetadata> - <pluginExecutions> - - <!-- ***************************** --> - <!-- IGNORE maven-bundle-plugin --> - <!-- ***************************** --> - <pluginExecution> - <pluginExecutionFilter> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <versionRange>[3,)</versionRange> - <goals> - <goal>process</goal> - <goal>bundle</goal> - <goal>manifest</goal> - </goals> - </pluginExecutionFilter> - <action> - <ignore /> - </action> - </pluginExecution> - <pluginExecution> - <pluginExecutionFilter> - <groupId>org.codehaus.gmaven</groupId> - <artifactId>groovy-maven-plugin</artifactId> - <versionRange>[1.4,)</versionRange> - <goals> - <goal>execute</goal> - </goals> - </pluginExecutionFilter> - <action> - <ignore /> - </action> - </pluginExecution> - </pluginExecutions> - </lifecycleMappingMetadata> - </configuration> - </plugin> - </plugins> - </pluginManagement> - </build> - </profile> - </profiles> </project> 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 @@ <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-test-util</artifactId> 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 @@ <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-tools</artifactId> 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 @@ <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-v3migration-jcas</artifactId>
