Skip to content

Commit

Permalink
Issue #235: Update dependencies
Browse files Browse the repository at this point in the history
- 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
  • Loading branch information
reckart committed Aug 11, 2023
1 parent 5cf2377 commit 8eccaae
Show file tree
Hide file tree
Showing 7 changed files with 102 additions and 160 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@ target/
api-change-report/
issuesFixed
.idea
.factorypath
3 changes: 0 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
38 changes: 17 additions & 21 deletions uimafit-maven-plugin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -38,10 +41,6 @@
</license>
</licenses>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>

<dependencies>
<dependency>
<groupId>commons-io</groupId>
Expand All @@ -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>
Expand All @@ -70,41 +69,35 @@
<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>
<groupId>org.apache.maven.plugin-tools</groupId>
<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 -->
Expand Down Expand Up @@ -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>
Expand Down
5 changes: 3 additions & 2 deletions uimafit-maven-plugin/src/it/compile-test-scope/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
5 changes: 3 additions & 2 deletions uimafit-maven-plugin/src/it/default/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Loading

0 comments on commit 8eccaae

Please sign in to comment.