This is an automated email from the ASF dual-hosted git repository. rec pushed a commit to branch refactoring/235-Update-dependencies in repository https://gitbox.apache.org/repos/asf/uima-uimafit.git
commit 8eccaae4df063454e14447890179adefa6818b55 Author: Richard Eckart de Castilho <[email protected]> AuthorDate: Fri Aug 11 12:22:50 2023 +0200 Issue #235: Update dependencies - Minimum Java Version 1.8 -> 17 - maven-plugin-tools-javadoc -> 3.5.2 - maven 3.0 -> 3.2.5 - plexus-utils 2.0.4 -> 3.0.20 - Remove japicmp-maven-plugin config override provided by Apache UIMA parent POM - Remove maven-gpg-plugin version override provided by Apache UIMA parent POM - Remove apache-rat-plugin version override provided by Apache UIMA parent POM - Remove unnecessary maven-compiler-plugin override - Remove unnecessary maven-javadoc-plugin override - Remove spotbugs profile provided by Apache UIMA parent POM --- .gitignore | 1 + pom.xml | 3 - uimafit-maven-plugin/pom.xml | 38 ++-- .../src/it/compile-test-scope/pom.xml | 5 +- uimafit-maven-plugin/src/it/default/pom.xml | 5 +- .../src/it/with-typesystem-in-descriptors/pom.xml | 7 +- uimafit-parent/pom.xml | 203 ++++++++------------- 7 files changed, 102 insertions(+), 160 deletions(-) diff --git a/.gitignore b/.gitignore index ed5ad65..bf686a6 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ target/ api-change-report/ issuesFixed .idea +.factorypath diff --git a/pom.xml b/pom.xml index d2d2cde..2783af3 100644 --- a/pom.xml +++ b/pom.xml @@ -88,9 +88,6 @@ <doctitle>Apache uimaFIT ${project.version} User-Level API Documentation</doctitle> <windowtitle>Apache uimaFIT ${project.version} User-Level API Documentation</windowtitle> <notimestamp>true</notimestamp> - <links> - <link>https://uima.apache.org/d/uimaj-${uima-version}/apidocs/</link> - </links> <groups> <group> <title>uimaFIT</title> diff --git a/uimafit-maven-plugin/pom.xml b/uimafit-maven-plugin/pom.xml index 5ef68bc..c8733c8 100644 --- a/uimafit-maven-plugin/pom.xml +++ b/uimafit-maven-plugin/pom.xml @@ -25,11 +25,14 @@ <version>3.5.0-SNAPSHOT</version> <relativePath>../uimafit-parent</relativePath> </parent> + <artifactId>uimafit-maven-plugin</artifactId> - <name>Apache UIMA uimaFIT - Maven Plugin</name> <packaging>maven-plugin</packaging> + + <name>Apache UIMA uimaFIT - Maven Plugin</name> <url>${uimaWebsiteUrl}</url> <inceptionYear>2012</inceptionYear> + <licenses> <license> <name>Apache License, Version 2.0</name> @@ -38,10 +41,6 @@ </license> </licenses> - <properties> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - </properties> - <dependencies> <dependency> <groupId>commons-io</groupId> @@ -58,7 +57,7 @@ <dependency> <groupId>org.apache.uima</groupId> <artifactId>uimafit-core</artifactId> - <version>3.5.0-SNAPSHOT</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.javassist</groupId> @@ -70,25 +69,21 @@ <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-plugin-api</artifactId> - <version>3.0</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-core</artifactId> - <version>3.0</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-artifact</artifactId> - <version>3.0</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-model</artifactId> - <version>3.0</version> <scope>provided</scope> </dependency> <dependency> @@ -96,15 +91,13 @@ <artifactId>maven-plugin-annotations</artifactId> <scope>provided</scope> </dependency> - <dependency> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-utils</artifactId> - <version>2.0.4</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> </dependency> <!-- Dependencies for accessing JavaDoc --> @@ -162,13 +155,16 @@ </dependencies> </plugin> <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> <configuration> - <!-- Exclude generated help mojo --> - <sourceFileExcludes> - <sourceFileExclude>**/org/apache/uima/fit/maven/HelpMojo.java</sourceFileExclude> - </sourceFileExcludes> + <!-- avoiding javadoc warnings caused by Mojo annotations --> + <tagletArtifacts> + <tagletArtifact> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-tools-javadoc</artifactId> + <version>3.5.2</version> + </tagletArtifact> + </tagletArtifacts> </configuration> </plugin> </plugins> diff --git a/uimafit-maven-plugin/src/it/compile-test-scope/pom.xml b/uimafit-maven-plugin/src/it/compile-test-scope/pom.xml index 6da2856..a7f32a7 100644 --- a/uimafit-maven-plugin/src/it/compile-test-scope/pom.xml +++ b/uimafit-maven-plugin/src/it/compile-test-scope/pom.xml @@ -28,8 +28,9 @@ <packaging>pom</packaging> <properties> - <maven.compiler.source>1.7</maven.compiler.source> - <maven.compiler.target>1.7</maven.compiler.target> + <maven.compiler.target>17</maven.compiler.target> + <maven.compiler.source>17</maven.compiler.source> + <maven.compiler.release>17</maven.compiler.release> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> </properties> diff --git a/uimafit-maven-plugin/src/it/default/pom.xml b/uimafit-maven-plugin/src/it/default/pom.xml index facdc1d..d429e1e 100644 --- a/uimafit-maven-plugin/src/it/default/pom.xml +++ b/uimafit-maven-plugin/src/it/default/pom.xml @@ -29,8 +29,9 @@ <name>Test for default configuration</name> <properties> - <maven.compiler.source>1.7</maven.compiler.source> - <maven.compiler.target>1.7</maven.compiler.target> + <maven.compiler.target>17</maven.compiler.target> + <maven.compiler.source>17</maven.compiler.source> + <maven.compiler.release>17</maven.compiler.release> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> </properties> diff --git a/uimafit-maven-plugin/src/it/with-typesystem-in-descriptors/pom.xml b/uimafit-maven-plugin/src/it/with-typesystem-in-descriptors/pom.xml index ad4408d..f543081 100644 --- a/uimafit-maven-plugin/src/it/with-typesystem-in-descriptors/pom.xml +++ b/uimafit-maven-plugin/src/it/with-typesystem-in-descriptors/pom.xml @@ -29,9 +29,10 @@ <name>Test for default configuration</name> <properties> - <maven.compiler.source>1.7</maven.compiler.source> - <maven.compiler.target>1.7</maven.compiler.target> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <maven.compiler.target>17</maven.compiler.target> + <maven.compiler.source>17</maven.compiler.source> + <maven.compiler.release>17</maven.compiler.release> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> </properties> <dependencies> diff --git a/uimafit-parent/pom.xml b/uimafit-parent/pom.xml index 3d867b7..d5c93aa 100644 --- a/uimafit-parent/pom.xml +++ b/uimafit-parent/pom.xml @@ -23,11 +23,13 @@ <groupId>org.apache.uima</groupId> <artifactId>parent-pom</artifactId> <relativePath /> - <version>16</version> + <version>17-SNAPSHOT</version> </parent> + <artifactId>uimafit-parent</artifactId> <version>3.5.0-SNAPSHOT</version> <packaging>pom</packaging> + <name>Apache UIMA uimaFIT - Parent</name> <url>${uimaWebsiteUrl}</url> <inceptionYear>2012</inceptionYear> @@ -44,23 +46,47 @@ <url>https://github.com/apache/uima-uimafit</url> </scm> + <repositories> + <!-- + - 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> + </repositories> + <properties> - <api_check_oldVersion>3.3.0</api_check_oldVersion> + <spring-version>5.3.25</spring-version> + <uima-version>3.5.0-SNAPSHOT</uima-version> + <slf4j-version>1.7.36</slf4j-version> + <maven.version>3.2.5</maven.version> - <maven.compiler.target>1.8</maven.compiler.target> - <maven.compiler.source>1.8</maven.compiler.source> - <assertj-version>3.22.0</assertj-version> - <commons-io-version>2.11.0</commons-io-version> - <commons-lang3-version>3.12.0</commons-lang3-version> <junit-version>5.10.0</junit-version> <junit-platform-version>1.10.0</junit-platform-version> - <groovy-version>3.0.10</groovy-version> + <assertj-version>3.24.2</assertj-version> <mockito-version>4.4.0</mockito-version> <opentest4j-version>1.2.0</opentest4j-version> - <spring-version>5.3.25</spring-version> - <slf4j-version>1.7.36</slf4j-version> - <uima-version>3.4.0</uima-version> <xmlunit-version>2.9.0</xmlunit-version> + + <commons-io-version>2.11.0</commons-io-version> + <commons-lang3-version>3.12.0</commons-lang3-version> + <groovy-version>3.0.18</groovy-version> + + <maven.compiler.target>17</maven.compiler.target> + <maven.compiler.source>17</maven.compiler.source> + <maven.compiler.release>17</maven.compiler.release> + + <api_check_oldVersion>3.4.0</api_check_oldVersion> </properties> <dependencies> @@ -89,34 +115,11 @@ <dependencyManagement> <dependencies> <dependency> - <groupId>org.junit.jupiter</groupId> - <artifactId>junit-jupiter-api</artifactId> - <version>${junit-version}</version> - </dependency> - <dependency> - <groupId>org.junit.jupiter</groupId> - <artifactId>junit-jupiter-engine</artifactId> - <version>${junit-version}</version> - </dependency> - <dependency> - <groupId>org.junit.jupiter</groupId> - <artifactId>junit-jupiter-migrationsupport</artifactId> - <version>${junit-version}</version> - </dependency> - <dependency> - <groupId>org.junit.jupiter</groupId> - <artifactId>junit-jupiter-params</artifactId> - <version>${junit-version}</version> - </dependency> - <dependency> - <groupId>org.junit.vintage</groupId> - <artifactId>junit-vintage-engine</artifactId> + <groupId>org.junit</groupId> + <artifactId>junit-bom</artifactId> <version>${junit-version}</version> - </dependency> - <dependency> - <groupId>org.junit.platform</groupId> - <artifactId>junit-platform-commons</artifactId> - <version>${junit-platform-version}</version> + <type>pom</type> + <scope>import</scope> </dependency> <dependency> <groupId>org.opentest4j</groupId> @@ -165,18 +168,10 @@ </dependency> <dependency> <groupId>org.apache.uima</groupId> - <artifactId>uimaj-core</artifactId> - <version>${uima-version}</version> - </dependency> - <dependency> - <groupId>org.apache.uima</groupId> - <artifactId>uimaj-cpe</artifactId> - <version>${uima-version}</version> - </dependency> - <dependency> - <groupId>org.apache.uima</groupId> - <artifactId>uimaj-tools</artifactId> + <artifactId>uimaj-bom</artifactId> <version>${uima-version}</version> + <type>pom</type> + <scope>import</scope> </dependency> <dependency> <groupId>org.springframework</groupId> @@ -198,6 +193,36 @@ <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.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-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.codehaus.plexus</groupId> + <artifactId>plexus-utils</artifactId> + <version>3.0.20</version> + </dependency> </dependencies> </dependencyManagement> @@ -229,26 +254,6 @@ </toolchains> </configuration> </plugin> - <plugin> - <!-- See: https://issues.apache.org/jira/browse/UIMA-6351 --> - <groupId>com.github.siom79.japicmp</groupId> - <artifactId>japicmp-maven-plugin</artifactId> - <version>0.15.7</version> - <configuration> - <newVersion> - <file> - <path>${project.build.directory}/${project.build.finalName}.jar</path> - </file> - </newVersion> - </configuration> - <dependencies> - <dependency> - <groupId>org.codehaus.groovy</groupId> - <artifactId>groovy-jsr223</artifactId> - <version>${groovy-version}</version> - </dependency> - </dependencies> - </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-dependency-plugin</artifactId> @@ -320,15 +325,9 @@ </plugins> <pluginManagement> <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-gpg-plugin</artifactId> - <version>3.0.1</version> - </plugin> <plugin> <groupId>org.apache.rat</groupId> <artifactId>apache-rat-plugin</artifactId> - <version>0.13</version> <executions> <execution> <id>default-cli</id> @@ -354,43 +353,6 @@ </configuration> </execution> </executions> - <dependencies> - <!-- https://issues.apache.org/jira/browse/RAT-158 --> - <dependency> - <groupId>org.apache.maven.doxia</groupId> - <artifactId>doxia-core</artifactId> - <version>1.11.1</version> - </dependency> - </dependencies> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>3.10.1</version> - <configuration> - <source>${maven.compiler.source}</source> - <target>${maven.compiler.target}</target> - <!--encoding>UTF-8</encoding this inherited from apache pom 7 --> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <version>3.3.2</version> - <executions> - <execution> - <id>attach-javadocs</id> - <configuration> - <source>${maven.compiler.source}</source> - </configuration> - </execution> - <execution> - <id>default-cli</id> <!-- Jenkins runs this apparently 3/2015 --> - <configuration> - <source>${maven.compiler.source}</source> - </configuration> - </execution> - </executions> </plugin> <plugin> <groupId>org.apache.uima</groupId> @@ -426,21 +388,4 @@ </plugins> </pluginManagement> </build> - - <profiles> - <profile> - <id>spotbugs</id> - <build> - <pluginManagement> - <plugins> - <plugin> - <groupId>com.github.spotbugs</groupId> - <artifactId>spotbugs-maven-plugin</artifactId> - <version>4.7.0.0</version> - </plugin> - </plugins> - </pluginManagement> - </build> - </profile> - </profiles> </project> \ No newline at end of file
