You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@causeway.apache.org by ah...@apache.org on 2023/02/19 06:39:51 UTC

[causeway] branch spring6 updated (caec3eeb49 -> 1def4ee92e)

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/causeway.git


    from caec3eeb49 Merge pull request #1434 from apache/dependabot/maven/spring6/com.structurizr-structurizr-core-1.20.1
     add 2789baa950 CAUSEWAY-3014: adding title to demo enums
     add 1c2030acab CAUSEWAY-3359 : updates demoapp to use new apache/causeway-app-demo-xxx repos
     add 42da07d94a updates logos, is all
     add b5f7a201b9 fixes ref to logo
     add 095a47dba2 CAUSEWAY-3151 : remove links to fisheye
     add bb172fba26 minor enhancement to build.sh, -d flag for mvnd
     add 123d5ca5c0 CAUSEWAY-3354: updates docs and mig notes relating to xsd change
     add f6ea19a92a Bump maven-surefire-report-plugin from 3.0.0-M8 to 3.0.0-M9
     add 734878701d Merge pull request #1415 from apache/dependabot/maven/master/org.apache.maven.plugins-maven-surefire-report-plugin-3.0.0-M9
     add 35d170ac62 Bump dependency-check-maven from 8.0.2 to 8.1.0
     add ce8f1e0dd0 Merge pull request #1414 from apache/dependabot/maven/master/org.owasp-dependency-check-maven-8.1.0
     add e49c5fc09f Bump commons-fileupload from 1.4 to 1.5
     add 827b1e72bf Merge pull request #1416 from apache/dependabot/maven/master/commons-fileupload-commons-fileupload-1.5
     add 1be556bf5c Bump maven-javadoc-plugin from 3.4.1 to 3.5.0
     add d3dd092e1c Merge pull request #1428 from apache/dependabot/maven/master/org.apache.maven.plugins-maven-javadoc-plugin-3.5.0
     add 648fd00916 Bump maven-invoker-plugin from 3.4.0 to 3.5.0
     add 1a17195fff Merge pull request #1426 from apache/dependabot/maven/master/org.apache.maven.plugins-maven-invoker-plugin-3.5.0
     add f8485c35dd Bump datatables from 1.13.1 to 1.13.2
     add 314eb301e3 Merge pull request #1422 from apache/dependabot/maven/master/org.webjars-datatables-1.13.2
     add b377053a18 Bump font-awesome from 6.2.1 to 6.3.0
     add f9bc66925b Merge pull request #1418 from apache/dependabot/maven/master/org.webjars-font-awesome-6.3.0
     add b9bb7ba11c Bump datatables from 1.13.1 to 1.13.2 (2)
     add 4a2764f006 Bump font-awesome from 6.2.1 to 6.3.0 (2)
     add a70cda2feb Bump structurizr-core from 1.19.0 to 1.20.1
     add f60a6a61bc Merge pull request #1433 from apache/dependabot/maven/master/com.structurizr-structurizr-core-1.20.1
     add 3daa234431 revert commit: Bump structurizr-core from 1.19.0 to 1.20.1
     new 1def4ee92e 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:
 .../components/docs/modules/ROOT/pages/about.adoc  |   1 -
 .../ROOT/partials/module-nav/framework.adoc        |   1 -
 .../index/services/grid/GridSystemService.adoc     |   4 +-
 .../applib-classes/pages/layout/menubars.adoc      |   4 +-
 .../applib-classes/pages/layout/object-layout.adoc |   8 +--
 .../ROOT/pages/2022/2.0.0-RC1/mignotes.adoc        |  25 ++++++---
 .../modules/petclinic/pages/040-pet-entity.adoc    |   2 +-
 .../modules/fun/pages/ui/menubars-layout.adoc      |   6 +--
 .../modules/fun/pages/ui/object-layout.adoc        |  12 ++---
 .../img/home/causeway-logo-200-148.png             | Bin 0 -> 21533 bytes
 .../img/home/causeway-logo-200-149.png             | Bin 21647 -> 0 bytes
 .../img/home/causeway-logo-65x48.png               | Bin 0 -> 3655 bytes
 .../img/home/causeway-logo.pptx.svg                |   1 -
 antora/supplemental-ui/index.html                  |   2 +-
 .../causeway/applib/annotation/DomainObject.java   |  17 ++++++
 build.sh                                           |  60 ++++++++++++---------
 .../java/demoapp/dom/_infra/samples/DemoEnum.java  |  24 +++++++--
 examples/demo/wicket/jdo/pom.xml                   |   2 +-
 examples/demo/wicket/jpa/pom.xml                   |   2 +-
 .../causeway/client/kroviz/utils/TestUtils.kt      |   2 +-
 .../kroviz/src/main/resources/bootstrap3.xsd       |  10 ++--
 .../src/main/resources/component/component.xsd     |   8 +--
 .../kroviz/src/main/resources/links/links.xsd      |   2 +-
 .../snapshots/demo2_0_0/STRINGS_LAYOUT_XML.kt      |   6 +--
 .../kroviz/snapshots/demo2_0_0/TAB_LAYOUT_XML.kt   |  24 ++++-----
 .../causeway/client/kroviz/snapshots/sample.xml    |   6 +--
 .../snapshots/simpleapp1_16_0/CFG_LAYOUT_XML.kt    |   4 +-
 .../snapshots/simpleapp1_16_0/FR_OBJECT_LAYOUT.kt  |   2 +-
 .../snapshots/simpleapp1_16_0/SO_LAYOUT_XML.kt     |   6 +--
 .../causeway/client/kroviz/util/XmlHelperTest.kt   |   2 +-
 tooling/pom.xml                                    |   5 +-
 .../commons/model/decorators/IconDecorator.java    |   2 +-
 .../adoc/modules/ROOT/pages/layout-resources.adoc  |  12 ++---
 .../pages/common/datatables/DatatablesDotNet.java  |   2 +-
 34 files changed, 159 insertions(+), 105 deletions(-)
 create mode 100644 antora/supplemental-ui/img/home/causeway-logo-200-148.png
 delete mode 100644 antora/supplemental-ui/img/home/causeway-logo-200-149.png
 create mode 100644 antora/supplemental-ui/img/home/causeway-logo-65x48.png
 delete mode 100644 antora/supplemental-ui/img/home/causeway-logo.pptx.svg


[causeway] 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/causeway.git

commit 1def4ee92ea65a52d9421ff6df233a10ccc4d190
Merge: caec3eeb49 3daa234431
Author: andi-huber <ah...@apache.org>
AuthorDate: Sun Feb 19 07:39:45 2023 +0100

    Merge remote-tracking branch 'origin/master' into spring6

 .../components/docs/modules/ROOT/pages/about.adoc  |   1 -
 .../ROOT/partials/module-nav/framework.adoc        |   1 -
 .../index/services/grid/GridSystemService.adoc     |   4 +-
 .../applib-classes/pages/layout/menubars.adoc      |   4 +-
 .../applib-classes/pages/layout/object-layout.adoc |   8 +--
 .../ROOT/pages/2022/2.0.0-RC1/mignotes.adoc        |  25 ++++++---
 .../modules/petclinic/pages/040-pet-entity.adoc    |   2 +-
 .../modules/fun/pages/ui/menubars-layout.adoc      |   6 +--
 .../modules/fun/pages/ui/object-layout.adoc        |  12 ++---
 .../img/home/causeway-logo-200-148.png             | Bin 0 -> 21533 bytes
 .../img/home/causeway-logo-200-149.png             | Bin 21647 -> 0 bytes
 .../img/home/causeway-logo-65x48.png               | Bin 0 -> 3655 bytes
 .../img/home/causeway-logo.pptx.svg                |   1 -
 antora/supplemental-ui/index.html                  |   2 +-
 .../causeway/applib/annotation/DomainObject.java   |  17 ++++++
 build.sh                                           |  60 ++++++++++++---------
 .../java/demoapp/dom/_infra/samples/DemoEnum.java  |  24 +++++++--
 examples/demo/wicket/jdo/pom.xml                   |   2 +-
 examples/demo/wicket/jpa/pom.xml                   |   2 +-
 .../causeway/client/kroviz/utils/TestUtils.kt      |   2 +-
 .../kroviz/src/main/resources/bootstrap3.xsd       |  10 ++--
 .../src/main/resources/component/component.xsd     |   8 +--
 .../kroviz/src/main/resources/links/links.xsd      |   2 +-
 .../snapshots/demo2_0_0/STRINGS_LAYOUT_XML.kt      |   6 +--
 .../kroviz/snapshots/demo2_0_0/TAB_LAYOUT_XML.kt   |  24 ++++-----
 .../causeway/client/kroviz/snapshots/sample.xml    |   6 +--
 .../snapshots/simpleapp1_16_0/CFG_LAYOUT_XML.kt    |   4 +-
 .../snapshots/simpleapp1_16_0/FR_OBJECT_LAYOUT.kt  |   2 +-
 .../snapshots/simpleapp1_16_0/SO_LAYOUT_XML.kt     |   6 +--
 .../causeway/client/kroviz/util/XmlHelperTest.kt   |   2 +-
 tooling/pom.xml                                    |   5 +-
 .../commons/model/decorators/IconDecorator.java    |   2 +-
 .../adoc/modules/ROOT/pages/layout-resources.adoc  |  12 ++---
 .../pages/common/datatables/DatatablesDotNet.java  |   2 +-
 34 files changed, 159 insertions(+), 105 deletions(-)

diff --cc tooling/pom.xml
index 25907016c6,bf41425f99..3965e2344c
--- a/tooling/pom.xml
+++ b/tooling/pom.xml
@@@ -39,14 -39,14 +39,17 @@@
  
  		<jar-plugin.automaticModuleName>org.apache.causeway.tooling</jar-plugin.automaticModuleName>
  		<git-plugin.propertiesDir>org/apache/causeway/tooling</git-plugin.propertiesDir>
 -		<gradle-tooling.version>7.1.1</gradle-tooling.version>
 +		<gradle-tooling.version>7.3-20210825160000+0000</gradle-tooling.version>
  		<maven-model-builder.version>3.9.0</maven-model-builder.version>
  		<picocli.version>4.7.1</picocli.version>
- 		<structurizr.version>1.20.1</structurizr.version>
+ 		
+ 		<!-- structurizr-core 1.20+ needs structurizr-plantuml newer than 1.6.3,
+ 			which is not availabale as of yet (19-feb-2023) -->
+ 		<structurizr.version>1.19.0</structurizr.version> 
  		<structurizr-plantuml.version>1.6.3</structurizr-plantuml.version>
 +		
 +		<!-- override surefire defaults from bom, as this is not a Java module yet -->
 +		<surefire-plugin.argLine>-Xmx384m</surefire-plugin.argLine>
  
  	</properties>