[java-idp-plugin-totp] branch main updated: Redo assembly process.
Scott Cantor
cantor.2 at osu.edu
Tue Aug 18 12:58:10 UTC 2020
This is an automated email from the git hooks/post-receive script.
scantor pushed a commit to branch main
in repository java-idp-plugin-totp.
View the commit online:
http://git.shibboleth.net/view/?p=java-idp-plugin-totp.git;a=commit;h=fce3b5d936f159df77020339ca8c5b33bb44da99
The following commit(s) were added to refs/heads/main by this push:
new fce3b5d Redo assembly process.
fce3b5d is described below
commit fce3b5d936f159df77020339ca8c5b33bb44da99
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Tue Aug 18 08:57:57 2020 -0400
Redo assembly process.
---
totp-dist/pom.xml | 45 +++++++++++++-
.../src/main/assembly/plugin-assembly-tgz.xml | 36 +++++++++++
.../src/main/assembly/plugin-assembly-zip.xml | 59 ++++++++++++++++++
totp-dist/src/main/assembly/totp-assembly.xml | 71 ----------------------
4 files changed, 139 insertions(+), 72 deletions(-)
diff --git a/totp-dist/pom.xml b/totp-dist/pom.xml
index c2788d1..bd5dd8e 100644
--- a/totp-dist/pom.xml
+++ b/totp-dist/pom.xml
@@ -18,10 +18,52 @@
<properties>
<checkstyle.configLocation>${project.basedir}/../checkstyle.xml</checkstyle.configLocation>
<dist.finalName>shibboleth-idp-plugin-totp-${project.version}</dist.finalName>
+ <dist.assemblyDirectory>${project.build.directory}/${dist.finalName}</dist.assemblyDirectory>
</properties>
<build>
<plugins>
+ <!-- Copy src/main/resources to assembly directory. -->
+ <plugin>
+ <artifactId>maven-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-resources</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+ <includeEmptyDirs>true</includeEmptyDirs>
+ <outputDirectory>${dist.assemblyDirectory}</outputDirectory>
+ <resources>
+ <resource>
+ <directory>${basedir}/src/main/resources</directory>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.8</version>
+ <executions>
+ <execution>
+ <id>make-files-in-bin-executable</id>
+ <phase>package</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <target>
+ <chmod dir="${dist.assemblyDirectory}/bin" perm="755" includes="**/*.sh" />
+ </target>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
<!-- Assemble -->
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
@@ -37,7 +79,8 @@
<configuration>
<appendAssemblyId>false</appendAssemblyId>
<descriptors>
- <descriptor>src/main/assembly/totp-assembly.xml</descriptor>
+ <descriptor>src/main/assembly/plugin-assembly-tgz.xml</descriptor>
+ <descriptor>src/main/assembly/plugin-assembly-zip.xml</descriptor>
</descriptors>
<finalName>${dist.finalName}</finalName>
<tarLongFileMode>gnu</tarLongFileMode>
diff --git a/totp-dist/src/main/assembly/plugin-assembly-tgz.xml b/totp-dist/src/main/assembly/plugin-assembly-tgz.xml
new file mode 100644
index 0000000..54b4335
--- /dev/null
+++ b/totp-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>../totp-impl/target</directory>
+ <outputDirectory>edit-webapp/WEB-INF/lib</outputDirectory>
+ <includes>
+ <include>idp-plugin-totp-impl-*.jar</include>
+ </includes>
+ <excludes>
+ <exclude>*test*.jar</exclude>
+ <exclude>*javadoc.jar</exclude>
+ <exclude>*sources.jar</exclude>
+ </excludes>
+ </fileSet>
+ <fileSet>
+ <directory>../totp-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/totp-dist/src/main/assembly/plugin-assembly-zip.xml b/totp-dist/src/main/assembly/plugin-assembly-zip.xml
new file mode 100644
index 0000000..f5a1645
--- /dev/null
+++ b/totp-dist/src/main/assembly/plugin-assembly-zip.xml
@@ -0,0 +1,59 @@
+<assembly>
+ <id>assembly</id>
+ <formats>
+ <format>zip</format>
+ </formats>
+ <fileSets>
+ <fileSet>
+ <directory>../totp-impl/target</directory>
+ <outputDirectory>edit-webapp/WEB-INF/lib</outputDirectory>
+ <includes>
+ <include>idp-plugin-totp-impl-*.jar</include>
+ </includes>
+ <excludes>
+ <exclude>*test*.jar</exclude>
+ <exclude>*javadoc.jar</exclude>
+ <exclude>*sources.jar</exclude>
+ </excludes>
+ </fileSet>
+ <fileSet>
+ <directory>../totp-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/totp-dist/src/main/assembly/totp-assembly.xml b/totp-dist/src/main/assembly/totp-assembly.xml
deleted file mode 100644
index 6a3e2e8..0000000
--- a/totp-dist/src/main/assembly/totp-assembly.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<assembly>
- <id>assembly</id>
- <formats>
- <format>tar.gz</format>
- <format>zip</format>
- </formats>
- <fileSets>
- <fileSet>
- <directory>../totp-impl/target</directory>
- <outputDirectory>edit-webapp/WEB-INF/lib</outputDirectory>
- <includes>
- <include>idp-plugin-totp-impl-*.jar</include>
- </includes>
- <excludes>
- <exclude>*test*.jar</exclude>
- <exclude>*javadoc.jar</exclude>
- <exclude>*sources.jar</exclude>
- </excludes>
- </fileSet>
- <fileSet>
- <directory>../totp-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>src/main/resources/bin</directory>
- <outputDirectory>bin</outputDirectory>
- <includes>
- <include>*.sh</include>
- <include>*.bat</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>src/main/resources/conf</directory>
- <outputDirectory>conf</outputDirectory>
- <includes>
- <include>*.xml</include>
- <include>*.properties</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>src/main/resources/views</directory>
- <outputDirectory>views</outputDirectory>
- <includes>
- <include>*.vm</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>src/main/resources/doc</directory>
- <outputDirectory>doc</outputDirectory>
- <includes>
- <include>*.txt</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>
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list