[java-idp-plugin-scripting] 07/15: Comments from Phil

[Ian Young]

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

iay 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=b6df4886d0ce961906cca6ecd0f962d30eb9ccc6

commit b6df4886d0ce961906cca6ecd0f962d30eb9ccc6
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Sat May 16 15:41:39 2020 +0100

    Comments from Phil
---
 nashorn-impl/pom.xml | 28 +++++++++-----------------
 pom.xml              | 55 +++++++++++++++++++++++++++++++++-------------------
 2 files changed, 44 insertions(+), 39 deletions(-)

diff --git a/nashorn-impl/pom.xml b/nashorn-impl/pom.xml
index d69635c..66fbb16 100644
--- a/nashorn-impl/pom.xml
+++ b/nashorn-impl/pom.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-	<groupId>net.shibboleth.plugin.scripting</groupId>
-	<artifactId>scripting</artifactId>
-	<version>0.0.1-SNAPSHOT</version>
+        <groupId>net.shibboleth.plugin.scripting</groupId>
+        <artifactId>scripting</artifactId>
+        <version>0.0.1-SNAPSHOT</version>
     </parent>
     
     <groupId>net.shibboleth.plugin.scripting.nashorn</groupId>
@@ -37,22 +37,12 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>${spring.groupId}</groupId>
-            <artifactId>spring-beans</artifactId>
-            <scope>provided</scope>
-            <optional>true</optional>
+            <groupId>net.shibboleth.ext</groupId>
+            <artifactId>spring-extensions</artifactId>
         </dependency>
         <dependency>
-            <groupId>${idp.groupId}</groupId>
-            <artifactId>idp-installer</artifactId>
-            <version>${idp.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.graalvm.js</groupId>
-            <artifactId>js</artifactId>
-            <version>${graalvm.version}</version>
-            <scope>test</scope>
+            <groupId>${spring.groupId}</groupId>
+            <artifactId>spring-beans</artifactId>
         </dependency>
     </dependencies>
 
@@ -72,7 +62,7 @@
                         </manifestEntries>
                     </archive>
                 </configuration>
-             </plugin>
+            </plugin>
         </plugins>
     </build>
 </project>
diff --git a/pom.xml b/pom.xml
index e12b5fb..e5be5f0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>net.shibboleth</groupId>
-        <artifactId>parent</artifactId>
-        <version>11.0.1-SNAPSHOT</version>
+        <groupId>net.shibboleth.idp</groupId>
+        <artifactId>idp-parent</artifactId>
+        <version>4.0.1-SNAPSHOT</version>
     </parent>
 
     
@@ -22,8 +22,11 @@
     </description>
 
     <properties>
-    	<java-support-version>8.1.0-SNAPSHOT</java-support-version>
-    	<graalvm.version>20.0.0</graalvm.version>
+        <shib.idp.version>4.0.1-SNAPSHOT</shib.idp.version>
+        <java-support-version>8.1.0-SNAPSHOT</java-support-version>
+        <spring.extensions.version>11.0.1-SNAPSHOT</spring.extensions.version>
+        
+        <graalvm.version>20.0.0</graalvm.version>
         <idp.groupId>net.shibboleth.idp</idp.groupId>
         <idp.version>4.0.1-SNAPSHOT</idp.version>
     </properties>
@@ -34,18 +37,6 @@
             <groupId>net.shibboleth.utilities</groupId>
             <artifactId>java-support</artifactId>
             <version>${java-support-version}</version>
-    	    <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>net.shibboleth.ext</groupId>
-            <artifactId>spring-extensions</artifactId>
-            <version>${spring-extensions.version}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>net.shibboleth.ext</groupId>
-            <artifactId>spring-extensions</artifactId>
-            <version>${spring-extensions.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -53,11 +44,35 @@
             <artifactId>spring-core</artifactId>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>${idp.groupId}</groupId>
+            <artifactId>idp-installer</artifactId>
+            <version>${idp.version}</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>net.shibboleth.idp</groupId>
+                <artifactId>idp-bom</artifactId>
+                <version>${shib.idp.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+            <dependency>
+                <groupId>net.shibboleth.ext</groupId>
+                <artifactId>spring-extensions</artifactId>
+                <version>${spring-extensions.version}</version>
+                <scope>provided</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
     <modules>
-	<module>nashorn-impl</module>
-	<module>nashorn-dist</module>
+        <module>nashorn-impl</module>
+        <module>nashorn-dist</module>
     </modules>
 
 </project>

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