[java-idp-plugin-scripting] 01/02: IDP-1620 Remove explicit dependencies from parent pom.

[Rod Widdowson]

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

rdw pushed a commit to branch master
in repository java-idp-plugin-scripting.

View the commit online:
http://git.shibboleth.net/view/?p=java-idp-plugin-scripting.git;a=commit;h=757f67aef2829407e21c7960454a291e9a805ede

commit 757f67aef2829407e21c7960454a291e9a805ede
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Tue Jul 7 16:35:06 2020 +0100

    IDP-1620  Remove explicit dependencies from parent pom.
    
    https://issues.shibboleth.net/jira/browse/IDP-1620
    
    In this case the plugin parent pom.
    
    Also remove any version information which isn't the IdP or the
    plugin.  We need to inherit that.
---
 nashorn-impl/pom.xml | 33 +++++++++++++++++++++++----------
 pom.xml              | 29 ++++++++++-------------------
 rhino-impl/pom.xml   | 24 ++++++++++++++++++++++++
 3 files changed, 57 insertions(+), 29 deletions(-)

diff --git a/nashorn-impl/pom.xml b/nashorn-impl/pom.xml
index e5f7c07..a9ff63c 100644
--- a/nashorn-impl/pom.xml
+++ b/nashorn-impl/pom.xml
@@ -25,7 +25,7 @@
     </description>
 
     <dependencies>
-	<!-- All dependencies except the api are provided and test -->
+	<!-- All dependencies except the api and the dependencies or graal (NOT GRAAL itself) are provided and test -->
 	<dependency>
             <groupId>net.shibboleth.idp.plugin.scripting</groupId>
             <artifactId>scripting-api</artifactId>
@@ -33,15 +33,8 @@
         </dependency>
 
         <dependency>
-            <groupId>org.graalvm.sdk</groupId>
-            <artifactId>graal-sdk</artifactId>
-	    <scope>provided</scope>
-            <version>${graalvm.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.graalvm.js</groupId>
-            <artifactId>js</artifactId>
-            <version>${graalvm.version}</version>
+	    <groupId>net.shibboleth.utilities</groupId>
+	    <artifactId>java-support</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -49,11 +42,31 @@
             <artifactId>spring-extensions</artifactId>
 	    <scope>provided</scope>
         </dependency>
+        <dependency>
+	    <groupId>${idp.groupId}</groupId>
+	    <artifactId>idp-installer</artifactId>
+	    <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>${spring.groupId}</groupId>
             <artifactId>spring-beans</artifactId>
 	    <scope>provided</scope>
         </dependency>
+
+	<dependency>
+            <groupId>org.graalvm.sdk</groupId>
+            <artifactId>graal-sdk</artifactId>
+	    <scope>provided</scope>
+            <version>${graalvm.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.graalvm.js</groupId>
+            <artifactId>js</artifactId>
+            <version>${graalvm.version}</version>
+            <scope>provided</scope>
+        </dependency>
+
     </dependencies>
 
     <build>
diff --git a/pom.xml b/pom.xml
index 3f79f73..b79c38c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,8 +23,6 @@
     <properties>
         <idp.groupId>net.shibboleth.idp</idp.groupId>
         <idp.version>4.1.0-SNAPSHOT</idp.version>
-        <java-support.version>8.1.0-SNAPSHOT</java-support.version>
-        <spring-extensions.version>6.1.0-SNAPSHOT</spring-extensions.version>
         <checkstyle.configLocation>${project.basedir}/checkstyle.xml</checkstyle.configLocation>
     </properties>
 
@@ -46,27 +44,20 @@
     </repositories>
 
     <dependencies>
-        <!-- provided dependency -->
-        <dependency>
-            <groupId>net.shibboleth.utilities</groupId>
-            <artifactId>java-support</artifactId>
-            <version>${java-support.version}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>${spring.groupId}</groupId>
-            <artifactId>spring-core</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>${idp.groupId}</groupId>
-            <artifactId>idp-installer</artifactId>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 
     <dependencyManagement>
         <dependencies>
+<!--            <dependency>
+		<groupId>net.shibboleth.utilities</groupId>
+		<artifactId>java-support</artifactId>
+		<scope>provided</scope>
+            </dependency> -->
+            <dependency>
+		<groupId>${spring.groupId}</groupId>
+		<artifactId>spring-core</artifactId>
+		<scope>provided</scope>
+            </dependency>
             <dependency>
                 <groupId>${idp.groupId}</groupId>
                 <artifactId>idp-bom</artifactId>
diff --git a/rhino-impl/pom.xml b/rhino-impl/pom.xml
index 4765495..d49c624 100644
--- a/rhino-impl/pom.xml
+++ b/rhino-impl/pom.xml
@@ -35,6 +35,30 @@
             <artifactId>rhino</artifactId>
             <scope>compile</scope>
         </dependency>
+
+        <dependency>
+	    <groupId>net.shibboleth.utilities</groupId>
+	    <artifactId>java-support</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>net.shibboleth.ext</groupId>
+            <artifactId>spring-extensions</artifactId>
+	    <scope>provided</scope>
+        </dependency>
+        <dependency>
+	    <groupId>${idp.groupId}</groupId>
+	    <artifactId>idp-installer</artifactId>
+	    <scope>test</scope>
+        </dependency>
+
+
+        <dependency>
+            <groupId>${spring.groupId}</groupId>
+            <artifactId>spring-beans</artifactId>
+	    <scope>provided</scope>
+        </dependency>
+
     </dependencies>
 
     <build>

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