Merge pull request #126 from apache/release/125-Apache-UIMA-Ruta-3.3.0

Issue #125: Apache UIMA Ruta 3.3.0
diff --git a/README.md b/README.md
index be84caa..378dbc2 100644
--- a/README.md
+++ b/README.md
@@ -69,28 +69,25 @@
 **Query:** Rules can be used as query statements in order to investigate annotated documents.
 
 
-The UIMA Ruta Workbench can be installed via Eclipse update sites:
-
-* for UIMA 2: <a href="https://downloads.apache.org/uima/eclipse-update-site/">https://downloads.apache.org/uima/eclipse-update-site/</a>
-* for UIMA 3: <a href="https://downloads.apache.org/uima/eclipse-update-site-v3/">https://downloads.apache.org/uima/eclipse-update-site-v3/</a>
+The UIMA Ruta Workbench can be installed via Eclipse update site [https://downloads.apache.org/uima/eclipse-update-site-v3](https://downloads.apache.org/uima/eclipse-update-site-v3).
 
 
 Building from the Source Distribution
 -------------------------------------
 
-We use Maven 3.0 and Java 8 or later for building; download this if needed, 
-and set the environment variable MAVEN_OPTS to -Xmx800m.
+We use Maven 3.6.3 and Java 11 or later for building; download this if needed, 
+and set the environment variable `MAVEN_OPTS` to `-Xmx800m`.
 
 Then do the build by going into the UIMA Ruta directory, and issuing the command
    
    mvn clean install
    
-This builds everything except the ...source-release.zip file. If you want that,
+This builds everything except the `...source-release.zip` file. If you want that,
 change the command to 
 
    mvn clean install -Papache-release
    
-For more details, please see https://uima.apache.org/building-uima.html   
+For more details, please see [https://uima.apache.org/building-uima.html](https://uima.apache.org/building-uima.html).
 
 
 How to Get Involved
@@ -105,7 +102,7 @@
 --------------------
 
 The Apache UIMA project uses JIRA for issue tracking. Please report any issues you find at 
-[our issue tracker](http://issues.apache.org/jira/browse/uima).
+[our issue tracker](https://github.com/apache/uima-ruta/issues).
 
 
 Useful tips
@@ -163,4 +160,4 @@
   doi = {10.1017/S1351324914000114},
   URL = {https://journals.cambridge.org/article_S1351324914000114},
 }
-~~~~
\ No newline at end of file
+~~~~
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 7f08da3..c7c62da 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -19,7 +19,7 @@
 ***************************************************************
 -->
    
-# Apache UIMA Ruta (TM) v3.2.0
+# Apache UIMA Ruta (TM) v3.3.0
 
 Apache UIMA Ruta&#8482; is a rule-based script language supported by Eclipse-based tooling.
 The language is designed to enable rapid development of text processing applications within Apache UIMA&#8482;. 
@@ -30,30 +30,33 @@
 
 This is a feature and bugfix release.
 
-## Notable changes in this release
+## What's Changed
+* ⭐️ Issue #100: Enable type system discovery via SPI in OSGI
+* ⭐️ Issue #102: RutaResourceLoader should consider TCCL
+* ⭐️ Issue #107: Enable loading uimaFIT annotators and other classes through the TCCL
+* ⭐️ Issue #111: Support copy/paste clipboard for feature values in annotation browser view
+* 🦟 Issue #110: Usage of labels within macro action definition is broken
+* ⚙️ Issue #118: Merge type system modules into core module
+* ⚙️ Issue #122: Resolve split package between ruta-core and ruta-core-ext
+* 🩹 Issue #104: Upgrade dependencies
 
-* [UIMA-6411] - Avoid creation of `RutaBasics` for bad annotations
-* [UIMA-6406] - Removing an annotation inside a `BLOCK` only takes effect outside the block
-* [UIMA-6408] - No type check of features in `TRANSFER`
-* [UIMA-6409] - Possible endless wildcard lookahead in combination with subtokens
-* [UIMA-6414] - Missing match for optional after sidestep out of composed
-* [UIMA-6404] - `@` with quantifier ignores matches
-* [UIMA-6405] - Local variable not captured properly in a wildcard matching condition.
-* [UIMA-6461] - Wrong argument to `contains()`
-* [UIMA-6399] - `RutaPatternCache` prevents `CPEEngine` from terminating
-* [UIMA-6383] - TRIE - Wordlist entry not annotated
-* [UIMA-6394] - Label assignment in alternative match causes problems
+**Full Changelog**: https://github.com/apache/uima-ruta/compare/rel/ruta-3.2.0...ruta-3.3.0
 
-A [full list of issues](https://issues.apache.org/jira/issues/?jql=project%20%3D%20UIMA%20AND%20fixVersion%20%3D%203.2.0ruta) addressed in this release can be found on issue tracker.
+Please use the [mailing lists](https://uima.apache.org/mail-lists.html) for feedback and the [issue tracker](https://github.com/apache/uima-ruta/issues) to report bugs.
 
-Please use the [mailing lists](https://uima.apache.org/mail-lists.html) for feedback and the [issue tracker](https://issues.apache.org/jira/browse/uima) to report bugs.
-
+## Compatibility notes
+* The modules `ruta-typesystem` and `ruta-basic-type` do no longer exist as separate modules. They have
+  been merged into the `ruta-core` module.
+* Parts of the `ruta-core-ext` module have been merged into the `ruta-core` module as well. The merged
+  extensions remain extensions and did not become part of the Ruta language. Check what remains in
+  the `ruta-core-ext` module and remove any dependencies on it if you do not need the extensions it
+  provides.
 
 ## Supported Platforms
 
-UIMA Ruta 3.2.0 should be used in combination with
+UIMA Ruta 3.3.0 should be used in combination with
 
 - Java 1.8 or higher
-- UIMA Java SDK 3.3.0 or higher
-- uimaFIT 3.3.0 or higher
-- Spring Framework 5.3.20 or higher
+- UIMA Java SDK 3.4.0 or higher
+- uimaFIT 3.4.0 or higher
+- Spring Framework 5.3.25 or higher
diff --git a/example-projects/ruta-ep-example-extensions/pom.xml b/example-projects/ruta-ep-example-extensions/pom.xml
index 5fcce89..881be36 100644
--- a/example-projects/ruta-ep-example-extensions/pom.xml
+++ b/example-projects/ruta-ep-example-extensions/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.uima</groupId>
     <artifactId>ruta-ep-parent</artifactId>
-    <version>3.3.0-SNAPSHOT</version>
+    <version>3.3.1-SNAPSHOT</version>
     <relativePath>../../ruta-ep-parent/pom.xml</relativePath>
   </parent>
   <properties>
diff --git a/example-projects/ruta-maven-example/pom.xml b/example-projects/ruta-maven-example/pom.xml
index 0c7b04a..d1a6ddc 100644
--- a/example-projects/ruta-maven-example/pom.xml
+++ b/example-projects/ruta-maven-example/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.uima</groupId>
     <artifactId>ruta-parent</artifactId>
-    <version>3.3.0-SNAPSHOT</version>
+    <version>3.3.1-SNAPSHOT</version>
     <relativePath>../../ruta-parent/pom.xml</relativePath>
   </parent>
   <url>${uimaWebsiteUrl}</url>
diff --git a/pom.xml b/pom.xml
index 69f23c3..1194ae3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.uima</groupId>
     <artifactId>ruta-parent</artifactId>
-    <version>3.3.0-SNAPSHOT</version>
+    <version>3.3.1-SNAPSHOT</version>
     <relativePath>ruta-parent/pom.xml</relativePath>
   </parent>
 
@@ -36,12 +36,6 @@
     <jiraVersion>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}ruta</jiraVersion>
   </properties>
 
-  <!-- override pom setting in the build project. JIRA 5.1 needs different URL -->
-  <issueManagement>
-    <system>Jira</system>
-    <url>https://issues.apache.org/jira/browse/UIMA</url>
-  </issueManagement>
-
   <!-- Special inheritance note even though the <scm> element that follows is exactly the same as those
     in super poms, it cannot be inherited because there is some special code that computes the connection
     elements from the chain of parent poms, if this is omitted. Keeping this a bit factored allows cutting/pasting
@@ -218,7 +212,7 @@
                     <!-- dir="${basedir}/example-projects/ExtensionsExample/" -->
                     <!-- includes=".project" -->
                     <!-- prefix="${project.artifactId}-${project.version}/example-projects/ExtensionsExample/" 
-                            /> -->
+                              /> -->
                     <!-- </zip> -->
                     <zip destfile="${project.build.directory}/${project.artifactId}-${project.version}-source-release.zip" update="true">
                       <zipfileset dir="${basedir}/example-projects/TextRulerExample/" includes=".project" prefix="${project.artifactId}-${project.version}/example-projects/TextRulerExample/" />
@@ -229,7 +223,7 @@
                     <!-- <zipfileset dir="${basedir}/example-projects/GermanNovels/" -->
                     <!-- includes=".project" -->
                     <!-- prefix="${project.artifactId}-${project.version}/example-projects/GermanNovels/" 
-                            /> -->
+                              /> -->
                     <!-- </zip> -->
                     <zip destfile="${project.build.directory}/${project.artifactId}-${project.version}-source-release.zip" update="true">
                       <zipfileset dir="${basedir}/example-projects/Misc/" includes=".project" prefix="${project.artifactId}-${project.version}/example-projects/Misc/" />
diff --git a/ruta-core-ext/pom.xml b/ruta-core-ext/pom.xml
index d09b17e..d56fcca 100644
--- a/ruta-core-ext/pom.xml
+++ b/ruta-core-ext/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.uima</groupId>
     <artifactId>ruta-parent</artifactId>
-    <version>3.3.0-SNAPSHOT</version>
+    <version>3.3.1-SNAPSHOT</version>
     <relativePath>../ruta-parent/pom.xml</relativePath>
   </parent>
 
diff --git a/ruta-core/pom.xml b/ruta-core/pom.xml
index b41d590..d723b58 100644
--- a/ruta-core/pom.xml
+++ b/ruta-core/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.uima</groupId>
     <artifactId>ruta-parent</artifactId>
-    <version>3.3.0-SNAPSHOT</version>
+    <version>3.3.1-SNAPSHOT</version>
     <relativePath>../ruta-parent/pom.xml</relativePath>
   </parent>
 
diff --git a/ruta-docbook/pom.xml b/ruta-docbook/pom.xml
index 817d9a8..4a2bfa2 100644
--- a/ruta-docbook/pom.xml
+++ b/ruta-docbook/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.uima</groupId>
     <artifactId>ruta-parent</artifactId>
-    <version>3.3.0-SNAPSHOT</version>
+    <version>3.3.1-SNAPSHOT</version>
     <relativePath>../ruta-parent/pom.xml</relativePath>
   </parent>
   <name>Apache UIMA Ruta Documentation</name>
diff --git a/ruta-eclipse-feature/feature.xml b/ruta-eclipse-feature/feature.xml
index d293a27..7c62f03 100644
--- a/ruta-eclipse-feature/feature.xml
+++ b/ruta-eclipse-feature/feature.xml
@@ -20,7 +20,7 @@
 <feature
       id="org.apache.uima.ruta.feature"
       label="UIMA Ruta Workbench"
-      version="3.3.0.qualifier"
+      version="3.3.1.qualifier"
       provider-name="Apache Software Foundation">
 
    <description url="http://uima.apache.org">
diff --git a/ruta-eclipse-feature/pom.xml b/ruta-eclipse-feature/pom.xml
index 082cbf9..a625ea9 100644
--- a/ruta-eclipse-feature/pom.xml
+++ b/ruta-eclipse-feature/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.uima</groupId>
     <artifactId>ruta-parent</artifactId>
-    <version>3.3.0-SNAPSHOT</version>
+    <version>3.3.1-SNAPSHOT</version>
     <relativePath>../ruta-parent/pom.xml</relativePath>
   </parent>
 
@@ -44,37 +44,37 @@
     <dependency>
       <groupId>org.apache.uima</groupId>
       <artifactId>ruta-ep-addons</artifactId>
-      <version>3.3.0-SNAPSHOT</version>
+      <version>3.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.uima</groupId>
       <artifactId>ruta-ep-caseditor</artifactId>
-      <version>3.3.0-SNAPSHOT</version>
+      <version>3.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.uima</groupId>
       <artifactId>ruta-ep-core-ext</artifactId>
-      <version>3.3.0-SNAPSHOT</version>
+      <version>3.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.uima</groupId>
       <artifactId>ruta-ep-engine</artifactId>
-      <version>3.3.0-SNAPSHOT</version>
+      <version>3.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.uima</groupId>
       <artifactId>ruta-ep-ide</artifactId>
-      <version>3.3.0-SNAPSHOT</version>
+      <version>3.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.uima</groupId>
       <artifactId>ruta-ep-ide-ui</artifactId>
-      <version>3.3.0-SNAPSHOT</version>
+      <version>3.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.uima</groupId>
       <artifactId>ruta-ep-textruler</artifactId>
-      <version>3.3.0-SNAPSHOT</version>
+      <version>3.3.1-SNAPSHOT</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file
diff --git a/ruta-eclipse-update-site/category.xml b/ruta-eclipse-update-site/category.xml
index e488188..f59eb58 100644
--- a/ruta-eclipse-update-site/category.xml
+++ b/ruta-eclipse-update-site/category.xml
@@ -20,7 +20,7 @@
    ***************************************************************
    -->
 <site>
-   <feature url="features/org.apache.uima.ruta.feature_3.3.0.qualifier.jar" id="org.apache.uima.ruta.feature" version="3.3.0.qualifier">
+   <feature url="features/org.apache.uima.ruta.feature_3.3.1.qualifier.jar" id="org.apache.uima.ruta.feature" version="3.3.1.qualifier">
       <category name="apache-uima-ruta"/>
    </feature>
    <category-def name="apache-uima-ruta" label="Apache UIMA Ruta">
diff --git a/ruta-eclipse-update-site/pom.xml b/ruta-eclipse-update-site/pom.xml
index e60e3fb..59bb571 100644
--- a/ruta-eclipse-update-site/pom.xml
+++ b/ruta-eclipse-update-site/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.uima</groupId>
     <artifactId>ruta-parent</artifactId>
-    <version>3.3.0-SNAPSHOT</version>
+    <version>3.3.1-SNAPSHOT</version>
     <relativePath>../ruta-parent/pom.xml</relativePath>
   </parent>
 
@@ -51,7 +51,7 @@
     <dependency>
       <groupId>org.apache.uima</groupId>
       <artifactId>org.apache.uima.ruta.feature</artifactId>
-      <version>3.3.0-SNAPSHOT</version>
+      <version>3.3.1-SNAPSHOT</version>
     </dependency>
   </dependencies>
 
diff --git a/ruta-ep-addons/pom.xml b/ruta-ep-addons/pom.xml
index 75555ca..7616147 100644
--- a/ruta-ep-addons/pom.xml
+++ b/ruta-ep-addons/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.uima</groupId>
     <artifactId>ruta-ep-parent</artifactId>
-    <version>3.3.0-SNAPSHOT</version>
+    <version>3.3.1-SNAPSHOT</version>
     <relativePath>../ruta-ep-parent/pom.xml</relativePath>
   </parent>
   <properties>
diff --git a/ruta-ep-caseditor/pom.xml b/ruta-ep-caseditor/pom.xml
index 8c094ad..fad37bc 100644
--- a/ruta-ep-caseditor/pom.xml
+++ b/ruta-ep-caseditor/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.uima</groupId>
     <artifactId>ruta-ep-parent</artifactId>
-    <version>3.3.0-SNAPSHOT</version>
+    <version>3.3.1-SNAPSHOT</version>
     <relativePath>../ruta-ep-parent/pom.xml</relativePath>
   </parent>
   <properties>
diff --git a/ruta-ep-core-ext/pom.xml b/ruta-ep-core-ext/pom.xml
index a0e2952..47eeabd 100644
--- a/ruta-ep-core-ext/pom.xml
+++ b/ruta-ep-core-ext/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.uima</groupId>
     <artifactId>ruta-ep-parent</artifactId>
-    <version>3.3.0-SNAPSHOT</version>
+    <version>3.3.1-SNAPSHOT</version>
     <relativePath>../ruta-ep-parent/pom.xml</relativePath>
   </parent>
   <properties>
diff --git a/ruta-ep-engine/pom.xml b/ruta-ep-engine/pom.xml
index 9cf187a..4644832 100644
--- a/ruta-ep-engine/pom.xml
+++ b/ruta-ep-engine/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.uima</groupId>
     <artifactId>ruta-parent</artifactId>
-    <version>3.3.0-SNAPSHOT</version>
+    <version>3.3.1-SNAPSHOT</version>
     <relativePath>../ruta-parent/pom.xml</relativePath>
   </parent>
 
@@ -57,18 +57,6 @@
     </dependency>
     <dependency>
       <groupId>org.apache.uima</groupId>
-      <artifactId>ruta-typesystem</artifactId>
-      <version>${project.parent.version}</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.uima</groupId>
-      <artifactId>ruta-basic-type</artifactId>
-      <version>${project.parent.version}</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.uima</groupId>
       <artifactId>ruta-core-ext</artifactId>
       <version>${project.parent.version}</version>
       <scope>compile</scope>
diff --git a/ruta-ep-engine/src/main/readme_bin/LICENSE b/ruta-ep-engine/src/main/readme_bin/LICENSE
index 4b60db6..02f9492 100644
--- a/ruta-ep-engine/src/main/readme_bin/LICENSE
+++ b/ruta-ep-engine/src/main/readme_bin/LICENSE
@@ -456,11 +456,11 @@
   after the cause of action arose. Each party waives its rights to a jury trial in

   any resulting litigation.

 

-====================================================================================================   

+=======================================================================

 

-SPRING FRAMEWORK 5.3.20 SUBCOMPONENTS:

+SPRING FRAMEWORK 5.3.25 SUBCOMPONENTS:

 

-Spring Framework 5.3.20 includes a number of subcomponents

+Spring Framework 5.3.25 includes a number of subcomponents

 with separate copyright notices and license terms. The product that

 includes this file does not necessarily use all the open source

 subcomponents referred to below. Your use of the source

@@ -568,7 +568,7 @@
    has been imported from the Orekit space flight dynamics library.

 

 ===============================================================================

- 

+

 

 

 APACHE COMMONS MATH DERIVATIVE WORKS: 

diff --git a/ruta-ep-engine/src/main/readme_bin/NOTICE b/ruta-ep-engine/src/main/readme_bin/NOTICE
index c2b5e06..c6d7a36 100644
--- a/ruta-ep-engine/src/main/readme_bin/NOTICE
+++ b/ruta-ep-engine/src/main/readme_bin/NOTICE
@@ -28,7 +28,7 @@
 ################################################################################
 
 This product contains Apache Commons IO
-Copyright 2002-2020 The Apache Software Foundation
+Copyright 2002-2021 The Apache Software Foundation
 
 ################################################################################
 
@@ -60,8 +60,8 @@
 
 ################################################################################
 
-Spring Framework 5.3.20
-Copyright (c) 2002-2022 Pivotal, Inc.
+Spring Framework 5.3.25
+Copyright (c) 2002-2023 Pivotal, Inc.
 
 This product is licensed to you under the Apache License, Version 2.0
 (the "License"). You may not use this product except in compliance with
@@ -75,7 +75,7 @@
 ################################################################################
 
 This product contains Apache UIMA uimaFIT - Core
-Copyright 2013-2021 The Apache Software Foundation
+Copyright 2013-2023 The Apache Software Foundation
 
 Copyright 2009-2012 Regents of the University of Colorado.
 All rights reserved.
diff --git a/ruta-ep-ide-ui/pom.xml b/ruta-ep-ide-ui/pom.xml
index ce4b834..11c8f6d 100644
--- a/ruta-ep-ide-ui/pom.xml
+++ b/ruta-ep-ide-ui/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.uima</groupId>
     <artifactId>ruta-ep-parent</artifactId>
-    <version>3.3.0-SNAPSHOT</version>
+    <version>3.3.1-SNAPSHOT</version>
     <relativePath>../ruta-ep-parent/pom.xml</relativePath>
   </parent>
 
diff --git a/ruta-ep-ide/pom.xml b/ruta-ep-ide/pom.xml
index af5d490..684a436 100644
--- a/ruta-ep-ide/pom.xml
+++ b/ruta-ep-ide/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.uima</groupId>
     <artifactId>ruta-ep-parent</artifactId>
-    <version>3.3.0-SNAPSHOT</version>
+    <version>3.3.1-SNAPSHOT</version>
     <relativePath>../ruta-ep-parent/pom.xml</relativePath>
   </parent>
 
diff --git a/ruta-ep-parent/pom.xml b/ruta-ep-parent/pom.xml
index 61ee2d0..a4449af 100644
--- a/ruta-ep-parent/pom.xml
+++ b/ruta-ep-parent/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.uima</groupId>
     <artifactId>ruta-parent</artifactId>
-    <version>3.3.0-SNAPSHOT</version>
+    <version>3.3.1-SNAPSHOT</version>
     <relativePath>../ruta-parent/pom.xml</relativePath>
   </parent>
 
diff --git a/ruta-ep-textruler/pom.xml b/ruta-ep-textruler/pom.xml
index 34c1b08..864ad7d 100644
--- a/ruta-ep-textruler/pom.xml
+++ b/ruta-ep-textruler/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.uima</groupId>
     <artifactId>ruta-ep-parent</artifactId>
-    <version>3.3.0-SNAPSHOT</version>
+    <version>3.3.1-SNAPSHOT</version>
     <relativePath>../ruta-ep-parent/pom.xml</relativePath>
   </parent>
 
diff --git a/ruta-maven-archetype/pom.xml b/ruta-maven-archetype/pom.xml
index 82d0c34..987a2d7 100644
--- a/ruta-maven-archetype/pom.xml
+++ b/ruta-maven-archetype/pom.xml
@@ -26,7 +26,7 @@
   <parent>
     <groupId>org.apache.uima</groupId>
     <artifactId>ruta-parent</artifactId>
-    <version>3.3.0-SNAPSHOT</version>
+    <version>3.3.1-SNAPSHOT</version>
     <relativePath>../ruta-parent/pom.xml</relativePath>
   </parent>
   <properties>
diff --git a/ruta-maven-plugin/pom.xml b/ruta-maven-plugin/pom.xml
index a15dfac..c23bd1c 100644
--- a/ruta-maven-plugin/pom.xml
+++ b/ruta-maven-plugin/pom.xml
@@ -32,7 +32,7 @@
   <parent>
     <groupId>org.apache.uima</groupId>
     <artifactId>ruta-parent</artifactId>
-    <version>3.3.0-SNAPSHOT</version>
+    <version>3.3.1-SNAPSHOT</version>
     <relativePath>../ruta-parent/pom.xml</relativePath>
   </parent>
   <properties>
diff --git a/ruta-parent/pom.xml b/ruta-parent/pom.xml
index 5837d1c..bfe688e 100644
--- a/ruta-parent/pom.xml
+++ b/ruta-parent/pom.xml
@@ -17,319 +17,291 @@
   specific language governing permissions and limitations
   under the License.
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<modelVersion>4.0.0</modelVersion>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
 
-	<parent>
-		<groupId>org.apache.uima</groupId>
-		<artifactId>parent-pom</artifactId>
-		<version>16</version>
-		<relativePath />
-	</parent>
+  <parent>
+    <groupId>org.apache.uima</groupId>
+    <artifactId>parent-pom</artifactId>
+    <version>16</version>
+    <relativePath />
+  </parent>
 
-	<artifactId>ruta-parent</artifactId>
-	<packaging>pom</packaging>
-	<version>3.3.0-SNAPSHOT</version>
-	<name>Apache UIMA Ruta: ${project.artifactId}</name>
-	<url>${uimaWebsiteUrl}</url>
-	<inceptionYear>2011</inceptionYear>
-	<description>The common parent pom for the UIMA Ruta</description>
+  <artifactId>ruta-parent</artifactId>
+  <packaging>pom</packaging>
+  <version>3.3.1-SNAPSHOT</version>
+  <name>Apache UIMA Ruta: ${project.artifactId}</name>
+  <url>${uimaWebsiteUrl}</url>
+  <inceptionYear>2011</inceptionYear>
+  <description>The common parent pom for the UIMA Ruta</description>
 
   <!-- Special inheritance note even though the <scm> element that follows 
     is exactly the same as those in super poms, it cannot be inherited because 
     there is some special code that computes the connection elements from the 
     chain of parent poms, if this is omitted. Keeping this a bit factored allows 
     cutting/pasting the <scm> element, and just changing the following two properties -->
-	<scm>
-		<connection>scm:git:https://github.com/apache/uima-ruta/</connection>
-		<developerConnection>scm:git:https://github.com/apache/uima-ruta/</developerConnection>
-		<url>https://github.com/apache/uima-ruta/</url>
-		<tag>HEAD</tag>
-	</scm>
+  <scm>
+    <connection>scm:git:https://github.com/apache/uima-ruta/</connection>
+    <developerConnection>scm:git:https://github.com/apache/uima-ruta/</developerConnection>
+    <url>https://github.com/apache/uima-ruta/</url>
+    <tag>HEAD</tag>
+  </scm>
 
-  <!-- The repositories and pluginRepositories section is duplicated from 
-    the parent pom one, and adds the Apache Snapshot Nexus repository where UIMA 
-    snapshots are deployed. This is needed if for instance, a project depends 
-    on some new SNAPSHOT level of a build tool, where the users hasn't checked 
-    out the build tooling. This allows maven to find the snapshots when looking 
-    for the parent of this pom -->
-	<repositories>
+  <issueManagement>
+    <system>Github</system>
+    <url>https://github.com/apache/uima-ruta/issues</url>
+  </issueManagement>
+
+  <repositories>
     <!-- modify central repository access: Turn on checksum checking -->
-		<repository>
-			<id>central</id>
-			<name>Maven Repository Switchboard</name>
-			<layout>default</layout>
-			<url>https://repo1.maven.org/maven2</url>
+    <repository>
+      <id>central</id>
+      <name>Maven Repository Switchboard</name>
+      <layout>default</layout>
+      <url>https://repo1.maven.org/maven2</url>
 
-			<releases>
-				<enabled>true</enabled>
-				<checksumPolicy>fail</checksumPolicy>
-				<updatePolicy>never</updatePolicy>
-			</releases>
+      <releases>
+        <enabled>true</enabled>
+        <checksumPolicy>fail</checksumPolicy>
+        <updatePolicy>never</updatePolicy>
+      </releases>
 
-			<snapshots>
-				<enabled>false</enabled>
-			</snapshots>
-		</repository>
+      <snapshots>
+        <enabled>false</enabled>
+      </snapshots>
+    </repository>
+  </repositories>
 
-		<repository>
-			<id>apache.snapshots</id>
-			<url>https://repository.apache.org/content/repositories/snapshots</url>
-			<releases>
-				<enabled>false</enabled>
-			</releases>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-		</repository>
-	</repositories>
+  <properties>
+    <uniWueNoticeText>Portions of UIMA Ruta were originally developed by
+      the Universität Würzburg.
+      Copyright (c) 2006, 2011 Universität
+      Würzburg.</uniWueNoticeText>
+    <postNoticeText>${uniWueNoticeText}
 
-	<!-- Only for testing -->
-	<pluginRepositories>
-		<pluginRepository>
-			<id>apache.snapshots</id>
-			<url>https://repository.apache.org/content/repositories/snapshots/</url>
-			<releases>
-				<enabled>false</enabled>
-			</releases>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-		</pluginRepository>
-	</pluginRepositories>
+      This product contains icons
+      developed by Mark James
+      (http://www.famfamfam.com/lab/icons/silk/), licensed under the
+      Creative Commons Attribution 3.0 License.
+    </postNoticeText>
 
-	<properties>
-		<uniWueNoticeText>Portions of UIMA Ruta were originally developed by
-			the Universität Würzburg.
-			Copyright (c) 2006, 2011 Universität
-			Würzburg.</uniWueNoticeText>
-		<postNoticeText>${uniWueNoticeText}
+    <uimaVersion>3.4.0</uimaVersion>
+    <uimafit-version>3.4.0</uimafit-version>
+    <spring-version>5.3.25</spring-version>
+    <junit-version>4.13.2</junit-version>
+    <slf4j-version>1.7.36</slf4j-version>
 
-			This product contains icons
-			developed by Mark James
-			(http://www.famfamfam.com/lab/icons/silk/), licensed under the
-			Creative Commons Attribution 3.0 License.
-		</postNoticeText>
+    <antlr-version>3.5.3</antlr-version>
+    <htmlparser-version>1.6</htmlparser-version>
+    <commons-collections-version>3.2.2</commons-collections-version>
+    <commons-collections4-version>4.4</commons-collections4-version>
+    <commons-text-version>1.9</commons-text-version>
+    <commons-lang3-version>3.12.0</commons-lang3-version>
+    <commons-io-version>2.11.0</commons-io-version>
+    <commons-math3-version>3.6.1</commons-math3-version>
+    <commons-logging-version>1.1.1</commons-logging-version>
+    <commons-logging-api-version>1.1</commons-logging-api-version>
+    <caffeine-version>2.9.3</caffeine-version>
 
-		<uimaVersion>3.4.0</uimaVersion>
-		<uimafit-version>3.4.0</uimafit-version>
-		<spring-version>5.3.25</spring-version>
-		<junit-version>4.13.2</junit-version>
-		<slf4j-version>1.7.36</slf4j-version>
+    <api_check_oldVersion>3.2.0</api_check_oldVersion>
 
-		<antlr-version>3.5.3</antlr-version>
-		<htmlparser-version>1.6</htmlparser-version>
-		<commons-collections-version>3.2.2</commons-collections-version>
-		<commons-collections4-version>4.4</commons-collections4-version>
-		<commons-text-version>1.9</commons-text-version>
-		<commons-lang3-version>3.12.0</commons-lang3-version>
-		<commons-io-version>2.11.0</commons-io-version>
-		<commons-math3-version>3.6.1</commons-math3-version>
-		<commons-logging-version>1.1.1</commons-logging-version>
-		<commons-logging-api-version>1.1</commons-logging-api-version>
-		<caffeine-version>2.9.3</caffeine-version>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <maven.compiler.target>1.8</maven.compiler.target>
+    <maven.compiler.source>1.8</maven.compiler.source>
+  </properties>
 
-		<api_check_oldVersion>3.2.0</api_check_oldVersion>
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>org.antlr</groupId>
+        <artifactId>antlr-runtime</artifactId>
+        <version>${antlr-version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.htmlparser</groupId>
+        <artifactId>htmlparser</artifactId>
+        <version>${htmlparser-version}</version>
+      </dependency>
+      <dependency>
+        <groupId>commons-collections</groupId>
+        <artifactId>commons-collections</artifactId>
+        <version>${commons-collections-version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.commons</groupId>
+        <artifactId>commons-collections4</artifactId>
+        <version>${commons-collections4-version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.commons</groupId>
+        <artifactId>commons-text</artifactId>
+        <version>${commons-text-version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.commons</groupId>
+        <artifactId>commons-lang3</artifactId>
+        <version>${commons-lang3-version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.uima</groupId>
+        <artifactId>uimafit-core</artifactId>
+        <version>${uimafit-version}</version>
+      </dependency>
+      <dependency>
+        <groupId>commons-io</groupId>
+        <artifactId>commons-io</artifactId>
+        <version>${commons-io-version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.commons</groupId>
+        <artifactId>commons-math3</artifactId>
+        <version>${commons-math3-version}</version>
+      </dependency>
+      <dependency>
+        <groupId>commons-logging</groupId>
+        <artifactId>commons-logging</artifactId>
+        <version>${commons-logging-version}</version>
+      </dependency>
+      <dependency>
+        <groupId>commons-logging</groupId>
+        <artifactId>commons-logging-api</artifactId>
+        <version>${commons-logging-api-version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.springframework</groupId>
+        <artifactId>spring-core</artifactId>
+        <version>${spring-version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.springframework</groupId>
+        <artifactId>spring-context</artifactId>
+        <version>${spring-version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.springframework</groupId>
+        <artifactId>spring-expression</artifactId>
+        <version>${spring-version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.springframework</groupId>
+        <artifactId>spring-beans</artifactId>
+        <version>${spring-version}</version>
+      </dependency>
 
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<maven.compiler.target>1.8</maven.compiler.target>
-		<maven.compiler.source>1.8</maven.compiler.source>
-	</properties>
+      <dependency>
+        <groupId>com.github.ben-manes.caffeine</groupId>
+        <artifactId>caffeine</artifactId>
+        <version>${caffeine-version}</version>
+      </dependency>
 
-	<dependencyManagement>
-		<dependencies>
-			<dependency>
-				<groupId>org.antlr</groupId>
-				<artifactId>antlr-runtime</artifactId>
-				<version>${antlr-version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.htmlparser</groupId>
-				<artifactId>htmlparser</artifactId>
-				<version>${htmlparser-version}</version>
-			</dependency>
-			<dependency>
-				<groupId>commons-collections</groupId>
-				<artifactId>commons-collections</artifactId>
-				<version>${commons-collections-version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.commons</groupId>
-				<artifactId>commons-collections4</artifactId>
-				<version>${commons-collections4-version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.commons</groupId>
-				<artifactId>commons-text</artifactId>
-				<version>${commons-text-version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.commons</groupId>
-				<artifactId>commons-lang3</artifactId>
-				<version>${commons-lang3-version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.uima</groupId>
-				<artifactId>uimafit-core</artifactId>
-				<version>${uimafit-version}</version>
-			</dependency>
-			<dependency>
-				<groupId>commons-io</groupId>
-				<artifactId>commons-io</artifactId>
-				<version>${commons-io-version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.commons</groupId>
-				<artifactId>commons-math3</artifactId>
-				<version>${commons-math3-version}</version>
-			</dependency>
-			<dependency>
-				<groupId>commons-logging</groupId>
-				<artifactId>commons-logging</artifactId>
-				<version>${commons-logging-version}</version>
-			</dependency>
-			<dependency>
-				<groupId>commons-logging</groupId>
-				<artifactId>commons-logging-api</artifactId>
-				<version>${commons-logging-api-version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework</groupId>
-				<artifactId>spring-core</artifactId>
-				<version>${spring-version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework</groupId>
-				<artifactId>spring-context</artifactId>
-				<version>${spring-version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework</groupId>
-				<artifactId>spring-expression</artifactId>
-				<version>${spring-version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework</groupId>
-				<artifactId>spring-beans</artifactId>
-				<version>${spring-version}</version>
-			</dependency>
+      <dependency>
+        <groupId>junit</groupId>
+        <artifactId>junit</artifactId>
+        <version>${junit-version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.slf4j</groupId>
+        <artifactId>slf4j-jdk14</artifactId>
+        <version>${slf4j-version}</version>
+        <scope>test</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
 
-			<dependency>
-				<groupId>com.github.ben-manes.caffeine</groupId>
-				<artifactId>caffeine</artifactId>
-				<version>${caffeine-version}</version>
-			</dependency>
+  <build>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>org.apache.uima</groupId>
+          <artifactId>uima-build-helper-maven-plugin</artifactId>
+          <version>7</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-compiler-plugin</artifactId>
+          <configuration>
+            <source>${maven.compiler.source}</source>
+            <target>${maven.compiler.target}</target>
+          </configuration>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-javadoc-plugin</artifactId>
+          <executions>
+            <execution>
+              <id>attach-javadocs</id>
+              <configuration>
+                <source>${maven.compiler.source}</source>
+              </configuration>
+            </execution>
+          </executions>
+          <configuration>
+            <source>${maven.compiler.source}</source>
+          </configuration>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-toolchains-plugin</artifactId>
+        <executions>
+          <execution>
+            <goals>
+              <goal>toolchain</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <toolchains>
+            <jdk>
+              <version>${maven.compiler.target}</version>
+            </jdk>
+          </toolchains>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-resources-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>copy customized bin LICENSE file</id>
+            <phase>prepare-package</phase>
+            <goals>
+              <goal>copy-resources</goal>
+            </goals>
+            <configuration>
+              <outputDirectory>${project.build.directory}/classes/META-INF</outputDirectory>
+              <resources>
+                <resource>
+                  <directory>src/main/readme_bin</directory>
+                  <includes>
+                    <include>LICENSE</include>
+                    <include>NOTICE</include>
+                  </includes>
+                  <filtering>true</filtering>
+                </resource>
+              </resources>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
 
-			<dependency>
-				<groupId>junit</groupId>
-				<artifactId>junit</artifactId>
-				<version>${junit-version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.slf4j</groupId>
-				<artifactId>slf4j-jdk14</artifactId>
-				<version>${slf4j-version}</version>
-				<scope>test</scope>
-			</dependency>
-		</dependencies>
-	</dependencyManagement>
-
-	<build>
-		<pluginManagement>
-			<plugins>
-				<plugin>
-					<groupId>org.apache.uima</groupId>
-					<artifactId>uima-build-helper-maven-plugin</artifactId>
-					<version>7</version>
-				</plugin>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-compiler-plugin</artifactId>
-					<configuration>
-						<source>${maven.compiler.source}</source>
-						<target>${maven.compiler.target}</target>
-					</configuration>
-				</plugin>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-javadoc-plugin</artifactId>
-					<executions>
-						<execution>
-							<id>attach-javadocs</id>
-							<configuration>
-								<source>${maven.compiler.source}</source>
-							</configuration>
-						</execution>
-					</executions>
-					<configuration>
-						<source>${maven.compiler.source}</source>
-					</configuration>
-				</plugin>
-			</plugins>
-		</pluginManagement>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-toolchains-plugin</artifactId>
-				<executions>
-					<execution>
-						<goals>
-							<goal>toolchain</goal>
-						</goals>
-					</execution>
-				</executions>
-				<configuration>
-					<toolchains>
-						<jdk>
-							<version>${maven.compiler.target}</version>
-						</jdk>
-					</toolchains>
-				</configuration>
-			</plugin>
-			<plugin>
-				<artifactId>maven-resources-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>copy customized bin LICENSE file</id>
-						<phase>prepare-package</phase>
-						<goals>
-							<goal>copy-resources</goal>
-						</goals>
-						<configuration>
-							<outputDirectory>${project.build.directory}/classes/META-INF</outputDirectory>
-							<resources>
-								<resource>
-									<directory>src/main/readme_bin</directory>
-									<includes>
-										<include>LICENSE</include>
-										<include>NOTICE</include>
-									</includes>
-									<filtering>true</filtering>
-								</resource>
-							</resources>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
-
-	<profiles>
-		<profile>
-			<id>spotbugs</id>
-			<build>
-				<pluginManagement>
-					<plugins>
-						<plugin>
-							<groupId>com.github.spotbugs</groupId>
-							<artifactId>spotbugs-maven-plugin</artifactId>
-							<version>4.7.0.0</version>
-						</plugin>
-					</plugins>
-				</pluginManagement>
-			</build>
-		</profile>
-	</profiles>
+  <profiles>
+    <profile>
+      <id>spotbugs</id>
+      <build>
+        <pluginManagement>
+          <plugins>
+            <plugin>
+              <groupId>com.github.spotbugs</groupId>
+              <artifactId>spotbugs-maven-plugin</artifactId>
+              <version>4.7.0.0</version>
+            </plugin>
+          </plugins>
+        </pluginManagement>
+      </build>
+    </profile>
+  </profiles>
 </project>