You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@opennlp.apache.org by rz...@apache.org on 2025/10/20 06:58:15 UTC
(opennlp) branch opennlp-2.x updated (5183434d -> 7bef7666)
This is an automated email from the ASF dual-hosted git repository.
rzo1 pushed a change to branch opennlp-2.x
in repository https://gitbox.apache.org/repos/asf/opennlp.git
from 5183434d [2.x]: OPENNLP-1779: Update Checkstyle to 12.0.1 (#876)
new 81865595 Ignore extra patch version component in version parsing
new a7de45c4 [maven-release-plugin] prepare release opennlp-2.5.6.1
new 7bef7666 [maven-release-plugin] prepare for next development iteration
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../src/main/java/opennlp/tools/util/Version.java | 15 +++++++++++----
.../src/test/java/opennlp/tools/util/VersionTest.java | 8 ++++++++
pom.xml | 2 +-
3 files changed, 20 insertions(+), 5 deletions(-)
(opennlp) 03/03: [maven-release-plugin] prepare for next development iteration
Posted by rz...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rzo1 pushed a commit to branch opennlp-2.x
in repository https://gitbox.apache.org/repos/asf/opennlp.git
commit 7bef7666e2a77ebade189d2b2f233ed7fb9b7b6b
Author: Richard Zowalla <rz...@apache.org>
AuthorDate: Thu Oct 16 08:22:19 2025 +0200
[maven-release-plugin] prepare for next development iteration
---
opennlp-distr/pom.xml | 2 +-
opennlp-dl-gpu/pom.xml | 2 +-
opennlp-dl/pom.xml | 2 +-
opennlp-docs/pom.xml | 2 +-
opennlp-morfologik-addon/pom.xml | 2 +-
opennlp-tools-models/pom.xml | 2 +-
opennlp-tools/pom.xml | 2 +-
opennlp-uima/pom.xml | 2 +-
pom.xml | 2 +-
9 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/opennlp-distr/pom.xml b/opennlp-distr/pom.xml
index 32d0660f..9d8f0e15 100644
--- a/opennlp-distr/pom.xml
+++ b/opennlp-distr/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.opennlp</groupId>
<artifactId>opennlp</artifactId>
- <version>2.5.6.1</version>
+ <version>2.5.7-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/opennlp-dl-gpu/pom.xml b/opennlp-dl-gpu/pom.xml
index 5f72a640..8eba00a3 100644
--- a/opennlp-dl-gpu/pom.xml
+++ b/opennlp-dl-gpu/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.opennlp</groupId>
<artifactId>opennlp</artifactId>
- <version>2.5.6.1</version>
+ <version>2.5.7-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.apache.opennlp</groupId>
diff --git a/opennlp-dl/pom.xml b/opennlp-dl/pom.xml
index 8dff8621..cf852965 100644
--- a/opennlp-dl/pom.xml
+++ b/opennlp-dl/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.opennlp</groupId>
<artifactId>opennlp</artifactId>
- <version>2.5.6.1</version>
+ <version>2.5.7-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.apache.opennlp</groupId>
diff --git a/opennlp-docs/pom.xml b/opennlp-docs/pom.xml
index a19428f9..3e190266 100644
--- a/opennlp-docs/pom.xml
+++ b/opennlp-docs/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.opennlp</groupId>
<artifactId>opennlp</artifactId>
- <version>2.5.6.1</version>
+ <version>2.5.7-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/opennlp-morfologik-addon/pom.xml b/opennlp-morfologik-addon/pom.xml
index 1156f8aa..315af412 100644
--- a/opennlp-morfologik-addon/pom.xml
+++ b/opennlp-morfologik-addon/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.opennlp</groupId>
<artifactId>opennlp</artifactId>
- <version>2.5.6.1</version>
+ <version>2.5.7-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/opennlp-tools-models/pom.xml b/opennlp-tools-models/pom.xml
index 044bc657..e1d9a3bc 100644
--- a/opennlp-tools-models/pom.xml
+++ b/opennlp-tools-models/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.opennlp</groupId>
<artifactId>opennlp</artifactId>
- <version>2.5.6.1</version>
+ <version>2.5.7-SNAPSHOT</version>
</parent>
<artifactId>opennlp-tools-models</artifactId>
diff --git a/opennlp-tools/pom.xml b/opennlp-tools/pom.xml
index 3eaae4e2..72a8cfcd 100644
--- a/opennlp-tools/pom.xml
+++ b/opennlp-tools/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.opennlp</groupId>
<artifactId>opennlp</artifactId>
- <version>2.5.6.1</version>
+ <version>2.5.7-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/opennlp-uima/pom.xml b/opennlp-uima/pom.xml
index 006fe1dd..2b990fcc 100644
--- a/opennlp-uima/pom.xml
+++ b/opennlp-uima/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.opennlp</groupId>
<artifactId>opennlp</artifactId>
- <version>2.5.6.1</version>
+ <version>2.5.7-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/pom.xml b/pom.xml
index 15f27a53..6b314c26 100644
--- a/pom.xml
+++ b/pom.xml
@@ -31,7 +31,7 @@
<groupId>org.apache.opennlp</groupId>
<artifactId>opennlp</artifactId>
- <version>2.5.6.1</version>
+ <version>2.5.7-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Apache OpenNLP Reactor</name>
(opennlp) 01/03: Ignore extra patch version component in version parsing
Posted by rz...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rzo1 pushed a commit to branch opennlp-2.x
in repository https://gitbox.apache.org/repos/asf/opennlp.git
commit 81865595192757538aafb08f706457c33312b70f
Author: Richard Zowalla <rz...@apache.org>
AuthorDate: Thu Oct 16 08:20:10 2025 +0200
Ignore extra patch version component in version parsing
---
.../src/main/java/opennlp/tools/util/Version.java | 15 +++++++++++----
.../src/test/java/opennlp/tools/util/VersionTest.java | 8 ++++++++
2 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/opennlp-tools/src/main/java/opennlp/tools/util/Version.java b/opennlp-tools/src/main/java/opennlp/tools/util/Version.java
index 20474a7f..7fd7de0d 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/util/Version.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/util/Version.java
@@ -161,16 +161,23 @@ public class Version {
int versionEnd;
if (indexFirstDash == -1) {
versionEnd = version.length();
- }
- else {
+ } else {
versionEnd = indexFirstDash;
}
- boolean snapshot = version.endsWith(SNAPSHOT_MARKER);
+ String revision = version.substring(indexSecondDot + 1, versionEnd);
+ final int indexPatchVersionDot = revision.indexOf('.');
+ if (indexPatchVersionDot != -1) {
+ // A rare extra patch version is present (e.g., 2.5.6.1), which OpenNLP normally doesn't use.
+ // Since it’s equivalent to the latest revision, we ignore it here.
+ revision = revision.substring(0, indexPatchVersionDot);
+ }
+
+ final boolean snapshot = version.endsWith(SNAPSHOT_MARKER);
return new Version(Integer.parseInt(version.substring(0, indexFirstDot)),
Integer.parseInt(version.substring(indexFirstDot + 1, indexSecondDot)),
- Integer.parseInt(version.substring(indexSecondDot + 1, versionEnd)), snapshot);
+ Integer.parseInt(revision), snapshot);
}
/**
diff --git a/opennlp-tools/src/test/java/opennlp/tools/util/VersionTest.java b/opennlp-tools/src/test/java/opennlp/tools/util/VersionTest.java
index 8921a932..3133777f 100644
--- a/opennlp-tools/src/test/java/opennlp/tools/util/VersionTest.java
+++ b/opennlp-tools/src/test/java/opennlp/tools/util/VersionTest.java
@@ -44,6 +44,14 @@ public class VersionTest {
Version.parse("1.5.2-SNAPSHOT"));
}
+ @Test
+ void testParseProjectVersionWithRarePatchVersion() {
+ // A rare extra patch version is present (e.g., 2.5.6.1), which OpenNLP normally doesn't use.
+ // Since it’s equivalent to the latest revision, it should be equal to 2.5.6
+ Assertions.assertEquals(new Version(2, 5, 6, false),
+ Version.parse("2.5.6.1"));
+ }
+
@Test
void testParseInvalidVersion() {
try {
(opennlp) 02/03: [maven-release-plugin] prepare release opennlp-2.5.6.1
Posted by rz...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rzo1 pushed a commit to branch opennlp-2.x
in repository https://gitbox.apache.org/repos/asf/opennlp.git
commit a7de45c4e1eddb15feedea84692c9095ccf3f89f
Author: Richard Zowalla <rz...@apache.org>
AuthorDate: Thu Oct 16 08:22:15 2025 +0200
[maven-release-plugin] prepare release opennlp-2.5.6.1
---
opennlp-distr/pom.xml | 2 +-
opennlp-dl-gpu/pom.xml | 2 +-
opennlp-dl/pom.xml | 2 +-
opennlp-docs/pom.xml | 2 +-
opennlp-morfologik-addon/pom.xml | 2 +-
opennlp-tools-models/pom.xml | 2 +-
opennlp-tools/pom.xml | 2 +-
opennlp-uima/pom.xml | 2 +-
pom.xml | 4 ++--
9 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/opennlp-distr/pom.xml b/opennlp-distr/pom.xml
index 9d8f0e15..32d0660f 100644
--- a/opennlp-distr/pom.xml
+++ b/opennlp-distr/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.opennlp</groupId>
<artifactId>opennlp</artifactId>
- <version>2.5.7-SNAPSHOT</version>
+ <version>2.5.6.1</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/opennlp-dl-gpu/pom.xml b/opennlp-dl-gpu/pom.xml
index 8eba00a3..5f72a640 100644
--- a/opennlp-dl-gpu/pom.xml
+++ b/opennlp-dl-gpu/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.opennlp</groupId>
<artifactId>opennlp</artifactId>
- <version>2.5.7-SNAPSHOT</version>
+ <version>2.5.6.1</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.apache.opennlp</groupId>
diff --git a/opennlp-dl/pom.xml b/opennlp-dl/pom.xml
index cf852965..8dff8621 100644
--- a/opennlp-dl/pom.xml
+++ b/opennlp-dl/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.opennlp</groupId>
<artifactId>opennlp</artifactId>
- <version>2.5.7-SNAPSHOT</version>
+ <version>2.5.6.1</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.apache.opennlp</groupId>
diff --git a/opennlp-docs/pom.xml b/opennlp-docs/pom.xml
index 3e190266..a19428f9 100644
--- a/opennlp-docs/pom.xml
+++ b/opennlp-docs/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.opennlp</groupId>
<artifactId>opennlp</artifactId>
- <version>2.5.7-SNAPSHOT</version>
+ <version>2.5.6.1</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/opennlp-morfologik-addon/pom.xml b/opennlp-morfologik-addon/pom.xml
index 315af412..1156f8aa 100644
--- a/opennlp-morfologik-addon/pom.xml
+++ b/opennlp-morfologik-addon/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.opennlp</groupId>
<artifactId>opennlp</artifactId>
- <version>2.5.7-SNAPSHOT</version>
+ <version>2.5.6.1</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/opennlp-tools-models/pom.xml b/opennlp-tools-models/pom.xml
index e1d9a3bc..044bc657 100644
--- a/opennlp-tools-models/pom.xml
+++ b/opennlp-tools-models/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.opennlp</groupId>
<artifactId>opennlp</artifactId>
- <version>2.5.7-SNAPSHOT</version>
+ <version>2.5.6.1</version>
</parent>
<artifactId>opennlp-tools-models</artifactId>
diff --git a/opennlp-tools/pom.xml b/opennlp-tools/pom.xml
index 72a8cfcd..3eaae4e2 100644
--- a/opennlp-tools/pom.xml
+++ b/opennlp-tools/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.opennlp</groupId>
<artifactId>opennlp</artifactId>
- <version>2.5.7-SNAPSHOT</version>
+ <version>2.5.6.1</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/opennlp-uima/pom.xml b/opennlp-uima/pom.xml
index 2b990fcc..006fe1dd 100644
--- a/opennlp-uima/pom.xml
+++ b/opennlp-uima/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.opennlp</groupId>
<artifactId>opennlp</artifactId>
- <version>2.5.7-SNAPSHOT</version>
+ <version>2.5.6.1</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/pom.xml b/pom.xml
index 2859fd82..15f27a53 100644
--- a/pom.xml
+++ b/pom.xml
@@ -31,7 +31,7 @@
<groupId>org.apache.opennlp</groupId>
<artifactId>opennlp</artifactId>
- <version>2.5.7-SNAPSHOT</version>
+ <version>2.5.6.1</version>
<packaging>pom</packaging>
<name>Apache OpenNLP Reactor</name>
@@ -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.5.5</tag>
+ <tag>opennlp-2.5.6.1</tag>
</scm>
<repositories>