You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2017/06/17 09:55:10 UTC
isis git commit: ISIS-1521: further minor tidy up of simpleapp
archetype
Repository: isis
Updated Branches:
refs/heads/master 5d24b3f7a -> 6e58e2e8f
ISIS-1521: further minor tidy up of simpleapp archetype
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/6e58e2e8
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/6e58e2e8
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/6e58e2e8
Branch: refs/heads/master
Commit: 6e58e2e8f32f82e616944757588ca789ab9b64f3
Parents: 5d24b3f
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Mon Jun 5 19:08:16 2017 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Mon Jun 5 19:08:16 2017 +0100
----------------------------------------------------------------------
.../application/simpleapp/module-simple/pom.xml | 36 +++++-------
example/application/simpleapp/webapp/pom.xml | 60 +++++++++-----------
2 files changed, 40 insertions(+), 56 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/6e58e2e8/example/application/simpleapp/module-simple/pom.xml
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/module-simple/pom.xml b/example/application/simpleapp/module-simple/pom.xml
index 1795444..b352e23 100644
--- a/example/application/simpleapp/module-simple/pom.xml
+++ b/example/application/simpleapp/module-simple/pom.xml
@@ -30,11 +30,12 @@
<name>SimpleApp Simple Module</name>
<properties>
- <isis-maven-plugin.validate.appManifest>domainapp.modules.simple.SimpleModuleManifest</isis-maven-plugin.validate.appManifest>
+ <isis-maven-plugin.validate.appManifest>
+ domainapp.modules.simple.SimpleModuleManifest
+ </isis-maven-plugin.validate.appManifest>
<maven-checkstyle-plugin.configLocation>${project.parent.basedir}/_checks/checkstyle.xml</maven-checkstyle-plugin.configLocation>
<maven-pmd-plugin.ruleset>${project.parent.basedir}/_checks/pmd.xml</maven-pmd-plugin.ruleset>
-
</properties>
<build>
@@ -109,38 +110,29 @@
<groupId>org.apache.isis.tool</groupId>
<artifactId>isis-maven-plugin</artifactId>
<version>${isis.version}</version>
- <configuration>
- <appManifest>${isis-maven-plugin.validate.appManifest}</appManifest>
- </configuration>
+ <executions>
+ <execution>
+ <phase>test</phase>
+ <goals>
+ <goal>validate</goal>
+ </goals>
+ <configuration>
+ <appManifest>${isis-maven-plugin.validate.appManifest}</appManifest>
+ </configuration>
+ </execution>
+ </executions>
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
</dependency>
- <!--
- ... workaround to avoid conflict with plexus-default
- (not sure why exclusions in the isis-maven-plugin aren't sufficient, though) ...
- -->
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>19.0</version>
- </dependency>
<dependency>
<groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<version>2.3.1</version>
</dependency>
</dependencies>
- <executions>
- <execution>
- <phase>test</phase>
- <goals>
- <goal>validate</goal>
- </goals>
- </execution>
- </executions>
</plugin>
</plugins>
</build>
http://git-wip-us.apache.org/repos/asf/isis/blob/6e58e2e8/example/application/simpleapp/webapp/pom.xml
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/webapp/pom.xml b/example/application/simpleapp/webapp/pom.xml
index 2d047d1..00cb801 100644
--- a/example/application/simpleapp/webapp/pom.xml
+++ b/example/application/simpleapp/webapp/pom.xml
@@ -34,12 +34,13 @@
<packaging>war</packaging>
<properties>
- <swagger>true</swagger>
- <isis-maven-plugin.swagger.appManifest>domainapp.application.manifest.DomainAppAppManifest</isis-maven-plugin.swagger.appManifest>
- <isis-maven-plugin.swagger.dependency.groupId>${project.groupId}</isis-maven-plugin.swagger.dependency.groupId>
- <isis-maven-plugin.swagger.dependency.artifactId>${project.parent.artifactId}-application</isis-maven-plugin.swagger.dependency.artifactId>
+ <isis-maven-plugin.appManifest>
+ domainapp.application.manifest.DomainAppAppManifest
+ </isis-maven-plugin.appManifest>
- <jetty-console-maven-plugin.backgroundImage>${basedir}/src/main/jettyconsole/isis-banner.png</jetty-console-maven-plugin.backgroundImage>
+ <jetty-console-maven-plugin.backgroundImage>
+ ${basedir}/src/main/jettyconsole/isis-banner.png
+ </jetty-console-maven-plugin.backgroundImage>
<maven-war-plugin.warName>${project.parent.artifactId}</maven-war-plugin.warName>
@@ -105,44 +106,36 @@
<groupId>org.apache.isis.tool</groupId>
<artifactId>isis-maven-plugin</artifactId>
<version>${isis.version}</version>
- <configuration>
- <appManifest>${isis-maven-plugin.swagger.appManifest}</appManifest>
- <visibilities>
- <visibility>PUBLIC</visibility>
- <visibility>PRIVATE</visibility>
- </visibilities>
- <format>${isis-maven-plugin.swagger.format}</format>
- <fileNamePrefix>swagger</fileNamePrefix>
- </configuration>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>swagger</goal>
+ </goals>
+ <configuration>
+ <appManifest>${isis-maven-plugin.appManifest}</appManifest>
+ <visibilities>
+ <visibility>PUBLIC</visibility>
+ <visibility>PRIVATE</visibility>
+ </visibilities>
+ <format>JSON</format>
+ <fileNamePrefix>swagger</fileNamePrefix>
+ </configuration>
+ </execution>
+ </executions>
<dependencies>
<dependency>
- <groupId>${isis-maven-plugin.swagger.dependency.groupId}</groupId>
- <artifactId>${isis-maven-plugin.swagger.dependency.artifactId}</artifactId>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>${project.parent.artifactId}-application</artifactId>
<version>${project.version}</version>
</dependency>
- <!--
- ... workaround to avoid conflict with plexus-default
- (not sure why exclusions in the isis-maven-plugin aren't sufficient, though) ...
- -->
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>19.0</version>
- </dependency>
<dependency>
<groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<version>2.3.1</version>
</dependency>
+ <!-- workaround to avoid conflict with plexus-default -->
</dependencies>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>swagger</goal>
- </goals>
- </execution>
- </executions>
</plugin>
</plugins>
</build>
@@ -161,7 +154,6 @@
<artifactId>isis-mavendeps-webapp</artifactId>
<type>pom</type>
</dependency>
-
<dependency>
<groupId>org.apache.isis.mavendeps</groupId>
<artifactId>isis-mavendeps-intellij</artifactId>