[java-idp-plugin-scripting] 05/15: Change poms to reflect changed kitting

[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=df335d54ea0c834c16fd3eebcb8407d5260044f1

commit df335d54ea0c834c16fd3eebcb8407d5260044f1
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Wed May 13 15:29:32 2020 +0100

    Change poms to reflect changed kitting
---
 nashorn-dist/src/main/assembly/nashorn-assembly.xml | 13 +------------
 nashorn-impl/pom.xml                                | 21 +++++----------------
 2 files changed, 6 insertions(+), 28 deletions(-)

diff --git a/nashorn-dist/src/main/assembly/nashorn-assembly.xml b/nashorn-dist/src/main/assembly/nashorn-assembly.xml
index 7105894..e7a0d4a 100644
--- a/nashorn-dist/src/main/assembly/nashorn-assembly.xml
+++ b/nashorn-dist/src/main/assembly/nashorn-assembly.xml
@@ -5,22 +5,11 @@
         <format>zip</format>
     </formats>
     <fileSets>
-        <fileSet>
-            <directory>../nashorn-impl/target/dependency</directory>
-            <outputDirectory>webapp/WEB-INF/lib</outputDirectory>
-            <includes>
-                <include>graal-sdk-*.jar</include>
-                <include>js-*.jar</include>
-            </includes>
-            <excludes>
-                <exclude>*test*.jar</exclude>
-            </excludes>
-        </fileSet>
         <fileSet>
             <directory>../nashorn-impl/target</directory>
             <outputDirectory>edit-webapp/WEB-INF/lib</outputDirectory>
             <includes>
-                <include>idp-oidc-extension-impl-*.jar</include>
+                <include>nashorn-impl-*.jar</include>
             </includes>
             <excludes>
                 <exclude>*test*.jar</exclude>
diff --git a/nashorn-impl/pom.xml b/nashorn-impl/pom.xml
index f692b95..d69635c 100644
--- a/nashorn-impl/pom.xml
+++ b/nashorn-impl/pom.xml
@@ -13,6 +13,11 @@
     <groupId>net.shibboleth.plugin.scripting.nashorn</groupId>
     <artifactId>nashorn-impl</artifactId>
     <packaging>jar</packaging>
+    
+    <properties>
+        <automatic.module.name>net.shibboleth.plugins.scripting</automatic.module.name>
+    </properties>
+    
 
     <name>Shibboleth Project Nashorn plugin</name>
     <description>
@@ -53,22 +58,6 @@
 
     <build>
         <plugins>
-	       <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>copy-dependencies</id>
-                        <phase>prepare-package</phase>
-                        <goals>
-                            <goal>copy-dependencies</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>target/dependency</outputDirectory>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId> 

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