Clone
danhaywood <dan@haywood-associates.co.uk>
committed
on 03 Jan 19
Merge branch 'release-1.17.0-RC3' into v2
# Conflicts:
# adocs/documentation/src/main/asciidoc/__versions.adoc
# adocs/documentation/src/mai… Show more
Merge branch 'release-1.17.0-RC3' into v2

# Conflicts:

#       adocs/documentation/src/main/asciidoc/__versions.adoc

#       adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_metadata-api_MetamodelService.adoc

#       adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_getting-started_simpleapp-archetype.adoc

#       adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_ui-hints_names-and-descriptions.adoc

#       adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_configuration-properties.adoc

#       core/.m2/settings.xml

#       core/applib/src/main/java/org/apache/isis/applib/services/metamodel/MetaModelServicesMenu.java

#       core/applib/src/test/java/org/apache/isis/schema/utils/CommonDtoUtils_setValueOn_Test.java

#       core/config/src/main/java/org/apache/isis/config/property/ConfigProperty.java

#       core/config/src/main/java/org/apache/isis/config/property/ConfigPropertyAbstract.java

#       core/config/src/main/java/org/apache/isis/config/property/ConfigPropertyBoolean.java

#       core/config/src/main/java/org/apache/isis/config/property/ConfigPropertyEnum.java

#       core/config/src/main/java/org/apache/isis/config/property/ConfigPropertyString.java

#       core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java

#       core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketModule.java

#       example/application/helloworld/src/main/java/domainapp/application/isis-non-changing.properties

#       example/application/helloworld/src/main/webapp/WEB-INF/web.xml

#       example/application/simpleapp/application/src/test/java/domainapp/application/integtests/tests/mml/MetaModelService_IntegTest.exports.approved.xml

#       example/application/simpleapp/webapp/src/main/webapp/WEB-INF/web.xml

#       example/archetype/helloworld/pom.xml

#       example/archetype/helloworld/src/main/resources/META-INF/maven/archetype-metadata.xml

#       example/archetype/helloworld/src/main/resources/archetype-resources/pom.xml

#       example/archetype/helloworld/src/main/resources/archetype-resources/src/main/java/domainapp/application/isis-non-changing.properties

#       example/archetype/helloworld/src/main/resources/archetype-resources/src/main/java/domainapp/dom/impl/HelloWorldObjects.java

#       example/archetype/helloworld/src/test/resources/projects/basic/archetype.properties

#       example/archetype/simpleapp/pom.xml

#       example/archetype/simpleapp/src/main/resources/META-INF/maven/archetype-metadata.xml

#       example/archetype/simpleapp/src/main/resources/archetype-resources/application/pom.xml

#       example/archetype/simpleapp/src/main/resources/archetype-resources/application/translations.pot

#       example/archetype/simpleapp/src/main/resources/archetype-resources/module-simple/pom.xml

#       example/archetype/simpleapp/src/main/resources/archetype-resources/module-simple/src/main/java/domainapp/modules/simple/dom/impl/SimpleObject.java

#       example/archetype/simpleapp/src/main/resources/archetype-resources/module-simple/translations.pot

#       example/archetype/simpleapp/src/main/resources/archetype-resources/pom.xml

#       example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/logging.properties

#       example/archetype/simpleapp/src/test/resources/projects/basic/archetype.properties

#       recreate_archetype_RELEASE.sh

#       recreate_archetype_SNAPSHOT.sh

#       scripts/updateGeneratedArchetypeSources.groovy

#       scripts/verify-isis-release.sh

Show less

master + 19 more