Merge REL1_6_STABLE into master

Author: jcflack

pljava-api/src/main/java/org/postgresql/pljava/annotation/processing/DDRProcessor.java

@@ -62,7 +62,7 @@ public SourceVersion getSupportedSourceVersion()
 		 * Update latest_tested to be the latest Java release on which this
 		 * annotation processor has been tested without problems.
 		 */
-		int latest_tested = 24;
+		int latest_tested = 25;
 		int ordinal_9 = SourceVersion.RELEASE_9.ordinal();
 		int ordinal_latest = latest_tested - 9 + ordinal_9;
 

pljava-packaging/build.xml

@@ -255,6 +255,10 @@ jos.close();
 			     simple update is possible, just repeat the next entry, with
 				 the from-version changed.
 			  -->
+			<utf8 dir="target/classes" includes="pljava--.sql"
+				fullpath=
+			"pljava/sharedir/pljava/pljava--1.6.10--${project.version}.sql"
+			/>
 			<utf8 dir="target/classes" includes="pljava--.sql"
 				fullpath=
 			"pljava/sharedir/pljava/pljava--1.6.9--${project.version}.sql"

pljava/src/main/java/org/postgresql/pljava/internal/InstallHelper.java

@@ -986,6 +986,7 @@ void migrateFrom( SchemaVariant sv, Connection c, Statement s)
 		UNREL20040120  ("5e4131738cd095b7ff6367d64f809f6cec6a7ba7"),
 		EMPTY          (null);
 
+		static final SchemaVariant REL_1_6_10      = REL_1_6_0;
 		static final SchemaVariant REL_1_6_9       = REL_1_6_0;
 		static final SchemaVariant REL_1_6_8       = REL_1_6_0;
 		static final SchemaVariant REL_1_6_7       = REL_1_6_0;

src/site/markdown/build/versions.md

@@ -1,6 +1,6 @@
 # Versions of external packages needed to build and use PL/Java
 
-As of spring 2025, the following version constraints are known.
+As of fall 2025, the following version constraints are known.
 
 ## Java
 
@@ -76,6 +76,6 @@ The PL/Java 1.6 series does not support PostgreSQL earlier than 9.5.
 More current PostgreSQL versions, naturally, are the focus of development
 and receive more attention in testing.
 
-PL/Java 1.6.9 has been successfully built and run on at least one platform
-with PostgreSQL versions from 17 to 9.5, the latest maintenance
+PL/Java 1.6.10 has been successfully built and run on at least one platform
+with PostgreSQL versions from 18 to 9.5, the latest maintenance
 release for each.

src/site/markdown/releasenotes.md.vm

@@ -10,6 +10,78 @@
 #set($ghbug = 'https://github.com/tada/pljava/issues/')
 #set($ghpull = 'https://github.com/tada/pljava/pull/')
 
+$h2 PL/Java 1.6.10
+
+This is the tenth minor update in the PL/Java 1.6 series. It adds support
+for building and running with Java 25 and with PostgreSQL 18, and improvements
+to exception handling and logging that should be helpful in debugging the common
+developer mistake of catching a PostgreSQL exception and proceeding without
+rolling back to a prior savepoint. Further information on the changes
+may be found below.
+
+When run on Java 24 or later, there is no security policy enforcement; please
+review the release notes below for PL/Java 1.6.9 for more detail on that.
+
+$h3 Version compatibility
+
+PL/Java 1.6.10 can be built against recent PostgreSQL versions including 18, and
+older ones back to 9.5, using Java SE 9 or later. The Java version used at
+runtime does not have to be the same version used for building. PL/Java itself
+can run on any Java version 9 or later, but for security policy enforcement the
+runtime Java version must be 23 or earlier. PL/Java functions can be
+written for, and use features of, whatever Java version will be loaded at run
+time. See [version compatibility][versions] for more detail.
+
+$h3 Changes
+
+$h4 Runtime
+
+$h5 Exception-handling and logging improvements for mishandled exceptions
+
+When a PL/Java function calls back into PostgreSQL, an exception may be thrown.
+At that point, there are two things a PL/Java function may legitimately do:
+it may re-throw the exception (or throw some other exception), so that the
+PL/Java function returns exceptionally and PostgreSQL cleans up the transaction,
+or it may roll back to a savepoint that was established before the exception was
+thrown, and then proceed and return non-exceptionally. To catch such an
+exception and simply proceed, without rolling back to a prior savepoint, is
+a common new-developer mistake.
+
+In past PL/Java versions, the troubleshooting for such a common mistake was
+uncommonly difficult, because the mishandling might not be detected until
+PL/Java made some later, even quite unrelated, call back into PostgreSQL, and
+the exception thrown at that point might have no connection to the original
+exception that was mishandled.
+
+PL/Java 1.6.10 adds new exception-handling and logging behavior that should
+greatly simplify debugging such common mistakes. Details are in the new
+documentation section [Catching PostgreSQL exceptions in Java][catch].
+
+[catch]: use/catch.html
+
+$h3 Bugs fixed
+
+* [ClassNotFoundException using PL/Java 1.6.8 on Postgres 17.2](${ghbug}523)
+* [support for PostgreSQL 18](${ghbug}524)
+* [SQL generator may use non-reproducible order in rare cases](${ghbug}527)
+
+$h3 Credits
+
+Thanks to Achilleas Mantzios for starting on the PostgreSQL 18 changes, `daddeo`
+for making the case to improve the treatment and logging of mishandled
+exceptions.
+
+$h2 Earlier releases
+
+## A nice thing about using Velocity is that each release can be entered at
+## birth using h2 as its main heading, h3 and below within ... and then, when
+## it is moved under 'earlier releases', just define those variables to be
+## one heading level finer. Here goes:
+#set($h2 = '###')
+#set($h3 = '####')
+#set($h4 = '#####')
+#set($h5 = '######')
+
 $h2 PL/Java 1.6.9
 
 This is the ninth minor update in the PL/Java 1.6 series. It adds support
@@ -135,17 +207,6 @@ document debugging arrangements and Java stack traces.
 [nopolicy]: use/unenforced.html
 [variables]: use/variables.html
 
-$h2 Earlier releases
-
-## A nice thing about using Velocity is that each release can be entered at
-## birth using h2 as its main heading, h3 and below within ... and then, when
-## it is moved under 'earlier releases', just define those variables to be
-## one heading level finer. Here goes:
-#set($h2 = '###')
-#set($h3 = '####')
-#set($h4 = '#####')
-#set($h5 = '######')
-
 $h2 PL/Java 1.6.8 (19 October 2024)
 
 This is the eighth minor update in the PL/Java 1.6 series. It adds support