[java-identity-provider] branch main updated: IDP-1661 Conditionalize Graal Pre-JDK15
Rod Widdowson
rdw at steadingsoftware.com
Fri Nov 20 15:06:57 UTC 2020
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=935b32b1b194c923a46875919367a8e994cbc148
The following commit(s) were added to refs/heads/main by this push:
new 935b32b1b IDP-1661 Conditionalize Graal Pre-JDK15
935b32b1b is described below
commit 935b32b1b194c923a46875919367a8e994cbc148
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Fri Nov 20 15:05:50 2020 +0000
IDP-1661 Conditionalize Graal Pre-JDK15
https://issues.shibboleth.net/jira/browse/IDP-1661
---
idp-attribute-filter-impl/pom.xml | 55 +++++++++++++++++++-------------
idp-attribute-filter-spring/pom.xml | 52 +++++++++++++++++++-----------
idp-attribute-resolver-impl/pom.xml | 59 ++++++++++++++++++++---------------
idp-attribute-resolver-spring/pom.xml | 55 +++++++++++++++++++-------------
idp-conf/pom.xml | 53 ++++++++++++++++++++-----------
idp-profile-api/pom.xml | 54 ++++++++++++++++++++------------
idp-profile-spring/pom.xml | 55 +++++++++++++++++++-------------
7 files changed, 238 insertions(+), 145 deletions(-)
diff --git a/idp-attribute-filter-impl/pom.xml b/idp-attribute-filter-impl/pom.xml
index 45ef482d8..afa31a5a0 100644
--- a/idp-attribute-filter-impl/pom.xml
+++ b/idp-attribute-filter-impl/pom.xml
@@ -194,34 +194,47 @@
<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>
<scope>test</scope>
</dependency>
- <!-- We need these even if mvn dependency:analyze says we don't - loaded by service interface -->
- <dependency>
- <groupId>org.graalvm.js</groupId>
- <artifactId>js</artifactId>
- <version>${graalvm.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.graalvm.sdk</groupId>
- <artifactId>graal-sdk</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-graal-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>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
<scm>
<connection>${shibboleth.scm.connection}java-identity-provider</connection>
<developerConnection>${shibboleth.scm.developerConnection}java-identity-provider</developerConnection>
diff --git a/idp-attribute-filter-spring/pom.xml b/idp-attribute-filter-spring/pom.xml
index 9074f2615..738cfb8d6 100644
--- a/idp-attribute-filter-spring/pom.xml
+++ b/idp-attribute-filter-spring/pom.xml
@@ -146,12 +146,6 @@
</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>net.shibboleth.idp.plugin.scripting</groupId>
<artifactId>idp-plugin-rhino-impl</artifactId>
@@ -159,18 +153,6 @@
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.graalvm.js</groupId>
- <artifactId>js</artifactId>
- <version>${graalvm.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.mozilla</groupId>
<artifactId>rhino</artifactId>
@@ -179,6 +161,40 @@
</dependency>
</dependencies>
+ <profiles>
+ <!--
+ Pull in a Javascript engine for testing in Java
+ versions where the JDK doesn't provide one.
+ -->
+ <profile>
+ <id>get-graal-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>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
<scm>
<connection>${shibboleth.scm.connection}java-identity-provider</connection>
<developerConnection>${shibboleth.scm.developerConnection}java-identity-provider</developerConnection>
diff --git a/idp-attribute-resolver-impl/pom.xml b/idp-attribute-resolver-impl/pom.xml
index 80e03de7a..7cba5ffe1 100644
--- a/idp-attribute-resolver-impl/pom.xml
+++ b/idp-attribute-resolver-impl/pom.xml
@@ -216,33 +216,42 @@
<type>test-jar</type>
<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>
- <version>${graalvm.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.mozilla</groupId>
- <artifactId>rhino</artifactId>
- <scope>test</scope>
- <!-- version in parent pom -->
- </dependency>
</dependencies>
+ <profiles>
+ <!--
+ Pull in a Javascript engine for testing in Java
+ versions where the JDK doesn't provide one.
+ -->
+ <profile>
+ <id>get-graal-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>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
<scm>
<connection>${shibboleth.scm.connection}java-identity-provider</connection>
<developerConnection>${shibboleth.scm.developerConnection}java-identity-provider</developerConnection>
diff --git a/idp-attribute-resolver-spring/pom.xml b/idp-attribute-resolver-spring/pom.xml
index f29fa8831..a42dff6e6 100644
--- a/idp-attribute-resolver-spring/pom.xml
+++ b/idp-attribute-resolver-spring/pom.xml
@@ -227,29 +227,42 @@
<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>
- <version>${graalvm.version}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.graalvm.sdk</groupId>
- <artifactId>graal-sdk</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-graal-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>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
<scm>
<connection>${shibboleth.scm.connection}java-identity-provider</connection>
<developerConnection>${shibboleth.scm.developerConnection}java-identity-provider</developerConnection>
diff --git a/idp-conf/pom.xml b/idp-conf/pom.xml
index b264d64df..d8f973080 100644
--- a/idp-conf/pom.xml
+++ b/idp-conf/pom.xml
@@ -146,27 +146,42 @@
<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>
- <version>${graalvm.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.graalvm.sdk</groupId>
- <artifactId>graal-sdk</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-graal-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>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
<scm>
<connection>${shibboleth.scm.connection}java-identity-provider</connection>
<developerConnection>${shibboleth.scm.developerConnection}java-identity-provider</developerConnection>
diff --git a/idp-profile-api/pom.xml b/idp-profile-api/pom.xml
index 693ae0a70..a99aebfe9 100644
--- a/idp-profile-api/pom.xml
+++ b/idp-profile-api/pom.xml
@@ -111,28 +111,42 @@
<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>
- <version>${graalvm.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.graalvm.sdk</groupId>
- <artifactId>graal-sdk</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-graal-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>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
<scm>
<connection>${shibboleth.scm.connection}java-identity-provider</connection>
<developerConnection>${shibboleth.scm.developerConnection}java-identity-provider</developerConnection>
diff --git a/idp-profile-spring/pom.xml b/idp-profile-spring/pom.xml
index 917acbfc2..2c6066ae6 100644
--- a/idp-profile-spring/pom.xml
+++ b/idp-profile-spring/pom.xml
@@ -206,29 +206,42 @@
<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>
- <version>${graalvm.version}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.graalvm.sdk</groupId>
- <artifactId>graal-sdk</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-graal-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>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
<scm>
<connection>${shibboleth.scm.connection}java-identity-provider</connection>
<developerConnection>${shibboleth.scm.developerConnection}java-identity-provider</developerConnection>
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list