Scripts: ECMAScript

- Nashorn is now included in the UniTime distribution - starting with Java 15, ECMAScript has been removed from JDK
UniTime · Nov 26, 2024 · 8e7e6f2 · 8e7e6f2
1 parent 1f93ca7
commit 8e7e6f2
Show file tree

Hide file tree

Showing 13 changed files with 53 additions and 2 deletions.
diff --git a/3rd_party/sources/asm-analysis-9.7.1-sources.jar b/3rd_party/sources/asm-analysis-9.7.1-sources.jar
diff --git a/3rd_party/sources/asm-commons-9.7.1-sources.jar b/3rd_party/sources/asm-commons-9.7.1-sources.jar
diff --git a/3rd_party/sources/asm-tree-9.7.1-sources.jar b/3rd_party/sources/asm-tree-9.7.1-sources.jar
diff --git a/3rd_party/sources/asm-util-9.7.1-sources.jar b/3rd_party/sources/asm-util-9.7.1-sources.jar
diff --git a/3rd_party/sources/nashorn-core-15.4-sources.jar b/3rd_party/sources/nashorn-core-15.4-sources.jar
diff --git a/NOTICE b/NOTICE
@@ -377,10 +377,30 @@ JGroups (jgroups-5.3.13.Final.jar)
 	under Apache Software License (ASL), Version 2.0
 	http://www.jgroups.org
 
+OpenJDK Nashorn (nashorn-core-15.4.jar)
+	under GPL v2 with the Classpath exception
+	https://github.com/openjdk/nashorn
+
 asm (asm-9.7.1.jar)
 	under BSD-3-Clause
 	http://asm.ow2.io/
 
+asm-analysis (asm-analysis-9.7.1.jar)
+	under BSD-3-Clause
+	http://asm.ow2.io/
+
+asm-commons (asm-commons-9.7.1.jar)
+	under BSD-3-Clause
+	http://asm.ow2.io/
+
+asm-tree (asm-tree-9.7.1.jar)
+	under BSD-3-Clause
+	http://asm.ow2.io/
+
+asm-util (asm-util-9.7.1.jar)
+	under BSD-3-Clause
+	http://asm.ow2.io/
+
 reactive-streams (reactive-streams-1.0.4.jar)
 	under MIT-0
 	http://www.reactive-streams.org/

diff --git a/WebContent/WEB-INF/lib/asm-analysis-9.7.1.jar b/WebContent/WEB-INF/lib/asm-analysis-9.7.1.jar
diff --git a/WebContent/WEB-INF/lib/asm-commons-9.7.1.jar b/WebContent/WEB-INF/lib/asm-commons-9.7.1.jar
diff --git a/WebContent/WEB-INF/lib/asm-tree-9.7.1.jar b/WebContent/WEB-INF/lib/asm-tree-9.7.1.jar
diff --git a/WebContent/WEB-INF/lib/asm-util-9.7.1.jar b/WebContent/WEB-INF/lib/asm-util-9.7.1.jar
diff --git a/WebContent/WEB-INF/lib/nashorn-core-15.4.jar b/WebContent/WEB-INF/lib/nashorn-core-15.4.jar
diff --git a/WebContent/help/Release-Notes.xml b/WebContent/help/Release-Notes.xml
@@ -131,6 +131,14 @@
 				<line>Added an optional attribute class.splitAttendance for classes with two or more rooms, defaults to false.</line>
 			</description>
 		</item>
+		<item>
+			<name>Scripts: ECMAScript</name>
+			<description>
+				<line>Nashorn is now included in the UniTime distribution.
+					<line>Starting with Java 15, ECMAScript has been removed from JDK.</line>
+				</line>
+			</description>
+		</item>
 	</category>
 </release>
 <release>

diff --git a/pom.xml b/pom.xml
@@ -437,7 +437,7 @@
 		<!-- Uncomment to enable python scripting on Scripts page.
 		<dependency>
 			<groupId>org.python</groupId>
-			<artifactId>jython-standalone</artifactId>
+			<artifactId>jython-slim</artifactId>
 			<version>${jython.version}</version>
 		</dependency>
 		 -->
@@ -466,6 +466,28 @@
 			<artifactId>commons-lang3</artifactId>
 			<version>${lang3.version}</version>
 		</dependency>
+		<!-- ECMAScript JSR233 Scripting Engine -->
+		<dependency>
+			<groupId>org.openjdk.nashorn</groupId>
+			<artifactId>nashorn-core</artifactId>
+			<version>${nashorn.version}</version>
+		</dependency>
+		<!-- Ensure that all ASM dependencies are of the same version -->
+		<dependency>
+			<groupId>org.ow2.asm</groupId>
+			<artifactId>asm-tree</artifactId>
+			<version>${asm.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.ow2.asm</groupId>
+			<artifactId>asm-util</artifactId>
+			<version>${asm.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.ow2.asm</groupId>
+			<artifactId>asm-commons</artifactId>
+			<version>${asm.version}</version>
+		</dependency>
 	</dependencies>
 	<build>
 		<sourceDirectory>${project.build.directory}/src</sourceDirectory>
@@ -743,7 +765,7 @@
 		<jstl.version>1.2</jstl.version>
 		<freemarker.version>2.3.33</freemarker.version>
 		<oracle.version>23.2.0.0</oracle.version>
-		<jython.version>2.7.3</jython.version>
+		<jython.version>2.7.4</jython.version>
 		<jgroups.version>5.3.13.Final</jgroups.version>
 		<jbossjts.version>4.16.6.Final</jbossjts.version>
 		<joda.version>2.13.0</joda.version>
@@ -756,6 +778,7 @@
 		<lang3.version>3.17.0</lang3.version>
 		<asm.version>9.7.1</asm.version>
 		<infinispan-hibernate.version>14.0.32.Final</infinispan-hibernate.version>
+		<nashorn.version>15.4</nashorn.version>
 	</properties>
 
 	<distributionManagement>