diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index b2e525db29..f436f61bdb 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,5 +1,3 @@
-**JIRA Ticket:** https://issues.apache.org/jira/browse/UIMA-XXXX
-
**What's in the PR**
* ...
diff --git a/README.md b/README.md
index 62f31d201c..15992bffc6 100644
--- a/README.md
+++ b/README.md
@@ -44,7 +44,7 @@ to your project:
org.apache.uima
uimaj-core
- 3.3.0
+ 3.3.1
```
@@ -55,7 +55,7 @@ Apache uimaFIT is a separate dependency that you can add:
org.apache.uima
uimafit-core
- 3.3.0
+ 3.3.1
```
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 5d8004091d..6f1c63848c 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -19,7 +19,7 @@
***************************************************************
-->
-# Apache UIMA (Unstructured Information Management Architecture) v3.3.0 Release Notes
+# Apache UIMA (Unstructured Information Management Architecture) v3.3.1 Release Notes
## Contents
@@ -55,53 +55,29 @@ with some support for Perl, Python and TCL.
## Notable changes in this release
-* [UIMA-6418] Added support for component parameters of type "long" and "double"
-* [UIMA-6358] Added platform-independent methods for setting the datapath in a resource manager
-* [UIMA-6374] Added an extensive CAS (de)serialization test suit
-* [UIMA-6431] Added support for using lambda functions as CAS processors
-* [UIMA-6412] Changed CPMEngine from using a thread group to using an executor service
-* [UIMA-6389] Fixed exceptions being swallowed when using Log4J2 through its SLF4J API
-* [UIMA-6386] Fixed wrong UIMA session being set on the ConfigurationManager in aggregates
-* [UIMA-6390] Fixed NPE when trying to access config names of fresh context
-* [UIMA-6378] Fixed build on Java 16
-* [UIMA-6393] Fixed circular imports in descriptors breaking the resource manager cache
-* [UIMA-6367] Fixed JCas cover annotation created in PEAR context being replaced by index operations
-* [UIMA-6388] Fixed CAS.select(null) returning all annotations instead of throwing an exception
-* [UIMA-6423] Fixed selecting a non-existing type returning all types instead of throwing an exception
-* [UIMA-6421] Fixed range check when injecting a String value into StringArray slot to throw an exception
-* [UIMA-6400] Fixed leaking ThreadLocal in UimaContextHolder
-* [UIMA-6398] Fixed memory leak in UIMA loggers and loggers using the wrong classloader for i18n messages
-* [UIMA-6413] Fixed memory leak in FSClassRegistry
-* [UIMA-6377] Fixed spurious multipleReferencesAllowed warning when serializing empty arrays
-* [UIMA-6372] Upgraded to JUnit 5
-* [UIMA-6373] Format UIMA Core Java SDK codebase
+This is a bug fix release.
-### API changes
+**Bugs fixed**
+* 🦟 Issue #255: File handle leak accessing performanceTuning.properties
+* 🦟 Issue #240: Helper annotation created by SelectFS should not survive
+* 🦟 Issue #238: Form 6 serializes non-reachable FSes but should not
+* 🦟 Issue #235: Misleading error message when JCas type is not registered
+* 🦟 [UIMA-6479] PearPackagingMavenPlugin has ancient JUnit dependency
+* 🦟 [UIMA-6473] CasToComparableText is broken
-#### SelectFS API with null or non-existing types
+**Improvements**
+* ⭐️ Issue #222: Support comparing test files irrespective of line endings
+* ⭐️ [UIMA-6480] Add tests with empty arrays to CAS de/ser-suite
-When providing `null` or as a type or an non-existing type to a `select` call, then an exception is
-is thrown. Previously, all annotations were returned instead. To explicitly select any type, use
-the new `anyType()` instead of calling `type(null)`.
+**Refactoring**
+* ⚙️ [UIMA-6454] Update dependencies
+* ⚙️ [UIMA-6463] Use toolchains to ensure compatibility with Java 1.8
+* ⚙️ [UIMA-6469] Cleaning up file handling code
-#### ResourceManager datapath methods
+For a full list of issues affecting this release, please see:
-The methods `getDataPath()` and `setDataPath(String)` which were accepting/returning paths using
-platform-specific path separators have been deprepcated. Instead, use the new
-`setDataPathElements(File/String...)` and `getDataPathElements()` methods.
-
-#### JUnit upgrade
-
-The JUnit module has been upgraded from JUnit 4 to JUnit 5 along with the rest of the test code
-switching to JUnit 5. If you use the unit test helpers from this module, you also have to upgrade
-your tests to JUnit 5.
-
-## Full list of JIRA Issues affecting this Release
-
-Click [issuesFixed/jira-report.hmtl](issuesFixed/jira-report.html) for the list of issues affecting
-this release.
-
-Please use the mailing lists ( http://uima.apache.org/mail-lists.html ) for feedback.
+* [GitHub issues](issuesFixed/github-report.html) [[online](https://github.com/apache/uima-uimaj/issues?q=milestone%3A3.3.1)]
+* [Jira issues (legacy)](issuesFixed/jira-report.html) [[online](https://issues.apache.org/jira/issues/?jql=project%20%3D%20UIMA%20AND%20fixVersion%20%3D%203.3.1SDK)]
## How to Get Involved
@@ -111,5 +87,5 @@ help, source code and feedback. If you are interested in contributing, please vi
## How to Report Issues
-The Apache UIMA project uses JIRA for issue tracking. Please report any issues you find at
-[http://issues.apache.org/jira/browse/uima](http://issues.apache.org/jira/browse/uima).
\ No newline at end of file
+The Apache UIMA project uses GitHub for issue tracking. Please report any issues you find at
+[https://github.com/apache/uima-uimaj/issues](https://github.com/apache/uima-uimaj/issues).
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 3f65aae5c3..950dca8824 100644
--- a/pom.xml
+++ b/pom.xml
@@ -189,6 +189,7 @@
uimaj-parent
aggregate-uimaj
+ uimaj-legacy-jira-report
@@ -335,6 +336,24 @@
+
+ maven-changes-plugin
+
+
+ default-cli
+ generate-resources
+
+ github-report
+
+
+ Type,Id,Status,Summary
+ true
+ https
+ 443
+
+
+
+
org.apache.maven.plugins
maven-antrun-plugin
diff --git a/uimaj-core/src/main/java/org/apache/uima/util/impl/Log4jLogger_impl.java b/uimaj-core/src/main/java/org/apache/uima/util/impl/Log4jLogger_impl.java
index 1881df81ad..7b6dd09c03 100644
--- a/uimaj-core/src/main/java/org/apache/uima/util/impl/Log4jLogger_impl.java
+++ b/uimaj-core/src/main/java/org/apache/uima/util/impl/Log4jLogger_impl.java
@@ -18,6 +18,7 @@
*/
package org.apache.uima.util.impl;
+import java.lang.reflect.Field;
import java.text.MessageFormat;
import org.apache.logging.log4j.LogManager;
@@ -241,7 +242,23 @@ static org.apache.logging.log4j.Level getLog4jLevel(Level level) {
}
private static org.apache.logging.log4j.Marker m(Marker m) {
- return (m == null) ? null : ((org.apache.logging.slf4j.Log4jMarker) m).getLog4jMarker();
+ if (m == null) {
+ return null;
+ }
+
+ Field markerField = null;
+ try {
+ markerField = m.getClass().getDeclaredField("marker");
+ markerField.setAccessible(true);
+ return (org.apache.logging.log4j.Marker) markerField.get(m);
+ } catch (Exception e) {
+ // Well, best effort...
+ return null;
+ } finally {
+ if (markerField != null) {
+ markerField.setAccessible(false);
+ }
+ }
}
/*
diff --git a/uimaj-legacy-jira-report/pom.xml b/uimaj-legacy-jira-report/pom.xml
new file mode 100644
index 0000000000..c04be281fd
--- /dev/null
+++ b/uimaj-legacy-jira-report/pom.xml
@@ -0,0 +1,73 @@
+
+
+
+ 4.0.0
+
+
+ org.apache.uima
+ uimaj-parent
+ 3.4.0-SNAPSHOT
+ ../uimaj-parent/pom.xml
+
+
+ uimaj-legacy-jira-report
+ pom
+
+
+ 3.4.0SDK
+ true
+
+
+
+ Jira
+ https://issues.apache.org/jira/browse/UIMA
+
+
+
+
+ apache-release
+
+
+
+
+
+ maven-changes-plugin
+
+
+ default-cli
+ generate-resources
+
+ jira-report
+
+
+ Type,Key,Status,Summary
+ ${project.basedir}/../issuesFixed
+ ${jiraVersion}
+
+
+
+
+
+
+
+
+
diff --git a/uimaj-parent/pom.xml b/uimaj-parent/pom.xml
index 85eba4e09b..7d8982ee82 100644
--- a/uimaj-parent/pom.xml
+++ b/uimaj-parent/pom.xml
@@ -44,6 +44,11 @@
The common parent pom for the UIMA Java SDK
${uimaWebsiteUrl}
+
+ Github
+ https://github.com/apache/uima-uimaj/issues
+
+
uimaj-3.2.0
scm:git:https://github.com/apache/uima-uimaj/
@@ -137,18 +142,19 @@
properties already, they should be injected manually into the plugins.
-->
1.7.36
- 2.17.1
+ 2.19.0
2.13.1
- 5.8.2
- 3.22.0
+ 5.9.1
+ 3.23.1
2.9.0
+ 3.2.5
1.8
1.8
org.eclipse.p2.201812
- 3.2.0
+ 3.3.0
@@ -299,7 +305,7 @@
org.openntf.maven
p2-layout-resolver
- 1.3.0
+ 1.5.0
true