Merge branch 'maint-1.13.2'

# Conflicts:
#       example/application/simpleapp/webapp/pom.xml
#       
example/archetype/simpleapp/src/main/resources/archetype-resources/application/translations.pot
#       
example/archetype/simpleapp/src/main/resources/archetype-resources/module-simple/translations.pot
#       
example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/pom.xml
#       
example/archetype/simpleapp/src/test/resources/projects/basic/archetype.properties


Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/36ee41a4
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/36ee41a4
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/36ee41a4

Branch: refs/heads/master
Commit: 36ee41a4a346941ee9cb97b2dd6e0674628f59cd
Parents: 12c5baf fa36da4
Author: Dan Haywood <d...@haywood-associates.co.uk>
Authored: Thu Dec 1 10:28:25 2016 +0000
Committer: Dan Haywood <d...@haywood-associates.co.uk>
Committed: Thu Dec 1 10:28:25 2016 +0000

----------------------------------------------------------------------
 .../asciidoc/guides/_rgant-DomainObject.adoc    |   6 +
 .../guides/_rgant-DomainObject_mixinMethod.adoc |  40 ++++
 .../src/main/asciidoc/guides/_rgant-Mixin.adoc  |  44 ++--
 .../asciidoc/guides/_rgant-Mixin_method.adoc    |  41 ++++
 .../guides/_ugbtb_decoupling_mixins.adoc        | 231 +++++++++++++------
 .../isis/applib/annotation/DomainObject.java    |  12 +-
 .../apache/isis/applib/annotation/Mixin.java    |  23 ++
 .../facets/object/mixin/MixinFacet.java         |   7 +-
 .../facets/object/mixin/MixinFacetAbstract.java |   8 +-
 .../MixinFacetForDomainObjectAnnotation.java    |   6 +-
 .../mixin/MixinFacetForMixinAnnotation.java     |   6 +-
 .../specloader/specimpl/MixedInMember.java      |  20 +-
 .../specimpl/ObjectActionMixedIn.java           |   4 +-
 .../specimpl/ObjectMemberAbstract.java          |  32 ++-
 .../specimpl/ObjectSpecificationAbstract.java   |  20 +-
 .../specimpl/OneToManyAssociationMixedIn.java   |   4 +-
 .../specimpl/OneToOneAssociationMixedIn.java    |   4 +-
 .../validator/JdoMetaModelValidator.java        |  27 ---
 example/application/simpleapp/README.adoc       |   6 +-
 .../application/simpleapp/application/pom.xml   |  10 +-
 .../application/integtests/Smoke_IntegTest.java |   6 +-
 .../application/simpleapp/module-simple/pom.xml |  30 +--
 .../modules/simple/dom/impl/SimpleObject.java   |  20 +-
 .../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 ----
 .../tests/SimpleObject_IntegTest.java           |   4 +-
 example/application/simpleapp/pom.xml           | 221 +++++++++++++++++-
 example/application/simpleapp/webapp/pom.xml    |  24 +-
 example/archetype/simpleapp/pom.xml             |   5 +
 .../resources/archetype-resources/README.adoc   |   6 +-
 .../archetype-resources/application/pom.xml     |  10 +-
 .../application/integtests/Smoke_IntegTest.java |   6 +-
 .../application/translations.pot                |  50 +++-
 .../archetype-resources/module-simple/pom.xml   |  28 ++-
 .../modules/simple/dom/impl/SimpleObject.java   |  20 +-
 .../dom/impl/SimpleObjectRepository_Test.java   | 128 ++++++++++
 .../impl/SimpleObjectRepository_UnitTest.java   | 129 -----------
 .../simple/dom/impl/SimpleObject_Test.java      |  52 +++++
 .../simple/dom/impl/SimpleObject_UnitTest.java  |  52 -----
 .../tests/SimpleObject_IntegTest.java           |   4 +-
 .../module-simple/translations.pot              |  27 ++-
 .../main/resources/archetype-resources/pom.xml  | 221 +++++++++++++++++-
 .../archetype-resources/webapp/pom.xml          |  24 +-
 .../projects/basic/archetype.properties         |   2 +-
 46 files changed, 1308 insertions(+), 661 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/isis/blob/36ee41a4/example/application/simpleapp/pom.xml
----------------------------------------------------------------------
diff --cc example/application/simpleapp/pom.xml
index e47e2b3,0f99b4d..aced013
--- a/example/application/simpleapp/pom.xml
+++ b/example/application/simpleapp/pom.xml
@@@ -39,17 -39,59 +39,59 @@@
          <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>
++        <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/36ee41a4/example/application/simpleapp/webapp/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/isis/blob/36ee41a4/example/archetype/simpleapp/src/main/resources/archetype-resources/pom.xml
----------------------------------------------------------------------
diff --cc 
example/archetype/simpleapp/src/main/resources/archetype-resources/pom.xml
index 01e0ee3,2cfc4be..6285343
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/pom.xml
+++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/pom.xml
@@@ -37,17 -37,59 +37,59 @@@
          <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>
++        <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/36ee41a4/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/pom.xml
----------------------------------------------------------------------

Reply via email to