[java-identity-provider] branch master updated: JPAR-121 Add our Nashorn ECMAScript engine as a TEST dependency
Rod Widdowson
rdw at steadingsoftware.com
Sat Jul 25 13:34:03 UTC 2020
This is an automated email from the git hooks/post-receive script.
rdw pushed a commit to branch master
in repository java-identity-provider.
View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=9ae35e3a8d8c1cb3a2bf280a0aa27e9573607b65
The following commit(s) were added to refs/heads/master by this push:
new 9ae35e3a8 JPAR-121 Add our Nashorn ECMAScript engine as a TEST dependency
9ae35e3a8 is described below
commit 9ae35e3a8d8c1cb3a2bf280a0aa27e9573607b65
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Sat Jul 25 14:27:58 2020 +0100
JPAR-121 Add our Nashorn ECMAScript engine as a TEST dependency
https://issues.shibboleth.net/jira/browse/JPAR-121
This will allow tests to run under JDK-15 to continue to run after
we remove the equivalent engine from the java-suppport test jar.
---
idp-attribute-filter-impl/pom.xml | 8 ++++++++
idp-attribute-filter-spring/pom.xml | 14 ++++++++++----
idp-attribute-resolver-impl/pom.xml | 6 ++++++
idp-attribute-resolver-spring/pom.xml | 6 ++++++
idp-conf/pom.xml | 10 ++++++++--
idp-parent/pom.xml | 1 -
idp-profile-api/pom.xml | 8 ++++----
idp-profile-spring/pom.xml | 6 ++++++
8 files changed, 48 insertions(+), 11 deletions(-)
diff --git a/idp-attribute-filter-impl/pom.xml b/idp-attribute-filter-impl/pom.xml
index cbcd9f1f4..c118b04f7 100644
--- a/idp-attribute-filter-impl/pom.xml
+++ b/idp-attribute-filter-impl/pom.xml
@@ -193,6 +193,14 @@
<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>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
diff --git a/idp-attribute-filter-spring/pom.xml b/idp-attribute-filter-spring/pom.xml
index 384beb0d3..c2c8c2c54 100644
--- a/idp-attribute-filter-spring/pom.xml
+++ b/idp-attribute-filter-spring/pom.xml
@@ -154,10 +154,16 @@
<!-- We need these even if mvn dependency:analyze says we don't - loaded by service interface -->
<dependency>
- <groupId>net.shibboleth.utilities</groupId>
- <artifactId>java-support</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
+ <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.idp.plugin.scripting</groupId>
+ <artifactId>idp-plugin-rhino-impl</artifactId>
+ <version>${rhino.engine.version}</version>
+ <scope>test</scope>
</dependency>
<dependency>
diff --git a/idp-attribute-resolver-impl/pom.xml b/idp-attribute-resolver-impl/pom.xml
index 58f017c24..8105b2c5e 100644
--- a/idp-attribute-resolver-impl/pom.xml
+++ b/idp-attribute-resolver-impl/pom.xml
@@ -224,6 +224,12 @@
<scope>test</scope>
</dependency>
<!-- We need these even if mvn dependency:analyze says we don't - loaded by service interface -->
+ <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.js</groupId>
<artifactId>js</artifactId>
diff --git a/idp-attribute-resolver-spring/pom.xml b/idp-attribute-resolver-spring/pom.xml
index 4d5235d60..a7c676568 100644
--- a/idp-attribute-resolver-spring/pom.xml
+++ b/idp-attribute-resolver-spring/pom.xml
@@ -227,6 +227,12 @@
</dependency>
<!-- We need these even if mvn dependency:analyze says we don't - loaded by service interface -->
+ <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.js</groupId>
<artifactId>js</artifactId>
diff --git a/idp-conf/pom.xml b/idp-conf/pom.xml
index 337dacc5e..133c955b0 100644
--- a/idp-conf/pom.xml
+++ b/idp-conf/pom.xml
@@ -196,12 +196,12 @@
<scope>test</scope>
</dependency>
- <dependency>
+<!-- <dependency>
<groupId>net.shibboleth.utilities</groupId>
<artifactId>java-support</artifactId>
<type>test-jar</type>
<scope>test</scope>
- </dependency>
+ </dependency>-->
<dependency>
<groupId>javax.servlet</groupId>
@@ -210,6 +210,12 @@
</dependency>
<!-- We need these even if mvn dependency:analyze says we don't - loaded by service interface -->
+ <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.js</groupId>
<artifactId>js</artifactId>
diff --git a/idp-parent/pom.xml b/idp-parent/pom.xml
index 623eb04bc..b45cb6028 100644
--- a/idp-parent/pom.xml
+++ b/idp-parent/pom.xml
@@ -78,7 +78,6 @@
<checkstyle.configLocation>${project.basedir}/../idp-parent/resources/checkstyle/checkstyle.xml</checkstyle.configLocation>
<idp-parent.site.url>${shibboleth.site.url}java-identity-provider/${project.version}/</idp-parent.site.url>
<idp-module.site.url>${idp-parent.site.url}${project.artifactId}</idp-module.site.url>
- <graalvm.version>20.0.0</graalvm.version>
</properties>
<repositories>
diff --git a/idp-profile-api/pom.xml b/idp-profile-api/pom.xml
index d1eebe5f8..54174558f 100644
--- a/idp-profile-api/pom.xml
+++ b/idp-profile-api/pom.xml
@@ -113,10 +113,10 @@
<!-- We need these even if mvn dependency:analyze says we don't - loaded by service interface -->
<dependency>
- <groupId>net.shibboleth.utilities</groupId>
- <artifactId>java-support</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
+ <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.js</groupId>
diff --git a/idp-profile-spring/pom.xml b/idp-profile-spring/pom.xml
index b185d02d8..8c773edee 100644
--- a/idp-profile-spring/pom.xml
+++ b/idp-profile-spring/pom.xml
@@ -207,6 +207,12 @@
</dependency>
<!-- We need these even if mvn dependency:analyze says we don't - loaded by service interface -->
+ <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.js</groupId>
<artifactId>js</artifactId>
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list