[java-shib-attribute] branch main updated: Add missing testing dependency and inline Nashorn test dep.

[Scott Cantor]

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

scantor pushed a commit to branch main
in repository java-shib-attribute.

View the commit online:
http://git.shibboleth.net/view/?p=java-shib-attribute.git;a=commit;h=27396a8e3b3571dcf6dc90c803801fca70bcd61a

The following commit(s) were added to refs/heads/main by this push:
     new 27396a8e3 Add missing testing dependency and inline Nashorn test dep.
27396a8e3 is described below

commit 27396a8e3b3571dcf6dc90c803801fca70bcd61a
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Mon Nov 6 11:32:42 2023 -0500

    Add missing testing dependency and inline Nashorn test dep.
---
 pom.xml                                |  7 +++++++
 shib-attribute-filter-impl/pom.xml     | 27 ++++++---------------------
 shib-attribute-filter-spring/pom.xml   | 28 ++++++----------------------
 shib-attribute-resolver-spring/pom.xml | 26 +++++---------------------
 4 files changed, 24 insertions(+), 64 deletions(-)

diff --git a/pom.xml b/pom.xml
index d10b92183..14654bce9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -250,6 +250,13 @@
             <!-- Runtime Dependencies -->
 
             <!-- Test Dependencies -->
+            <dependency>
+                <groupId>${shib-metadata.groupId}</groupId>
+                <artifactId>shib-metadata-testing</artifactId>
+                <version>${shib-metadata.version}</version>
+                <scope>test</scope>
+            </dependency>
+
             <dependency>
                 <groupId>${opensaml.groupId}</groupId>
                 <artifactId>opensaml-testing</artifactId>
diff --git a/shib-attribute-filter-impl/pom.xml b/shib-attribute-filter-impl/pom.xml
index a6f4c240a..221624a15 100644
--- a/shib-attribute-filter-impl/pom.xml
+++ b/shib-attribute-filter-impl/pom.xml
@@ -134,27 +134,12 @@
             <artifactId>spring-core</artifactId>
             <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-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>
+        <dependency>
+            <groupId>org.openjdk.nashorn</groupId>
+            <artifactId>nashorn-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
 
 </project>
diff --git a/shib-attribute-filter-spring/pom.xml b/shib-attribute-filter-spring/pom.xml
index 82f588fcd..0d1761622 100644
--- a/shib-attribute-filter-spring/pom.xml
+++ b/shib-attribute-filter-spring/pom.xml
@@ -162,29 +162,13 @@
             <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-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>
+        <dependency>
+            <groupId>org.openjdk.nashorn</groupId>
+            <artifactId>nashorn-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
 
 </project>
diff --git a/shib-attribute-resolver-spring/pom.xml b/shib-attribute-resolver-spring/pom.xml
index 98dc7b626..15f4b2269 100644
--- a/shib-attribute-resolver-spring/pom.xml
+++ b/shib-attribute-resolver-spring/pom.xml
@@ -191,27 +191,11 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>org.openjdk.nashorn</groupId>
+            <artifactId>nashorn-core</artifactId>
+            <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-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>
-
 </project>

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