You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2023/01/09 09:28:22 UTC
[isis] branch spring6 updated (a46ea06fb6 -> 3bf2c51f10)
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a change to branch spring6
in repository https://gitbox.apache.org/repos/asf/isis.git
from a46ea06fb6 Merge pull request #1339 from apache/dependabot/maven/spring6/org.owasp-dependency-check-maven-7.4.4
add eff39de79b moves the notes on nightly builds to committers guide
add d75c275503 ISIS-3297 : reinstates activation of datanucleus enhancer profile to use the logging-dn-enhance.properties file.
add 888c19e4b5 specifies version for datanucleus-maven-plugin (once more) in causeway-app-starter-parent
add 63f9a2a8e9 Bump assertj-guava from 3.24.0 to 3.24.1
add e30ef21e09 Merge pull request #1334 from apache/dependabot/maven/master/org.assertj-assertj-guava-3.24.1
add d536463080 Bump dependency-check-maven from 7.4.3 to 7.4.4
add c555fbf6b5 Merge pull request #1333 from apache/dependabot/maven/master/org.owasp-dependency-check-maven-7.4.4
add f32f1e3a5d Bump various swagger versions
add ea9b478328 Bump jquery from 3.6.1 to 3.6.3
new 3bf2c51f10 Merge remote-tracking branch 'origin/master' into spring6
The 1 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:
.../image-2023-01-03-08-31-58-018.png | Bin
.../image-2023-01-03-17-58-33-718.png | Bin
.../image-2023-01-03-18-07-57-499.png | Bin
.../image-2023-01-03-18-10-33-567.png | Bin
.../image-2023-01-03-18-16-01-614.png | Bin
.../image-2023-01-03-18-22-59-542.png | Bin
.../image-2023-01-03-18-27-32-832.png | Bin
.../image-2023-01-03-18-33-23-116.png | Bin
.../image-2023-01-04-06-23-41-099.png | Bin
.../image-2023-01-04-06-25-56-926.png | Bin
.../image-2023-01-04-06-26-42-960.png | Bin
.../image-2023-01-04-06-29-02-083.png | Bin
.../image-2023-01-04-06-31-36-293.png | Bin
.../image-2023-01-05-11-44-09-855.png | Bin
antora/components/comguide/modules/ROOT/nav.adoc | 3 +++
.../modules/ROOT/pages/nightly-builds.adoc} | 11 ++++-----
.../modules/ROOT/pages/nightly-deploys.adoc} | 26 ++++++++++-----------
.../ROOT}/partials/az-containerapp-create.adoc | 0
.../conguide/modules/nightly-deploys/nav.adoc | 2 +-
bom/pom.xml | 2 +-
incubator/viewers/vaadin/model/pom.xml | 8 +++----
starters/pom.xml | 16 ++++++-------
.../viewer/wicketapp/config/JQueryInitWkt.java | 4 ++--
23 files changed, 37 insertions(+), 35 deletions(-)
rename antora/components/{conguide/modules/nightly-deploys/images => comguide/modules/ROOT/images/nightly-deploys}/image-2023-01-03-08-31-58-018.png (100%)
rename antora/components/{conguide/modules/nightly-deploys/images => comguide/modules/ROOT/images/nightly-deploys}/image-2023-01-03-17-58-33-718.png (100%)
rename antora/components/{conguide/modules/nightly-deploys/images => comguide/modules/ROOT/images/nightly-deploys}/image-2023-01-03-18-07-57-499.png (100%)
rename antora/components/{conguide/modules/nightly-deploys/images => comguide/modules/ROOT/images/nightly-deploys}/image-2023-01-03-18-10-33-567.png (100%)
rename antora/components/{conguide/modules/nightly-deploys/images => comguide/modules/ROOT/images/nightly-deploys}/image-2023-01-03-18-16-01-614.png (100%)
rename antora/components/{conguide/modules/nightly-deploys/images => comguide/modules/ROOT/images/nightly-deploys}/image-2023-01-03-18-22-59-542.png (100%)
rename antora/components/{conguide/modules/nightly-deploys/images => comguide/modules/ROOT/images/nightly-deploys}/image-2023-01-03-18-27-32-832.png (100%)
rename antora/components/{conguide/modules/nightly-deploys/images => comguide/modules/ROOT/images/nightly-deploys}/image-2023-01-03-18-33-23-116.png (100%)
rename antora/components/{conguide/modules/nightly-deploys/images => comguide/modules/ROOT/images/nightly-deploys}/image-2023-01-04-06-23-41-099.png (100%)
rename antora/components/{conguide/modules/nightly-deploys/images => comguide/modules/ROOT/images/nightly-deploys}/image-2023-01-04-06-25-56-926.png (100%)
rename antora/components/{conguide/modules/nightly-deploys/images => comguide/modules/ROOT/images/nightly-deploys}/image-2023-01-04-06-26-42-960.png (100%)
rename antora/components/{conguide/modules/nightly-deploys/images => comguide/modules/ROOT/images/nightly-deploys}/image-2023-01-04-06-29-02-083.png (100%)
rename antora/components/{conguide/modules/nightly-deploys/images => comguide/modules/ROOT/images/nightly-deploys}/image-2023-01-04-06-31-36-293.png (100%)
rename antora/components/{conguide/modules/nightly-deploys/images => comguide/modules/ROOT/images/nightly-deploys}/image-2023-01-05-11-44-09-855.png (100%)
copy antora/components/{refguide-index/modules/applib/pages/index/mixins/rest/hooks/Object_openRestApi_see-also.adoc => comguide/modules/ROOT/pages/nightly-builds.adoc} (69%)
rename antora/components/{conguide/modules/nightly-deploys/pages/about.adoc => comguide/modules/ROOT/pages/nightly-deploys.adoc} (94%)
rename antora/components/{conguide/modules/nightly-deploys => comguide/modules/ROOT}/partials/az-containerapp-create.adoc (100%)
[isis] 01/01: Merge remote-tracking branch 'origin/master' into spring6
Posted by ah...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch spring6
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 3bf2c51f10c10963bc0a236fd1d5bb328eecd83d
Merge: a46ea06fb6 ea9b478328
Author: Andi Huber <ah...@apache.org>
AuthorDate: Mon Jan 9 10:28:11 2023 +0100
Merge remote-tracking branch 'origin/master' into spring6
.../image-2023-01-03-08-31-58-018.png | Bin
.../image-2023-01-03-17-58-33-718.png | Bin
.../image-2023-01-03-18-07-57-499.png | Bin
.../image-2023-01-03-18-10-33-567.png | Bin
.../image-2023-01-03-18-16-01-614.png | Bin
.../image-2023-01-03-18-22-59-542.png | Bin
.../image-2023-01-03-18-27-32-832.png | Bin
.../image-2023-01-03-18-33-23-116.png | Bin
.../image-2023-01-04-06-23-41-099.png | Bin
.../image-2023-01-04-06-25-56-926.png | Bin
.../image-2023-01-04-06-26-42-960.png | Bin
.../image-2023-01-04-06-29-02-083.png | Bin
.../image-2023-01-04-06-31-36-293.png | Bin
.../image-2023-01-05-11-44-09-855.png | Bin
antora/components/comguide/modules/ROOT/nav.adoc | 3 +++
.../modules/ROOT/pages/nightly-builds.adoc} | 10 +++++++-
.../modules/ROOT/pages/nightly-deploys.adoc} | 26 ++++++++++-----------
.../ROOT}/partials/az-containerapp-create.adoc | 0
.../conguide/modules/nightly-deploys/nav.adoc | 2 +-
bom/pom.xml | 2 +-
incubator/viewers/vaadin/model/pom.xml | 8 +++----
starters/pom.xml | 16 ++++++-------
.../viewer/wicketapp/config/JQueryInitWkt.java | 4 ++--
23 files changed, 41 insertions(+), 30 deletions(-)
diff --cc bom/pom.xml
index ac2313e14c,46170e417c..ea4d02faaa
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@@ -192,15 -183,15 +192,15 @@@ It is therefore a copy of org.apache:ap
<togglz.version>3.3.3</togglz.version>
- <vaadin.version>23.3.2</vaadin.version>
+ <vaadin.version>24.0.0.alpha5</vaadin.version>
- <wicket.version>9.12.0</wicket.version> <!-- 9.4.0 is last known good, before wicket put jupiter-api on the module graph -->
+ <wicket.version>936167650a</wicket.version> <!-- 9.4.0 is last known good, before wicket put jupiter-api on the module graph -->
+
<wicket-bootstrap.version>6.0.0</wicket-bootstrap.version> <!-- de.agilecoders.wicket:wicket-bootstrap... -->
<wicket-webjars.version>3.0.6</wicket-webjars.version>
- <wicket-viewer-jquery.version>3.6.1</wicket-viewer-jquery.version> <!-- as served by wicket via webjars -->
+ <wicket-viewer-jquery.version>3.6.3</wicket-viewer-jquery.version> <!-- as served by wicket via webjars -->
- <wicketstuff.version>${wicket.version}</wicketstuff.version> <!-- org.wicketstuff:wicketstuff-select2 -->
- <wicketstuff-gmap3.version>${wicket.version}</wicketstuff-gmap3.version>
+ <wicketstuff.version>9.12.0</wicketstuff.version> <!-- org.wicketstuff:wicketstuff-select2 -->
<!-- OTHER -->
diff --cc starters/pom.xml
index 20b168e022,9cfc54a64a..26d63c6561
--- a/starters/pom.xml
+++ b/starters/pom.xml
@@@ -39,12 -39,13 +39,13 @@@
<properties>
- <maven.compiler.release>11</maven.compiler.release>
+ <maven.compiler.release>17</maven.compiler.release>
- <spring-boot.version>2.7.7</spring-boot.version>
+ <spring-boot.version>3.0.1</spring-boot.version>
<approvaltests.version>18.5.0</approvaltests.version>
- <resteasy.version>5.0.0.Final</resteasy.version> <!-- keep in sync with property defined in resteasy-spring-boot-starter -->
+ <resteasy.version>6.0.0.Alpha2</resteasy.version> <!-- keep in sync with property defined in resteasy-spring-boot-starter -->
+ <datanucleus-maven-plugin.version>6.0.0-release</datanucleus-maven-plugin.version> <!-- keep in sync with property defined in causeway-bom -->
</properties>
@@@ -109,9 -110,9 +110,9 @@@
<dependency>
<groupId>org.apache.causeway.testing</groupId>
<artifactId>causeway-testing-fakedata-applib</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
</dependency>
-
+
<dependency>
<groupId>org.apache.causeway.testing</groupId>
<artifactId>causeway-testing-fixtures-applib</artifactId>