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/08/14 19:39:39 UTC

[49/50] [abbrv] isis git commit: Merge branch 'release-1.15.0-RC1'

Merge branch 'release-1.15.0-RC1'


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

Branch: refs/heads/master
Commit: 238ef6ae2c254fcf96b85ec5694a09d20579289d
Parents: 4a573a9 563ffff
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Mon Aug 14 20:35:49 2017 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Mon Aug 14 20:35:49 2017 +0100

----------------------------------------------------------------------
 STATUS                                          |     4 +
 .../src/main/asciidoc/doap_isis.rdf             |    26 +-
 .../src/main/asciidoc/downloads.adoc            |    18 +-
 .../guides/cgcom/_cgcom_cutting-a-release.adoc  |    40 +-
 .../cgcom/_cgcom_post-release-successful.adoc   |    96 +-
 .../cgcom/_cgcom_post-release-unsuccessful.adoc |    19 +-
 .../guides/cgcom/_cgcom_verifying-releases.adoc |    12 +-
 .../rgant/_rgant-ActionLayout_promptStyle.adoc  |     2 +-
 .../guides/rgant/_rgant-PropertyLayout.adoc     |     4 +-
 .../_rgant-PropertyLayout_promptStyle.adoc      |     2 +-
 .../rgant/_rgant-PropertyLayout_unchanging.adoc |     2 +-
 .../guides/rgcfg/_rgcfg_configuring-core.adoc   |    10 +-
 .../guides/rgcms/_rgcms_schema-cmd.adoc         |     4 +-
 .../guides/rgcms/_rgcms_schema-ixn.adoc         |     4 +-
 .../guides/rgfis/_rgfis_application-layer.adoc  |    10 -
 ...tion-layer_MessageBrokerServiceInternal.adoc |    42 -
 .../guides/rgfis/_rgfis_persistence-layer.adoc  |    12 -
 ...-layer_TransactionStateProviderInternal.adoc |    36 -
 ...vc_application-layer-api_MessageService.adoc |     2 +-
 ...pplication-layer-api_TransactionService.adoc |     6 +-
 ..._rgsvc_presentation-layer-spi_HintStore.adoc |     4 +-
 ...placing-default-service-implementations.adoc |     2 +-
 ..._ugfun_building-blocks_events_ui-events.adoc |     2 +-
 ...un_getting-started_helloworld-archetype.adoc |    36 +-
 ...fun_getting-started_simpleapp-archetype.adoc |    32 +-
 ...g-model_view-models_jaxb_joda-datatypes.adoc |     2 +-
 ..._integ-test-support_maven-configuration.adoc |     2 +-
 ...t_unit-test-support_maven-configuration.adoc |     2 +-
 .../ugvw/_ugvw_configuration-properties.adoc    |    10 +-
 .../asciidoc/guides/ugvw/_ugvw_isis-addons.adoc |     4 +-
 .../guides/ugvw/_ugvw_layout_file-based.adoc    |     2 +-
 .../documentation/src/main/asciidoc/index.html  |    25 +-
 .../_migration-notes_1.14.0-to-1.15.0.adoc      |     4 -
 .../main/asciidoc/pages/tg/_tg_pet-clinic.adoc  |     2 +-
 .../tg/_tg_stop-scaffolding-start-coding.adoc   |     2 +-
 .../release-notes/_release-notes_1.15.0.adoc    |     5 -
 adocs/template/document.html.erb                |     4 +-
 core/applib/pom.xml                             |     2 +-
 core/integtestsupport/pom.xml                   |     2 +-
 core/log4j/pom.xml                              |     2 +-
 core/maven-plugin/pom.xml                       |     2 +-
 core/mavendeps-intellij/pom.xml                 |     7 +-
 core/mavendeps-testing/pom.xml                  |     7 +-
 core/mavendeps-webapp/pom.xml                   |     7 +-
 core/metamodel/pom.xml                          |     2 +-
 core/pom.xml                                    |    70 +-
 core/runtime/pom.xml                            |     2 +-
 core/schema/pom.xml                             |     2 +-
 core/security-shiro/pom.xml                     |     6 +-
 core/security/pom.xml                           |     2 +-
 core/specsupport/pom.xml                        |     2 +-
 core/unittestsupport/pom.xml                    |     2 +-
 core/viewer-restfulobjects-applib/pom.xml       |     2 +-
 core/viewer-restfulobjects-rendering/pom.xml    |     2 +-
 core/viewer-restfulobjects-server/pom.xml       |     2 +-
 core/viewer-wicket-applib/pom.xml               |     2 +-
 core/viewer-wicket-impl/pom.xml                 |     2 +-
 core/viewer-wicket-model/pom.xml                |     2 +-
 core/viewer-wicket-ui/pom.xml                   |     2 +-
 core/webserver/pom.xml                          |     2 +-
 core/wrapper/pom.xml                            |     2 +-
 example/application/helloworld/pom.xml          |     2 +-
 .../java/domainapp/application/isis.properties  |    56 +
 .../domainapp/application/isis.properties       |    56 -
 .../manifest/viewer_wicket.properties           |     1 -
 example/application/simpleapp/pom.xml           |     2 +-
 example/archetype/helloworld/pom.xml            |    79 +
 .../appended-resources/supplemental-models.xml  |    26 +
 .../META-INF/maven/archetype-metadata.xml       |    79 +
 .../archetype-resources/.gitattributes          |    51 +
 .../resources/archetype-resources/.gitignore    |    41 +
 .../resources/archetype-resources/README.adoc   |    30 +
 .../logging-dn-enhance.properties               |    44 +
 .../main/resources/archetype-resources/pom.xml  |   154 +
 .../src/main/java/META-INF/persistence.xml      |    29 +
 .../application/HelloWorldAppManifest.java      |    42 +
 .../java/domainapp/application/isis.properties  |    59 +
 .../java/domainapp/dom/HelloWorldModule.java    |    26 +
 .../domainapp/dom/impl/HelloWorldObject.java    |   114 +
 .../dom/impl/HelloWorldObject.layout.xml        |    73 +
 .../domainapp/dom/impl/HelloWorldObject.png     |   Bin 0 -> 653 bytes
 .../domainapp/dom/impl/HelloWorldObjects.java   |    81 +
 .../domainapp/webapp/HelloWorldApplication.java |    72 +
 .../src/main/java/domainapp/webapp/welcome.html |    34 +
 .../src/main/webapp/WEB-INF/isis.properties     |    41 +
 .../src/main/webapp/WEB-INF/logging.properties  |   232 +
 .../src/main/webapp/WEB-INF/shiro.ini           |    58 +
 .../src/main/webapp/WEB-INF/web.xml             |   331 +
 .../src/main/webapp/about/images/isis-logo.png  |   Bin 0 -> 14160 bytes
 .../src/main/webapp/about/index.html            |   110 +
 .../src/main/webapp/css/application.css         |    19 +
 .../src/main/webapp/scripts/application.js      |     3 +
 .../src/main/webapp/swagger-ui/00-README.md     |     5 +
 .../src/main/webapp/swagger-ui/css/print.css    |     1 +
 .../src/main/webapp/swagger-ui/css/reset.css    |     1 +
 .../src/main/webapp/swagger-ui/css/screen.css   |     1 +
 .../src/main/webapp/swagger-ui/css/style.css    |     1 +
 .../main/webapp/swagger-ui/css/typography.css   |     0
 .../webapp/swagger-ui/fonts/DroidSans-Bold.ttf  |   Bin 0 -> 42480 bytes
 .../main/webapp/swagger-ui/fonts/DroidSans.ttf  |   Bin 0 -> 41028 bytes
 .../main/webapp/swagger-ui/images/collapse.gif  |   Bin 0 -> 69 bytes
 .../main/webapp/swagger-ui/images/expand.gif    |   Bin 0 -> 73 bytes
 .../webapp/swagger-ui/images/explorer_icons.png |   Bin 0 -> 5115 bytes
 .../webapp/swagger-ui/images/favicon-16x16.png  |   Bin 0 -> 445 bytes
 .../webapp/swagger-ui/images/favicon-32x32.png  |   Bin 0 -> 1141 bytes
 .../main/webapp/swagger-ui/images/favicon.ico   |   Bin 0 -> 5430 bytes
 .../webapp/swagger-ui/images/logo_small.png     |   Bin 0 -> 455 bytes
 .../webapp/swagger-ui/images/pet_store_api.png  |   Bin 0 -> 631 bytes
 .../main/webapp/swagger-ui/images/throbber.gif  |   Bin 0 -> 9257 bytes
 .../webapp/swagger-ui/images/wordnik_api.png    |   Bin 0 -> 670 bytes
 .../webapp/swagger-ui/index-ORIG-2.2.10.html    |   129 +
 .../src/main/webapp/swagger-ui/index.html       |   171 +
 .../src/main/webapp/swagger-ui/lang/ca.js       |    53 +
 .../src/main/webapp/swagger-ui/lang/el.js       |    56 +
 .../src/main/webapp/swagger-ui/lang/en.js       |    56 +
 .../src/main/webapp/swagger-ui/lang/es.js       |    53 +
 .../src/main/webapp/swagger-ui/lang/fr.js       |    54 +
 .../src/main/webapp/swagger-ui/lang/geo.js      |    56 +
 .../src/main/webapp/swagger-ui/lang/it.js       |    52 +
 .../src/main/webapp/swagger-ui/lang/ja.js       |    56 +
 .../src/main/webapp/swagger-ui/lang/ko-kr.js    |    53 +
 .../src/main/webapp/swagger-ui/lang/pl.js       |    53 +
 .../src/main/webapp/swagger-ui/lang/pt.js       |    53 +
 .../src/main/webapp/swagger-ui/lang/ru.js       |    56 +
 .../src/main/webapp/swagger-ui/lang/tr.js       |    53 +
 .../main/webapp/swagger-ui/lang/translator.js   |    39 +
 .../src/main/webapp/swagger-ui/lang/zh-cn.js    |    56 +
 .../main/webapp/swagger-ui/lib/backbone-min.js  |     1 +
 .../src/main/webapp/swagger-ui/lib/es5-shim.js  |     1 +
 .../webapp/swagger-ui/lib/handlebars-4.0.5.js   |     3 +
 .../swagger-ui/lib/highlight.9.1.0.pack.js      |     1 +
 .../lib/highlight.9.1.0.pack_extended.js        |     1 +
 .../webapp/swagger-ui/lib/jquery-1.8.0.min.js   |     3 +
 .../webapp/swagger-ui/lib/jquery.ba-bbq.min.js  |     1 +
 .../webapp/swagger-ui/lib/jquery.slideto.min.js |     1 +
 .../webapp/swagger-ui/lib/jquery.wiggle.min.js  |     1 +
 .../main/webapp/swagger-ui/lib/js-yaml.min.js   |     2 +
 .../webapp/swagger-ui/lib/jsoneditor.min.js     |     5 +
 .../main/webapp/swagger-ui/lib/lodash.min.js    |     2 +
 .../src/main/webapp/swagger-ui/lib/marked.js    |     1 +
 .../swagger-ui/lib/object-assign-pollyfill.js   |     1 +
 .../webapp/swagger-ui/lib/sanitize-html.min.js  |     4 +
 .../main/webapp/swagger-ui/lib/swagger-oauth.js |     1 +
 .../src/main/webapp/swagger-ui/o2c.html         |    23 +
 .../src/main/webapp/swagger-ui/swagger-ui.js    | 25344 +++++++++++++++++
 .../main/webapp/swagger-ui/swagger-ui.min.js    |    15 +
 .../dom/impl/HelloWorldObjectTest_delete.java   |    72 +
 .../impl/HelloWorldObjectTest_updateName.java   |    43 +
 .../projects/basic/archetype.properties         |     5 +
 .../src/test/resources/projects/basic/goal.txt  |     0
 example/archetype/simpleapp/pom.xml             |    30 +-
 .../META-INF/maven/archetype-metadata.xml       |     3 +
 .../resources/archetype-resources/README.adoc   |    11 +-
 .../archetype-resources/application/pom.xml     |    23 +-
 .../manifest/DomainAppAppManifest.java          |   134 +-
 .../DomainAppAppManifestBypassSecurity.java     |     4 +-
 .../DomainAppAppManifestWithFixtures.java       |    10 +-
 ...ppAppManifestWithFixturesBypassSecurity.java |     5 +-
 .../services/dbmanager/HsqlDbManagerMenu.java   |    77 -
 .../services/homepage/HomePageViewModel.java    |     2 +-
 .../manifest/authentication_shiro.properties    |    28 +
 .../application/manifest/isis.properties        |   199 +-
 .../manifest/persistor_datanucleus.properties   |   109 +
 .../manifest/viewer_restfulobjects.properties   |    67 +
 .../manifest/viewer_wicket.properties           |   182 +
 .../integtests/DomainAppIntegTestAbstract.java  |    33 +-
 .../archetype-resources/module-simple/pom.xml   |    63 +-
 .../modules/simple/SimpleModuleManifest.java    |    48 +-
 .../simple/dom/impl/SimpleObject.layout.xml     |     8 +-
 .../SimpleModuleIntegTestAbstract.java          |    55 +-
 .../tests/SimpleObject_IntegTest.java           |     4 +-
 .../main/resources/archetype-resources/pom.xml  |   220 +-
 .../archetype-resources/webapp/pom.xml          |    95 +-
 .../domainapp/webapp/DomainApplication.java     |    22 +-
 .../WEB-INF/authentication_shiro.properties     |    28 -
 .../src/main/webapp/WEB-INF/isis.properties     |   104 +-
 .../src/main/webapp/WEB-INF/logging.properties  |     9 +-
 .../main/webapp/WEB-INF/persistor.properties    |   116 -
 .../WEB-INF/viewer_restfulobjects.properties    |    69 -
 .../webapp/WEB-INF/viewer_wicket.properties     |   140 -
 .../webapp/src/main/webapp/about/index.html     |     4 +-
 .../src/main/webapp/swagger-ui/00-README.md     |     5 +
 .../src/main/webapp/swagger-ui/css/print.css    |     1 +
 .../src/main/webapp/swagger-ui/css/reset.css    |     1 +
 .../src/main/webapp/swagger-ui/css/screen.css   |     1 +
 .../src/main/webapp/swagger-ui/css/style.css    |     1 +
 .../main/webapp/swagger-ui/css/typography.css   |     0
 .../webapp/swagger-ui/fonts/DroidSans-Bold.ttf  |   Bin 0 -> 42480 bytes
 .../main/webapp/swagger-ui/fonts/DroidSans.ttf  |   Bin 0 -> 41028 bytes
 .../main/webapp/swagger-ui/images/collapse.gif  |   Bin 0 -> 69 bytes
 .../main/webapp/swagger-ui/images/expand.gif    |   Bin 0 -> 73 bytes
 .../webapp/swagger-ui/images/explorer_icons.png |   Bin 0 -> 5115 bytes
 .../webapp/swagger-ui/images/favicon-16x16.png  |   Bin 0 -> 445 bytes
 .../webapp/swagger-ui/images/favicon-32x32.png  |   Bin 0 -> 1141 bytes
 .../main/webapp/swagger-ui/images/favicon.ico   |   Bin 0 -> 5430 bytes
 .../webapp/swagger-ui/images/logo_small.png     |   Bin 0 -> 455 bytes
 .../webapp/swagger-ui/images/pet_store_api.png  |   Bin 0 -> 631 bytes
 .../main/webapp/swagger-ui/images/throbber.gif  |   Bin 0 -> 9257 bytes
 .../webapp/swagger-ui/images/wordnik_api.png    |   Bin 0 -> 670 bytes
 .../webapp/swagger-ui/index-ORIG-2.2.10.html    |   129 +
 .../src/main/webapp/swagger-ui/index.html       |    57 +-
 .../src/main/webapp/swagger-ui/lang/ca.js       |    53 +
 .../src/main/webapp/swagger-ui/lang/el.js       |    56 +
 .../src/main/webapp/swagger-ui/lang/en.js       |    56 +
 .../src/main/webapp/swagger-ui/lang/es.js       |    53 +
 .../src/main/webapp/swagger-ui/lang/fr.js       |    54 +
 .../src/main/webapp/swagger-ui/lang/geo.js      |    56 +
 .../src/main/webapp/swagger-ui/lang/it.js       |    52 +
 .../src/main/webapp/swagger-ui/lang/ja.js       |    56 +
 .../src/main/webapp/swagger-ui/lang/ko-kr.js    |    53 +
 .../src/main/webapp/swagger-ui/lang/pl.js       |    53 +
 .../src/main/webapp/swagger-ui/lang/pt.js       |    53 +
 .../src/main/webapp/swagger-ui/lang/ru.js       |    56 +
 .../src/main/webapp/swagger-ui/lang/tr.js       |    53 +
 .../main/webapp/swagger-ui/lang/translator.js   |    39 +
 .../src/main/webapp/swagger-ui/lang/zh-cn.js    |    56 +
 .../main/webapp/swagger-ui/lib/backbone-min.js  |     1 +
 .../src/main/webapp/swagger-ui/lib/es5-shim.js  |     1 +
 .../webapp/swagger-ui/lib/handlebars-4.0.5.js   |     3 +
 .../swagger-ui/lib/highlight.9.1.0.pack.js      |     1 +
 .../lib/highlight.9.1.0.pack_extended.js        |     1 +
 .../webapp/swagger-ui/lib/jquery-1.8.0.min.js   |     3 +
 .../webapp/swagger-ui/lib/jquery.ba-bbq.min.js  |     1 +
 .../webapp/swagger-ui/lib/jquery.slideto.min.js |     1 +
 .../webapp/swagger-ui/lib/jquery.wiggle.min.js  |     1 +
 .../main/webapp/swagger-ui/lib/js-yaml.min.js   |     2 +
 .../webapp/swagger-ui/lib/jsoneditor.min.js     |     5 +
 .../main/webapp/swagger-ui/lib/lodash.min.js    |     2 +
 .../src/main/webapp/swagger-ui/lib/marked.js    |     1 +
 .../swagger-ui/lib/object-assign-pollyfill.js   |     1 +
 .../webapp/swagger-ui/lib/sanitize-html.min.js  |     4 +
 .../main/webapp/swagger-ui/lib/swagger-oauth.js |     1 +
 .../webapp/src/main/webapp/swagger-ui/o2c.html  |    23 +
 .../src/main/webapp/swagger-ui/swagger-ui.js    | 25344 +++++++++++++++++
 .../main/webapp/swagger-ui/swagger-ui.min.js    |    15 +
 .../projects/basic/archetype.properties         |     2 +-
 236 files changed, 55919 insertions(+), 1600 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/isis/blob/238ef6ae/adocs/documentation/src/main/asciidoc/guides/cgcom/_cgcom_cutting-a-release.adoc
----------------------------------------------------------------------
diff --cc adocs/documentation/src/main/asciidoc/guides/cgcom/_cgcom_cutting-a-release.adoc
index dfb5bdc,46d1602..f2b6e39
--- a/adocs/documentation/src/main/asciidoc/guides/cgcom/_cgcom_cutting-a-release.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/cgcom/_cgcom_cutting-a-release.adoc
@@@ -933,7 -924,7 +933,7 @@@ The source code artifacts have been upl
  
  For each zip there is a corresponding signature file (append .asc to the zip's url).
  
- In the source code repo the code has been tagged as isis-1.15.0-RC1, helloworld-archetype-1.15.0-RC1 and simpleapp-archetype-1.15.0-RC1; see https://git-wip-us.apache.org/repos/asf?p=isis.git
 -In the source code repo the code has been tagged as isis-1.16.0-RC1 and simpleapp-archetype-1.16.0-RC1; see https://git-wip-us.apache.org/repos/asf?p=isis.git
++In the source code repo the code has been tagged as isis-1.16.0-RC1, helloworld-archetype-1.16.0-RC1 and simpleapp-archetype-1.16.0-RC1; see https://git-wip-us.apache.org/repos/asf?p=isis.git
  
  For instructions on how to verify the release (build from binaries and/or use in Maven directly), see http://isis.apache.org/guides/cgcom.html#_cgcom_verifying-releases
  

http://git-wip-us.apache.org/repos/asf/isis/blob/238ef6ae/adocs/documentation/src/main/asciidoc/guides/cgcom/_cgcom_post-release-successful.adoc
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/isis/blob/238ef6ae/adocs/documentation/src/main/asciidoc/guides/cgcom/_cgcom_verifying-releases.adoc
----------------------------------------------------------------------
diff --cc adocs/documentation/src/main/asciidoc/guides/cgcom/_cgcom_verifying-releases.adoc
index 94c770a,d5dd702..e8e8111
--- a/adocs/documentation/src/main/asciidoc/guides/cgcom/_cgcom_verifying-releases.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/cgcom/_cgcom_verifying-releases.adoc
@@@ -230,17 -228,22 +230,17 @@@ chmod +x verify-isis-release.s
  
  ==== Create an input file
  
 -The input file is a plain `.txt` file containing all urls to the packages to be verified.
 -Here's a sample of the release of Apache Isis 1.16.0:
 +The input file is a plain `urls.txt` file containing all urls to the packages to be verified.
- Here's a sample of the release from Apache Isis 1.15.0:
++Here's a sample of the release from Apache Isis 1.12.0:
  
  [source]
  ----
- http://repository.apache.org/content/repositories/orgapacheisis-1058/org/apache/isis/core/isis/1.15.0/isis-1.15.0-source-release.zip
- http://repository.apache.org/content/repositories/orgapacheisis-1059/org/apache/isis/archetype/helloworld-archetype/1.15.0/helloworld-archetype-1.15.0-source-release.zip
- http://repository.apache.org/content/repositories/orgapacheisis-1059/org/apache/isis/archetype/simpleapp-archetype/1.15.0/simpleapp-archetype-1.15.0-source-release.zip
 -https://repository.apache.org/content/repositories/orgapacheisis-063/org/apache/isis/core/isis/1.8.0/isis-1.16.0-source-release.zip
 -https://repository.apache.org/content/repositories/orgapacheisis-065/org/apache/isis/archetype/helloworld-archetype/1.8.0/simpleapp-archetype-1.16.0-source-release.zip
 -https://repository.apache.org/content/repositories/orgapacheisis-065/org/apache/isis/archetype/simpleapp-archetype/1.8.0/simpleapp-archetype-1.16.0-source-release.zip
++http://repository.apache.org/content/repositories/orgapacheisis-1058/org/apache/isis/core/isis/1.12.0/isis-1.12.0-source-release.zip
++http://repository.apache.org/content/repositories/orgapacheisis-1059/org/apache/isis/archetype/helloworld-archetype/1.12.0/helloworld-archetype-1.12.0-source-release.zip
++http://repository.apache.org/content/repositories/orgapacheisis-1059/org/apache/isis/archetype/simpleapp-archetype/1.12.0/simpleapp-archetype-1.12.0-source-release.zip
  ----
  
 -The actual list of packages to be verified will be provided through the mailing list.
 +You will find the actual list of URLs to be verified in the vote mail on the dev mailing list.
  
  
  

http://git-wip-us.apache.org/repos/asf/isis/blob/238ef6ae/adocs/documentation/src/main/asciidoc/migration-notes/_migration-notes_1.14.0-to-1.15.0.adoc
----------------------------------------------------------------------
diff --cc adocs/documentation/src/main/asciidoc/migration-notes/_migration-notes_1.14.0-to-1.15.0.adoc
index bfe489a,6f6f345..10bae3a
--- a/adocs/documentation/src/main/asciidoc/migration-notes/_migration-notes_1.14.0-to-1.15.0.adoc
+++ b/adocs/documentation/src/main/asciidoc/migration-notes/_migration-notes_1.14.0-to-1.15.0.adoc
@@@ -6,35 -6,30 +6,31 @@@
  
  
  
- [NOTE]
- ====
- Apache Isis 1.15.0-SNAPSHOT is currently still in development
- ====
  
 -== Overriding framework services (link:https://issues.apache.org/jira/browse/ISIS-1611[ISIS-1611])
  
 -Domain services fall into three categories:
  
 -* application services: written by the application developer and used only within the application
 -* SPI services: written by the application developer but called by the framework
 -* framework services: defined within the applib with a default implementation provided by the framework itself
 +== `isis-mavendeps` Aggregator POMs
  
 -As described
 -xref:../guides/ugbtb/ugbtb.adoc#_ugbtb_hints-and-tips_replacing-default-service-implementations[here], it is possible to override framework services so that the framework uses the replacement implementation.
 -Previously this required explicitly setting either xref:../guides/rgant/rgant.adoc#_rgant_DomainService_menuOrder[`@DomainService#menuOrder()`] or xref:../guides/rgant/rgant.adoc#_rgant_DomainServiceLayout_menuOrder[`@DomainServiceLayout#menuOrder()`].
 +To remove boilerplate in your application's `pom.xml`, three new maven "aggregator projects have been defined:
  
 -In 1.15.0, the default value for `menuOrder` has been set to a value lower than that of the framework-provided implementations, and so will a custom implementation will always take precedence over the framework implementations without having to remember to also set `menuOrder`.
 +* `org.apache.isis.mavendeps:isis-mavendeps-testing` +
 ++
 +aggregates dependencies for unit, integration and BDD tests
  
 +* `org.apache.isis.mavendeps:isis-mavendeps-webapp` +
 ++
 +aggregates dependencies for running as a webapp
  
 -== Fix to config variable (link:https://issues.apache.org/jira/browse/ISIS-1595[ISIS-1595])
 +* `org.apache.isis.mavendeps:isis-mavendeps-intellij` +
 ++
 +brings in a dependency on `isis-core-webserver` (to run the application from the command line using `org.apache.isis.WebServer`).
 +This is defined in a profile which is actived only when running under the Intellij IDE.
 +
 +The xref:../ugfun/ugfun.adoc#_ugfun_getting-started_helloworld-archetype[HelloWorld] and xref:../ugfun/ugfun.adoc#_ugfun_getting-started_simpleapp-archetype[SimpleApp] archetypes both make use of these new aggregators.
  
 -The configuration property xref:../guides/rgcfg/rgcfg.adoc#__rgcfg_configuring-core_metamodel-validation[] `isis.reflector.validator.jdoqlVariablesClause` was incorrectly named `variablesClause`.
 -This has now been corrected.
  
 -Any applications that used this configuration property should be updated.
  
 -== Rename of isis-viewer-wicket artifacts
 +== Rename of isis-viewer-wicket artifacts (link:https://issues.apache.org/jira/browse/ISIS-1528[ISIS-1528])
  
  The `<groupId>` and `<artifactId>` of the xref:../guides/ugvw/ugvw.adoc#[Wicket viewer] have been made consistent with other artifacts:
  

http://git-wip-us.apache.org/repos/asf/isis/blob/238ef6ae/adocs/documentation/src/main/asciidoc/release-notes/_release-notes_1.15.0.adoc
----------------------------------------------------------------------
diff --cc adocs/documentation/src/main/asciidoc/release-notes/_release-notes_1.15.0.adoc
index e709923,7f32a1f..be489a5
--- a/adocs/documentation/src/main/asciidoc/release-notes/_release-notes_1.15.0.adoc
+++ b/adocs/documentation/src/main/asciidoc/release-notes/_release-notes_1.15.0.adoc
@@@ -6,13 -6,8 +6,8 @@@
  :toc: right
  
  
- [NOTE]
- ====
- Apache Isis 1.15.0-SNAPSHOT is currently still in development
- ====
- 
  
 -The main new feature is inline prompts: the ability to edit a property or invoke an action (associated with a property) without requiring a modal dialog box.
 +The main new feature of `1.15.0` is inline prompts: the ability to edit a property or invoke an action (associated with a property) without requiring a modal dialog box.
  There have also been several improvements in the ability to tab around the UI.
  
  The version of Apache Wicket has also been upgraded from `6.x` to `7.x`.