Merge trackjdk/REL1_6_STABLE/jdk22bld into REL1_6_STABLE

Merges PR #479.
tada · Mar 27, 2024 · 9b7d010 · 9b7d010
2 parents e4f91ab + 3816e9f
commit 9b7d010
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 50 deletions.
diff --git a/pljava-api/src/main/java/org/postgresql/pljava/annotation/processing/DDRProcessor.java b/pljava-api/src/main/java/org/postgresql/pljava/annotation/processing/DDRProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004-2023 Tada AB and other contributors, as listed below.
+ * Copyright (c) 2004-2024 Tada AB and other contributors, as listed below.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the The BSD 3-Clause License
@@ -173,7 +173,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 = 21;
+		int latest_tested = 22;
 		int ordinal_9 = SourceVersion.RELEASE_9.ordinal();
 		int ordinal_latest = latest_tested - 9 + ordinal_9;
 

diff --git a/pljava-pgxs/pom.xml b/pljava-pgxs/pom.xml
@@ -40,20 +40,15 @@
 
 	<profiles>
 		<profile>
-			<id>nashorngone</id>
+			<id>nashornmod</id>
 			<activation>
 				<jdk>[15,)</jdk>
 			</activation>
 			<dependencies>
 				<dependency>
-					<groupId>org.graalvm.js</groupId>
-					<artifactId>js</artifactId>
-					<version>20.1.0</version>
-				</dependency>
-				<dependency>
-					<groupId>org.graalvm.js</groupId>
-					<artifactId>js-scriptengine</artifactId>
-					<version>20.1.0</version>
+					<groupId>org.openjdk.nashorn</groupId>
+					<artifactId>nashorn-core</artifactId>
+					<version>15.4</version>
 				</dependency>
 			</dependencies>
 		</profile>

diff --git a/pljava-so/src/main/c/Backend.c b/pljava-so/src/main/c/Backend.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004-2023 Tada AB and other contributors, as listed below.
+ * Copyright (c) 2004-2024 Tada AB and other contributors, as listed below.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the The BSD 3-Clause License
@@ -1941,10 +1941,10 @@ void Backend_warnJEP411(bool isCommit)
 			"Java features that will be phased out in future Java versions. "
 			"Those changes will come in releases after Java 17."),
 		errhint(
-			"For migration planning, Java versions up to and including 17 "
-			"remain fully usable with this version of PL/Java, and Java 17 "
-			"is positioned as a long-term support release. For details on "
-			"how PL/Java will adapt, please bookmark "
+			"For migration planning, this version of PL/Java can still "
+			"enforce policy in Java versions up to and including 22, "
+			"and Java 17 and 21 are positioned as long-term support releases. "
+			"For details on how PL/Java will adapt, please bookmark "
 			"https://github.com/tada/pljava/wiki/JEP-411")
 	));
 }

diff --git a/pom.xml b/pom.xml
@@ -70,45 +70,20 @@
 
 	<profiles>
 		<profile>
-			<id>nashorngone</id>
+			<id>nashornmod</id>
 			<activation>
 				<jdk>[15,)</jdk>
 			</activation>
 			<build>
 				<plugins>
-					<plugin>
-						<groupId>org.codehaus.mojo</groupId>
-						<artifactId>properties-maven-plugin</artifactId>
-						<version>1.0.0</version>
-						<executions>
-							<execution>
-								<phase>initialize</phase>
-								<goals>
-									<goal>set-system-properties</goal>
-								</goals>
-								<configuration>
-									<properties>
-										<polyglot.js.nashorn-compat>
-											true
-										</polyglot.js.nashorn-compat>
-									</properties>
-								</configuration>
-							</execution>
-						</executions>
-					</plugin>
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-antrun-plugin</artifactId>
 						<dependencies>
 							<dependency>
-								<groupId>org.graalvm.js</groupId>
-								<artifactId>js</artifactId>
-								<version>20.1.0</version>
-							</dependency>
-							<dependency>
-								<groupId>org.graalvm.js</groupId>
-								<artifactId>js-scriptengine</artifactId>
-								<version>20.1.0</version>
+								<groupId>org.openjdk.nashorn</groupId>
+								<artifactId>nashorn-core</artifactId>
+								<version>15.4</version>
 							</dependency>
 						</dependencies>
 					</plugin>

diff --git a/src/site/markdown/use/policy.md b/src/site/markdown/use/policy.md
@@ -372,11 +372,16 @@ release, so relying on it is not recommended.
 
 The developers of Java have elected to phase out important language features
 used by PL/Java to enforce policy. The changes will come in releases after
-Java 17. For migration planning, Java versions up to and including 17
-remain fully usable with this version of PL/Java, and Java 17
-is positioned as a long-term support release. For details on
-how PL/Java will adapt, please bookmark [the JEP 411 topic][jep411]
-on the PL/Java wiki.
+Java 17. For migration planning, this version of PL/Java can still enable
+policy enforcement in Java versions up to and including 22, and Java 17 and 21
+are positioned as long-term support releases. (There is a likelihood,
+increasing with later Java versions, even before policy stops being enforceable,
+that some internal privileged operations by Java itself, or other libraries,
+will cease to work transparently, and may have to be manually added to a site's
+PL/Java policy.)
+
+For details on how PL/Java will adapt, please bookmark
+[the JEP 411 topic][jep411] on the PL/Java wiki.
 
 
 [pfsyn]: https://docs.oracle.com/en/java/javase/14/security/permissions-jdk1.html#GUID-7942E6F8-8AAB-4404-9FE9-E08DD6FFCFFA