Skip to content

Commit 8e7e6f2

Browse files
committed
Scripts: ECMAScript
- Nashorn is now included in the UniTime distribution - starting with Java 15, ECMAScript has been removed from JDK
1 parent 1f93ca7 commit 8e7e6f2

13 files changed

+53
-2
lines changed
41.5 KB
Binary file not shown.
Binary file not shown.
74.8 KB
Binary file not shown.
84.4 KB
Binary file not shown.
1.63 MB
Binary file not shown.

NOTICE

+20
Original file line numberDiff line numberDiff line change
@@ -377,10 +377,30 @@ JGroups (jgroups-5.3.13.Final.jar)
377377
under Apache Software License (ASL), Version 2.0
378378
http://www.jgroups.org
379379

380+
OpenJDK Nashorn (nashorn-core-15.4.jar)
381+
under GPL v2 with the Classpath exception
382+
https://github.com/openjdk/nashorn
383+
380384
asm (asm-9.7.1.jar)
381385
under BSD-3-Clause
382386
http://asm.ow2.io/
383387

388+
asm-analysis (asm-analysis-9.7.1.jar)
389+
under BSD-3-Clause
390+
http://asm.ow2.io/
391+
392+
asm-commons (asm-commons-9.7.1.jar)
393+
under BSD-3-Clause
394+
http://asm.ow2.io/
395+
396+
asm-tree (asm-tree-9.7.1.jar)
397+
under BSD-3-Clause
398+
http://asm.ow2.io/
399+
400+
asm-util (asm-util-9.7.1.jar)
401+
under BSD-3-Clause
402+
http://asm.ow2.io/
403+
384404
reactive-streams (reactive-streams-1.0.4.jar)
385405
under MIT-0
386406
http://www.reactive-streams.org/
34.3 KB
Binary file not shown.
71.7 KB
Binary file not shown.
50.7 KB
Binary file not shown.
92.3 KB
Binary file not shown.
2.07 MB
Binary file not shown.

WebContent/help/Release-Notes.xml

+8
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,14 @@
131131
<line>Added an optional attribute class.splitAttendance for classes with two or more rooms, defaults to false.</line>
132132
</description>
133133
</item>
134+
<item>
135+
<name>Scripts: ECMAScript</name>
136+
<description>
137+
<line>Nashorn is now included in the UniTime distribution.
138+
<line>Starting with Java 15, ECMAScript has been removed from JDK.</line>
139+
</line>
140+
</description>
141+
</item>
134142
</category>
135143
</release>
136144
<release>

pom.xml

+25-2
Original file line numberDiff line numberDiff line change
@@ -437,7 +437,7 @@
437437
<!-- Uncomment to enable python scripting on Scripts page.
438438
<dependency>
439439
<groupId>org.python</groupId>
440-
<artifactId>jython-standalone</artifactId>
440+
<artifactId>jython-slim</artifactId>
441441
<version>${jython.version}</version>
442442
</dependency>
443443
-->
@@ -466,6 +466,28 @@
466466
<artifactId>commons-lang3</artifactId>
467467
<version>${lang3.version}</version>
468468
</dependency>
469+
<!-- ECMAScript JSR233 Scripting Engine -->
470+
<dependency>
471+
<groupId>org.openjdk.nashorn</groupId>
472+
<artifactId>nashorn-core</artifactId>
473+
<version>${nashorn.version}</version>
474+
</dependency>
475+
<!-- Ensure that all ASM dependencies are of the same version -->
476+
<dependency>
477+
<groupId>org.ow2.asm</groupId>
478+
<artifactId>asm-tree</artifactId>
479+
<version>${asm.version}</version>
480+
</dependency>
481+
<dependency>
482+
<groupId>org.ow2.asm</groupId>
483+
<artifactId>asm-util</artifactId>
484+
<version>${asm.version}</version>
485+
</dependency>
486+
<dependency>
487+
<groupId>org.ow2.asm</groupId>
488+
<artifactId>asm-commons</artifactId>
489+
<version>${asm.version}</version>
490+
</dependency>
469491
</dependencies>
470492
<build>
471493
<sourceDirectory>${project.build.directory}/src</sourceDirectory>
@@ -743,7 +765,7 @@
743765
<jstl.version>1.2</jstl.version>
744766
<freemarker.version>2.3.33</freemarker.version>
745767
<oracle.version>23.2.0.0</oracle.version>
746-
<jython.version>2.7.3</jython.version>
768+
<jython.version>2.7.4</jython.version>
747769
<jgroups.version>5.3.13.Final</jgroups.version>
748770
<jbossjts.version>4.16.6.Final</jbossjts.version>
749771
<joda.version>2.13.0</joda.version>
@@ -756,6 +778,7 @@
756778
<lang3.version>3.17.0</lang3.version>
757779
<asm.version>9.7.1</asm.version>
758780
<infinispan-hibernate.version>14.0.32.Final</infinispan-hibernate.version>
781+
<nashorn.version>15.4</nashorn.version>
759782
</properties>
760783

761784
<distributionManagement>

0 commit comments

Comments
 (0)