[spring-extensions] branch main updated: JSCRIPTING-9 JSCRIPTING-12 Start using jdk nashorn for tests

[Rod Widdowson]

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

rdw pushed a commit to branch main
in repository spring-extensions.

View the commit online:
http://git.shibboleth.net/view/?p=spring-extensions.git;a=commit;h=26d43e631a2726a875bd52b3b5388e45f5e24d6f

The following commit(s) were added to refs/heads/main by this push:
       new  26d43e6   JSCRIPTING-9 JSCRIPTING-12 Start using jdk nashorn for tests
26d43e6 is described below

commit 26d43e631a2726a875bd52b3b5388e45f5e24d6f
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Sun Aug 22 16:47:30 2021 +0100

    JSCRIPTING-9 JSCRIPTING-12 Start using jdk nashorn for tests
    
    https://shibboleth.atlassian.net/browse/JSCRIPTING-9
    https://shibboleth.atlassian.net/browse/JSCRIPTING-12
    
    Also involves upping the parent to the current snapshot
---
 pom.xml | 46 ++++++++++++++++++++++++----------------------
 1 file changed, 24 insertions(+), 22 deletions(-)

diff --git a/pom.xml b/pom.xml
index 025e6b6..716794a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.shibboleth</groupId>
         <artifactId>parent</artifactId>
-        <version>11.2.1</version>
+        <version>11.2.2-SNAPSHOT</version>
     </parent>
 
     <groupId>net.shibboleth.ext</groupId>
@@ -26,6 +26,7 @@
         <!-- TODO: Remove when parent POM updated. -->
         <spring.version>5.3.9</spring.version>
         <shibboleth.site.deploy.url>//shibboleth.net/home/javasites/staging/</shibboleth.site.deploy.url>
+	<jdk.version>15.3</jdk.version>
     </properties>
 
     <repositories>
@@ -156,27 +157,6 @@
           <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>
-
-        <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>net.shibboleth.utilities</groupId>
             <artifactId>java-support</artifactId>
@@ -187,6 +167,28 @@
 
     </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.