From 5017a9287f7d9bf53923766bc71029b1c3d31ad8 Mon Sep 17 00:00:00 2001 From: Sebastian Eicke Date: Wed, 26 Nov 2025 09:04:16 +0100 Subject: [PATCH 01/14] Bump org.springframework.boot:spring-boot-starter-parent from 3.5.4 to 3.5.8 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index b9a0e4a42..4843fa21c 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.springframework.boot spring-boot-starter-parent - 3.5.4 + 3.5.8 org.eclipse.digitaltwin.basyx @@ -1587,4 +1587,4 @@ - \ No newline at end of file + From d0d93b3a399fa276b3b3231d020bfeee9e4d8d75 Mon Sep 17 00:00:00 2001 From: Sebastian Eicke Date: Wed, 26 Nov 2025 09:17:53 +0100 Subject: [PATCH 02/14] Fixes eof --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index 4843fa21c..0fdbf25c4 100644 --- a/pom.xml +++ b/pom.xml @@ -1588,3 +1588,4 @@ + From 3e813c9b90ec325f8ef515ecfa2b94880cc117e4 Mon Sep 17 00:00:00 2001 From: Sebastian Eicke Date: Wed, 26 Nov 2025 09:18:54 +0100 Subject: [PATCH 03/14] Fixes eof --- pom.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0fdbf25c4..4843fa21c 100644 --- a/pom.xml +++ b/pom.xml @@ -1588,4 +1588,3 @@ - From 45083a85b1306b6a0fbbb6b79d1b7beed4d80e7c Mon Sep 17 00:00:00 2001 From: Aaron Zielstorff Date: Mon, 1 Dec 2025 14:19:44 +0100 Subject: [PATCH 04/14] Tries fixing javadoc problem by adding explicit encoding config in pom.xml --- pom.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pom.xml b/pom.xml index 4843fa21c..cda3da35a 100644 --- a/pom.xml +++ b/pom.xml @@ -1506,6 +1506,11 @@ org.apache.maven.plugins maven-javadoc-plugin + + UTF-8 + UTF-8 + UTF-8 + attach-javadocs From 2b81887e4f84f92fc9e41d31f4ce909927562ecd Mon Sep 17 00:00:00 2001 From: Aaron Zielstorff Date: Mon, 1 Dec 2025 14:23:54 +0100 Subject: [PATCH 05/14] Adds the same fix to docker build profile --- pom.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pom.xml b/pom.xml index cda3da35a..9108d76f3 100644 --- a/pom.xml +++ b/pom.xml @@ -1557,6 +1557,11 @@ org.apache.maven.plugins maven-javadoc-plugin + + UTF-8 + UTF-8 + UTF-8 + attach-javadocs From 642879536422217c5432e58d688ae9286349c394 Mon Sep 17 00:00:00 2001 From: Aaron Zielstorff Date: Mon, 1 Dec 2025 14:31:22 +0100 Subject: [PATCH 06/14] Adds locale to workflow --- .github/workflows/test-javadoc.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/test-javadoc.yml b/.github/workflows/test-javadoc.yml index f1d17d38b..ecf6d5acd 100644 --- a/.github/workflows/test-javadoc.yml +++ b/.github/workflows/test-javadoc.yml @@ -33,5 +33,10 @@ jobs: java-version: '17' distribution: 'adopt' cache: maven + - name: Set locale + run: sudo apt-get update && sudo apt-get install -y locales && sudo locale-gen en_US.UTF-8 - name: Validate Javadoc run: mvn package -DskipTests javadoc:javadoc + env: + LANG: en_US.UTF-8 + LC_ALL: en_US.UTF-8 From b9ff05ea76a475133d6a5b50c57d69e4bca8eefc Mon Sep 17 00:00:00 2001 From: Aaron Zielstorff Date: Mon, 1 Dec 2025 14:41:26 +0100 Subject: [PATCH 07/14] Adds javadoc to search feature --- .../pom.xml | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/basyx.submodelregistry/basyx.submodelregistry-feature-search/pom.xml b/basyx.submodelregistry/basyx.submodelregistry-feature-search/pom.xml index 5d853db45..e103b55e9 100644 --- a/basyx.submodelregistry/basyx.submodelregistry-feature-search/pom.xml +++ b/basyx.submodelregistry/basyx.submodelregistry-feature-search/pom.xml @@ -13,6 +13,35 @@ BaSyx Submodel Registry Feature Search Feature Search for the BaSyx Submodel Registry + + + + org.apache.maven.plugins + maven-javadoc-plugin + + true + + + + org.apache.maven.plugins + maven-jar-plugin + + + empty-javadoc-jar + package + + jar + + + javadoc + ${basedir}/javadoc + + + + + + + org.eclipse.digitaltwin.basyx From d779fdb7c18902a2d42c99191c5f72645bbc2fd1 Mon Sep 17 00:00:00 2001 From: Aaron Zielstorff Date: Mon, 1 Dec 2025 14:46:46 +0100 Subject: [PATCH 08/14] Adds encoding setting --- pom.xml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pom.xml b/pom.xml index 9108d76f3..b9f03d435 100644 --- a/pom.xml +++ b/pom.xml @@ -267,6 +267,15 @@ + + org.apache.maven.plugins + maven-javadoc-plugin + + UTF-8 + UTF-8 + UTF-8 + + org.apache.maven.plugins maven-surefire-plugin From af34595c2cc09c27f4d0a318c54ab3d63fe40ddc Mon Sep 17 00:00:00 2001 From: Aaron Zielstorff Date: Mon, 1 Dec 2025 14:52:19 +0100 Subject: [PATCH 09/14] skips javadoc for http module --- .../pom.xml | 29 +++++++++++++++++++ .../basyx.submodelrepository-http/pom.xml | 29 +++++++++++++++++++ 2 files changed, 58 insertions(+) diff --git a/basyx.submodelrepository/basyx.submodelrepository-feature-search/pom.xml b/basyx.submodelrepository/basyx.submodelrepository-feature-search/pom.xml index 2e34aa81a..1089ead5a 100644 --- a/basyx.submodelrepository/basyx.submodelrepository-feature-search/pom.xml +++ b/basyx.submodelrepository/basyx.submodelrepository-feature-search/pom.xml @@ -13,6 +13,35 @@ BaSyx Submodel Repository Feature Search Feature Search for the BaSyx Submodel Repository + + + + org.apache.maven.plugins + maven-javadoc-plugin + + true + + + + org.apache.maven.plugins + maven-jar-plugin + + + empty-javadoc-jar + package + + jar + + + javadoc + ${basedir}/javadoc + + + + + + + org.eclipse.digitaltwin.basyx diff --git a/basyx.submodelrepository/basyx.submodelrepository-http/pom.xml b/basyx.submodelrepository/basyx.submodelrepository-http/pom.xml index 6c4e3de25..4a999e5e7 100644 --- a/basyx.submodelrepository/basyx.submodelrepository-http/pom.xml +++ b/basyx.submodelrepository/basyx.submodelrepository-http/pom.xml @@ -13,6 +13,35 @@ BaSyx submodelrepository-http BaSyx submodelrepository-http + + + + org.apache.maven.plugins + maven-javadoc-plugin + + true + + + + org.apache.maven.plugins + maven-jar-plugin + + + empty-javadoc-jar + package + + jar + + + javadoc + ${basedir}/javadoc + + + + + + + org.eclipse.digitaltwin.basyx From e6413a42dfbbd94796e4d16cc8ac65ff1c3612b6 Mon Sep 17 00:00:00 2001 From: Aaron Zielstorff Date: Mon, 1 Dec 2025 15:02:15 +0100 Subject: [PATCH 10/14] Tries to solve the problem with a global plugin config --- .github/workflows/test-javadoc.yml | 5 ---- .../pom.xml | 29 ------------------- .../pom.xml | 29 ------------------- .../basyx.submodelrepository-http/pom.xml | 29 ------------------- pom.xml | 16 ++++------ 5 files changed, 6 insertions(+), 102 deletions(-) diff --git a/.github/workflows/test-javadoc.yml b/.github/workflows/test-javadoc.yml index ecf6d5acd..f1d17d38b 100644 --- a/.github/workflows/test-javadoc.yml +++ b/.github/workflows/test-javadoc.yml @@ -33,10 +33,5 @@ jobs: java-version: '17' distribution: 'adopt' cache: maven - - name: Set locale - run: sudo apt-get update && sudo apt-get install -y locales && sudo locale-gen en_US.UTF-8 - name: Validate Javadoc run: mvn package -DskipTests javadoc:javadoc - env: - LANG: en_US.UTF-8 - LC_ALL: en_US.UTF-8 diff --git a/basyx.submodelregistry/basyx.submodelregistry-feature-search/pom.xml b/basyx.submodelregistry/basyx.submodelregistry-feature-search/pom.xml index e103b55e9..5d853db45 100644 --- a/basyx.submodelregistry/basyx.submodelregistry-feature-search/pom.xml +++ b/basyx.submodelregistry/basyx.submodelregistry-feature-search/pom.xml @@ -13,35 +13,6 @@ BaSyx Submodel Registry Feature Search Feature Search for the BaSyx Submodel Registry - - - - org.apache.maven.plugins - maven-javadoc-plugin - - true - - - - org.apache.maven.plugins - maven-jar-plugin - - - empty-javadoc-jar - package - - jar - - - javadoc - ${basedir}/javadoc - - - - - - - org.eclipse.digitaltwin.basyx diff --git a/basyx.submodelrepository/basyx.submodelrepository-feature-search/pom.xml b/basyx.submodelrepository/basyx.submodelrepository-feature-search/pom.xml index 1089ead5a..2e34aa81a 100644 --- a/basyx.submodelrepository/basyx.submodelrepository-feature-search/pom.xml +++ b/basyx.submodelrepository/basyx.submodelrepository-feature-search/pom.xml @@ -13,35 +13,6 @@ BaSyx Submodel Repository Feature Search Feature Search for the BaSyx Submodel Repository - - - - org.apache.maven.plugins - maven-javadoc-plugin - - true - - - - org.apache.maven.plugins - maven-jar-plugin - - - empty-javadoc-jar - package - - jar - - - javadoc - ${basedir}/javadoc - - - - - - - org.eclipse.digitaltwin.basyx diff --git a/basyx.submodelrepository/basyx.submodelrepository-http/pom.xml b/basyx.submodelrepository/basyx.submodelrepository-http/pom.xml index 4a999e5e7..6c4e3de25 100644 --- a/basyx.submodelrepository/basyx.submodelrepository-http/pom.xml +++ b/basyx.submodelrepository/basyx.submodelrepository-http/pom.xml @@ -13,35 +13,6 @@ BaSyx submodelrepository-http BaSyx submodelrepository-http - - - - org.apache.maven.plugins - maven-javadoc-plugin - - true - - - - org.apache.maven.plugins - maven-jar-plugin - - - empty-javadoc-jar - package - - jar - - - javadoc - ${basedir}/javadoc - - - - - - - org.eclipse.digitaltwin.basyx diff --git a/pom.xml b/pom.xml index b9f03d435..7d550b253 100644 --- a/pom.xml +++ b/pom.xml @@ -274,6 +274,12 @@ UTF-8 UTF-8 UTF-8 + 17 + none + true + + -J-Dfile.encoding=UTF-8 + @@ -1515,11 +1521,6 @@ org.apache.maven.plugins maven-javadoc-plugin - - UTF-8 - UTF-8 - UTF-8 - attach-javadocs @@ -1566,11 +1567,6 @@ org.apache.maven.plugins maven-javadoc-plugin - - UTF-8 - UTF-8 - UTF-8 - attach-javadocs From 661ce4fa96f4033e01295a97e0fa01b0ca221747 Mon Sep 17 00:00:00 2001 From: Aaron Zielstorff Date: Mon, 1 Dec 2025 15:08:04 +0100 Subject: [PATCH 11/14] adds the config to the build plugins as well --- pom.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/pom.xml b/pom.xml index 7d550b253..29d8c2d02 100644 --- a/pom.xml +++ b/pom.xml @@ -156,6 +156,21 @@ + + org.apache.maven.plugins + maven-javadoc-plugin + + UTF-8 + UTF-8 + UTF-8 + 17 + none + true + + -J-Dfile.encoding=UTF-8 + + + From ebfbc5a470597090f65547361578bb9fef5e17e7 Mon Sep 17 00:00:00 2001 From: Aaron Zielstorff Date: Mon, 1 Dec 2025 15:16:07 +0100 Subject: [PATCH 12/14] Updates javadoc version --- pom.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pom.xml b/pom.xml index 29d8c2d02..f6e69a2c0 100644 --- a/pom.xml +++ b/pom.xml @@ -159,6 +159,7 @@ org.apache.maven.plugins maven-javadoc-plugin + 3.12.0 UTF-8 UTF-8 @@ -285,6 +286,7 @@ org.apache.maven.plugins maven-javadoc-plugin + 3.12.0 UTF-8 UTF-8 From bc3daed885267fe161641e1071d704cb7af8c896 Mon Sep 17 00:00:00 2001 From: Aaron Zielstorff Date: Mon, 1 Dec 2025 15:26:32 +0100 Subject: [PATCH 13/14] simplifies plugin config --- pom.xml | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/pom.xml b/pom.xml index f6e69a2c0..a12485d12 100644 --- a/pom.xml +++ b/pom.xml @@ -160,17 +160,6 @@ org.apache.maven.plugins maven-javadoc-plugin 3.12.0 - - UTF-8 - UTF-8 - UTF-8 - 17 - none - true - - -J-Dfile.encoding=UTF-8 - - @@ -291,12 +280,6 @@ UTF-8 UTF-8 UTF-8 - 17 - none - true - - -J-Dfile.encoding=UTF-8 - From 7004849622236d4e36a0bc72c121ff4af8de600c Mon Sep 17 00:00:00 2001 From: Aaron Zielstorff Date: Mon, 1 Dec 2025 15:34:37 +0100 Subject: [PATCH 14/14] Update pom.xml Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- pom.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/pom.xml b/pom.xml index a12485d12..8b69e0bf2 100644 --- a/pom.xml +++ b/pom.xml @@ -159,7 +159,6 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.12.0