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 2019/11/19 07:03:08 UTC
[isis] branch master updated (b8dd550 -> b7e0c09)
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 b8dd550 ISIS-2084: more messing about with jdk11
new 2afc377 ISIS-2084: cleans up smoketests app properties
new b7e0c09 ISIS-2084: reinstates deps for jdk11 in schema
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:
core/schema/pom.xml | 5 +-
examples/smoketests/pom.xml | 6 ---
.../src/main/resources/application.properties | 56 ----------------------
.../src/main/resources/application.yml | 27 ++++-------
4 files changed, 10 insertions(+), 84 deletions(-)
delete mode 100644 examples/smoketests/src/main/resources/application.properties
copy examples/{apps/helloworld => smoketests}/src/main/resources/application.yml (65%)
[isis] 02/02: ISIS-2084: reinstates deps for jdk11 in schema
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 b7e0c0907de9438e0aceede3badafbdf9c62136b
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Tue Nov 19 07:02:44 2019 +0000
ISIS-2084: reinstates deps for jdk11 in schema
---
core/schema/pom.xml | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/core/schema/pom.xml b/core/schema/pom.xml
index 506003a..df7921d 100644
--- a/core/schema/pom.xml
+++ b/core/schema/pom.xml
@@ -54,8 +54,8 @@
</activation>
<!--
- REMOVED BECAUSE IF BUILT ON JDK11, THEN ADDS DEPENDENCIES ALWAYS
-
+ These dependencies are required in order to build on jdk11
+ -->
<dependencies>
<dependency>
<groupId>javax.xml.bind</groupId>
@@ -70,7 +70,6 @@
<artifactId>jaxb-impl</artifactId>
</dependency>
</dependencies>
- -->
<build>
<pluginManagement>
[isis] 01/02: ISIS-2084: cleans up smoketests app properties
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 2afc37716b294dc6b75f5b2e3720142d2c86842a
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Tue Nov 19 07:01:26 2019 +0000
ISIS-2084: cleans up smoketests app properties
---
examples/smoketests/pom.xml | 6 ---
.../src/main/resources/application.properties | 56 ----------------------
.../smoketests/src/main/resources/application.yml | 55 +++++++++++++++++++++
3 files changed, 55 insertions(+), 62 deletions(-)
diff --git a/examples/smoketests/pom.xml b/examples/smoketests/pom.xml
index b61b38f..2d370b8 100644
--- a/examples/smoketests/pom.xml
+++ b/examples/smoketests/pom.xml
@@ -168,12 +168,6 @@
<artifactId>isis-mavendeps-testing</artifactId>
<scope>test</scope>
<type>pom</type>
-<!-- <exclusions> -->
-<!-- <exclusion> -->
-<!-- <groupId>org.slf4j</groupId> -->
-<!-- <artifactId>slf4j-api</artifactId> -->
-<!-- </exclusion> -->
-<!-- </exclusions> -->
</dependency>
<dependency>
diff --git a/examples/smoketests/src/main/resources/application.properties b/examples/smoketests/src/main/resources/application.properties
deleted file mode 100644
index 1936d18..0000000
--- a/examples/smoketests/src/main/resources/application.properties
+++ /dev/null
@@ -1,56 +0,0 @@
-# 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.
-
-isis.reflector.validator.allowDeprecated=false
-isis.reflector.validator.noParamsOnly=true
-#isis.reflector.validator.explicitObjectType=true DONT DEFINE HERE
-#isis.reflector.validator.serviceActionsOnly=true DEPTRECATED
-#isis.reflector.validator.mixinsOnly=true DEPTRECATED
-
-isis.reflector.facet.cssClassFa.patterns=\
- new.*:fa-plus,\
- add.*:fa-plus-square,\
- create.*:fa-plus,\
- update.*:fa-edit,\
- delete.*:fa-trash,\
- find.*:fa-search,\
- list.*:fa-list
-
-isis.reflector.facet.cssClass.patterns=\
- delete.*:btn-danger
-
-isis.reflector.explicitAnnotations.action=true
-
-isis.objects.editing=false
-
-isis.viewer.wicket.application.name=Hello World App
-isis.viewer.wicket.application.css=css/application.css
-isis.viewer.wicket.application.js=scripts/application.js
-isis.viewer.wicket.application.about=Hello World
-isis.viewer.wicket.welcome.file=welcome.html
-
-isis.viewer.wicket.credit[0].image=/images/apache-isis/logo-48x48.png
-isis.viewer.wicket.credit[0].name=Apache Isis
-isis.viewer.wicket.credit[0].url=http://isis.apache.org
-
-isis.viewer.wicket.themes.initial=Flatly
-isis.viewer.wicket.themes.showChooser=yes
-isis.viewer.wicket.themes.enabled=Cosmo,Flatly,Darkly,Sandstone,United
-
-
-isis.viewer.wicket.maxTitleLengthInStandaloneTables=0
-isis.viewer.wicket.maxTitleLengthInParentedTables=0
diff --git a/examples/smoketests/src/main/resources/application.yml b/examples/smoketests/src/main/resources/application.yml
new file mode 100644
index 0000000..f34c628
--- /dev/null
+++ b/examples/smoketests/src/main/resources/application.yml
@@ -0,0 +1,55 @@
+isis:
+ reflector:
+ validator:
+ allowDeprecated: false
+ noParamsOnly: true
+ #explicitObjectType: true # DON'T DEFINE HERE
+ #serviceActionsOnly: true # DEPRECATED
+ #mixinsOnly: true # DEPRECATED
+
+ facet:
+ cssClassFa:
+ patterns:
+ new.*:fa-plus,\
+ add.*:fa-plus-square,\
+ create.*:fa-plus,\
+ update.*:fa-edit,\
+ delete.*:fa-trash,\
+ find.*:fa-search,\
+ list.*:fa-list
+
+ cssClass:
+ patterns:
+ delete.*:btn-danger
+
+ explicitAnnotations:
+ action: true
+
+ objects:
+ editing: false
+
+ viewer:
+ wicket:
+ application:
+ name: Smoke Tests
+ css: css/application.css
+ js: scripts/application.js
+ about: Smoke Tests
+ welcome:
+ file: welcome.html
+
+ credit[0]:
+ image: /images/apache-isis/logo-48x48.png
+ name: Apache Isis
+ url: http://isis.apache.org
+
+ themes:
+ initial: Flatly
+ showChooser: true
+ enabled: Cosmo,Flatly,Darkly,Sandstone,United
+
+ maxTitleLengthInStandaloneTables: 0
+ maxTitleLengthInParentedTables: 0
+
+
+