[java-idp-plugin-scripting] 13/15: Pom clean up.

[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=3cc7eafb930c686c6262309fc92962fce9a06e4e

commit 3cc7eafb930c686c6262309fc92962fce9a06e4e
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Tue Jun 9 11:33:06 2020 +0100

    Pom clean up.
    
    Move as many dependencies to provided as possible (to avoid polution).
    run the dependency copy stage during rhino impl (so as to get the
    rhino jar available for packaging)
---
 nashorn-impl/pom.xml  |  5 +++++
 rhino-impl/pom.xml    | 17 ++++++++++++++++-
 scripting-api/pom.xml | 11 -----------
 3 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/nashorn-impl/pom.xml b/nashorn-impl/pom.xml
index f45f939..621e5b7 100644
--- a/nashorn-impl/pom.xml
+++ b/nashorn-impl/pom.xml
@@ -25,14 +25,17 @@
     </description>
 
     <dependencies>
+	<!-- All dependencies except the api are provided and test -->
 	<dependency>
             <groupId>net.shibboleth.plugin.scripting</groupId>
             <artifactId>scripting-api</artifactId>
             <version>0.0.1-SNAPSHOT</version>
         </dependency>
+
         <dependency>
             <groupId>org.graalvm.sdk</groupId>
             <artifactId>graal-sdk</artifactId>
+	    <scope>provided</scope>
             <version>${graalvm.version}</version>
         </dependency>
         <dependency>
@@ -44,10 +47,12 @@
         <dependency>
             <groupId>net.shibboleth.ext</groupId>
             <artifactId>spring-extensions</artifactId>
+	    <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>${spring.groupId}</groupId>
             <artifactId>spring-beans</artifactId>
+	    <scope>provided</scope>
         </dependency>
     </dependencies>
 
diff --git a/rhino-impl/pom.xml b/rhino-impl/pom.xml
index 72e9517..3b420af 100644
--- a/rhino-impl/pom.xml
+++ b/rhino-impl/pom.xml
@@ -24,7 +24,7 @@
     </description>
 
     <dependencies>
-	<dependency>
+        <dependency>
             <groupId>net.shibboleth.plugin.scripting</groupId>
             <artifactId>scripting-api</artifactId>
             <version>0.0.1-SNAPSHOT</version>
@@ -38,6 +38,21 @@
 
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>copy-dependencies</id>
+                        <goals>
+                            <goal>copy-dependencies</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>target</outputDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId> 
diff --git a/scripting-api/pom.xml b/scripting-api/pom.xml
index 45bd7ea..4711612 100644
--- a/scripting-api/pom.xml
+++ b/scripting-api/pom.xml
@@ -24,17 +24,6 @@
         A project to build a jar file that nashorn and rhino depend upon.
     </description>
 
-    <dependencies>
-        <dependency>
-            <groupId>net.shibboleth.ext</groupId>
-            <artifactId>spring-extensions</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${spring.groupId}</groupId>
-            <artifactId>spring-beans</artifactId>
-        </dependency>
-    </dependencies>
-
     <build>
         <plugins>
             <plugin>

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