[java-idp-plugin-scripting] 01/02: IDP-1595 Update scripting poms to latest technology
Rod Widdowson
rdw at steadingsoftware.com
Wed Aug 19 11:39:55 UTC 2020
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=b9528423d55a0b02d9c243b88e660a1a7c09e097
commit b9528423d55a0b02d9c243b88e660a1a7c09e097
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Tue Aug 18 17:23:18 2020 +0100
IDP-1595 Update scripting poms to latest technology
https://issues.shibboleth.net/jira/browse/IDP-1595
* Separate assmebly for zip and windows
* Explicit dependencies throughout
* Mention by name those jars that need packaged
---
nashorn-dist/pom.xml | 17 +++---
.../src/main/assembly/nashorn-assembly.xml | 46 ----------------
.../src/main/assembly/plugin-assembly-tgz.xml | 36 +++++++++++++
.../src/main/assembly/plugin-assembly-zip.xml | 63 ++++++++++++++++++++++
nashorn-impl/pom.xml | 46 +++++++++++++++-
rhino-dist/pom.xml | 7 +--
.../src/main/assembly/plugin-assembly-tgz.xml | 36 +++++++++++++
.../src/main/assembly/plugin-assembly-zip.xml | 59 ++++++++++++++++++++
rhino-dist/src/main/assembly/rhino-assembly.xml | 45 ----------------
rhino-impl/pom.xml | 6 ++-
10 files changed, 255 insertions(+), 106 deletions(-)
diff --git a/nashorn-dist/pom.xml b/nashorn-dist/pom.xml
index ebd4240..443233b 100644
--- a/nashorn-dist/pom.xml
+++ b/nashorn-dist/pom.xml
@@ -29,18 +29,19 @@
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
- <execution>
- <id>make-assembly</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
+ <execution>
+ <id>make-assembly</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
</executions>
<configuration>
<appendAssemblyId>false</appendAssemblyId>
<descriptors>
- <descriptor>src/main/assembly/nashorn-assembly.xml</descriptor>
+ <descriptor>src/main/assembly/plugin-assembly-tgz.xml</descriptor>
+ <descriptor>src/main/assembly/plugin-assembly-zip.xml</descriptor>
</descriptors>
<finalName>${nashorn.finalName}</finalName>
<tarLongFileMode>gnu</tarLongFileMode>
diff --git a/nashorn-dist/src/main/assembly/nashorn-assembly.xml b/nashorn-dist/src/main/assembly/nashorn-assembly.xml
deleted file mode 100644
index bf02716..0000000
--- a/nashorn-dist/src/main/assembly/nashorn-assembly.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<assembly>
- <id>assembly</id>
- <formats>
- <format>tar.gz</format>
- <format>zip</format>
- </formats>
- <fileSets>
- <fileSet>
- <directory>../nashorn-impl/target</directory>
- <outputDirectory>edit-webapp/WEB-INF/lib</outputDirectory>
- <includes>
- <include>idp-plugin-nashorn-impl-*.jar</include>
- <include>idp-plugin-scripting-api-*.jar</include>
- <include>asm-*.jar</include> <!-- https://asm.ow2.io/license.html -->
- <include>icu4j-*.jar</include> <!-- http://userguide.icu-project.org/icufaq#TOC-How-is-the-ICU-licensed- -->
- </includes>
- <excludes>
- <exclude>*test*.jar</exclude>
- <exclude>*javadoc.jar</exclude>
- <exclude>*sources.jar</exclude>
- </excludes>
- </fileSet>
- <fileSet>
- <directory>src/main/resources/conf</directory>
- <outputDirectory>conf</outputDirectory>
- <includes>
- <include>*</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>src/main/resources/doc</directory>
- <outputDirectory>doc</outputDirectory>
- <includes>
- <include>*</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>src/main/resources/bootstrap</directory>
- <outputDirectory>bootstrap</outputDirectory>
- <includes>
- <include>keys.txt</include>
- <include>id.property</include>
- </includes>
- </fileSet>
- </fileSets>
-</assembly>
diff --git a/nashorn-dist/src/main/assembly/plugin-assembly-tgz.xml b/nashorn-dist/src/main/assembly/plugin-assembly-tgz.xml
new file mode 100644
index 0000000..f930a56
--- /dev/null
+++ b/nashorn-dist/src/main/assembly/plugin-assembly-tgz.xml
@@ -0,0 +1,36 @@
+<assembly>
+ <id>assembly</id>
+ <formats>
+ <format>tar.gz</format>
+ </formats>
+ <fileSets>
+ <fileSet>
+ <directory>../rhino-impl/target</directory>
+ <outputDirectory>edit-webapp/WEB-INF/lib</outputDirectory>
+ <includes>
+ <include>idp-plugin-rhino-impl-*.jar</include>
+ </includes>
+ <excludes>
+ <exclude>*test*.jar</exclude>
+ <exclude>*javadoc.jar</exclude>
+ <exclude>*sources.jar</exclude>
+ </excludes>
+ </fileSet>
+ <fileSet>
+ <directory>../rhino-impl/target/dependency</directory>
+ <outputDirectory>edit-webapp/WEB-INF/lib</outputDirectory>
+ <includes>
+ <include>*.jar</include>
+ </includes>
+ <excludes>
+ <exclude>*test*.jar</exclude>
+ <exclude>*javadoc.jar</exclude>
+ <exclude>*sources.jar</exclude>
+ </excludes>
+ </fileSet>
+ <fileSet>
+ <directory>${dist.assemblyDirectory}</directory>
+ <outputDirectory></outputDirectory>
+ </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
new file mode 100644
index 0000000..711de89
--- /dev/null
+++ b/nashorn-dist/src/main/assembly/plugin-assembly-zip.xml
@@ -0,0 +1,63 @@
+<assembly>
+ <id>assembly</id>
+ <formats>
+ <format>zip</format>
+ </formats>
+ <fileSets>
+ <fileSet>
+ <directory>../nashorn-impl/target</directory>
+ <outputDirectory>edit-webapp/WEB-INF/lib</outputDirectory>
+ <includes>
+ <include>idp-plugin-nashorn-impl-*.jar</include>
+ </includes>
+ <excludes>
+ <exclude>*test*.jar</exclude>
+ <exclude>*javadoc.jar</exclude>
+ <exclude>*sources.jar</exclude>
+ </excludes>
+ </fileSet>
+ <fileSet>
+ <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>
+ <outputDirectory></outputDirectory>
+ <excludes>
+ <exclude>**/*.bat</exclude>
+ <exclude>**/*.config</exclude>
+ <exclude>**/*.ini</exclude>
+ <exclude>**/*.properties</exclude>
+ <exclude>**/*.txt</exclude>
+ <exclude>**/*.vm</exclude>
+ <exclude>**/*.xml</exclude>
+ </excludes>
+ </fileSet>
+ <fileSet>
+ <directory>${dist.assemblyDirectory}</directory>
+ <outputDirectory></outputDirectory>
+ <includes>
+ <include>**/*.bat</include>
+ <include>**/*.config</include>
+ <include>**/*.ini</include>
+ <include>**/*.properties</include>
+ <include>**/*.txt</include>
+ <include>**/*.vm</include>
+ <include>**/*.xml</include>
+ </includes>
+ <lineEnding>windows</lineEnding>
+ </fileSet>
+ </fileSets>
+</assembly>
diff --git a/nashorn-impl/pom.xml b/nashorn-impl/pom.xml
index 410c50f..5bb3a1a 100644
--- a/nashorn-impl/pom.xml
+++ b/nashorn-impl/pom.xml
@@ -17,6 +17,9 @@
<properties>
<checkstyle.configLocation>${project.basedir}/../checkstyle.xml</checkstyle.configLocation>
<automatic.module.name>net.shibboleth.idp.plugin.nashorn</automatic.module.name>
+ <!-- Revise these two when Graal changes -->
+ <asm.version>7.1</asm.version>
+ <icu4j.version>64.2</icu4j.version>
</properties>
<description>
@@ -80,6 +83,43 @@
<version>${graalvm.version}</version>
<scope>provided</scope>
</dependency>
+
+ <dependency>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm</artifactId>
+ <version>${asm.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm-tree</artifactId>
+ <version>${asm.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm-analysis</artifactId>
+ <version>${asm.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm-commons</artifactId>
+ <version>${asm.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm-util</artifactId>
+ <version>${asm.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.ibm.icu</groupId>
+ <artifactId>icu4j</artifactId>
+ <version>${icu4j.version}</version>
+ <scope>runtime</scope>
+ </dependency>
<dependency>
<groupId>${idp.groupId}</groupId>
@@ -107,12 +147,14 @@
<executions>
<execution>
<id>copy-dependencies</id>
- <phase>install</phase>
+ <phase>package</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
<configuration>
- <outputDirectory>target</outputDirectory>
+ <outputDirectory>${project.target.directory}</outputDirectory>
+ <includeScope>runtime</includeScope>
+ <excludeTransitive>true</excludeTransitive>
</configuration>
</execution>
</executions>
diff --git a/rhino-dist/pom.xml b/rhino-dist/pom.xml
index 2fe9b71..d0c57ba 100644
--- a/rhino-dist/pom.xml
+++ b/rhino-dist/pom.xml
@@ -20,7 +20,7 @@
<properties>
<checkstyle.configLocation>${project.basedir}/../checkstyle.xml</checkstyle.configLocation>
- <rhino.finalName>shibboleth-idp-plugin-rhino-${project.version}</rhino.finalName>
+ <dist.finalName>shibboleth-idp-plugin-rhino-${project.version}</dist.finalName>
</properties>
<build>
@@ -40,9 +40,10 @@
<configuration>
<appendAssemblyId>false</appendAssemblyId>
<descriptors>
- <descriptor>src/main/assembly/rhino-assembly.xml</descriptor>
+ <descriptor>src/main/assembly/plugin-assembly-tgz.xml</descriptor>
+ <descriptor>src/main/assembly/plugin-assembly-zip.xml</descriptor>
</descriptors>
- <finalName>${rhino.finalName}</finalName>
+ <finalName>${dist.finalName}</finalName>
<tarLongFileMode>gnu</tarLongFileMode>
</configuration>
</plugin>
diff --git a/rhino-dist/src/main/assembly/plugin-assembly-tgz.xml b/rhino-dist/src/main/assembly/plugin-assembly-tgz.xml
new file mode 100644
index 0000000..f930a56
--- /dev/null
+++ b/rhino-dist/src/main/assembly/plugin-assembly-tgz.xml
@@ -0,0 +1,36 @@
+<assembly>
+ <id>assembly</id>
+ <formats>
+ <format>tar.gz</format>
+ </formats>
+ <fileSets>
+ <fileSet>
+ <directory>../rhino-impl/target</directory>
+ <outputDirectory>edit-webapp/WEB-INF/lib</outputDirectory>
+ <includes>
+ <include>idp-plugin-rhino-impl-*.jar</include>
+ </includes>
+ <excludes>
+ <exclude>*test*.jar</exclude>
+ <exclude>*javadoc.jar</exclude>
+ <exclude>*sources.jar</exclude>
+ </excludes>
+ </fileSet>
+ <fileSet>
+ <directory>../rhino-impl/target/dependency</directory>
+ <outputDirectory>edit-webapp/WEB-INF/lib</outputDirectory>
+ <includes>
+ <include>*.jar</include>
+ </includes>
+ <excludes>
+ <exclude>*test*.jar</exclude>
+ <exclude>*javadoc.jar</exclude>
+ <exclude>*sources.jar</exclude>
+ </excludes>
+ </fileSet>
+ <fileSet>
+ <directory>${dist.assemblyDirectory}</directory>
+ <outputDirectory></outputDirectory>
+ </fileSet>
+ </fileSets>
+</assembly>
diff --git a/rhino-dist/src/main/assembly/plugin-assembly-zip.xml b/rhino-dist/src/main/assembly/plugin-assembly-zip.xml
new file mode 100644
index 0000000..27365d7
--- /dev/null
+++ b/rhino-dist/src/main/assembly/plugin-assembly-zip.xml
@@ -0,0 +1,59 @@
+<assembly>
+ <id>assembly</id>
+ <formats>
+ <format>zip</format>
+ </formats>
+ <fileSets>
+ <fileSet>
+ <directory>../rhino-impl/target</directory>
+ <outputDirectory>edit-webapp/WEB-INF/lib</outputDirectory>
+ <includes>
+ <include>idp-plugin-rhino-impl-*.jar</include>
+ </includes>
+ <excludes>
+ <exclude>*test*.jar</exclude>
+ <exclude>*javadoc.jar</exclude>
+ <exclude>*sources.jar</exclude>
+ </excludes>
+ </fileSet>
+ <fileSet>
+ <directory>../rhino-impl/target/dependency</directory>
+ <outputDirectory>edit-webapp/WEB-INF/lib</outputDirectory>
+ <includes>
+ <include>*.jar</include>
+ </includes>
+ <excludes>
+ <exclude>*test*.jar</exclude>
+ <exclude>*javadoc.jar</exclude>
+ <exclude>*sources.jar</exclude>
+ </excludes>
+ </fileSet>
+ <fileSet>
+ <directory>${dist.assemblyDirectory}</directory>
+ <outputDirectory></outputDirectory>
+ <excludes>
+ <exclude>**/*.bat</exclude>
+ <exclude>**/*.config</exclude>
+ <exclude>**/*.ini</exclude>
+ <exclude>**/*.properties</exclude>
+ <exclude>**/*.txt</exclude>
+ <exclude>**/*.vm</exclude>
+ <exclude>**/*.xml</exclude>
+ </excludes>
+ </fileSet>
+ <fileSet>
+ <directory>${dist.assemblyDirectory}</directory>
+ <outputDirectory></outputDirectory>
+ <includes>
+ <include>**/*.bat</include>
+ <include>**/*.config</include>
+ <include>**/*.ini</include>
+ <include>**/*.properties</include>
+ <include>**/*.txt</include>
+ <include>**/*.vm</include>
+ <include>**/*.xml</include>
+ </includes>
+ <lineEnding>windows</lineEnding>
+ </fileSet>
+ </fileSets>
+</assembly>
diff --git a/rhino-dist/src/main/assembly/rhino-assembly.xml b/rhino-dist/src/main/assembly/rhino-assembly.xml
deleted file mode 100644
index bdcba87..0000000
--- a/rhino-dist/src/main/assembly/rhino-assembly.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<assembly>
- <id>assembly</id>
- <formats>
- <format>tar.gz</format>
- <format>zip</format>
- </formats>
- <fileSets>
- <fileSet>
- <directory>../rhino-impl/target</directory>
- <outputDirectory>edit-webapp/WEB-INF/lib</outputDirectory>
- <includes>
- <include>idp-plugin-rhino-impl-*.jar</include>
- <include>idp-plugin-scripting-api-*.jar</include>
- <include>rhino-*.jar</include> <!-- https://developer.mozilla.org/en-US/docs/Mozilla/Projects/Rhino/License -->
- </includes>
- <excludes>
- <exclude>*test*.jar</exclude>
- <exclude>*javadoc.jar</exclude>
- <exclude>*sources.jar</exclude>
- </excludes>
- </fileSet>
- <fileSet>
- <directory>src/main/resources/conf</directory>
- <outputDirectory>conf</outputDirectory>
- <includes>
- <include>*</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>src/main/resources/doc</directory>
- <outputDirectory>doc</outputDirectory>
- <includes>
- <include>*</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>src/main/resources/bootstrap</directory>
- <outputDirectory>bootstrap</outputDirectory>
- <includes>
- <include>keys.txt</include>
- <include>id.property</include>
- </includes>
- </fileSet>
- </fileSets>
-</assembly>
diff --git a/rhino-impl/pom.xml b/rhino-impl/pom.xml
index f10b869..507d739 100644
--- a/rhino-impl/pom.xml
+++ b/rhino-impl/pom.xml
@@ -89,12 +89,14 @@
<executions>
<execution>
<id>copy-dependencies</id>
- <phase>install</phase>
+ <phase>package</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
<configuration>
- <outputDirectory>target</outputDirectory>
+ <outputDirectory>${project.target.directory}</outputDirectory>
+ <includeScope>runtime</includeScope>
+ <excludeTransitive>true</excludeTransitive>
</configuration>
</execution>
</executions>
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list