[java-idp-oidc] branch main updated: Move to using JDK Nashorn for Java >= 15

[Rod Widdowson]

This is an automated email from the git hooks/post-receive script.

rdw pushed a commit to branch main
in repository java-idp-oidc.

View the commit online:
http://git.shibboleth.net/view/?p=java-idp-oidc.git;a=commit;h=6a0b0b2e13122a8bdfdf22335f5e81517829f622

The following commit(s) were added to refs/heads/main by this push:
       new  6a0b0b2e  Move to using JDK Nashorn for Java >= 15
6a0b0b2e is described below

commit 6a0b0b2e13122a8bdfdf22335f5e81517829f622
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Mon Aug 23 13:29:50 2021 +0100

    Move to using JDK Nashorn for Java >= 15
---
 idp-oidc-extension-impl/pom.xml | 38 ++++++++++++++++++++------------------
 1 file changed, 20 insertions(+), 18 deletions(-)

diff --git a/idp-oidc-extension-impl/pom.xml b/idp-oidc-extension-impl/pom.xml
index 5ae287fd..8333c08d 100644
--- a/idp-oidc-extension-impl/pom.xml
+++ b/idp-oidc-extension-impl/pom.xml
@@ -316,25 +316,27 @@
 	       <type>test-jar</type>
 	       <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>net.shibboleth.idp.plugin.scripting</groupId>
-            <artifactId>idp-plugin-nashorn-impl</artifactId>
-            <version>${nashorn.engine.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.graalvm.sdk</groupId>
-            <artifactId>graal-sdk</artifactId>
-            <version>${graalvm.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.graalvm.js</groupId>
-            <artifactId>js</artifactId>
-            <version>${graalvm.version}</version>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
+    <profiles>
+        <!--
+            Pull in a Javascript engine for testing in Java
+            versions where the JDK doesn't provide one.
+        -->
+        <profile>
+            <id>get-nashorn</id>
+            <activation>
+                <jdk>[15,</jdk>
+            </activation>
+            <dependencies>
+                <dependency>
+		    <groupId>org.openjdk.nashorn</groupId>
+		    <artifactId>nashorn-core</artifactId>
+		    <version>${nashorn.jdk.version}</version>
+                    <scope>test</scope>
+                </dependency>
+            </dependencies>
+        </profile>
+    </profiles>
     <build>
         <plugins>
              <plugin>

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.