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 2018/03/06 12:43:25 UTC
[isis] branch master updated (f071427 -> fbc71a2)
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git.
from f071427 ISIS-1893 fixes jax-rs core-plugin, missing dependencies
add 5fa4cf6 ISIS-1888: standardises CSS, with 'isis-' prefix, for various components
add cdf9872 ISIS-1888: adds CSS for logout link
add 8c0deb8 ISIS-1888: further tidy up of some CSS classes
add 69b4759 [maven-release-plugin] prepare release isis-1.16.2
add 54dcd21 [maven-release-plugin] prepare for next development iteration
add 4690586 ISIS-1875: updates simpleapp isis.version
add ee43169 ISIS-1875: recreating simpleapp archetype
add 9aa7b8c [maven-release-plugin] prepare release simpleapp-archetype-1.16.2
add c1e80ca [maven-release-plugin] prepare for next development iteration
add 0ad3d96 ISIS-1875: updates helloworld isis.version
add bbf143c ISIS-1875: recreating helloworld archetype
add c029e20 [maven-release-plugin] prepare release helloworld-archetype-1.16.2
add d99f5a7 [maven-release-plugin] prepare for next development iteration
add e10731a ISIS-1875: updates docs for 1.16.2 release
add fcb0422 ISIS-1875: updates for 1.16.2 website
add 13ff45f Merge branch 'release-1.16.2-RC1' into maint-1.16.2
add 240282c ISIS-1888: further tidy up of CSS classes, fully qualified and no longer lower-caes
add fb83729 ISIS-1888: copies over TypeOfFacet for an empty pojo list, so that actions returning empty collections render with the correct CSS.
new 9da1440 Merge branch 'maint-1.16.2'
new fbc71a2 completes merge from maint-1.16.2
The 2 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:
STATUS | 4 +++
.../documentation/src/main/asciidoc/doap_isis.rdf | 24 ++++++++++++++
.../documentation/src/main/asciidoc/downloads.adoc | 12 +++----
...ugfun_getting-started_helloworld-archetype.adoc | 2 +-
..._ugfun_getting-started_simpleapp-archetype.adoc | 2 +-
adocs/documentation/src/main/asciidoc/index.html | 11 ++++---
.../src/main/asciidoc/pages/tg/tg.adoc | 2 +-
.../release-notes/_release-notes_1.16.2.adoc | 36 +++++++++++++++++++++
.../main/asciidoc/release-notes/release-notes.adoc | 9 ++++++
adocs/template/document.html.erb | 2 +-
.../core/metamodel/spec/feature/ObjectAction.java | 2 +-
.../viewer/wicket/model/models/ScalarModel.java | 32 ++++++++++---------
.../actionresponse/ActionResultResponseType.java | 11 +++++++
.../actionmenu/serviceactions/CssMenuItem.java | 10 +++++-
.../serviceactions/ServiceActionUtil.java | 1 +
.../serviceactions/ServiceActionsPanel.java | 37 ++++++++++++++++++++++
.../serviceactions/TertiaryActionsPanel.html | 2 +-
.../components/actions/ActionParametersForm.java | 22 +++++++++++--
.../actions/ActionParametersFormPanel.java | 2 +-
.../CollectionContentsAsAjaxTablePanel.java | 2 +-
.../columns/ObjectAdapterPropertyColumn.java | 3 +-
.../wicket/ui/components/header/HeaderPanel.html | 2 +-
.../ui/components/scalars/ScalarPanelAbstract.java | 2 +-
.../components/scalars/ScalarPanelAbstract2.java | 6 ++--
.../StandaloneCollectionPanel.java | 6 ++--
.../viewer/wicket/ui/pages/entity/EntityPage.java | 4 +--
.../wicket/ui/pages/login/IsisSignInPanel.html | 4 +--
.../viewer/wicket/ui/util/CssClassAppender.java | 2 +-
example/archetype/helloworld/pom.xml | 2 +-
.../src/main/resources/archetype-resources/pom.xml | 2 +-
.../resources/projects/basic/archetype.properties | 2 +-
example/archetype/simpleapp/pom.xml | 2 +-
.../META-INF/maven/archetype-metadata.xml | 19 -----------
.../application/logging-integtest.properties | 10 ++++++
.../application/DomainAppApplicationModule.java | 3 ++
.../module-simple/logging-integtest.properties | 9 ++++++
.../domainapp/modules/simple/SimpleModule.java | 5 ++-
.../src/main/resources/archetype-resources/pom.xml | 2 +-
.../resources/projects/basic/archetype.properties | 2 +-
39 files changed, 236 insertions(+), 76 deletions(-)
create mode 100644 adocs/documentation/src/main/asciidoc/release-notes/_release-notes_1.16.2.adoc
--
To stop receiving notification emails like this one, please contact
danhaywood@apache.org.
[isis] 01/02: Merge branch 'maint-1.16.2'
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 9da1440920bb1516caeeaf292f2de5599775c815
Merge: f071427 fb83729
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Tue Mar 6 12:31:58 2018 +0000
Merge branch 'maint-1.16.2'
# Conflicts:
# core/pom.xml
# core/runtime/pom.xml
# core/security-shiro/pom.xml
# example/application/helloworld/pom.xml
# example/application/simpleapp/pom.xml
# example/archetype/simpleapp/pom.xml
STATUS | 4 +++
.../documentation/src/main/asciidoc/doap_isis.rdf | 24 ++++++++++++++
.../documentation/src/main/asciidoc/downloads.adoc | 12 +++----
...ugfun_getting-started_helloworld-archetype.adoc | 2 +-
..._ugfun_getting-started_simpleapp-archetype.adoc | 2 +-
adocs/documentation/src/main/asciidoc/index.html | 11 ++++---
.../src/main/asciidoc/pages/tg/tg.adoc | 2 +-
.../release-notes/_release-notes_1.16.2.adoc | 36 +++++++++++++++++++++
.../main/asciidoc/release-notes/release-notes.adoc | 9 ++++++
adocs/template/document.html.erb | 2 +-
.../core/metamodel/spec/feature/ObjectAction.java | 2 +-
.../viewer/wicket/model/models/ScalarModel.java | 32 ++++++++++---------
.../actionresponse/ActionResultResponseType.java | 11 +++++++
.../actionmenu/serviceactions/CssMenuItem.java | 10 +++++-
.../serviceactions/ServiceActionUtil.java | 1 +
.../serviceactions/ServiceActionsPanel.java | 37 ++++++++++++++++++++++
.../serviceactions/TertiaryActionsPanel.html | 2 +-
.../components/actions/ActionParametersForm.java | 22 +++++++++++--
.../actions/ActionParametersFormPanel.java | 2 +-
.../CollectionContentsAsAjaxTablePanel.java | 2 +-
.../columns/ObjectAdapterPropertyColumn.java | 3 +-
.../wicket/ui/components/header/HeaderPanel.html | 2 +-
.../ui/components/scalars/ScalarPanelAbstract.java | 2 +-
.../components/scalars/ScalarPanelAbstract2.java | 6 ++--
.../StandaloneCollectionPanel.java | 6 ++--
.../viewer/wicket/ui/pages/entity/EntityPage.java | 4 +--
.../wicket/ui/pages/login/IsisSignInPanel.html | 4 +--
.../viewer/wicket/ui/util/CssClassAppender.java | 2 +-
.../src/main/resources/archetype-resources/pom.xml | 2 +-
.../resources/projects/basic/archetype.properties | 2 +-
.../META-INF/maven/archetype-metadata.xml | 19 -----------
.../application/logging-integtest.properties | 10 ++++++
.../application/DomainAppApplicationModule.java | 3 ++
.../module-simple/logging-integtest.properties | 9 ++++++
.../domainapp/modules/simple/SimpleModule.java | 5 ++-
.../src/main/resources/archetype-resources/pom.xml | 2 +-
.../resources/projects/basic/archetype.properties | 2 +-
37 files changed, 234 insertions(+), 74 deletions(-)
--
To stop receiving notification emails like this one, please contact
danhaywood@apache.org.
[isis] 02/02: completes merge from maint-1.16.2
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit fbc71a2e9b72c673efffa06c16ea4f2c2ff20224
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Tue Mar 6 12:33:15 2018 +0000
completes merge from maint-1.16.2
---
example/archetype/helloworld/pom.xml | 2 +-
example/archetype/simpleapp/pom.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/example/archetype/helloworld/pom.xml b/example/archetype/helloworld/pom.xml
index 5f84e1f..fc5f961 100644
--- a/example/archetype/helloworld/pom.xml
+++ b/example/archetype/helloworld/pom.xml
@@ -70,7 +70,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.16.1</version>
+ <version>1.16.2</version>
<relativePath>../../../core/pom.xml</relativePath>
</parent>
<properties>
diff --git a/example/archetype/simpleapp/pom.xml b/example/archetype/simpleapp/pom.xml
index a432bb2..a14773d 100644
--- a/example/archetype/simpleapp/pom.xml
+++ b/example/archetype/simpleapp/pom.xml
@@ -70,7 +70,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>1.16.2</version>
<relativePath>../../../core/pom.xml</relativePath>
</parent>
<properties>
--
To stop receiving notification emails like this one, please contact
danhaywood@apache.org.