This is an automated email from the ASF dual-hosted git repository. mawiesne pushed a commit to branch OPENNLP-1708-Raise-OpenNLP-version-to-3.x-on-main-branch in repository https://gitbox.apache.org/repos/asf/opennlp.git
commit f2899d4fd0a0cbad3cb8a70c2747002eb82e0fa6 Author: Martin Wiesner <[email protected]> AuthorDate: Tue May 20 22:27:41 2025 +0200 OPENNLP-1708: Raise OpenNLP version to 3.x on main branch - adjusts upper major model version to 3.x - adds static method Version#between for simpler version range checks in BaseModel - adjusts all pom.xml files towards 3.0.0-SNAPSHOT --- 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-tools/src/main/java/opennlp/tools/util/Version.java | 12 ++++++++++++ .../src/main/java/opennlp/tools/util/model/BaseModel.java | 2 +- opennlp-uima/pom.xml | 2 +- pom.xml | 2 +- 11 files changed, 22 insertions(+), 10 deletions(-) diff --git a/opennlp-distr/pom.xml b/opennlp-distr/pom.xml index 0ada8ff0..ba0b8640 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.5-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> diff --git a/opennlp-dl-gpu/pom.xml b/opennlp-dl-gpu/pom.xml index 81b7c368..c79d0084 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.5-SNAPSHOT</version> + <version>3.0.0-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 6ab97601..ef84ee97 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.5-SNAPSHOT</version> + <version>3.0.0-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 d7f6e534..298114aa 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.5-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> diff --git a/opennlp-morfologik-addon/pom.xml b/opennlp-morfologik-addon/pom.xml index edc84b6a..0479354f 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.5-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> diff --git a/opennlp-tools-models/pom.xml b/opennlp-tools-models/pom.xml index 3d1f9188..c084d019 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.5-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> </parent> <artifactId>opennlp-tools-models</artifactId> diff --git a/opennlp-tools/pom.xml b/opennlp-tools/pom.xml index 1876cdb9..43bb5ebc 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.5-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> 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..64438175 100644 --- a/opennlp-tools/src/main/java/opennlp/tools/util/Version.java +++ b/opennlp-tools/src/main/java/opennlp/tools/util/Version.java @@ -199,4 +199,16 @@ public class Version { return Version.parse(versionString); } + + /** + * Checks whether a {@code version} is in between an interval and its boundaries. + * + * @param version The (major) version number to check. + * @param minValue The inclusive value of the lower interval boundary. + * @param maxValue The inclusive value of the upper interval boundary. + * @return {@code true} if the value is in between the boundary, {@code false} otherwise. + */ + public static boolean between(int version, int minValue, int maxValue) { + return (version >= minValue && version <= maxValue); + } } diff --git a/opennlp-tools/src/main/java/opennlp/tools/util/model/BaseModel.java b/opennlp-tools/src/main/java/opennlp/tools/util/model/BaseModel.java index 35e47763..7716bd0d 100644 --- a/opennlp-tools/src/main/java/opennlp/tools/util/model/BaseModel.java +++ b/opennlp-tools/src/main/java/opennlp/tools/util/model/BaseModel.java @@ -460,7 +460,7 @@ public abstract class BaseModel implements ArtifactProvider, Serializable { // Version check is only performed if current version is not the dev/debug version if (!Version.currentVersion().equals(Version.DEV_VERSION)) { // Support OpenNLP 1.x models. - if (version.getMajor() != 1 && version.getMajor() != 2) { + if (!Version.between(version.getMajor(), 1, 3)) { throw new InvalidFormatException("Model version " + version + " is not supported by this (" + Version.currentVersion() + ") version of OpenNLP!"); } diff --git a/opennlp-uima/pom.xml b/opennlp-uima/pom.xml index 7c4f05b8..e81d3b8c 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.5-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> diff --git a/pom.xml b/pom.xml index b244e204..e410f9e0 100644 --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,7 @@ <groupId>org.apache.opennlp</groupId> <artifactId>opennlp</artifactId> - <version>2.5.5-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> <packaging>pom</packaging> <name>Apache OpenNLP Reactor</name>
