[java-identity-provider] 02/02: JSCRIPTING-9 JSCRIPTING-12 Start using jdk nashorn for tests
Rod Widdowson
rdw at steadingsoftware.com
Mon Aug 23 10:37:24 UTC 2021
This is an automated email from the git hooks/post-receive script.
rdw pushed a commit to branch main
in repository java-identity-provider.
View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=cd556ae5c8d6484664406a9085d2db3a9ef00d41
commit cd556ae5c8d6484664406a9085d2db3a9ef00d41
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Mon Aug 23 11:37:10 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
---
idp-attribute-filter-impl/pom.xml | 23 +++++------------------
idp-attribute-filter-spring/pom.xml | 23 +++++------------------
idp-attribute-resolver-impl/pom.xml | 23 +++++------------------
idp-attribute-resolver-spring/pom.xml | 21 ++++-----------------
idp-conf/pom.xml | 21 ++++-----------------
idp-profile-api/pom.xml | 21 ++++-----------------
idp-profile-spring/pom.xml | 21 ++++-----------------
7 files changed, 31 insertions(+), 122 deletions(-)
diff --git a/idp-attribute-filter-impl/pom.xml b/idp-attribute-filter-impl/pom.xml
index 02e57d7e6..6be366ddc 100644
--- a/idp-attribute-filter-impl/pom.xml
+++ b/idp-attribute-filter-impl/pom.xml
@@ -207,28 +207,15 @@
versions where the JDK doesn't provide one.
-->
<profile>
- <id>get-graal-nashorn</id>
+ <id>get-nashorn</id>
<activation>
<jdk>[15,</jdk>
</activation>
<dependencies>
- <!-- We need these even if mvn dependency:analyze says we don't - loaded by service interface -->
- <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>
+ <dependency>
+ <groupId>org.openjdk.nashorn</groupId>
+ <artifactId>nashorn-core</artifactId>
+ <version>${nashorn.jdk.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/idp-attribute-filter-spring/pom.xml b/idp-attribute-filter-spring/pom.xml
index a8ca7e4dc..de3c23aea 100644
--- a/idp-attribute-filter-spring/pom.xml
+++ b/idp-attribute-filter-spring/pom.xml
@@ -167,28 +167,15 @@
versions where the JDK doesn't provide one.
-->
<profile>
- <id>get-graal-nashorn</id>
+ <id>get-nashorn</id>
<activation>
<jdk>[15,</jdk>
</activation>
<dependencies>
- <!-- We need these even if mvn dependency:analyze says we don't - loaded by service interface -->
- <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>
+ <dependency>
+ <groupId>org.openjdk.nashorn</groupId>
+ <artifactId>nashorn-core</artifactId>
+ <version>${nashorn.jdk.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/idp-attribute-resolver-impl/pom.xml b/idp-attribute-resolver-impl/pom.xml
index 9f3383b82..e7701089c 100644
--- a/idp-attribute-resolver-impl/pom.xml
+++ b/idp-attribute-resolver-impl/pom.xml
@@ -224,29 +224,16 @@
versions where the JDK doesn't provide one.
-->
<profile>
- <id>get-graal-nashorn</id>
+ <id>get-nashorn</id>
<activation>
<jdk>[15,</jdk>
</activation>
<dependencies>
- <!-- We need these even if mvn dependency:analyze says we don't - loaded by service interface -->
<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>
+ <groupId>org.openjdk.nashorn</groupId>
+ <artifactId>nashorn-core</artifactId>
+ <version>${nashorn.jdk.version}</version>
+ <scope>test</scope>
</dependency>
</dependencies>
</profile>
diff --git a/idp-attribute-resolver-spring/pom.xml b/idp-attribute-resolver-spring/pom.xml
index bfe37e176..a6f6d3b20 100644
--- a/idp-attribute-resolver-spring/pom.xml
+++ b/idp-attribute-resolver-spring/pom.xml
@@ -235,28 +235,15 @@
versions where the JDK doesn't provide one.
-->
<profile>
- <id>get-graal-nashorn</id>
+ <id>get-nashorn</id>
<activation>
<jdk>[15,</jdk>
</activation>
<dependencies>
- <!-- We need these even if mvn dependency:analyze says we don't - loaded by service interface -->
<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>
+ <groupId>org.openjdk.nashorn</groupId>
+ <artifactId>nashorn-core</artifactId>
+ <version>${nashorn.jdk.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/idp-conf/pom.xml b/idp-conf/pom.xml
index a9e6a5ec0..6c26fffc7 100644
--- a/idp-conf/pom.xml
+++ b/idp-conf/pom.xml
@@ -154,28 +154,15 @@
versions where the JDK doesn't provide one.
-->
<profile>
- <id>get-graal-nashorn</id>
+ <id>get-nashorn</id>
<activation>
<jdk>[15,</jdk>
</activation>
<dependencies>
- <!-- We need these even if mvn dependency:analyze says we don't - loaded by service interface -->
<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>
+ <groupId>org.openjdk.nashorn</groupId>
+ <artifactId>nashorn-core</artifactId>
+ <version>${nashorn.jdk.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/idp-profile-api/pom.xml b/idp-profile-api/pom.xml
index b033fddbe..cfbff4cbe 100644
--- a/idp-profile-api/pom.xml
+++ b/idp-profile-api/pom.xml
@@ -126,28 +126,15 @@
versions where the JDK doesn't provide one.
-->
<profile>
- <id>get-graal-nashorn</id>
+ <id>get-nashorn</id>
<activation>
<jdk>[15,</jdk>
</activation>
<dependencies>
- <!-- We need these even if mvn dependency:analyze says we don't - loaded by service interface -->
<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>
+ <groupId>org.openjdk.nashorn</groupId>
+ <artifactId>nashorn-core</artifactId>
+ <version>${nashorn.jdk.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/idp-profile-spring/pom.xml b/idp-profile-spring/pom.xml
index ff68efc5e..146ea926f 100644
--- a/idp-profile-spring/pom.xml
+++ b/idp-profile-spring/pom.xml
@@ -214,28 +214,15 @@
versions where the JDK doesn't provide one.
-->
<profile>
- <id>get-graal-nashorn</id>
+ <id>get-nashorn</id>
<activation>
<jdk>[15,</jdk>
</activation>
<dependencies>
- <!-- We need these even if mvn dependency:analyze says we don't - loaded by service interface -->
<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>
+ <groupId>org.openjdk.nashorn</groupId>
+ <artifactId>nashorn-core</artifactId>
+ <version>${nashorn.jdk.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list