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 2016/04/09 09:03:27 UTC

[1/6] isis git commit: ISIS-1363: move ConfigurationServiceMenu to tertiary menu bar.

Repository: isis
Updated Branches:
  refs/heads/master dcee071f3 -> 5160d32dd


ISIS-1363: move ConfigurationServiceMenu to tertiary menu bar.


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

Branch: refs/heads/master
Commit: 6f9168e6dfff47407f9d83f892ecbfbd569a5ad6
Parents: 3646d0a
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Fri Apr 8 18:05:42 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Fri Apr 8 18:08:49 2016 +0100

----------------------------------------------------------------------
 .../isis/applib/services/config/ConfigurationServiceMenu.java   | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/isis/blob/6f9168e6/core/applib/src/main/java/org/apache/isis/applib/services/config/ConfigurationServiceMenu.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/config/ConfigurationServiceMenu.java b/core/applib/src/main/java/org/apache/isis/applib/services/config/ConfigurationServiceMenu.java
index 5780b88..ed850e1 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/config/ConfigurationServiceMenu.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/config/ConfigurationServiceMenu.java
@@ -36,8 +36,7 @@ import org.apache.isis.applib.annotation.SemanticsOf;
         nature = NatureOfService.VIEW_MENU_ONLY
 )
 @DomainServiceLayout(
-        named = "Prototyping",
-        menuBar = DomainServiceLayout.MenuBar.SECONDARY,
+        menuBar = DomainServiceLayout.MenuBar.TERTIARY,
         menuOrder = "500.900"
 )
 public class ConfigurationServiceMenu {
@@ -57,7 +56,7 @@ public class ConfigurationServiceMenu {
             cssClassFa = "fa-wrench"
     )
     @MemberOrder(sequence = "500.900.1")
-    public Set<ConfigurationProperty> allConfigurationProperties(){
+    public Set<ConfigurationProperty> configuration(){
         return configurationService.allProperties();
     }
 


[5/6] isis git commit: ISIS-1362: merging in changes for 1.12.1 RC1 (ISIS-1357, ISIS-1363)

Posted by da...@apache.org.
ISIS-1362: merging in changes for 1.12.1 RC1 (ISIS-1357, ISIS-1363)


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

Branch: refs/heads/master
Commit: 805dec4c6a00a6764cb5f078ee0384cb4ccf8c55
Parents: dcee071 a19f7c2
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Sat Apr 9 07:35:37 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Sat Apr 9 07:35:37 2016 +0100

----------------------------------------------------------------------
 .../services/config/ConfigurationServiceMenu.java     |  5 ++---
 core/pom.xml                                          |  2 +-
 .../main/appended-resources/supplemental-models.xml   | 14 --------------
 example/application/simpleapp/app/pom.xml             |  2 +-
 example/application/simpleapp/dom/pom.xml             |  4 ++--
 example/application/simpleapp/fixture/pom.xml         |  2 +-
 example/application/simpleapp/integtests/pom.xml      |  4 ++--
 example/application/simpleapp/pom.xml                 |  4 ++--
 example/application/simpleapp/webapp/pom.xml          |  2 +-
 9 files changed, 12 insertions(+), 27 deletions(-)
----------------------------------------------------------------------



[6/6] isis git commit: ISIS-1335: minor updates to docs for generating docs

Posted by da...@apache.org.
ISIS-1335: minor updates to docs for generating docs


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

Branch: refs/heads/master
Commit: 5160d32dd9c53fbf6089e2ff4a8ba23fb110b1ae
Parents: 805dec4
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Sat Apr 9 07:51:26 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Sat Apr 9 07:51:26 2016 +0100

----------------------------------------------------------------------
 .../main/asciidoc/_release-notes_1.12.1.adoc    | 30 ++++++++++++++++++++
 .../guides/_cgcom_cutting-a-release.adoc        |  8 ++++--
 .../src/main/asciidoc/guides/_dg_asciidoc.adoc  | 18 +++++++++++-
 .../src/main/asciidoc/release-notes.adoc        |  9 ++++++
 4 files changed, 61 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/isis/blob/5160d32d/adocs/documentation/src/main/asciidoc/_release-notes_1.12.1.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/_release-notes_1.12.1.adoc b/adocs/documentation/src/main/asciidoc/_release-notes_1.12.1.adoc
new file mode 100644
index 0000000..221eb68
--- /dev/null
+++ b/adocs/documentation/src/main/asciidoc/_release-notes_1.12.1.adoc
@@ -0,0 +1,30 @@
+[[r1.12.1]]
+= 1.12.1
+:notice: 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.
+:_basedir: ./
+:_imagesdir: images/
+:toc: right
+
+
+Apache Isis 1.12.1 is a bug fix release for Apache Isis 1.12.0.
+
+[WARNING]
+====
+This release is currently being voted on and has not yet been released to Maven central repo.
+====
+
+
+
+== Bug
+
+* link:https://issues.apache.org/jira/browse/ISIS-1355[ISIS-1355] - concurrency exception after property edit when attempting to render...
+* link:https://issues.apache.org/jira/browse/ISIS-1357[ISIS-1357] - Update dependency from guava-19.0.20150826 to guava-19.0
+* link:https://issues.apache.org/jira/browse/ISIS-1361[ISIS-1361] - View model that changes two domain objects only has one of them updated.
+* link:https://issues.apache.org/jira/browse/ISIS-1363[ISIS-1363] - ConfigurationServiceMenu is defined under the prototyping menu, but is not restricted to prototyping.  Suggest place under the tertiary menu instead.
+
+
+== Task
+
+* link:https://issues.apache.org/jira/browse/ISIS-1362[ISIS-1362] - Release activities for v1.12.1
+
+

http://git-wip-us.apache.org/repos/asf/isis/blob/5160d32d/adocs/documentation/src/main/asciidoc/guides/_cgcom_cutting-a-release.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_cgcom_cutting-a-release.adoc b/adocs/documentation/src/main/asciidoc/guides/_cgcom_cutting-a-release.adoc
index 2a52740..0586574 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_cgcom_cutting-a-release.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_cgcom_cutting-a-release.adoc
@@ -46,17 +46,19 @@ We use environment variables to parameterize as many of the steps as possible.
 [source,bash]
 ----
 cd core
-export ISISTMP=/c/tmp              # <1>
+export ISISTMP=/c/tmp                               # <1>
 export ISISDEV=1.14.0-SNAPSHOT
 export ISISREL=1.13.0
 export ISISRC=RC1
 export ISISBRANCH=release-$ISISREL-$ISISRC
-export ISISJIRA=ISIS-9999          # <2>
+export ISISJIRA=ISIS-9999                           # <2>
+export CATALINA_HOME=/c/java/apache-tomcat-8.0.30   # <3>
 
 env | grep ISIS | sort
 ----
 <1> adjust by platform
 <2> set to an "umbrella" ticket for all release activities.  (One should exist already, xref:cgcom.adoc#_cgcom_post-release-successful_update-jira_create-new-jira[created at] the beginning of the development cycle now completing).
+<3> adjust as required (Tomcat is used to smoke test the simpleapp archetype)
 
 Obviously, alter `$ISISDEV` and `$ISISREL` as required, and bump `$ISISRC` for re-releasing following an xref:cgcom.adoc#_cgcom_post-release-unsuccessful[unsuccessful] releases.
 
@@ -444,7 +446,7 @@ popd
 +
 [source,bash]
 ----
-cp webapps/target/simpleapp.war $CATALINA_HOME/webapps/ROOT.war
+cp webapp/target/simpleapp.war $CATALINA_HOME/webapps/ROOT.war
 ----
 
 Check the about page and confirm built against non-SNAPSHOT versions of the Apache Isis jars.

http://git-wip-us.apache.org/repos/asf/isis/blob/5160d32d/adocs/documentation/src/main/asciidoc/guides/_dg_asciidoc.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_dg_asciidoc.adoc b/adocs/documentation/src/main/asciidoc/guides/_dg_asciidoc.adoc
index 6c2c0ca..2e4e00d 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_dg_asciidoc.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_dg_asciidoc.adoc
@@ -169,7 +169,7 @@ You also need to know that ASF's publishing script work from the 'asf-site' bran
 git checkout asf-site
 ----
 
-=== Publishing
+=== Publishing (full build)
 
 Back in the `adocs/documentation` directory of the main `isis-git.repo`, to copy the generated documents to the `isis-site.git` repo, run:
 
@@ -195,6 +195,8 @@ sh publish.sh "ISIS-nnnn: a custom commit message"
 
 Behind the scenes this just calls `mvn clean install -Dmessage=...`.
 
+It's also possible to omit the message, in which case `publish.sh` will reuse the most recent commit message from the main `isis.git` repo.
+
 Pushing the commits (in the `isis-site.git` directory, of course) will publishing the changes:
 
 [source,bash]
@@ -203,3 +205,17 @@ git push
 ----
 
 Double check at http://isis.apache.org[isis.apache.org].
+
+
+
+
+=== Publishing (partial build)
+
+If none of the guides have been changed, and if you have run the full rebuild recently, then you can skip the generation of PDFs using:
+
+[source,bash]
+----
+mvn install -Dskip.pdf -D"ISIS-nnnn: a custom commit message"
+----
+
+The `clean` goal *must not* be included though (else all the guides will disappear from the site content).

http://git-wip-us.apache.org/repos/asf/isis/blob/5160d32d/adocs/documentation/src/main/asciidoc/release-notes.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/release-notes.adoc b/adocs/documentation/src/main/asciidoc/release-notes.adoc
index cd01921..3c41983 100644
--- a/adocs/documentation/src/main/asciidoc/release-notes.adoc
+++ b/adocs/documentation/src/main/asciidoc/release-notes.adoc
@@ -21,6 +21,14 @@ This table summarises all releases of Apache Isis to date.
 | Improves
 | Bugs
 
+| xref:r1.12.1[1.12.1]
+| apr-2016
+| (currently being voted on)
+| Bug-fix release
+| 0
+| 1
+| 3
+
 | xref:r1.12.0[1.12.0]
 | 29-mar-2016
 | https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=12327483[Release notes for v1.12.0]
@@ -226,6 +234,7 @@ This table summarises all releases of Apache Isis to date.
 
 
 
+include::_release-notes_1.12.1.adoc[leveloffset=+1]
 include::_release-notes_1.12.0.adoc[leveloffset=+1]
 include::_release-notes_1.11.1.adoc[leveloffset=+1]
 include::_release-notes_1.11.0.adoc[leveloffset=+1]


[3/6] isis git commit: ISIS-1362: updating simpleapp to use 1.13.0-SNAPSHOT; bumping assertj to 2.4.0.

Posted by da...@apache.org.
ISIS-1362: updating simpleapp to use 1.13.0-SNAPSHOT; bumping assertj to 2.4.0.


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

Branch: refs/heads/master
Commit: 45f95d64fc46b84e47289e9ff9a02eee9ee66325
Parents: 300ab1c
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Fri Apr 8 18:19:37 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Fri Apr 8 18:19:37 2016 +0100

----------------------------------------------------------------------
 example/application/simpleapp/app/pom.xml        | 2 +-
 example/application/simpleapp/dom/pom.xml        | 2 +-
 example/application/simpleapp/fixture/pom.xml    | 2 +-
 example/application/simpleapp/integtests/pom.xml | 2 +-
 example/application/simpleapp/pom.xml            | 6 +++---
 example/application/simpleapp/webapp/pom.xml     | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/isis/blob/45f95d64/example/application/simpleapp/app/pom.xml
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/app/pom.xml b/example/application/simpleapp/app/pom.xml
index 6a322ec..5724332 100644
--- a/example/application/simpleapp/app/pom.xml
+++ b/example/application/simpleapp/app/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.isis.example.application</groupId>
         <artifactId>simpleapp</artifactId>
-        <version>1.12.0-SNAPSHOT</version>
+        <version>1.13.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>simpleapp-app</artifactId>

http://git-wip-us.apache.org/repos/asf/isis/blob/45f95d64/example/application/simpleapp/dom/pom.xml
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/dom/pom.xml b/example/application/simpleapp/dom/pom.xml
index fc1489f..18d07e8 100644
--- a/example/application/simpleapp/dom/pom.xml
+++ b/example/application/simpleapp/dom/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.isis.example.application</groupId>
         <artifactId>simpleapp</artifactId>
-        <version>1.12.0-SNAPSHOT</version>
+        <version>1.13.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>simpleapp-dom</artifactId>

http://git-wip-us.apache.org/repos/asf/isis/blob/45f95d64/example/application/simpleapp/fixture/pom.xml
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/fixture/pom.xml b/example/application/simpleapp/fixture/pom.xml
index f47681f..5a76890 100644
--- a/example/application/simpleapp/fixture/pom.xml
+++ b/example/application/simpleapp/fixture/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.isis.example.application</groupId>
         <artifactId>simpleapp</artifactId>
-        <version>1.12.0-SNAPSHOT</version>
+        <version>1.13.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>simpleapp-fixture</artifactId>

http://git-wip-us.apache.org/repos/asf/isis/blob/45f95d64/example/application/simpleapp/integtests/pom.xml
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/integtests/pom.xml b/example/application/simpleapp/integtests/pom.xml
index 697e2d3..09ffe36 100644
--- a/example/application/simpleapp/integtests/pom.xml
+++ b/example/application/simpleapp/integtests/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.isis.example.application</groupId>
         <artifactId>simpleapp</artifactId>
-        <version>1.12.0-SNAPSHOT</version>
+        <version>1.13.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>simpleapp-integtests</artifactId>

http://git-wip-us.apache.org/repos/asf/isis/blob/45f95d64/example/application/simpleapp/pom.xml
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/pom.xml b/example/application/simpleapp/pom.xml
index fab7eea..d3c1e53 100644
--- a/example/application/simpleapp/pom.xml
+++ b/example/application/simpleapp/pom.xml
@@ -23,7 +23,7 @@
 
     <groupId>org.apache.isis.example.application</groupId>
     <artifactId>simpleapp</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
 
     <name>Simple App</name>
 
@@ -34,11 +34,11 @@
     </prerequisites>
 
     <properties>
-        <isis.version>1.12.0</isis.version>
+        <isis.version>1.13.0-SNAPSHOT</isis.version>
 
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <assertj-core.version>2.0.0</assertj-core.version>
+        <assertj-core.version>2.4.0</assertj-core.version>
     </properties>
 
     <repositories>

http://git-wip-us.apache.org/repos/asf/isis/blob/45f95d64/example/application/simpleapp/webapp/pom.xml
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/webapp/pom.xml b/example/application/simpleapp/webapp/pom.xml
index fcab91d..c71ede8 100644
--- a/example/application/simpleapp/webapp/pom.xml
+++ b/example/application/simpleapp/webapp/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.isis.example.application</groupId>
         <artifactId>simpleapp</artifactId>
-        <version>1.12.0-SNAPSHOT</version>
+        <version>1.13.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>simpleapp-webapp</artifactId>


[2/6] isis git commit: ISIS-1357: updating guava to 19.0

Posted by da...@apache.org.
ISIS-1357: updating guava to 19.0


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

Branch: refs/heads/master
Commit: 300ab1ca8bb3a780eeaa0981de564578b84aa459
Parents: 6f9168e
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Fri Apr 8 18:10:28 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Fri Apr 8 18:10:28 2016 +0100

----------------------------------------------------------------------
 core/pom.xml                                     | 2 +-
 example/application/simpleapp/dom/pom.xml        | 2 +-
 example/application/simpleapp/integtests/pom.xml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/isis/blob/300ab1ca/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 7585f08..6770b0d 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -108,7 +108,7 @@
         <log4j.version>1.2.17</log4j.version>
 
         <joda-time.version>2.9.1</joda-time.version>
-        <guava.version>19.0.20150826</guava.version>
+        <guava.version>19.0</guava.version>
 
         <hamcrest.version>1.3</hamcrest.version>
 

http://git-wip-us.apache.org/repos/asf/isis/blob/300ab1ca/example/application/simpleapp/dom/pom.xml
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/dom/pom.xml b/example/application/simpleapp/dom/pom.xml
index fefe2b4..fc1489f 100644
--- a/example/application/simpleapp/dom/pom.xml
+++ b/example/application/simpleapp/dom/pom.xml
@@ -183,7 +183,7 @@
                             <dependency>
                                 <groupId>com.google.guava</groupId>
                                 <artifactId>guava</artifactId>
-                                <version>19.0.20150826</version>
+                                <version>19.0</version>
                             </dependency>
                             <dependency>
                                 <groupId>org.hsqldb</groupId>

http://git-wip-us.apache.org/repos/asf/isis/blob/300ab1ca/example/application/simpleapp/integtests/pom.xml
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/integtests/pom.xml b/example/application/simpleapp/integtests/pom.xml
index 3ed484b..697e2d3 100644
--- a/example/application/simpleapp/integtests/pom.xml
+++ b/example/application/simpleapp/integtests/pom.xml
@@ -123,7 +123,7 @@
                             <dependency>
                                 <groupId>com.google.guava</groupId>
                                 <artifactId>guava</artifactId>
-                                <version>16.0.1</version>
+                                <version>19.0</version>
                             </dependency>
                         </dependencies>
                         <executions>


[4/6] isis git commit: ISIS-1357: removing surplus entry in supplemental-models.xml

Posted by da...@apache.org.
ISIS-1357: removing surplus entry in supplemental-models.xml


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

Branch: refs/heads/master
Commit: a19f7c2ace465defac096996cf72307eec01b86b
Parents: 45f95d6
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Fri Apr 8 18:42:20 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Fri Apr 8 18:42:20 2016 +0100

----------------------------------------------------------------------
 .../main/appended-resources/supplemental-models.xml   | 14 --------------
 1 file changed, 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/isis/blob/a19f7c2a/core/src/main/appended-resources/supplemental-models.xml
----------------------------------------------------------------------
diff --git a/core/src/main/appended-resources/supplemental-models.xml b/core/src/main/appended-resources/supplemental-models.xml
index e5197a3..7187fcd 100644
--- a/core/src/main/appended-resources/supplemental-models.xml
+++ b/core/src/main/appended-resources/supplemental-models.xml
@@ -43,20 +43,6 @@
 
     <supplement>
         <project>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-            <version>19.0.20150826</version>
-            <licenses>
-                <license>
-                    <name>The Apache Software License, Version 2.0</name>
-                    <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-                </license>
-            </licenses>
-        </project>
-    </supplement>
-
-    <supplement>
-        <project>
           <groupId>javax.transaction</groupId>
           <artifactId>transaction-api</artifactId>
           <version>1.1</version>