From ff3658afe10a3ba3bc6fea52febcc5521949fb8a Mon Sep 17 00:00:00 2001 From: Frank Delporte Date: Fri, 22 Nov 2024 12:32:40 +0100 Subject: [PATCH] Bump versions --- pom.xml | 8 +++++--- .../pi4j/boardinfoservice/views/BoardInfoView.java | 1 + src/main/resources/application.properties | 8 ++------ src/main/resources/log4j2.xml | 2 +- types.d.ts | 11 +++++++++-- 5 files changed, 18 insertions(+), 12 deletions(-) diff --git a/pom.xml b/pom.xml index 96ef656..ea2a626 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.springframework.boot spring-boot-starter-parent - 3.2.4 + 3.4.0 @@ -20,9 +20,11 @@ 17 - 2.6.0 + 2.7.0 2.5.0 - 24.3.10 + 24.5.5 + 21 + 21 diff --git a/src/main/java/com/pi4j/boardinfoservice/views/BoardInfoView.java b/src/main/java/com/pi4j/boardinfoservice/views/BoardInfoView.java index 4200185..636cf9c 100644 --- a/src/main/java/com/pi4j/boardinfoservice/views/BoardInfoView.java +++ b/src/main/java/com/pi4j/boardinfoservice/views/BoardInfoView.java @@ -117,6 +117,7 @@ private void showBoard(BoardModel boardModel) { holder.add(getLabelValue("Model", boardModel.getModel().name())); holder.add(getLabelValue("Header version", boardModel.getHeaderVersion().getLabel())); holder.add(getLabelValue("Release date", boardModel.getReleaseDate().toString())); + holder.add(getLabelValue("Board code(s)", String.join(", ", boardModel.getBoardCodes()))); holder.add(getLabelValue("SOC", boardModel.getSoc().name() + " / " + boardModel.getSoc().getInstructionSet().getLabel())); holder.add(getLabelValue("CPU", boardModel.getNumberOfCpu() diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index dd5e609..f528385 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1,4 +1,3 @@ -spring.mvc.pathmatch.matching-strategy=ant-path-matcher server.port=${PORT:8080} spring.mustache.check-template-location=false # Dev tools @@ -7,10 +6,7 @@ spring.devtools.add-properties=false vaadin.launch-browser=true # To improve the performance during development. # For more information https://vaadin.com/docs/flow/spring/tutorial-spring-configuration.html#special-configuration-parameters -vaadin.whitelisted-packages=com.vaadin,org.vaadin,dev.hilla,com.example.application -# This is a preview release of the Side Navigation component. -# https://vaadin.com/docs/latest/components/side-nav/#feature-flag -com.vaadin.experimental.sideNavComponent=true +vaadin.allowed-packages=com.vaadin,org.vaadin,dev.hilla,com.example.application # Correct mapping of Swagger UI # See https://github.com/vaadin/flow/issues/10163 #vaadin.url-mapping=/web/* @@ -19,4 +15,4 @@ vaadin.exclude-urls=/api/**,/swagger-ui/** springdoc.api-docs.enabled=true springdoc.api-docs.path=/api/docs springdoc.swagger-ui.enabled=true -springdoc.swagger-ui.operationsSorter=method \ No newline at end of file +springdoc.swagger-ui.operationsSorter=method diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml index b451d12..dacd98b 100644 --- a/src/main/resources/log4j2.xml +++ b/src/main/resources/log4j2.xml @@ -2,7 +2,7 @@ - + /home/ft/pi4j-board-info-service/logs/ diff --git a/types.d.ts b/types.d.ts index 250302b..eff230b 100644 --- a/types.d.ts +++ b/types.d.ts @@ -3,8 +3,15 @@ // This is needed for TypeScript compiler to declare and export as a TypeScript module. // It is recommended to commit this file to the VCS. // You might want to change the configurations to fit your preferences -declare module '*.css' { - import { CSSResultGroup } from 'lit'; +declare module '*.css?inline' { + import type { CSSResultGroup } from 'lit'; const content: CSSResultGroup; export default content; } + +// Allow any CSS Custom Properties +declare module 'csstype' { + interface Properties { + [index: `--${string}`]: any; + } +}