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/01/03 19:08:03 UTC
[10/10] isis git commit: Merge branch 'release-1.13.2.1-RC1'
Merge branch 'release-1.13.2.1-RC1'
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/d8e1dfc3
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/d8e1dfc3
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/d8e1dfc3
Branch: refs/heads/master
Commit: d8e1dfc36e4882db089535268b57dd10a51e33d9
Parents: d509c73 1538333
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Tue Jan 3 19:06:14 2017 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Tue Jan 3 19:06:14 2017 +0000
----------------------------------------------------------------------
example/application/simpleapp/README.adoc | 59 +++++-
.../application/simpleapp/application/pom.xml | 7 +-
...nAppFixtureScriptsSpecificationProvider.java | 6 +-
.../fixture/scenarios/DomainAppDemo.java | 28 +--
.../fixture/teardown/DomainAppTearDown.java | 5 -
.../DomainAppAppManifestWithFixtures.java | 4 +-
.../services/homepage/HomePageViewModel.java | 9 -
.../bdd/specglue/BootstrappingGlue.java | 2 -
.../bdd/specglue/CatalogOfFixturesGlue.java | 6 +-
.../bdd/specglue/SimpleObjectGlue.java | 50 ------
.../application/bdd/specs/RunIntegBddSpecs.java | 5 +-
.../SimpleObjectSpec_listAllAndCreate.feature | 2 +-
.../application/integtests/Smoke_IntegTest.java | 4 +-
.../simple/dom/SimpleModuleDomSubmodule.java | 2 +-
.../modules/simple/dom/impl/SimpleObject.java | 180 +++++--------------
.../fixture/SimpleModuleFixtureSubmodule.java | 3 +-
.../fixture/data/SimpleObjectMenu_create.java | 58 ------
.../fixture/scenario/CreateSimpleObjects.java | 81 +++++++++
.../fixture/scenario/RecreateSimpleObjects.java | 76 --------
.../tests/SimpleObjectMenu_IntegTest.java | 8 +-
.../tests/SimpleObject_IntegTest.java | 10 +-
.../simple/specglue/SimpleObjectMenuGlue.java | 53 ++++++
example/application/simpleapp/pom.xml | 18 ++
example/application/simpleapp/webapp/pom.xml | 17 +-
.../webapp/src/main/resources/docker/Dockerfile | 4 +
.../src/main/webapp/WEB-INF/translations-en.po | 2 +-
.../src/main/webapp/WEB-INF/translations-es.po | 2 +-
.../src/main/webapp/WEB-INF/translations-nl.po | 2 +-
.../src/main/webapp/WEB-INF/translations.po | 2 +-
.../META-INF/maven/archetype-metadata.xml | 6 +
.../resources/archetype-resources/README.adoc | 59 +++++-
.../archetype-resources/application/pom.xml | 7 +-
...nAppFixtureScriptsSpecificationProvider.java | 6 +-
.../fixture/scenarios/DomainAppDemo.java | 28 +--
.../fixture/teardown/DomainAppTearDown.java | 5 -
.../DomainAppAppManifestWithFixtures.java | 4 +-
.../services/homepage/HomePageViewModel.java | 9 -
.../bdd/specglue/BootstrappingGlue.java | 2 -
.../bdd/specglue/CatalogOfFixturesGlue.java | 6 +-
.../bdd/specglue/SimpleObjectGlue.java | 53 ------
.../application/bdd/specs/RunIntegBddSpecs.java | 5 +-
.../SimpleObjectSpec_listAllAndCreate.feature | 2 +-
.../application/integtests/Smoke_IntegTest.java | 4 +-
.../simple/dom/SimpleModuleDomSubmodule.java | 2 +-
.../modules/simple/dom/impl/SimpleObject.java | 180 +++++--------------
.../fixture/SimpleModuleFixtureSubmodule.java | 3 +-
.../fixture/data/SimpleObjectMenu_create.java | 61 -------
.../fixture/scenario/CreateSimpleObjects.java | 84 +++++++++
.../fixture/scenario/RecreateSimpleObjects.java | 79 --------
.../tests/SimpleObjectMenu_IntegTest.java | 8 +-
.../tests/SimpleObject_IntegTest.java | 10 +-
.../simple/specglue/SimpleObjectMenuGlue.java | 56 ++++++
.../main/resources/archetype-resources/pom.xml | 18 ++
.../archetype-resources/webapp/pom.xml | 16 +-
.../src/main/webapp/WEB-INF/translations-en.po | 2 +-
.../src/main/webapp/WEB-INF/translations-es.po | 2 +-
.../src/main/webapp/WEB-INF/translations-nl.po | 2 +-
.../src/main/webapp/WEB-INF/translations.po | 2 +-
.../projects/basic/archetype.properties | 2 +-
59 files changed, 625 insertions(+), 803 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/d8e1dfc3/example/application/simpleapp/pom.xml
----------------------------------------------------------------------
diff --cc example/application/simpleapp/pom.xml
index 6e1b29c,e20afcc..a34d5f4
--- a/example/application/simpleapp/pom.xml
+++ b/example/application/simpleapp/pom.xml
@@@ -89,9 -89,13 +89,13 @@@
<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.2</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>
+
<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>
+ <mavendeps-isiswebapp.version>0.0.2</mavendeps-isiswebapp.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
http://git-wip-us.apache.org/repos/asf/isis/blob/d8e1dfc3/example/application/simpleapp/webapp/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/d8e1dfc3/example/archetype/simpleapp/src/main/resources/archetype-resources/pom.xml
----------------------------------------------------------------------
diff --cc example/archetype/simpleapp/src/main/resources/archetype-resources/pom.xml
index 7c7b4b2,a0c4a22..d95f454
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/pom.xml
+++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/pom.xml
@@@ -87,9 -87,13 +87,13 @@@
<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.2</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>
+
<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>
+ <mavendeps-isiswebapp.version>0.0.2</mavendeps-isiswebapp.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
http://git-wip-us.apache.org/repos/asf/isis/blob/d8e1dfc3/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/pom.xml
----------------------------------------------------------------------