This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 0557a4c8147df0ecdd494b07f3f076da17035ae4
Author: danhaywood <d...@haywood-associates.co.uk>
AuthorDate: Tue Jul 24 00:30:48 2018 +0100
ISIS-1969: updates helloworld and simpleapp to optionally build skinny wars
(intended for use with Docker image as per webdocker).
---
example/application/helloworld/pom.xml | 35 +++++++++++++++++++++++++
example/application/simpleapp/webapp/pom.xml | 38 +++++++++++++++++++++++++++-
2 files changed, 72 insertions(+), 1 deletion(-)
diff --git a/example/application/helloworld/pom.xml
b/example/application/helloworld/pom.xml
index 5be9963..90508f8 100644
--- a/example/application/helloworld/pom.xml
+++ b/example/application/helloworld/pom.xml
@@ -221,6 +221,41 @@
</build>
</profile>
+ <profile>
+ <id>skinny-war</id>
+ <activation>
+ <property>
+ <name>skinny-war</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-war-plugin</artifactId>
+ <version>${maven-war-plugin.version}</version>
+ <configuration>
+ <warName>${maven-war-plugin.warName}</warName>
+
<packagingExcludes>%regex[WEB-INF/lib/(?!common-A|common-B).*.jar]</packagingExcludes>
+ <archive>
+ <manifest>
+ <addClasspath>false</addClasspath>
+ </manifest>
+ <manifestEntries>
+
<Build-Time>${maven.build.timestamp}</Build-Time>
+ <Build-Host>${agent.name}</Build-Host>
+ <Build-User>${user.name}</Build-User>
+ <Build-Maven>Maven
${maven.version}</Build-Maven>
+ <Build-Java>${java.version}</Build-Java>
+ <Build-OS>${os.name}</Build-OS>
+
<Build-Label>${project.version}</Build-Label>
+ </manifestEntries>
+ </archive>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
<!--
using:
mvn -s .m2/settings.xml -D deploy-to-tomcat tomcat7:deploy-only
diff --git a/example/application/simpleapp/webapp/pom.xml
b/example/application/simpleapp/webapp/pom.xml
index 16d0e14..52850f4 100644
--- a/example/application/simpleapp/webapp/pom.xml
+++ b/example/application/simpleapp/webapp/pom.xml
@@ -236,10 +236,46 @@
</dependencies>
</profile>
+ <profile>
+ <id>skinny-war</id>
+ <activation>
+ <property>
+ <name>skinny-war</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-war-plugin</artifactId>
+ <version>${maven-war-plugin.version}</version>
+ <configuration>
+ <warName>${maven-war-plugin.warName}</warName>
+ <packagingExcludes>
+
%regex[WEB-INF/lib/(?!simpleapp-application|simpleapp-module-simple).*.jar]
+ </packagingExcludes>
+ <archive>
+ <manifest>
+ <addClasspath>false</addClasspath>
+ </manifest>
+ <manifestEntries>
+
<Build-Time>${maven.build.timestamp}</Build-Time>
+ <Build-Host>${agent.name}</Build-Host>
+ <Build-User>${user.name}</Build-User>
+ <Build-Maven>Maven
${maven.version}</Build-Maven>
+ <Build-Java>${java.version}</Build-Java>
+ <Build-OS>${os.name}</Build-OS>
+
<Build-Label>${project.version}</Build-Label>
+ </manifestEntries>
+ </archive>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
<!--
using:
- mvn -s .m2/settings.xml -D deploy-to-tomcat tomcat7:deploy-only
+ mvn -pl webapp -s .m2/settings.xml -D deploy-to-tomcat
tomcat7:deploy-only
-->
<profile>
<id>deploy-to-tomcat</id>
