Skip to content

Commit

Permalink
OPENNLP-1630 Move to Apache Parent 33 (#668)
Browse files Browse the repository at this point in the history
* OPENNLP-1630 Move to Apache Parent 33
- aligns version of Apache parent project to '33', details: https://github.com/apache/maven-apache-parent/releases/tag/apache-33

* Explicitly declare project release/target version

* OPENNLP-1630 Move to Apache Parent 33
- aligns version of Apache parent project to '33', details: https://github.com/apache/maven-apache-parent/releases/tag/apache-33
- drops outdated, custom-managed maven plugin versions (now via parent)
- updates maven.failsafe plugin to version 3.5.1

---------

Co-authored-by: Richard Zowalla <rzo1@apache.org>
  • Loading branch information
mawiesne and rzo1 authored Oct 24, 2024
1 parent ccca8ca commit 01e9b94
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 18 deletions.
1 change: 0 additions & 1 deletion opennlp-tools-models/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${maven.surefire.plugin}</version>
<configuration>
<forkCount>${opennlp.forkCount}</forkCount>
<useSystemClassLoader>false</useSystemClassLoader>
Expand Down
1 change: 0 additions & 1 deletion opennlp-tools/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${maven.surefire.plugin}</version>
<configuration>
<argLine>-Xmx2048m -Dorg.slf4j.simpleLogger.defaultLogLevel=off -javaagent:${settings.localRepository}/com/ginsberg/junit5-system-exit/${junit5-system-exit.version}/junit5-system-exit-${junit5-system-exit.version}.jar</argLine>
<forkCount>${opennlp.forkCount}</forkCount>
Expand Down
26 changes: 10 additions & 16 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
<version>31</version>
<version>33</version>
<relativePath />
</parent>

Expand All @@ -40,7 +40,7 @@
<connection>scm:git:https://github.com/apache/opennlp.git</connection>
<developerConnection>scm:git:git@github.com:apache/opennlp.git</developerConnection>
<url>https://github.com/apache/opennlp.git</url>
<tag>opennlp-2.3.1</tag>
<tag>opennlp-2.4.0</tag>
</scm>

<repositories>
Expand All @@ -60,29 +60,29 @@
<subscribe>users-subscribe@opennlp.apache.org</subscribe>
<unsubscribe>users-unsubscribe@opennlp.apache.org</unsubscribe>
<post>users@opennlp.apache.org</post>
<archive>http://mail-archives.apache.org/mod_mbox/opennlp-users/</archive>
<archive>https://mail-archives.apache.org/mod_mbox/opennlp-users/</archive>
</mailingList>

<mailingList>
<name>Apache OpenNLP Developers</name>
<subscribe>dev-subscribe@opennlp.apache.org</subscribe>
<unsubscribe>dev-unsubscribe@opennlp.apache.org</unsubscribe>
<post>dev@opennlp.apache.org</post>
<archive>http://mail-archives.apache.org/mod_mbox/opennlp-dev/</archive>
<archive>https://mail-archives.apache.org/mod_mbox/opennlp-dev/</archive>
</mailingList>

<mailingList>
<name>Apache OpenNLP Commits</name>
<subscribe>commits-subscribe@opennlp.apache.org</subscribe>
<unsubscribe>commits-unsubscribe@opennlp.apache.org</unsubscribe>
<archive>http://mail-archives.apache.org/mod_mbox/opennlp-commits/</archive>
<archive>https://mail-archives.apache.org/mod_mbox/opennlp-commits/</archive>
</mailingList>

<mailingList>
<name>Apache OpenNLP Issues</name>
<subscribe>issues-subscribe@opennlp.apache.org</subscribe>
<unsubscribe>issues-unsubscribe@opennlp.apache.org</unsubscribe>
<archive>http://mail-archives.apache.org/mod_mbox/opennlp-issues/</archive>
<archive>https://mail-archives.apache.org/mod_mbox/opennlp-issues/</archive>
</mailingList>
</mailingLists>

Expand Down Expand Up @@ -165,26 +165,25 @@
<properties>
<!-- Build Properties -->
<java.version>17</java.version>
<maven.compiler.release>${java.version}</maven.compiler.release>
<maven.compiler.target>${java.version}</maven.compiler.target>
<maven.version>3.3.9</maven.version>
<enforcer.plugin.version>3.3.0</enforcer.plugin.version>
<jackson.version>2.18.0</jackson.version>
<jersey.version>3.1.9</jersey.version>
<junit.version>5.11.2</junit.version>
<junit5-system-exit.version>2.0.0</junit5-system-exit.version>
<uimaj.version>3.5.0</uimaj.version>
<morfologik.version>2.1.9</morfologik.version>
<checkstyle.plugin.version>3.2.0</checkstyle.plugin.version>
<onnxruntime.version>1.19.2</onnxruntime.version>
<slf4j.version>2.0.16</slf4j.version>
<log4j2.version>2.23.1</log4j2.version>
<jmh.version>1.37</jmh.version>
<classgraph.version>4.8.176</classgraph.version>
<opennlp.models.version>1.0.1</opennlp.models.version>
<opennlp.forkCount>1.0C</opennlp.forkCount>
<junit5-system-exit.version>2.0.0</junit5-system-exit.version>
<coveralls.maven.plugin>4.3.0</coveralls.maven.plugin>
<jacoco.maven.plugin>0.8.12</jacoco.maven.plugin>
<maven.surefire.plugin>3.2.2</maven.surefire.plugin>
<maven.failsafe.plugin>3.2.2</maven.failsafe.plugin>
<maven.failsafe.plugin>3.5.1</maven.failsafe.plugin>
<forbiddenapis.plugin>3.8</forbiddenapis.plugin>
</properties>

Expand Down Expand Up @@ -217,7 +216,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>${checkstyle.plugin.version}</version>
<dependencies>
<dependency>
<groupId>com.puppycrawl.tools</groupId>
Expand Down Expand Up @@ -288,7 +286,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${maven.surefire.plugin}</version>
<configuration>
<argLine>-Xmx2048m -Dorg.slf4j.simpleLogger.defaultLogLevel=off</argLine>
<forkCount>${opennlp.forkCount}</forkCount>
Expand Down Expand Up @@ -416,7 +413,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>${enforcer.plugin.version}</version>
<executions>
<execution>
<id>enforce-java</id>
Expand Down Expand Up @@ -509,7 +505,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${maven.surefire.plugin}</version>
<configuration>
<argLine>-Xmx4g</argLine>
<includes>
Expand All @@ -533,7 +528,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${maven.surefire.plugin}</version>
<configuration>
<argLine>-Xmx20g</argLine>
<includes>
Expand Down

0 comments on commit 01e9b94

Please sign in to comment.