[java-idp-plugin-scripting] 01/02: Fix Build

[Rod Widdowson]

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

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

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

commit 8a3724b8881b40e3d5d165776b287d0753541927
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Sat Aug 22 15:38:45 2020 +0100

    Fix Build
---
 nashorn-dist/src/main/assembly/plugin-assembly-tgz.xml   | 16 ++++++++++------
 nashorn-dist/src/main/assembly/plugin-assembly-zip.xml   |  6 ++++--
 .../resources/doc/{nashorn-plugin => nashorn-plugin.txt} |  0
 rhino-dist/src/main/assembly/plugin-assembly-tgz.xml     |  2 +-
 rhino-dist/src/main/assembly/plugin-assembly-zip.xml     |  6 ++++--
 .../resources/doc/{rhino-plugin => rhino-plugin.txt}     |  0
 6 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/nashorn-dist/src/main/assembly/plugin-assembly-tgz.xml b/nashorn-dist/src/main/assembly/plugin-assembly-tgz.xml
index e9ae044..4680e3d 100644
--- a/nashorn-dist/src/main/assembly/plugin-assembly-tgz.xml
+++ b/nashorn-dist/src/main/assembly/plugin-assembly-tgz.xml
@@ -5,10 +5,10 @@
     </formats>
     <fileSets>
         <fileSet>
-            <directory>../rhino-impl/target</directory>
+            <directory>../nashorn-impl/target</directory>
             <outputDirectory>edit-webapp/WEB-INF/lib</outputDirectory>
             <includes>
-                <include>idp-plugin-rhino-impl-*.jar</include>
+                <include>idp-plugin-nashorn-impl-*.jar</include>
             </includes>
             <excludes>
                 <exclude>*test*.jar</exclude>
@@ -17,20 +17,24 @@
             </excludes>
         </fileSet>
         <fileSet>
-            <directory>../rhino-impl/target/dependency</directory>
+            <directory>../nashorn-impl/target/dependency</directory>
             <outputDirectory>edit-webapp/WEB-INF/lib</outputDirectory>
             <includes>
                 <include>*.jar</include>
             </includes>
             <excludes>
+                <exclude>graal-sdk*</exclude>
+                <exclude>js*</exclude>
+                <exclude>truffle-api*</exclude>
+                <exclude>regex*</exclude>
                 <exclude>*test*.jar</exclude>
                 <exclude>*javadoc.jar</exclude>
                 <exclude>*sources.jar</exclude>
             </excludes>
         </fileSet>
-        <fileSet>
-            <directory>${dist.assemblyDirectory}</directory>
+       <fileSet>
+            <directory>src/main/resources</directory>
             <outputDirectory></outputDirectory>
-        </fileSet>
+       </fileSet>
     </fileSets>
 </assembly>
diff --git a/nashorn-dist/src/main/assembly/plugin-assembly-zip.xml b/nashorn-dist/src/main/assembly/plugin-assembly-zip.xml
index 77e70da..fcf5fec 100644
--- a/nashorn-dist/src/main/assembly/plugin-assembly-zip.xml
+++ b/nashorn-dist/src/main/assembly/plugin-assembly-zip.xml
@@ -33,26 +33,28 @@
             </excludes>
         </fileSet>
         <fileSet>
-            <directory>${dist.assemblyDirectory}</directory>
+            <directory>src/main/resources</directory>
             <outputDirectory></outputDirectory>
             <excludes>
                 <exclude>**/*.bat</exclude>
                 <exclude>**/*.config</exclude>
                 <exclude>**/*.ini</exclude>
                 <exclude>**/*.properties</exclude>
+                <exclude>**/*.property</exclude>
                 <exclude>**/*.txt</exclude>
                 <exclude>**/*.vm</exclude>
                 <exclude>**/*.xml</exclude>
             </excludes>
         </fileSet>
         <fileSet>
-            <directory>${dist.assemblyDirectory}</directory>
+            <directory>src/main/resources</directory>
             <outputDirectory></outputDirectory>
             <includes>
                 <include>**/*.bat</include>
                 <include>**/*.config</include>
                 <include>**/*.ini</include>
                 <include>**/*.properties</include>
+                <include>**/*.property</include>
                 <include>**/*.txt</include>
                 <include>**/*.vm</include>
                 <include>**/*.xml</include>
diff --git a/nashorn-dist/src/main/resources/doc/nashorn-plugin b/nashorn-dist/src/main/resources/doc/nashorn-plugin.txt
similarity index 100%
rename from nashorn-dist/src/main/resources/doc/nashorn-plugin
rename to nashorn-dist/src/main/resources/doc/nashorn-plugin.txt
diff --git a/rhino-dist/src/main/assembly/plugin-assembly-tgz.xml b/rhino-dist/src/main/assembly/plugin-assembly-tgz.xml
index e9ae044..81ea030 100644
--- a/rhino-dist/src/main/assembly/plugin-assembly-tgz.xml
+++ b/rhino-dist/src/main/assembly/plugin-assembly-tgz.xml
@@ -29,7 +29,7 @@
             </excludes>
         </fileSet>
         <fileSet>
-            <directory>${dist.assemblyDirectory}</directory>
+            <directory>src/main/resources</directory>
             <outputDirectory></outputDirectory>
         </fileSet>
     </fileSets>
diff --git a/rhino-dist/src/main/assembly/plugin-assembly-zip.xml b/rhino-dist/src/main/assembly/plugin-assembly-zip.xml
index 390a0ae..14c3f2c 100644
--- a/rhino-dist/src/main/assembly/plugin-assembly-zip.xml
+++ b/rhino-dist/src/main/assembly/plugin-assembly-zip.xml
@@ -29,26 +29,28 @@
             </excludes>
         </fileSet>
         <fileSet>
-            <directory>${dist.assemblyDirectory}</directory>
+            <directory>src/main/resources</directory>
             <outputDirectory></outputDirectory>
             <excludes>
                 <exclude>**/*.bat</exclude>
                 <exclude>**/*.config</exclude>
                 <exclude>**/*.ini</exclude>
                 <exclude>**/*.properties</exclude>
+                <exclude>**/*.property</exclude>
                 <exclude>**/*.txt</exclude>
                 <exclude>**/*.vm</exclude>
                 <exclude>**/*.xml</exclude>
             </excludes>
         </fileSet>
         <fileSet>
-            <directory>${dist.assemblyDirectory}</directory>
+            <directory>src/main/resources</directory>
             <outputDirectory></outputDirectory>
             <includes>
                 <include>**/*.bat</include>
                 <include>**/*.config</include>
                 <include>**/*.ini</include>
                 <include>**/*.properties</include>
+                <include>**/*.property</include>
                 <include>**/*.txt</include>
                 <include>**/*.vm</include>
                 <include>**/*.xml</include>
diff --git a/rhino-dist/src/main/resources/doc/rhino-plugin b/rhino-dist/src/main/resources/doc/rhino-plugin.txt
similarity index 100%
rename from rhino-dist/src/main/resources/doc/rhino-plugin
rename to rhino-dist/src/main/resources/doc/rhino-plugin.txt

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