This is an automated email from the ASF dual-hosted git repository.

piergiorgio pushed a commit to branch CONNECTORS-1779
in repository https://gitbox.apache.org/repos/asf/manifoldcf.git

commit 1ab621d9a6975fa2ea2a66a294753ebaaf995f95
Merge: f44b0c80d 2bad4da5f
Author: Piergiorgio Lucidi <[email protected]>
AuthorDate: Mon Mar 16 15:24:15 2026 +0100

    Merge branch 'trunk' into CONNECTORS-1779

 CHANGES.txt                                                       | 8 +++++++-
 .../crawler/reprioritizationtracker/ReprioritizationTracker.java  | 2 +-
 pom.xml                                                           | 2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --cc CHANGES.txt
index 6d1194248,539859ee2..3a928a70a
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,23 -1,14 +1,29 @@@
  ManifoldCF Change Log
  
 -======================= Release 2.30-dev ======================
 +======================= 2.30-dev =========================
 +
 +CONNECTORS-1782: Upgrade Nuxeo Java Client to version 3.2.0
 +(Piergiorgio Lucidi)
 +
 +CONNECTORS-1781: Possible NullPointerException on rollbackCurrentTransaction 
for MySQL/MariaDB
 +(Markus Schuch, Piergiorgio Lucidi)
 +
 +CONNECTORS-1779: Upgrade to OpenJDK 21
 +(Piergiorgio Lucidi)
 +
 +CONNECTORS-1778: Error: Repeated service interruptions - failure processing 
document: The target server failed to respond
 +(Piergiorgio Lucidi)
 +
 +CONNECTORS-1720: Fatal Error due to NPE in RepriorizationTracker
 +(Markus Schuch)
  
- ======================= Release 2.29 =========================
+ CONNECTORS-1720: Armor equals method in RepriorizationTracker against null 
bin names
+ (Markus Schuch)
+ 
+ CONNECTORS-1780: Align JNA version defined in maven POM to the verison 
defined in build.xml
+ (Markus Schuch)
+ 
+ ======================= Release 2.29 ==========================
  
  CONNECTORS-1776: Update Copyright footer to 2025
  (Piergiorgio Lucidi)
diff --cc pom.xml
index 2a55b732e,5f30c365f..f5942b7ce
--- a/pom.xml
+++ b/pom.xml
@@@ -91,12 -87,11 +91,12 @@@
      <tika.version>1.28.1</tika.version>
      <boilerpipe.version>1.1.0</boilerpipe.version>
      <hadoop.version>3.3.6</hadoop.version>
 -    <tomcat.version>6.0.35</tomcat.version>
 -    <ecj.version>4.3.1</ecj.version>
 +    <tomcat.version>10.1.25</tomcat.version>
 +    <ecj.version>3.39.0</ecj.version>
 +    <asm.version>9.7</asm.version>
      <json-simple.version>1.1.1</json-simple.version>
      <commons-exec.version>1.3</commons-exec.version>
-     <jna.version>4.1.0</jna.version>
+     <jna.version>5.10.0</jna.version>
      <gson.version>2.8.0</gson.version>
      <guava.version>21.0</guava.version>
      <jsoup.version>1.7.2</jsoup.version>

Reply via email to