apache
diff --git a/‎.asf.yaml‎
Lines changed: 1 addition & 0 deletions b/‎.asf.yaml‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎.github/workflows/maven.yml‎
Lines changed: 3 additions & 3 deletions b/‎.github/workflows/maven.yml‎
Lines changed: 3 additions & 3 deletions
diff --git a/‎NOTICE‎
Lines changed: 2 additions & 2 deletions b/‎NOTICE‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎README.md‎
Lines changed: 30 additions & 6 deletions b/‎README.md‎
Lines changed: 30 additions & 6 deletions
diff --git a/‎opennlp-distr/pom.xml‎
Lines changed: 1 addition & 1 deletion b/‎opennlp-distr/pom.xml‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎opennlp-dl-gpu/pom.xml‎
Lines changed: 1 addition & 1 deletion b/‎opennlp-dl-gpu/pom.xml‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎opennlp-dl/pom.xml‎
Lines changed: 1 addition & 1 deletion b/‎opennlp-dl/pom.xml‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎opennlp-docs/pom.xml‎
Lines changed: 1 addition & 1 deletion b/‎opennlp-docs/pom.xml‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎opennlp-docs/src/docbkx/model-loading.xml‎
Lines changed: 11 additions & 11 deletions b/‎opennlp-docs/src/docbkx/model-loading.xml‎
Lines changed: 11 additions & 11 deletions
diff --git a/‎opennlp-morfologik-addon/pom.xml‎
Lines changed: 1 addition & 1 deletion b/‎opennlp-morfologik-addon/pom.xml‎
Lines changed: 1 addition & 1 deletion
@@ -12,6 +12,7 @@ github:
         dismiss_stale_reviews: false
         require_code_owner_reviews: false
         required_approving_review_count: 1
+    opennlp-2.x:  {}
   autolink_jira:
     - OPENNLP
   custom_subjects:
 
@@ -34,7 +34,7 @@ jobs:
         java: [ 17, 21 ]
         experimental: [false]
         include:
-          - java: 24-ea
+          - java: 25-ea
             os: ubuntu-latest
             experimental: true
 
@@ -49,11 +49,11 @@ jobs:
         restore-keys: |
           ${{ runner.os }}-maven-
     - name: Set up JDK ${{ matrix.java }}
-      uses: actions/setup-java@v4
+      uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4.7.0
       with:
         distribution: temurin
         java-version: ${{ matrix.java }}
     - name: Build with Maven
-      run: mvn -V clean test install --no-transfer-progress -Pjacoco -Pci
+      run: mvn -V clean test install --show-version --batch-mode --no-transfer-progress -Pjacoco -Pci
     - name: Jacoco
       run: mvn jacoco:report
@@ -61,8 +61,8 @@ List of third-party dependencies grouped by their license type.
 
     MIT License
 
-        * onnx-runtime (com.microsoft.onnxruntime:onnxruntime_gpu:1.21.0 - https://microsoft.github.io/onnxruntime/)
-        * onnx-runtime (com.microsoft.onnxruntime:onnxruntime:1.21.0 - https://microsoft.github.io/onnxruntime/)
+        * onnx-runtime (com.microsoft.onnxruntime:onnxruntime_gpu:1.22.0 - https://microsoft.github.io/onnxruntime/)
+        * onnx-runtime (com.microsoft.onnxruntime:onnxruntime:1.22.0 - https://microsoft.github.io/onnxruntime/)
         * SLF4J API Module (org.slf4j:slf4j-api:2.0.17 - http://www.slf4j.org)
 
     The MIT License (MIT)
 
@@ -71,10 +71,10 @@ Currently, the library has different packages:
 * `opennlp-tools` : The core toolkit.
 * `opennlp-tools-models` : A set of classes to load [OpenNLP models](https://github.com/apache/opennlp-models) from the classpath.
 * `opennlp-uima` : A set of [Apache UIMA](https://uima.apache.org) annotators.
-* `opennlp-morfologik-addon` : An addon for Morfologik
-* `opennlp-dl` : OpenNLP interface implementations for ONNX models using the `onnxruntime` dependency.
+* `opennlp-morfologik-addon` : An addon for _Morfologik_.
+* `opennlp-dl` : OpenNLP interface implementations for [ONNX](https://onnx.ai) models using the `onnxruntime` dependency.
 * `opennlp-dl-gpu` : Replaces `onnxruntime` with the `onnxruntime_gpu` dependency to support GPU acceleration.
-* `opennlp-sandbox`: Other projects in progress are found in the [sandbox](https://github.com/apache/opennlp-sandbox)
+* `opennlp-sandbox`: Other projects in progress reside in the [sandbox](https://github.com/apache/opennlp-sandbox).           
 
 ## Getting Started
 
@@ -104,6 +104,28 @@ compile group: "org.apache.opennlp", name: "opennlp-tools", version: "${opennlp.
 
 For more details please check our [documentation](http://opennlp.apache.org/docs/)
 
+## Branches and Merging Strategy
+
+To support ongoing development and stable maintenance of Apache OpenNLP, the project follows a dual-branch model:
+
+### Branch overview
+
+- **`main`**: Development branch for version **3.0** and beyond. All feature development and 3.x releases occur here.
+- **`opennlp-2.x`**: Maintains the stable **2.x** release line. This branch will receive selective updates and patch releases.
+
+### Workflow summary
+
+- Feature development
+  - New features targeting versions 3.0+ are developed on feature branches _off_ `main` and merged _into_ `main`.
+- Bug fixes and dependency updates
+  - Relevant fixes or dependency updates from `main` may be cherry-picked into `opennlp-2.x` as needed.
+- Releases
+  - **3.x** releases are made from the `main` branch.
+  - **2.x** releases are made from the `opennlp-2.x` branch.
+- Release tags
+  - Release tags are applied directly to the appropriate version branch (`main` for 3.x or `opennlp-2.x` for 2.x). 
+  - The presence of a version branch does not affect the tagging or visibility of releases.
+
 ## Building OpenNLP
 
 At least JDK 17 and Maven 3.3.9 are required to build the library.
@@ -114,12 +136,14 @@ After cloning the repository go into the destination directory and run:
 mvn install
 ```
 
-### Additional Developement Information
+### Additional Development Information
 
-- [Building and Integrating Snowball Stemmer for OpenNLP](dev/Snowball-Stemmer.md)
+- Building and integrating [Snowball Stemmer](dev/Snowball-Stemmer.md) for OpenNLP.
 
 ## Contributing
 
-The Apache OpenNLP project is developed by volunteers and is always looking for new contributors to work on all parts of the project. Every contribution is welcome and needed to make it better. A contribution can be anything from a small documentation typo fix to a new component.
+The Apache OpenNLP project is developed by volunteers and is always looking for new contributors to work on all parts of the project. 
+Every contribution is welcome and needed to make it better. 
+A contribution can be anything from a small documentation typo fix to a new component.
 
 If you would like to get involved please follow the instructions [here](https://github.com/apache/opennlp/blob/main/.github/CONTRIBUTING.md)
@@ -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>
 
 
@@ -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>
 
@@ -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>
 
@@ -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>
 
 
@@ -78,18 +78,18 @@ under the License.
 
             <programlisting language="java">
                 <![CDATA[
-final ClassgraphModelFinder finder = new ClassgraphModelFinder(); // or use new SimpleClassPathModelFinder()
+final ClassgraphModelFinder finder = new ClassgraphModelFinder(); // or use: new SimpleClassPathModelFinder()
 final ClassPathModelLoader loader = new ClassPathModelLoader();
 final Set<ClassPathModelEntry> models = finder.findModels(false);
 for(ClassPathModelEntry entry : models) {
 
    final ClassPathModel model = loader.load(entry);
 
    if(model != null) {
-                System.out.println(model.getModelName());
-                System.out.println(model.getModelSHA256());
-                System.out.println(model.getModelVersion());
-                System.out.println(model.getModeLanguage());
+      System.out.println(model.getModelName());
+      System.out.println(model.getModelSHA256());
+      System.out.println(model.getModelVersion());
+      System.out.println(model.getModelLanguage());
       // do something with the model by consuming the byte array
    }
 }]]>
@@ -120,23 +120,23 @@ model.language=${model.language}
             Make sure to replace the values accordingly and configure your build tool to include the binary model and the <emphasis>model.properties</emphasis>
             in the resulting JAR file.
 
-            To load such a custom model, you may need to adjust the pattern for classpath scanning. For example, if you name your model "custom-opennlp-model",
+            To load such a custom model, you may need to adjust the pattern for classpath scanning. For example, if you name the model "custom-opennlp-model",
             you need the following code to successfully find and load it:
 
             <programlisting language="java">
                 <![CDATA[
-final ClassgraphModelFinder finder = new ClassgraphModelFinder("custom-opennlp-model.jar"); // or use new SimpleClassPathModelFinder("custom-opennlp-model.jar")
+final ClassgraphModelFinder finder = new ClassgraphModelFinder("custom-opennlp-model.jar"); // or use: new SimpleClassPathModelFinder("custom-opennlp-model.jar")
 final ClassPathModelLoader loader = new ClassPathModelLoader();
 final Set<ClassPathModelEntry> models = finder.findModels(false);
 for(ClassPathModelEntry entry : models) {
 
    final ClassPathModel model = loader.load(entry);
 
    if(model != null) {
-                System.out.println(model.getModelName());
-                System.out.println(model.getModelSHA256());
-                System.out.println(model.getModelVersion());
-                System.out.println(model.getModeLanguage());
+      System.out.println(model.getModelName());
+      System.out.println(model.getModelSHA256());
+      System.out.println(model.getModelVersion());
+      System.out.println(model.getModelLanguage());
       // do something with the model by consuming the byte array
    }
 }]]>
 
@@ -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>