Merge branch 'main' into refactoring/UIMA-6436-Move-maintainer-docume…

…ntation-from-website-into-maintainer-guide * main: No issue: Remove Jira line from PR template - we do not use Jira anymore. #270 - Update dependencies #270 - Update dependencies #267 - UIMA Log4jLogger_impl not compatible with log4j 2.18.0+ No issue. Adjust jira legacy module version. [maven-release-plugin] prepare for next development iteration [maven-release-plugin] prepare release uimaj-3.3.1 Issue #258: Apache UIMA Java SDK 3.3.1 release Issue #258: Apache UIMA Java SDK 3.3.1 release Issue #258: Apache UIMA Java SDK 3.3.1 release Issue #260: Issues-fixed report for GitHub and Jira Issue #258: Apache UIMA Java SDK 3.3.1 release Issue #258: Apache UIMA Java SDK 3.3.1 release Issue #258: Apache UIMA Java SDK 3.3.1 release
apache · Jan 11, 2023 · 4f4367d · 4f4367d
2 parents 90562ad + 57bc1bb
commit 4f4367d
Show file tree

Hide file tree

Showing 7 changed files with 144 additions and 55 deletions.
diff --git 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
@@ -44,7 +44,7 @@ to your project:
 <dependency>
   <groupId>org.apache.uima</groupId>
   <artifactId>uimaj-core</artifactId>
-  <version>3.3.0</version>
+  <version>3.3.1</version>
 </dependency>
 ```
 
@@ -55,7 +55,7 @@ Apache uimaFIT is a separate dependency that you can add:
 <dependency>
   <groupId>org.apache.uima</groupId>
   <artifactId>uimafit-core</artifactId>
-  <version>3.3.0</version>
+  <version>3.3.1</version>
 </dependency>
 ```
 

diff --git 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.
 
 ## <a id="major.changes">Notable changes in this release</a>
 
-* [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.
-
-## <a id="list.issues">Full list of JIRA Issues affecting this Release</a>
-
-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)]
 
 ## <a id="get.involved">How to Get Involved</a>
 
@@ -111,5 +87,5 @@ help, source code and feedback. If you are interested in contributing, please vi
 
 ## <a id="report.issues">How to Report Issues</a>
 
-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).
+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).
diff --git a/pom.xml b/pom.xml
@@ -189,6 +189,7 @@
   <modules>
     <module>uimaj-parent</module>
     <module>aggregate-uimaj</module>
+    <module>uimaj-legacy-jira-report</module>
   </modules>
 
   <build>
@@ -335,6 +336,24 @@
 
       <build>
         <plugins>
+          <plugin>
+            <artifactId>maven-changes-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>default-cli</id>
+                <phase>generate-resources</phase>
+                <goals>
+                  <goal>github-report</goal>
+                </goals>
+                <configuration>
+                  <columnNames>Type,Id,Status,Summary</columnNames>
+                  <onlyCurrentVersion>true</onlyCurrentVersion>
+                  <githubAPIScheme>https</githubAPIScheme>
+                  <githubAPIPort>443</githubAPIPort>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-antrun-plugin</artifactId>

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
@@ -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
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one
+   or more contributor license agreements.  See the NOTICE file
+   distributed with this work for additional information
+   regarding copyright ownership.  The ASF licenses this file
+   to you under the Apache License, Version 2.0 (the
+   "License"); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing,
+   software distributed under the License is distributed on an
+   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+   KIND, either express or implied.  See the License for the
+   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>
+
+  <parent>
+    <groupId>org.apache.uima</groupId>
+    <artifactId>uimaj-parent</artifactId>
+    <version>3.4.0-SNAPSHOT</version>
+    <relativePath>../uimaj-parent/pom.xml</relativePath>
+  </parent>
+
+  <artifactId>uimaj-legacy-jira-report</artifactId>
+  <packaging>pom</packaging>
+
+  <properties>
+    <jiraVersion>3.4.0SDK</jiraVersion>
+    <maven.deploy.skip>true</maven.deploy.skip>
+  </properties>
+
+  <issueManagement>
+    <system>Jira</system>
+    <url>https://issues.apache.org/jira/browse/UIMA</url>
+  </issueManagement>
+
+  <profiles>
+    <profile>
+      <id>apache-release</id>
+      <build>
+        <!-- Run jira report -->
+        <!-- depends on having -DjiraVersion set -->
+        <plugins>
+          <plugin>
+            <artifactId>maven-changes-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>default-cli</id>
+                <phase>generate-resources</phase>
+                <goals>
+                  <goal>jira-report</goal>
+                </goals>
+                <configuration>
+                  <columnNames>Type,Key,Status,Summary</columnNames>
+                  <outputDirectory>${project.basedir}/../issuesFixed</outputDirectory>
+                  <fixVersionIds>${jiraVersion}</fixVersionIds>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+</project>
diff --git a/uimaj-parent/pom.xml b/uimaj-parent/pom.xml
@@ -44,6 +44,11 @@
   <description>The common parent pom for the UIMA Java SDK</description>
   <url>${uimaWebsiteUrl}</url>
 
+  <issueManagement>
+    <system>Github</system>
+    <url>https://github.com/apache/uima-uimaj/issues</url>
+  </issueManagement>
+
   <scm>
     <tag>uimaj-3.2.0</tag>
     <connection>scm:git:https://github.com/apache/uima-uimaj/</connection>
@@ -137,18 +142,19 @@
      properties already, they should be injected manually into the plugins. 
     -->
     <slf4j-version>1.7.36</slf4j-version>
-    <log4j-version>2.17.1</log4j-version>
+    <log4j-version>2.19.0</log4j-version>
     <jackson-version>2.13.1</jackson-version>
-    <junit-version>5.8.2</junit-version>
-    <assertj-version>3.22.0</assertj-version>
+    <junit-version>5.9.1</junit-version>
+    <assertj-version>3.23.1</assertj-version>
     <xmlunit-version>2.9.0</xmlunit-version>
+    <maven.version>3.2.5</maven.version>
 
     <maven.compiler.target>1.8</maven.compiler.target>
     <maven.compiler.source>1.8</maven.compiler.source>
 
     <eclipseP2RepoId>org.eclipse.p2.201812</eclipseP2RepoId>
 
-    <api_check_oldVersion>3.2.0</api_check_oldVersion>
+    <api_check_oldVersion>3.3.0</api_check_oldVersion>
   </properties>
 
   <dependencyManagement>
@@ -299,7 +305,7 @@
       <plugin>
         <groupId>org.openntf.maven</groupId>
         <artifactId>p2-layout-resolver</artifactId>
-        <version>1.3.0</version>
+        <version>1.5.0</version>
         <extensions>true</extensions>
       </plugin>