[isis] branch v2 updated (ba192e7 -> 31b4059)

[da...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

danhaywood pushed a change to branch v2
in repository https://gitbox.apache.org/repos/asf/isis.git.


    from ba192e7  Merge remote-tracking branch 'origin/master' into v2
     add fd69146  ISIS-1899: fixes lombok version for simpleapp
     new 31b4059  Merge branch 'master' into v2

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 example/application/simpleapp/pom.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

[isis] 01/01: Merge branch 'master' into v2

[da...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

danhaywood pushed a commit to branch v2
in repository https://gitbox.apache.org/repos/asf/isis.git

commit 31b4059204a6bd2cb58211f2112228771c9a72b5
Merge: ba192e7 fd69146
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Thu Nov 1 13:31:43 2018 +0000

    Merge branch 'master' into v2

 example/application/simpleapp/pom.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --cc example/application/simpleapp/pom.xml
index 077062c,4ca6f69..7cdd1c6
--- a/example/application/simpleapp/pom.xml
+++ b/example/application/simpleapp/pom.xml
@@@ -36,10 -36,11 +36,11 @@@
      <packaging>pom</packaging>
  
      <properties>
 -        <revision>1.0.0-SNAPSHOT</revision>
 +        <revision>2.0.0-M2-SNAPSHOT</revision>
          <isis.version>${revision}</isis.version>
  
-         <lombok.version>[1.18,)</lombok.version>
+         <!-- bumping to 1.18.4 causes a conflict with DataNucleus' annotation processor. -->
+         <lombok.version>1.18.2</lombok.version>
  
          <compiler-plugin.source>1.8</compiler-plugin.source>
          <compiler-plugin.target>1.8</compiler-plugin.target>