This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch v2
in repository https://gitbox.apache.org/repos/asf/causeway-app-referenceapp.git
The following commit(s) were added to refs/heads/v2 by this push:
new 61f0eba backports from v4
61f0eba is described below
commit 61f0eba601e4e44c869b937556b5ba1845232f08
Author: andi-huber <[email protected]>
AuthorDate: Wed Mar 11 11:34:32 2026 +0100
backports from v4
---
.../demoapp/dom/progmodel/uihints/UiHintsMenu.java | 22 ++++++++++++++--
domain/src/main/resources/application.yml | 11 ++------
.../demoapp/dom => resources}/menubars.layout.xml | 2 ++
pom.xml | 23 +++++++++++++++++
wicket/jpa/pom.xml | 30 +++++++++++-----------
5 files changed, 62 insertions(+), 26 deletions(-)
diff --git
a/domain/src/main/java/demoapp/dom/progmodel/uihints/UiHintsMenu.java
b/domain/src/main/java/demoapp/dom/progmodel/uihints/UiHintsMenu.java
index 6a68e69..70d4ec5 100644
--- a/domain/src/main/java/demoapp/dom/progmodel/uihints/UiHintsMenu.java
+++ b/domain/src/main/java/demoapp/dom/progmodel/uihints/UiHintsMenu.java
@@ -31,7 +31,7 @@ import
org.apache.causeway.applib.annotation.PriorityPrecedence;
public class UiHintsMenu {
@Action
- @ActionLayout(cssClassFa="fa-css3", describedAs="cssClass()")
+ @ActionLayout(cssClassFa="fa-brands fa-css", describedAs="cssClass()")
public Object cssClassSupportingMethod(){
return null;
}
@@ -40,7 +40,7 @@ public class UiHintsMenu {
}
@Action
- @ActionLayout(cssClassFa="fa-icons", describedAs="icon()")
+ @ActionLayout(cssClassFa="fa-icons", describedAs="IconResource
icon(IconSize iconSize)")
public Object iconSupportingMethod(){
return null;
}
@@ -48,6 +48,15 @@ public class UiHintsMenu {
return "Not yet implemented";
}
+ @Action
+ @ActionLayout(cssClassFa="fa-icons", describedAs="iconName()")
+ public Object iconNameSupportingMethod(){
+ return null;
+ }
+ public String disableIconNameSupportingMethod(){
+ return "Not yet implemented";
+ }
+
@Action
@ActionLayout(cssClassFa="fa-border-all", describedAs="layout()")
public Object layoutSupportingMethod(){
@@ -57,4 +66,13 @@ public class UiHintsMenu {
return "Not yet implemented";
}
+ @Action
+ @ActionLayout(cssClassFa="fa-thin fa-tag", describedAs="title()")
+ public Object titleMethod(){
+ return null;
+ }
+ public String disableTitleMethod(){
+ return "Not yet implemented";
+ }
+
}
diff --git a/domain/src/main/resources/application.yml
b/domain/src/main/resources/application.yml
index 2c05275..ad9b5ef 100644
--- a/domain/src/main/resources/application.yml
+++ b/domain/src/main/resources/application.yml
@@ -53,7 +53,7 @@ causeway:
label-position: left
collection-layout:
paged: 15
- table-decorator:
org.apache.causeway.applib.annotation.TableDecorator.DatatablesNet
+ #table-decorator:
org.apache.causeway.applib.annotation.TableDecorator.DatatablesNet
core:
meta-model:
@@ -81,7 +81,7 @@ causeway:
viewer:
common:
application:
- menubars-layout-file: demoapp/dom/menubars.layout.xml
+ menubars-layout-file: menubars.layout.xml
favicon-url: images/gift.svg
brand-logo-header: images/gift_48.png
brand-logo-signin: images/gift_256.png
@@ -184,13 +184,6 @@ spring:
quartz:
job-store-type: memory
-vaadin:
- compatibilityMode: false
- whitelisted-packages: com.vaadin
- urlMapping: "/vaadin/*"
- servlet:
- productionMode: true
-
management:
endpoint:
health:
diff --git a/domain/src/main/java/demoapp/dom/menubars.layout.xml
b/domain/src/main/resources/menubars.layout.xml
similarity index 99%
rename from domain/src/main/java/demoapp/dom/menubars.layout.xml
rename to domain/src/main/resources/menubars.layout.xml
index 18c9c86..20d3433 100644
--- a/domain/src/main/java/demoapp/dom/menubars.layout.xml
+++ b/domain/src/main/resources/menubars.layout.xml
@@ -164,7 +164,9 @@ For latest we use:
https://raw.githubusercontent.com/apache/causeway/master/anto
<mb3:named>UI Supporting Methods</mb3:named>
<mb3:serviceAction objectType="demo.UiHintsMenu"
id="cssClassSupportingMethod"/>
<mb3:serviceAction objectType="demo.UiHintsMenu"
id="iconSupportingMethod"/>
+ <mb3:serviceAction objectType="demo.UiHintsMenu"
id="iconNameSupportingMethod"/>
<mb3:serviceAction objectType="demo.UiHintsMenu"
id="layoutSupportingMethod"/>
+ <mb3:serviceAction objectType="demo.UiHintsMenu"
id="titleMethod"/>
</mb3:section>
</mb3:menu>
diff --git a/pom.xml b/pom.xml
index 0b6106d..9f9290c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -52,6 +52,29 @@
</resources>
<plugins>
+
+ <!-- Compile -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.15.0</version>
+ <configuration>
+ <showDeprecation>false</showDeprecation>
+ <showWarnings>false</showWarnings>
+ <parameters>true</parameters>
+ <!-- Java compliance level, to be overridden with option
+ maven.compiler.release -->
+ </configuration>
+ <!-- goal:compile binds to phase:compile -->
+ <!-- goal:testCompile binds to phase:test-compile -->
+ <dependencies>
+ <dependency>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm</artifactId>
+ <version>9.9.1</version>
+ </dependency>
+ </dependencies>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
diff --git a/wicket/jpa/pom.xml b/wicket/jpa/pom.xml
index 14df5ad..a67e0ed 100644
--- a/wicket/jpa/pom.xml
+++ b/wicket/jpa/pom.xml
@@ -92,8 +92,8 @@
</goals>
<configuration>
<additionalProperties>
-
<java.version>${java.version}</java.version>
-
<description>${project.description}</description>
+
<java.version>${maven.compiler.release}</java.version>
+<!--
<description>${project.description}</description> maven fails when this
resolves to null -->
</additionalProperties>
</configuration>
</execution>
@@ -108,9 +108,8 @@
</build>
</profile>
-
<profile>
- <id>deploy-to-docker-io</id>
+ <id>build-docker-image</id>
<activation>
<property>
<name>!skip-docker</name>
@@ -125,9 +124,10 @@
<plugin>
<groupId>com.google.cloud.tools</groupId>
<artifactId>jib-maven-plugin</artifactId>
+ <version>3.5.1</version>
<configuration>
<from>
-
<image>openjdk:21-jdk-bookworm</image>
+
<image>eclipse-temurin:25-jdk</image>
</from>
<container>
<jvmFlags>
@@ -138,16 +138,16 @@
<port>8080</port>
</ports>
</container>
- <to>
-
<image>docker.io/apache/causeway-app-demo-jpa</image>
- <tags>
-
<tag>${env.REVISION}</tag>
- </tags>
- <auth>
-
<username>${env.DOCKER_REGISTRY_USERNAME}</username>
-
<password>${env.DOCKER_REGISTRY_PASSWORD}</password>
- </auth>
- </to>
+<!-- <to>-->
+<!--
<image>docker.io/apache/causeway-app-demo-jpa</image>-->
+<!-- <tags>-->
+<!--
<tag>${env.REVISION}</tag>-->
+<!-- </tags>-->
+<!-- <auth>-->
+<!--
<username>${env.DOCKER_REGISTRY_USERNAME}</username>-->
+<!--
<password>${env.DOCKER_REGISTRY_PASSWORD}</password>-->
+<!-- </auth>-->
+<!-- </to>-->
</configuration>
</plugin>
</plugins>
