Repository: isis Updated Branches: refs/heads/master 12c5baf2b -> 1f03e0dc1
ISIS-1538: updates to latest version of the mavenmixins. Shorter property names, fixes the plugin versions. Also rename _UnitTest to _Test Project: http://git-wip-us.apache.org/repos/asf/isis/repo Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/91f8c83b Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/91f8c83b Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/91f8c83b Branch: refs/heads/master Commit: 91f8c83b27a27471ec888985c58c15a00eb1493e Parents: 4078033 Author: Dan Haywood <d...@haywood-associates.co.uk> Authored: Wed Nov 30 22:04:38 2016 +0000 Committer: Dan Haywood <d...@haywood-associates.co.uk> Committed: Wed Nov 30 22:04:38 2016 +0000 ---------------------------------------------------------------------- example/application/simpleapp/README.adoc | 6 +- .../application/simpleapp/application/pom.xml | 10 +- .../application/simpleapp/module-simple/pom.xml | 30 +-- .../dom/impl/SimpleObjectRepository_Test.java | 125 +++++++++++ .../impl/SimpleObjectRepository_UnitTest.java | 126 ----------- .../simple/dom/impl/SimpleObject_Test.java | 49 ++++ .../simple/dom/impl/SimpleObject_UnitTest.java | 49 ---- example/application/simpleapp/pom.xml | 221 ++++++++++++++++++- example/application/simpleapp/webapp/pom.xml | 24 +- 9 files changed, 421 insertions(+), 219 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/isis/blob/91f8c83b/example/application/simpleapp/README.adoc ---------------------------------------------------------------------- diff --git a/example/application/simpleapp/README.adoc b/example/application/simpleapp/README.adoc index bd1f923..df457bb 100644 --- a/example/application/simpleapp/README.adoc +++ b/example/application/simpleapp/README.adoc @@ -77,7 +77,7 @@ mvn -f pom-jdo-enhance-all.xml datanucleus:enhance + [source,bash] ---- -mvn package -Ddanhaywood-mavenmixin-jettyconsole +mvn package -Dmavenmixin-jettyconsole ---- + This can then be run using: + @@ -94,7 +94,7 @@ Add additional flags, eg ``--headless`` or ``--port 9999``, if required. + [source,bash] ---- -mvn clean package -Ddanhaywood-mavenmixin-sourceandjavadoc +mvn clean package -Dmavenmixin-sourceandjavadoc ---- + [NOTE] @@ -106,7 +106,7 @@ This is configured only for the `module-simple` module. + [source,bash] ---- -mvn -pl module-simple site -Ddanhaywood-mavenmixin-sourceandjavadoc -Ddanhaywood-mavenmixin-staticanalysis +mvn -pl module-simple site -Dmavenmixin-sourceandjavadoc -Dmavenmixin-staticanalysis ---- + [NOTE] http://git-wip-us.apache.org/repos/asf/isis/blob/91f8c83b/example/application/simpleapp/application/pom.xml ---------------------------------------------------------------------- diff --git a/example/application/simpleapp/application/pom.xml b/example/application/simpleapp/application/pom.xml index 0dd65d9..d0dd876 100644 --- a/example/application/simpleapp/application/pom.xml +++ b/example/application/simpleapp/application/pom.xml @@ -77,22 +77,22 @@ <mixin> <groupId>com.danhaywood.mavenmixin</groupId> <artifactId>standard</artifactId> - <version>${danhaywood-mavenmixin-standard.version}</version> + <version>${mavenmixin-standard.version}</version> </mixin> <mixin> <groupId>com.danhaywood.mavenmixin</groupId> <artifactId>enforcerrelaxed</artifactId> - <version>${danhaywood-mavenmixin-enforcerelaxed.version}</version> + <version>${mavenmixin-enforcerrelaxed.version}</version> </mixin> <mixin> <groupId>com.danhaywood.mavenmixin</groupId> <artifactId>surefire</artifactId> - <version>${danhaywood-mavenmixin-surefire.version}</version> + <version>${mavenmixin-surefire.version}</version> </mixin> <mixin> <groupId>com.danhaywood.mavenmixin</groupId> <artifactId>cucumberreporting</artifactId> - <version>${danhaywood-mavenmixin-cucumberreporting.version}</version> + <version>${mavenmixin-cucumberreporting.version}</version> </mixin> </mixins> </configuration> @@ -118,7 +118,7 @@ <dependency> <groupId>com.danhaywood.mavendeps</groupId> <artifactId>isistesting</artifactId> - <version>0.0.2</version> + <version>${mavendeps-isistesting.version}</version> <type>pom</type> <scope>test</scope> </dependency> http://git-wip-us.apache.org/repos/asf/isis/blob/91f8c83b/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 06d656c..4e3d00f 100644 --- a/example/application/simpleapp/module-simple/pom.xml +++ b/example/application/simpleapp/module-simple/pom.xml @@ -29,6 +29,14 @@ <artifactId>simpleapp-module-simple</artifactId> <name>SimpleApp Simple Module</name> + <properties> + <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> <resources> <resource> @@ -73,37 +81,37 @@ <mixin> <groupId>com.danhaywood.mavenmixin</groupId> <artifactId>standard</artifactId> - <version>${danhaywood-mavenmixin-standard.version}</version> + <version>${mavenmixin-standard.version}</version> </mixin> <mixin> <groupId>com.danhaywood.mavenmixin</groupId> <artifactId>enforcerrelaxed</artifactId> - <version>${danhaywood-mavenmixin-enforcerelaxed.version}</version> + <version>${mavenmixin-enforcerrelaxed.version}</version> </mixin> <mixin> <groupId>com.danhaywood.mavenmixin</groupId> <artifactId>datanucleusenhance</artifactId> - <version>${danhaywood-mavenmixin-datanucleusenhance.version}</version> + <version>${mavenmixin-datanucleusenhance.version}</version> </mixin> <mixin> <groupId>com.danhaywood.mavenmixin</groupId> <artifactId>isisvalidate</artifactId> - <version>${danhaywood-mavenmixin-isisvalidate.version}</version> + <version>${mavenmixin-isisvalidate.version}</version> </mixin> <mixin> <groupId>com.danhaywood.mavenmixin</groupId> <artifactId>surefire</artifactId> - <version>${danhaywood-mavenmixin-surefire.version}</version> + <version>${mavenmixin-surefire.version}</version> </mixin> <mixin> <groupId>com.danhaywood.mavenmixin</groupId> <artifactId>sourceandjavadoc</artifactId> - <version>${danhaywood-mavenmixin-sourceandjavadoc.version}</version> + <version>${mavenmixin-sourceandjavadoc.version}</version> </mixin> <mixin> <groupId>com.danhaywood.mavenmixin</groupId> <artifactId>staticanalysis</artifactId> - <version>${danhaywood-mavenmixin-staticanalysis.version}</version> + <version>${mavenmixin-staticanalysis.version}</version> </mixin> </mixins> </configuration> @@ -111,12 +119,6 @@ </plugins> </build> - <properties> - <danhaywood-mavenmixin-isisvalidate.appManifest> - domainapp.modules.simple.SimpleModuleManifest - </danhaywood-mavenmixin-isisvalidate.appManifest> - </properties> - <dependencies> <dependency> <groupId>org.apache.isis.core</groupId> @@ -126,7 +128,7 @@ <dependency> <groupId>com.danhaywood.mavendeps</groupId> <artifactId>isistesting</artifactId> - <version>0.0.2</version> + <version>${mavendeps-isistesting.version}</version> <type>pom</type> <scope>test</scope> </dependency> http://git-wip-us.apache.org/repos/asf/isis/blob/91f8c83b/example/application/simpleapp/module-simple/src/test/java/domainapp/modules/simple/dom/impl/SimpleObjectRepository_Test.java ---------------------------------------------------------------------- diff --git a/example/application/simpleapp/module-simple/src/test/java/domainapp/modules/simple/dom/impl/SimpleObjectRepository_Test.java b/example/application/simpleapp/module-simple/src/test/java/domainapp/modules/simple/dom/impl/SimpleObjectRepository_Test.java new file mode 100644 index 0000000..a81e9a3 --- /dev/null +++ b/example/application/simpleapp/module-simple/src/test/java/domainapp/modules/simple/dom/impl/SimpleObjectRepository_Test.java @@ -0,0 +1,125 @@ +/** + * 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. + */ +package domainapp.modules.simple.dom.impl; + +import java.util.List; + +import com.google.common.collect.Lists; + +import org.hamcrest.Description; +import org.hamcrest.Matcher; +import org.hamcrest.TypeSafeMatcher; +import org.jmock.Expectations; +import org.jmock.Sequence; +import org.jmock.auto.Mock; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; + +import org.apache.isis.applib.services.registry.ServiceRegistry2; +import org.apache.isis.applib.services.repository.RepositoryService; +import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2; +import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode; + +import static org.assertj.core.api.Assertions.assertThat; + +public class SimpleObjectRepository_Test { + + @Rule + public JUnitRuleMockery2 context = JUnitRuleMockery2.createFor(Mode.INTERFACES_AND_CLASSES); + + @Mock + ServiceRegistry2 mockServiceRegistry; + + @Mock + RepositoryService mockRepositoryService; + + SimpleObjectRepository simpleObjectRepository; + + @Before + public void setUp() throws Exception { + simpleObjectRepository = new SimpleObjectRepository(); + simpleObjectRepository.repositoryService = mockRepositoryService; + simpleObjectRepository.serviceRegistry = mockServiceRegistry; + } + + public static class Create extends SimpleObjectRepository_Test { + + @Test + public void happyCase() throws Exception { + + final String someName = "Foobar"; + + // given + final Sequence seq = context.sequence("create"); + context.checking(new Expectations() { + { + oneOf(mockServiceRegistry).injectServicesInto(with(any(SimpleObject.class))); + inSequence(seq); + + oneOf(mockRepositoryService).persist(with(nameOf(someName))); + inSequence(seq); + } + + }); + + // when + final SimpleObject obj = simpleObjectRepository.create(someName); + + // then + assertThat(obj).isNotNull(); + assertThat(obj.getName()).isEqualTo(someName); + } + + private static Matcher<SimpleObject> nameOf(final String name) { + return new TypeSafeMatcher<SimpleObject>() { + @Override + protected boolean matchesSafely(final SimpleObject item) { + return name.equals(item.getName()); + } + + @Override + public void describeTo(final Description description) { + description.appendText("has name of '" + name + "'"); + } + }; + } + } + + public static class ListAll extends SimpleObjectRepository_Test { + + @Test + public void happyCase() throws Exception { + + // given + final List<SimpleObject> all = Lists.newArrayList(); + + context.checking(new Expectations() { + { + oneOf(mockRepositoryService).allInstances(SimpleObject.class); + will(returnValue(all)); + } + }); + + // when + final List<SimpleObject> list = simpleObjectRepository.listAll(); + + // then + assertThat(list).isEqualTo(all); + } + } +} http://git-wip-us.apache.org/repos/asf/isis/blob/91f8c83b/example/application/simpleapp/module-simple/src/test/java/domainapp/modules/simple/dom/impl/SimpleObjectRepository_UnitTest.java ---------------------------------------------------------------------- diff --git a/example/application/simpleapp/module-simple/src/test/java/domainapp/modules/simple/dom/impl/SimpleObjectRepository_UnitTest.java b/example/application/simpleapp/module-simple/src/test/java/domainapp/modules/simple/dom/impl/SimpleObjectRepository_UnitTest.java deleted file mode 100644 index 3d6cf23..0000000 --- a/example/application/simpleapp/module-simple/src/test/java/domainapp/modules/simple/dom/impl/SimpleObjectRepository_UnitTest.java +++ /dev/null @@ -1,126 +0,0 @@ -/** - * 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. - */ -package domainapp.modules.simple.dom.impl; - -import java.util.List; - -import com.google.common.collect.Lists; - -import org.hamcrest.Description; -import org.hamcrest.Matcher; -import org.hamcrest.TypeSafeMatcher; -import org.jmock.Expectations; -import org.jmock.Sequence; -import org.jmock.auto.Mock; -import org.junit.Before; -import org.junit.Ignore; -import org.junit.Rule; -import org.junit.Test; - -import org.apache.isis.applib.services.registry.ServiceRegistry2; -import org.apache.isis.applib.services.repository.RepositoryService; -import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2; -import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode; - -import static org.assertj.core.api.Assertions.assertThat; - -public class SimpleObjectRepository_UnitTest { - - @Rule - public JUnitRuleMockery2 context = JUnitRuleMockery2.createFor(Mode.INTERFACES_AND_CLASSES); - - @Mock - ServiceRegistry2 mockServiceRegistry; - - @Mock - RepositoryService mockRepositoryService; - - SimpleObjectRepository simpleObjectRepository; - - @Before - public void setUp() throws Exception { - simpleObjectRepository = new SimpleObjectRepository(); - simpleObjectRepository.repositoryService = mockRepositoryService; - simpleObjectRepository.serviceRegistry = mockServiceRegistry; - } - - public static class Create extends SimpleObjectRepository_UnitTest { - - @Test - public void happyCase() throws Exception { - - final String someName = "Foobar"; - - // given - final Sequence seq = context.sequence("create"); - context.checking(new Expectations() { - { - oneOf(mockServiceRegistry).injectServicesInto(with(any(SimpleObject.class))); - inSequence(seq); - - oneOf(mockRepositoryService).persist(with(nameOf(someName))); - inSequence(seq); - } - - }); - - // when - final SimpleObject obj = simpleObjectRepository.create(someName); - - // then - assertThat(obj).isNotNull(); - assertThat(obj.getName()).isEqualTo(someName); - } - - private static Matcher<SimpleObject> nameOf(final String name) { - return new TypeSafeMatcher<SimpleObject>() { - @Override - protected boolean matchesSafely(final SimpleObject item) { - return name.equals(item.getName()); - } - - @Override - public void describeTo(final Description description) { - description.appendText("has name of '" + name + "'"); - } - }; - } - } - - public static class ListAll extends SimpleObjectRepository_UnitTest { - - @Test - public void happyCase() throws Exception { - - // given - final List<SimpleObject> all = Lists.newArrayList(); - - context.checking(new Expectations() { - { - oneOf(mockRepositoryService).allInstances(SimpleObject.class); - will(returnValue(all)); - } - }); - - // when - final List<SimpleObject> list = simpleObjectRepository.listAll(); - - // then - assertThat(list).isEqualTo(all); - } - } -} http://git-wip-us.apache.org/repos/asf/isis/blob/91f8c83b/example/application/simpleapp/module-simple/src/test/java/domainapp/modules/simple/dom/impl/SimpleObject_Test.java ---------------------------------------------------------------------- diff --git a/example/application/simpleapp/module-simple/src/test/java/domainapp/modules/simple/dom/impl/SimpleObject_Test.java b/example/application/simpleapp/module-simple/src/test/java/domainapp/modules/simple/dom/impl/SimpleObject_Test.java new file mode 100644 index 0000000..d228676 --- /dev/null +++ b/example/application/simpleapp/module-simple/src/test/java/domainapp/modules/simple/dom/impl/SimpleObject_Test.java @@ -0,0 +1,49 @@ +/** + * 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. + */ +package domainapp.modules.simple.dom.impl; + +import org.junit.Before; +import org.junit.Test; + +import static org.assertj.core.api.Assertions.assertThat; + +public class SimpleObject_Test { + + SimpleObject simpleObject; + + @Before + public void setUp() throws Exception { + simpleObject = new SimpleObject("Foobar"); + } + + public static class Name extends SimpleObject_Test { + + @Test + public void happyCase() throws Exception { + // given + assertThat(simpleObject.getName()).isEqualTo("Foobar"); + + // when + String name = "Foobar - updated"; + simpleObject.setName(name); + + // then + assertThat(simpleObject.getName()).isEqualTo(name); + } + } + +} http://git-wip-us.apache.org/repos/asf/isis/blob/91f8c83b/example/application/simpleapp/module-simple/src/test/java/domainapp/modules/simple/dom/impl/SimpleObject_UnitTest.java ---------------------------------------------------------------------- diff --git a/example/application/simpleapp/module-simple/src/test/java/domainapp/modules/simple/dom/impl/SimpleObject_UnitTest.java b/example/application/simpleapp/module-simple/src/test/java/domainapp/modules/simple/dom/impl/SimpleObject_UnitTest.java deleted file mode 100644 index c22c1ac..0000000 --- a/example/application/simpleapp/module-simple/src/test/java/domainapp/modules/simple/dom/impl/SimpleObject_UnitTest.java +++ /dev/null @@ -1,49 +0,0 @@ -/** - * 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. - */ -package domainapp.modules.simple.dom.impl; - -import org.junit.Before; -import org.junit.Test; - -import static org.assertj.core.api.Assertions.assertThat; - -public class SimpleObject_UnitTest { - - SimpleObject simpleObject; - - @Before - public void setUp() throws Exception { - simpleObject = new SimpleObject("Foobar"); - } - - public static class Name extends SimpleObject_UnitTest { - - @Test - public void happyCase() throws Exception { - // given - assertThat(simpleObject.getName()).isEqualTo("Foobar"); - - // when - String name = "Foobar - updated"; - simpleObject.setName(name); - - // then - assertThat(simpleObject.getName()).isEqualTo(name); - } - } - -} http://git-wip-us.apache.org/repos/asf/isis/blob/91f8c83b/example/application/simpleapp/pom.xml ---------------------------------------------------------------------- diff --git a/example/application/simpleapp/pom.xml b/example/application/simpleapp/pom.xml index e47e2b3..0f99b4d 100644 --- a/example/application/simpleapp/pom.xml +++ b/example/application/simpleapp/pom.xml @@ -39,22 +39,221 @@ <lombok.version>1.16.10</lombok.version> <assertj-core.version>3.6.0</assertj-core.version> - <danhaywood-mavenmixin-cucumberreporting.version>0.0.1</danhaywood-mavenmixin-cucumberreporting.version> - <danhaywood-mavenmixin-enforcerelaxed.version>0.0.1</danhaywood-mavenmixin-enforcerelaxed.version> - <danhaywood-mavenmixin-datanucleusenhance.version>0.0.3</danhaywood-mavenmixin-datanucleusenhance.version> - <danhaywood-mavenmixin-isisswagger.version>0.0.2</danhaywood-mavenmixin-isisswagger.version> - <danhaywood-mavenmixin-isisvalidate.version>0.0.1</danhaywood-mavenmixin-isisvalidate.version> - <danhaywood-mavenmixin-jettyconsole.version>0.0.1</danhaywood-mavenmixin-jettyconsole.version> - <danhaywood-mavenmixin-jettywar.version>0.0.1</danhaywood-mavenmixin-jettywar.version> - <danhaywood-mavenmixin-sourceandjavadoc.version>0.0.1</danhaywood-mavenmixin-sourceandjavadoc.version> - <danhaywood-mavenmixin-standard.version>0.0.1</danhaywood-mavenmixin-standard.version> - <danhaywood-mavenmixin-surefire.version>0.0.2</danhaywood-mavenmixin-surefire.version> - <danhaywood-mavenmixin-staticanalysis.version>0.0.1</danhaywood-mavenmixin-staticanalysis.version> + <mavenmixin-cucumberreporting.version>0.0.2</mavenmixin-cucumberreporting.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>1.13.1</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.2</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> + + <mavendeps-isistesting.version>0.0.2</mavendeps-isistesting.version> + <mavendeps-isisintellij.version>0.0.1</mavendeps-isisintellij.version> + <mavendeps-isiswebapp.version>0.0.1</mavendeps-isiswebapp.version> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> </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> + </plugins> + </pluginManagement> + <plugins> + <plugin> + <groupId>com.github.odavid.maven.plugins</groupId> + <artifactId>mixin-maven-plugin</artifactId> + <version>0.1-alpha-39</version> + <extensions>true</extensions> + <configuration> + <mixins> + <mixin> + <groupId>com.danhaywood.mavenmixin</groupId> + <artifactId>standard</artifactId> + <version>${mavenmixin-standard.version}</version> + </mixin> + </mixins> + </configuration> + </plugin> + </plugins> + </build> + <repositories> <repository> <id>apache.snapshots</id> http://git-wip-us.apache.org/repos/asf/isis/blob/91f8c83b/example/application/simpleapp/webapp/pom.xml ---------------------------------------------------------------------- diff --git a/example/application/simpleapp/webapp/pom.xml b/example/application/simpleapp/webapp/pom.xml index 5e8e7d8..96b22a5 100644 --- a/example/application/simpleapp/webapp/pom.xml +++ b/example/application/simpleapp/webapp/pom.xml @@ -34,12 +34,14 @@ <packaging>war</packaging> <properties> - <danhaywood-mavenmixin-isisswagger.appManifest>domainapp.application.manifest.DomainAppAppManifest</danhaywood-mavenmixin-isisswagger.appManifest> - <danhaywood-mavenmixin-isisswagger.dependency.artifactId>${project.parent.artifactId}-application</danhaywood-mavenmixin-isisswagger.dependency.artifactId> - <danhaywood-mavenmixin-jettywar.warName>${project.parent.artifactId}</danhaywood-mavenmixin-jettywar.warName> - <danhaywood-mavenmixin-jettyconsole.backgroundImage>${basedir}/src/main/jettyconsole/isis-banner.png</danhaywood-mavenmixin-jettyconsole.backgroundImage> + <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> + <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> </properties> <build> @@ -96,27 +98,27 @@ <mixin> <groupId>com.danhaywood.mavenmixin</groupId> <artifactId>standard</artifactId> - <version>${danhaywood-mavenmixin-standard.version}</version> + <version>${mavenmixin-standard.version}</version> </mixin> <mixin> <groupId>com.danhaywood.mavenmixin</groupId> <artifactId>enforcerrelaxed</artifactId> - <version>${danhaywood-mavenmixin-enforcerelaxed.version}</version> + <version>${mavenmixin-enforcerrelaxed.version}</version> </mixin> <mixin> <groupId>com.danhaywood.mavenmixin</groupId> <artifactId>isisswagger</artifactId> - <version>${danhaywood-mavenmixin-isisswagger.version}</version> + <version>${mavenmixin-isisswagger.version}</version> </mixin> <mixin> <groupId>com.danhaywood.mavenmixin</groupId> <artifactId>jettywar</artifactId> - <version>${danhaywood-mavenmixin-jettywar.version}</version> + <version>${mavenmixin-jettywar.version}</version> </mixin> <mixin> <groupId>com.danhaywood.mavenmixin</groupId> <artifactId>jettyconsole</artifactId> - <version>${danhaywood-mavenmixin-jettyconsole.version}</version> + <version>${mavenmixin-jettyconsole.version}</version> </mixin> </mixins> </configuration> @@ -136,14 +138,14 @@ <dependency> <groupId>com.danhaywood.mavendeps</groupId> <artifactId>isiswebapp</artifactId> - <version>0.0.1</version> + <version>${mavendeps-isiswebapp.version}</version> <type>pom</type> </dependency> <dependency> <groupId>com.danhaywood.mavendeps</groupId> <artifactId>isisintellij</artifactId> - <version>0.0.1</version> + <version>${mavendeps-isisintellij.version}</version> <type>pom</type> </dependency> </dependencies>
