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/05 16:22:35 UTC
isis git commit: ISIS-1521: cleans up the simpleapp archetype,
adds in mavendeps (brought in from incode)
Repository: isis
Updated Branches:
refs/heads/master 3aca448ba -> 5d24b3f7a
ISIS-1521: cleans up the simpleapp archetype, adds in mavendeps (brought in from incode)
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/5d24b3f7
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/5d24b3f7
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/5d24b3f7
Branch: refs/heads/master
Commit: 5d24b3f7a9ad543753c2c07d0107680b7172a06d
Parents: 3aca448
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Mon Jun 5 17:22:07 2017 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Mon Jun 5 17:22:07 2017 +0100
----------------------------------------------------------------------
core/mavendeps-intellij/pom.xml | 60 +++++
core/mavendeps-testing/pom.xml | 92 ++++++++
core/mavendeps-webapp/pom.xml | 79 +++++++
core/pom.xml | 37 +++-
.../application/simpleapp/application/pom.xml | 23 +-
.../application/simpleapp/module-simple/pom.xml | 71 ++++--
example/application/simpleapp/pom.xml | 218 +------------------
example/application/simpleapp/webapp/pom.xml | 104 +++++----
8 files changed, 380 insertions(+), 304 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/5d24b3f7/core/mavendeps-intellij/pom.xml
----------------------------------------------------------------------
diff --git a/core/mavendeps-intellij/pom.xml b/core/mavendeps-intellij/pom.xml
new file mode 100644
index 0000000..3206b1d
--- /dev/null
+++ b/core/mavendeps-intellij/pom.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<project
+ xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis</artifactId>
+ <version>1.15.0-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.apache.isis.mavendeps</groupId>
+ <artifactId>isis-mavendeps-intellij</artifactId>
+
+ <packaging>pom</packaging>
+
+ <name>Apache Isis Maven Dependencies for IntelliJ</name>
+ <description>
+ Defines a module that can be used to run an Apache Isis webapp from within IntelliJ.
+ </description>
+
+ <profiles>
+ <profile>
+ <id>isis-mavendeps-intellij</id>
+ <activation>
+ <property>
+ <name>idea.version</name>
+ </property>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-core-webserver</artifactId>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
+</project>
http://git-wip-us.apache.org/repos/asf/isis/blob/5d24b3f7/core/mavendeps-testing/pom.xml
----------------------------------------------------------------------
diff --git a/core/mavendeps-testing/pom.xml b/core/mavendeps-testing/pom.xml
new file mode 100644
index 0000000..677c331
--- /dev/null
+++ b/core/mavendeps-testing/pom.xml
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<project
+ xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis</artifactId>
+ <version>1.15.0-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.apache.isis.mavendeps</groupId>
+ <artifactId>isis-mavendeps-testing</artifactId>
+
+ <packaging>pom</packaging>
+
+ <name>Apache Isis Maven Dependencies for Testing</name>
+ <description>
+ Defines a module that can be used as a single dependency for a set of common testing libraries.
+ </description>
+
+ <profiles>
+ <profile>
+ <id>isis-mavendeps-testing</id>
+ <activation>
+ <property>
+ <name>!skip.isis-mavendeps-testing</name>
+ </property>
+ </activation>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-core-unittestsupport</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-core-integtestsupport</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-core-specsupport</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.objenesis</groupId>
+ <artifactId>objenesis</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest-library</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.assertj</groupId>
+ <artifactId>assertj-core</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.hsqldb</groupId>
+ <artifactId>hsqldb</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.datanucleus</groupId>
+ <artifactId>datanucleus-core</artifactId>
+ </dependency>
+
+ </dependencies>
+ </profile>
+ </profiles>
+
+</project>
http://git-wip-us.apache.org/repos/asf/isis/blob/5d24b3f7/core/mavendeps-webapp/pom.xml
----------------------------------------------------------------------
diff --git a/core/mavendeps-webapp/pom.xml b/core/mavendeps-webapp/pom.xml
new file mode 100644
index 0000000..c93d3a1
--- /dev/null
+++ b/core/mavendeps-webapp/pom.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<project
+ xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis</artifactId>
+ <version>1.15.0-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.apache.isis.mavendeps</groupId>
+ <artifactId>isis-mavendeps-webapp</artifactId>
+
+ <packaging>pom</packaging>
+
+ <name>Apache Isis Maven Dependencies for Webapp</name>
+ <description>
+ Defines a module that can be used as a single dependency for running an Apache Isis webapp (Wicket, Restful Objects and Shiro security)
+ </description>
+
+ <profiles>
+ <profile>
+ <id>isis-mavendeps-webapp</id>
+ <activation>
+ <property>
+ <name>!skip.isis-mavendeps-webapp</name>
+ </property>
+ </activation>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-core-viewer-wicket-impl</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-core-viewer-restfulobjects-server</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-core-security-shiro</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-core-security</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-servlet_3.0_spec</artifactId>
+ </dependency>
+ </dependencies>
+
+ </profile>
+ </profiles>
+
+</project>
http://git-wip-us.apache.org/repos/asf/isis/blob/5d24b3f7/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 5e9731a..3379199 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -112,6 +112,7 @@
<hamcrest.version>1.3</hamcrest.version>
+ <assertj.version>3.6.2</assertj.version>
<objenesis.version>2.4</objenesis.version>
<javassist.version>3.20.0-GA</javassist.version>
<reflections.version>0.9.10</reflections.version>
@@ -1083,7 +1084,6 @@ ${license.additional-notes}
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-unittestsupport</artifactId>
<version>1.15.0-SNAPSHOT</version>
- <!-- not scope=test, because referenced by some sql-tests-common under compile scope -->
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
@@ -1188,7 +1188,6 @@ ${license.additional-notes}
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-integtestsupport</artifactId>
<version>1.15.0-SNAPSHOT</version>
- <!-- not scope=test, because referenced by some sql-tests-common under compile scope -->
</dependency>
<!-- Restful Objects viewer -->
@@ -1285,7 +1284,6 @@ ${license.additional-notes}
<type>test-jar</type>
</dependency>
-
<!-- Maven plugin -->
<dependency>
<groupId>org.apache.isis.tool</groupId>
@@ -1293,6 +1291,26 @@ ${license.additional-notes}
<version>1.15.0-SNAPSHOT</version>
</dependency>
+ <!-- Maven dependencies -->
+ <dependency>
+ <groupId>org.apache.isis.mavendeps</groupId>
+ <artifactId>isis-mavendeps-intellij</artifactId>
+ <version>1.15.0-SNAPSHOT</version>
+ <type>pom</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.isis.mavendeps</groupId>
+ <artifactId>isis-mavendeps-testing</artifactId>
+ <version>1.15.0-SNAPSHOT</version>
+ <type>pom</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.isis.mavendeps</groupId>
+ <artifactId>isis-mavendeps-webapp</artifactId>
+ <version>1.15.0-SNAPSHOT</version>
+ <type>pom</type>
+ </dependency>
+
<!-- JodaTime -->
<dependency>
<groupId>joda-time</groupId>
@@ -1841,6 +1859,13 @@ ${license.additional-notes}
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.assertj</groupId>
+ <artifactId>assertj-core</artifactId>
+ <version>${assertj.version}</version>
+ </dependency>
+
+
<!-- BDD testing -->
<dependency>
<groupId>info.cukes</groupId>
@@ -2011,6 +2036,7 @@ ${license.additional-notes}
</dependencies>
<profiles>
+
<profile>
<id>jdk7</id>
<build>
@@ -2200,8 +2226,11 @@ ${license.additional-notes}
<module>viewer-wicket-impl</module>
<module>maven-plugin</module>
- </modules>
+ <module>mavendeps-intellij</module>
+ <module>mavendeps-webapp</module>
+ <module>mavendeps-testing</module>
+ </modules>
</project>
http://git-wip-us.apache.org/repos/asf/isis/blob/5d24b3f7/example/application/simpleapp/application/pom.xml
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/application/pom.xml b/example/application/simpleapp/application/pom.xml
index b2a0a6d..9b292fb 100644
--- a/example/application/simpleapp/application/pom.xml
+++ b/example/application/simpleapp/application/pom.xml
@@ -77,22 +77,18 @@
<mixin>
<groupId>com.danhaywood.mavenmixin</groupId>
<artifactId>standard</artifactId>
- <version>${mavenmixin-standard.version}</version>
</mixin>
<mixin>
<groupId>com.danhaywood.mavenmixin</groupId>
<artifactId>enforcerrelaxed</artifactId>
- <version>${mavenmixin-enforcerrelaxed.version}</version>
</mixin>
<mixin>
<groupId>com.danhaywood.mavenmixin</groupId>
<artifactId>surefire</artifactId>
- <version>${mavenmixin-surefire.version}</version>
</mixin>
<mixin>
<groupId>com.danhaywood.mavenmixin</groupId>
<artifactId>cucumberreporting</artifactId>
- <version>${mavenmixin-cucumberreporting.version}</version>
</mixin>
</mixins>
</configuration>
@@ -102,11 +98,17 @@
<dependencies>
- <!-- this app -->
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>simpleapp-module-simple</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-core-wrapper</artifactId>
+ </dependency>
+
+ <!-- test -->
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>simpleapp-module-simple</artifactId>
@@ -114,16 +116,9 @@
<scope>test</scope>
</dependency>
- <!-- isis -->
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-wrapper</artifactId>
- </dependency>
-
<dependency>
- <groupId>com.danhaywood.mavendeps</groupId>
- <artifactId>isistesting</artifactId>
- <version>${mavendeps-isistesting.version}</version>
+ <groupId>org.apache.isis.mavendeps</groupId>
+ <artifactId>isis-mavendeps-testing</artifactId>
<type>pom</type>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/isis/blob/5d24b3f7/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 168ebb7..1795444 100644
--- a/example/application/simpleapp/module-simple/pom.xml
+++ b/example/application/simpleapp/module-simple/pom.xml
@@ -80,42 +80,68 @@
<mixins>
<mixin>
<groupId>com.danhaywood.mavenmixin</groupId>
- <artifactId>standard</artifactId>
- <version>${mavenmixin-standard.version}</version>
+ <artifactId>datanucleusenhance</artifactId>
</mixin>
<mixin>
<groupId>com.danhaywood.mavenmixin</groupId>
<artifactId>enforcerrelaxed</artifactId>
- <version>${mavenmixin-enforcerrelaxed.version}</version>
- </mixin>
- <mixin>
- <groupId>com.danhaywood.mavenmixin</groupId>
- <artifactId>datanucleusenhance</artifactId>
- <version>${mavenmixin-datanucleusenhance.version}</version>
</mixin>
<mixin>
<groupId>com.danhaywood.mavenmixin</groupId>
- <artifactId>isisvalidate</artifactId>
- <version>${mavenmixin-isisvalidate.version}</version>
+ <artifactId>sourceandjavadoc</artifactId>
</mixin>
<mixin>
<groupId>com.danhaywood.mavenmixin</groupId>
- <artifactId>surefire</artifactId>
- <version>${mavenmixin-surefire.version}</version>
+ <artifactId>standard</artifactId>
</mixin>
<mixin>
<groupId>com.danhaywood.mavenmixin</groupId>
- <artifactId>sourceandjavadoc</artifactId>
- <version>${mavenmixin-sourceandjavadoc.version}</version>
+ <artifactId>staticanalysis</artifactId>
</mixin>
<mixin>
<groupId>com.danhaywood.mavenmixin</groupId>
- <artifactId>staticanalysis</artifactId>
- <version>${mavenmixin-staticanalysis.version}</version>
+ <artifactId>surefire</artifactId>
</mixin>
</mixins>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.isis.tool</groupId>
+ <artifactId>isis-maven-plugin</artifactId>
+ <version>${isis.version}</version>
+ <configuration>
+ <appManifest>${isis-maven-plugin.validate.appManifest}</appManifest>
+ </configuration>
+ <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>
@@ -125,17 +151,24 @@
<artifactId>isis-core-applib</artifactId>
</dependency>
+ <!-- test -->
<dependency>
- <groupId>com.danhaywood.mavendeps</groupId>
- <artifactId>isistesting</artifactId>
- <version>${mavendeps-isistesting.version}</version>
+ <groupId>org.apache.isis.mavendeps</groupId>
+ <artifactId>isis-mavendeps-testing</artifactId>
<type>pom</type>
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.datanucleus</groupId>
+ <artifactId>datanucleus-core</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
<groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
+ <scope>test</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/isis/blob/5d24b3f7/example/application/simpleapp/pom.xml
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/pom.xml b/example/application/simpleapp/pom.xml
index c66cab4..fe9bb03 100644
--- a/example/application/simpleapp/pom.xml
+++ b/example/application/simpleapp/pom.xml
@@ -21,6 +21,12 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.incode</groupId>
+ <artifactId>incode-build</artifactId>
+ <version>2</version>
+ </parent>
+
<groupId>org.apache.isis.example.application</groupId>
<artifactId>simpleapp</artifactId>
<version>1.15.0-SNAPSHOT</version>
@@ -37,67 +43,6 @@
<isis.version>1.15.0-SNAPSHOT</isis.version>
<lombok.version>1.16.10</lombok.version>
- <assertj-core.version>3.6.1</assertj-core.version>
-
- <mavenmixin-cucumberreporting.version>0.0.2</mavenmixin-cucumberreporting.version>
- <maven-cucumber-reporting.version>3.2.0</maven-cucumber-reporting.version>
- <maven-cucumber-reporting.dependency.log4j.version>2.7</maven-cucumber-reporting.dependency.log4j.version>
-
- <mavenmixin-datanucleusenhance.version>0.0.4</mavenmixin-datanucleusenhance.version>
- <datanucleus-maven-plugin.version>4.0.5</datanucleus-maven-plugin.version>
- <datanucleus-core.version>4.1.7</datanucleus-core.version>
- <datanucleus-api-jdo.version>4.1.1</datanucleus-api-jdo.version>
- <datanucleus-jodatime.version>4.1.0-release</datanucleus-jodatime.version>
-
- <mavenmixin-enforcerrelaxed.version>0.0.2</mavenmixin-enforcerrelaxed.version>
- <maven-enforcer-plugin.version>1.4.1</maven-enforcer-plugin.version>
-
- <mavenmixin-isisswagger.version>0.0.3</mavenmixin-isisswagger.version>
- <mavenmixin-isisvalidate.version>0.0.2</mavenmixin-isisvalidate.version>
- <isis-maven-plugin.version>${isis.version}</isis-maven-plugin.version>
-
- <mavenmixin-jettyconsole.version>0.0.2</mavenmixin-jettyconsole.version>
- <jetty-console-maven-plugin.version>1.59</jetty-console-maven-plugin.version>
- <maven-antrun-plugin.version>1.8</maven-antrun-plugin.version>
-
- <mavenmixin-jettywar.version>0.0.2</mavenmixin-jettywar.version>
- <maven-war-plugin.version>2.4</maven-war-plugin.version>
- <jetty-maven-plugin.version>9.3.5.v20151012</jetty-maven-plugin.version>
-
- <mavenmixin-sourceandjavadoc.version>0.0.2</mavenmixin-sourceandjavadoc.version>
- <maven-javadoc-plugin.version>2.9.1</maven-javadoc-plugin.version>
- <maven-jxr-plugin.version>2.4</maven-jxr-plugin.version>
- <maven-source-plugin.version>2.2.1</maven-source-plugin.version>
-
- <mavenmixin-standard.version>0.0.3</mavenmixin-standard.version>
- <maven-clean-plugin.version>2.5</maven-clean-plugin.version>
- <maven-project-info-reports-plugin.version>2.9</maven-project-info-reports-plugin.version>
- <maven-resources-plugin.version>2.6</maven-resources-plugin.version>
- <maven-compiler-plugin.version>3.1</maven-compiler-plugin.version>
- <maven-jar-plugin.version>2.4</maven-jar-plugin.version>
- <maven-install-plugin.version>2.5.1</maven-install-plugin.version>
- <maven-deploy-plugin.version>2.8.1</maven-deploy-plugin.version>
- <maven-site-plugin.version>3.3</maven-site-plugin.version>
-
- <mavenmixin-surefire.version>0.0.4</mavenmixin-surefire.version>
- <maven-surefire-plugin.version>2.19.1</maven-surefire-plugin.version>
- <maven-surefire-report-plugin.version>2.19.1</maven-surefire-report-plugin.version>
-
- <mavenmixin-staticanalysis.version>0.0.2</mavenmixin-staticanalysis.version>
- <maven-checkstyle-plugin.version>2.11</maven-checkstyle-plugin.version>
- <maven-pmd-plugin.version>3.0.1</maven-pmd-plugin.version>
- <javancss-maven-plugin.version>2.1</javancss-maven-plugin.version>
- <jdepend-maven-plugin.version>2.0-beta-2</jdepend-maven-plugin.version>
- <findbugs-maven-plugin.version>2.5</findbugs-maven-plugin.version>
-
- <mavenmixin-docker.version>0.0.3</mavenmixin-docker.version>
- <maven-deploy-plugin.version>2.8.1</maven-deploy-plugin.version>
- <docker-maven-plugin.version>0.4.13</docker-maven-plugin.version>
- <gmavenplus-plugin.version>1.5</gmavenplus-plugin.version>
-
- <mavendeps-isistesting.version>0.0.2</mavendeps-isistesting.version>
- <mavendeps-isisintellij.version>0.0.1</mavendeps-isisintellij.version>
- <mavendeps-isiswebapp.version>0.0.2</mavendeps-isiswebapp.version>
<compiler-plugin.source>1.7</compiler-plugin.source>
<compiler-plugin.target>1.7</compiler-plugin.target>
@@ -108,156 +53,6 @@
</properties>
<build>
- <pluginManagement>
- <plugins>
- <!-- mavenmixin-cucumberreporting -->
- <plugin>
- <groupId>net.masterthought</groupId>
- <artifactId>maven-cucumber-reporting</artifactId>
- <version>${maven-cucumber-reporting.version}</version>
- </plugin>
-
- <!-- mavenmixin-datanucleusenhancer -->
- <plugin>
- <groupId>org.datanucleus</groupId>
- <artifactId>datanucleus-maven-plugin</artifactId>
- <version>${datanucleus-maven-plugin.version}</version>
- </plugin>
-
- <!-- mavenmixin-enforcerrelaxed -->
- <plugin>
- <artifactId>maven-enforcer-plugin</artifactId>
- <version>${maven-enforcer-plugin.version}</version>
- </plugin>
-
- <!-- mavenmixin-isisvalidate & mavenmixin-isisswagger -->
- <plugin>
- <groupId>org.apache.isis.tool</groupId>
- <artifactId>isis-maven-plugin</artifactId>
- <version>${isis-maven-plugin.version}</version>
- </plugin>
-
- <!-- mavenmixin-jettyconsole -->
- <plugin>
- <groupId>org.simplericity.jettyconsole</groupId>
- <artifactId>jetty-console-maven-plugin</artifactId>
- <version>${jetty-console-maven-plugin.version}</version>
- </plugin>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <version>${maven-antrun-plugin.version}</version>
- </plugin>
-
- <!-- mavenmixin-jettywar -->
- <plugin>
- <artifactId>maven-war-plugin</artifactId>
- <version>${maven-war-plugin.version}</version>
- </plugin>
- <plugin>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-maven-plugin</artifactId>
- <version>${jetty-maven-plugin.version}</version>
- </plugin>
-
- <!-- mavenmixin-sourceandjavadoc -->
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>${maven-javadoc-plugin.version}</version>
- </plugin>
- <plugin>
- <artifactId>maven-jxr-plugin</artifactId>
- <version>${maven-jxr-plugin.version}</version>
- </plugin>
- <plugin>
- <artifactId>maven-source-plugin</artifactId>
- <version>${maven-source-plugin.version}</version>
- </plugin>
-
- <!-- mavenmixin-standard -->
- <plugin>
- <artifactId>maven-clean-plugin</artifactId>
- <version>${maven-clean-plugin.version}</version>
- </plugin>
- <plugin>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- <version>${maven-project-info-reports-plugin.version}</version>
- </plugin>
- <plugin>
- <artifactId>maven-resources-plugin</artifactId>
- <version>${maven-resources-plugin.version}</version>
- </plugin>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>${maven-compiler-plugin.version}</version>
- </plugin>
- <plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <version>${maven-jar-plugin.version}</version>
- </plugin>
- <plugin>
- <artifactId>maven-install-plugin</artifactId>
- <version>${maven-install-plugin.version}</version>
- </plugin>
- <plugin>
- <artifactId>maven-deploy-plugin</artifactId>
- <version>${maven-deploy-plugin.version}</version>
- </plugin>
- <plugin>
- <artifactId>maven-site-plugin</artifactId>
- <version>${maven-site-plugin.version}</version>
- </plugin>
-
- <!-- mavenmixin-surefire -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${maven-surefire-plugin.version}</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-report-plugin</artifactId>
- <version>${maven-surefire-report-plugin.version}</version>
- </plugin>
-
- <!-- mavenmixin-staticanalysis -->
- <plugin>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <version>${maven-checkstyle-plugin.version}</version>
- </plugin>
- <plugin>
- <artifactId>maven-pmd-plugin</artifactId>
- <version>${maven-pmd-plugin.version}</version>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>javancss-maven-plugin</artifactId>
- <version>${javancss-maven-plugin.version}</version>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>jdepend-maven-plugin</artifactId>
- <version>${jdepend-maven-plugin.version}</version>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>findbugs-maven-plugin</artifactId>
- <version>${findbugs-maven-plugin.version}</version>
- </plugin>
-
- <!-- mavenmixin-docker -->
- <plugin>
- <groupId>com.spotify</groupId>
- <artifactId>docker-maven-plugin</artifactId>
- <version>${docker-maven-plugin.version}</version>
- </plugin>
- <plugin>
- <groupId>org.codehaus.gmavenplus</groupId>
- <artifactId>gmavenplus-plugin</artifactId>
- <version>${gmavenplus-plugin.version}</version>
- </plugin>
-
- </plugins>
- </pluginManagement>
<plugins>
<plugin>
<groupId>com.github.odavid.maven.plugins</groupId>
@@ -269,7 +64,6 @@
<mixin>
<groupId>com.danhaywood.mavenmixin</groupId>
<artifactId>standard</artifactId>
- <version>${mavenmixin-standard.version}</version>
</mixin>
</mixins>
</configuration>
http://git-wip-us.apache.org/repos/asf/isis/blob/5d24b3f7/example/application/simpleapp/webapp/pom.xml
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/webapp/pom.xml b/example/application/simpleapp/webapp/pom.xml
index 7e08914..2d047d1 100644
--- a/example/application/simpleapp/webapp/pom.xml
+++ b/example/application/simpleapp/webapp/pom.xml
@@ -34,7 +34,7 @@
<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>
@@ -72,37 +72,6 @@
</resources>
<plugins>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>buildnumber-maven-plugin</artifactId>
- <version>1.4</version>
- <configuration>
- <shortRevisionLength>8</shortRevisionLength>
- <timestampFormat>{0,date,yyyy-MM-dd HH:mm:ss}</timestampFormat>
- </configuration>
- <executions>
- <execution>
- <phase>validate</phase>
- <goals>
- <goal>create</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <version>1.8</version>
- <executions>
- <execution>
- <phase>validate</phase>
- <goals>
- <goal>maven-version</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
<groupId>com.github.odavid.maven.plugins</groupId>
<artifactId>mixin-maven-plugin</artifactId>
<version>0.1-alpha-39</version>
@@ -112,37 +81,69 @@
<mixin>
<groupId>com.danhaywood.mavenmixin</groupId>
<artifactId>standard</artifactId>
- <version>${mavenmixin-standard.version}</version>
</mixin>
<mixin>
<groupId>com.danhaywood.mavenmixin</groupId>
<artifactId>enforcerrelaxed</artifactId>
- <version>${mavenmixin-enforcerrelaxed.version}</version>
- </mixin>
- <mixin>
- <groupId>com.danhaywood.mavenmixin</groupId>
- <artifactId>isisswagger</artifactId>
- <version>${mavenmixin-isisswagger.version}</version>
</mixin>
<mixin>
<groupId>com.danhaywood.mavenmixin</groupId>
<artifactId>jettywar</artifactId>
- <version>${mavenmixin-jettywar.version}</version>
</mixin>
<mixin>
<groupId>com.danhaywood.mavenmixin</groupId>
<artifactId>jettyconsole</artifactId>
- <version>${mavenmixin-jettyconsole.version}</version>
</mixin>
<mixin>
<groupId>com.danhaywood.mavenmixin</groupId>
<artifactId>docker</artifactId>
- <version>${mavenmixin-docker.version}</version>
</mixin>
</mixins>
</configuration>
</plugin>
-
+ <plugin>
+ <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>
+ <dependencies>
+ <dependency>
+ <groupId>${isis-maven-plugin.swagger.dependency.groupId}</groupId>
+ <artifactId>${isis-maven-plugin.swagger.dependency.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>package</phase>
+ <goals>
+ <goal>swagger</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
@@ -156,27 +157,20 @@
<!-- isis -->
<dependency>
- <groupId>com.danhaywood.mavendeps</groupId>
- <artifactId>isiswebapp</artifactId>
- <version>${mavendeps-isiswebapp.version}</version>
+ <groupId>org.apache.isis.mavendeps</groupId>
+ <artifactId>isis-mavendeps-webapp</artifactId>
<type>pom</type>
</dependency>
<dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-security</artifactId>
- </dependency>
-
- <dependency>
- <groupId>com.danhaywood.mavendeps</groupId>
- <artifactId>isisintellij</artifactId>
- <version>${mavendeps-isisintellij.version}</version>
+ <groupId>org.apache.isis.mavendeps</groupId>
+ <artifactId>isis-mavendeps-intellij</artifactId>
<type>pom</type>
</dependency>
+
</dependencies>
<profiles>
-
<profile>
<id>jdbc-hsqldb</id>
<activation>