[java-support] 06/11: JSPT-95 Move GraalVm support to main (from Test)

[Rod Widdowson]

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

rdw pushed a commit to branch dev/JSPT-95
in repository java-support.

View the commit online:
http://git.shibboleth.net/view/?p=java-support.git;a=commit;h=0e8ca0fbf01d9dc145de1dd5d4072cf190f8be80

commit 0e8ca0fbf01d9dc145de1dd5d4072cf190f8be80
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Fri Apr 3 14:48:34 2020 +0100

    JSPT-95 Move GraalVm support to main (from Test)
    
    https://issues.shibboleth.net/jira/browse/JSPT-95
---
 pom.xml                                            | 29 ++++++++--------------
 .../support/scripting/AbstractScriptEngine.java    |  2 +-
 .../java/support/scripting/GraalEngine.java        |  0
 .../java/support/scripting/GraalFactory.java       |  0
 .../scripting/RuntimeScriptingException.java       |  2 +-
 .../services/javax.script.ScriptEngineFactory      |  1 -
 .../services/javax.script.ScriptEngineFactory      |  1 -
 7 files changed, 13 insertions(+), 22 deletions(-)

diff --git a/pom.xml b/pom.xml
index 2cff2ec..7a14f0b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -57,6 +57,11 @@
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.graalvm.sdk</groupId>
+            <artifactId>graal-sdk</artifactId>
+            <version>${graalvm.version}</version>
+        </dependency>
 
         <!-- OPTIONAL Compile Dependencies -->
         <dependency>
@@ -124,6 +129,12 @@
         </dependency>
 
         <!-- Runtime Dependencies -->
+        <dependency>
+            <groupId>org.graalvm.js</groupId>
+            <artifactId>js</artifactId>
+            <version>${graalvm.version}</version>
+            <scope>runtime</scope>
+        </dependency>
 
         <!-- Test Dependencies -->
         <dependency>
@@ -142,24 +153,6 @@
             <scope>test</scope>
         </dependency>
 
-        <!-- Use of GraalVM is currently test only.
-             Move to compile for 'release' -->
-        <dependency>
-            <groupId>org.graalvm.sdk</groupId>
-            <artifactId>graal-sdk</artifactId>
-            <version>20.0.0</version>
-            <scope>test</scope>
-        </dependency>
-
-        <!-- Use of GraalVM is currently test only.
-             Move to runtime for 'release' -->
-        <dependency>
-            <groupId>org.graalvm.js</groupId>
-            <artifactId>js</artifactId>
-            <version>20.0.0</version>
-            <scope>test</scope>
-        </dependency>
-
         <!-- Use of GraalVM rhino is currently test only
              Move to compile of we ever want to release -->
         <dependency>
diff --git a/src/test/java/net/shibboleth/utilities/java/support/scripting/AbstractScriptEngine.java b/src/main/java/net/shibboleth/utilities/java/support/scripting/AbstractScriptEngine.java
similarity index 98%
rename from src/test/java/net/shibboleth/utilities/java/support/scripting/AbstractScriptEngine.java
rename to src/main/java/net/shibboleth/utilities/java/support/scripting/AbstractScriptEngine.java
index 304ccb8..917433c 100644
--- a/src/test/java/net/shibboleth/utilities/java/support/scripting/AbstractScriptEngine.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/scripting/AbstractScriptEngine.java
@@ -92,7 +92,7 @@ public abstract class AbstractScriptEngine implements ScriptEngine {
     }
 
     /** {@inheritDoc} */
-    public void setContext(ScriptContext context) {
+    public void setContext(final ScriptContext context) {
         throw new RuntimeScriptingException("Unsupported method setContext");
     }
 
diff --git a/src/test/java/net/shibboleth/utilities/java/support/scripting/GraalEngine.java b/src/main/java/net/shibboleth/utilities/java/support/scripting/GraalEngine.java
similarity index 100%
rename from src/test/java/net/shibboleth/utilities/java/support/scripting/GraalEngine.java
rename to src/main/java/net/shibboleth/utilities/java/support/scripting/GraalEngine.java
diff --git a/src/test/java/net/shibboleth/utilities/java/support/scripting/GraalFactory.java b/src/main/java/net/shibboleth/utilities/java/support/scripting/GraalFactory.java
similarity index 100%
rename from src/test/java/net/shibboleth/utilities/java/support/scripting/GraalFactory.java
rename to src/main/java/net/shibboleth/utilities/java/support/scripting/GraalFactory.java
diff --git a/src/test/java/net/shibboleth/utilities/java/support/scripting/RuntimeScriptingException.java b/src/main/java/net/shibboleth/utilities/java/support/scripting/RuntimeScriptingException.java
similarity index 95%
rename from src/test/java/net/shibboleth/utilities/java/support/scripting/RuntimeScriptingException.java
rename to src/main/java/net/shibboleth/utilities/java/support/scripting/RuntimeScriptingException.java
index 0d7ea3e..5644e8e 100644
--- a/src/test/java/net/shibboleth/utilities/java/support/scripting/RuntimeScriptingException.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/scripting/RuntimeScriptingException.java
@@ -31,7 +31,7 @@ public class RuntimeScriptingException extends RuntimeException {
      *
      * @param message the message.
      */
-    public RuntimeScriptingException(String message) {
+    public RuntimeScriptingException(final String message) {
         super(message);
     }
 }
diff --git a/src/test/resources/META-INF/services/javax.script.ScriptEngineFactory b/src/main/resources/META-INF/services/javax.script.ScriptEngineFactory
similarity index 50%
copy from src/test/resources/META-INF/services/javax.script.ScriptEngineFactory
copy to src/main/resources/META-INF/services/javax.script.ScriptEngineFactory
index 2a1bdcd..7654b2a 100644
--- a/src/test/resources/META-INF/services/javax.script.ScriptEngineFactory
+++ b/src/main/resources/META-INF/services/javax.script.ScriptEngineFactory
@@ -1,2 +1 @@
 net.shibboleth.utilities.java.support.scripting.GraalFactory
-net.shibboleth.utilities.java.support.scripting.RhinoFactory
diff --git a/src/test/resources/META-INF/services/javax.script.ScriptEngineFactory b/src/test/resources/META-INF/services/javax.script.ScriptEngineFactory
index 2a1bdcd..8421176 100644
--- a/src/test/resources/META-INF/services/javax.script.ScriptEngineFactory
+++ b/src/test/resources/META-INF/services/javax.script.ScriptEngineFactory
@@ -1,2 +1 @@
-net.shibboleth.utilities.java.support.scripting.GraalFactory
 net.shibboleth.utilities.java.support.scripting.RhinoFactory

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