From 5e083df31a3267e0265ef8ea007c9a3e68774645 Mon Sep 17 00:00:00 2001 From: Matthias Betz Date: Fri, 11 Apr 2025 13:28:04 +0200 Subject: [PATCH 1/5] reenable validation of xml files --- .../java/de/hft/stuttgart/citydoctor2/CityDoctorValidation.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CityDoctorParent/CityDoctorValidation/src/main/java/de/hft/stuttgart/citydoctor2/CityDoctorValidation.java b/CityDoctorParent/CityDoctorValidation/src/main/java/de/hft/stuttgart/citydoctor2/CityDoctorValidation.java index a85e8691..f1c04bbb 100644 --- a/CityDoctorParent/CityDoctorValidation/src/main/java/de/hft/stuttgart/citydoctor2/CityDoctorValidation.java +++ b/CityDoctorParent/CityDoctorValidation/src/main/java/de/hft/stuttgart/citydoctor2/CityDoctorValidation.java @@ -160,7 +160,7 @@ public class CityDoctorValidation { logger.error("Input file '{}' does not exist.", input); System.exit(1); } - if (inputFile.getName().endsWith(".gml")) { + if (inputFile.getName().endsWith(".gml") || inputFile.getName().endsWith(".xml")) { startFileValidation(inputFile, xmlOutput, pdfOutput, config, outputFile); } else if (inputFile.getName().endsWith(".zip")) { startZipValidation(input, xmlOutput, pdfOutput, config, outputFile); -- GitLab From a06695bedac0a9420cc16485102cd518399afa5c Mon Sep 17 00:00:00 2001 From: Matthias Betz Date: Fri, 11 Apr 2025 13:30:55 +0200 Subject: [PATCH 2/5] add logging message when an invalid file ending is encountered --- .../de/hft/stuttgart/citydoctor2/CityDoctorValidation.java | 3 +++ .../hft/stuttgart/citydoctor2/CityDoctorValidationCLI.java | 6 ++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/CityDoctorParent/CityDoctorValidation/src/main/java/de/hft/stuttgart/citydoctor2/CityDoctorValidation.java b/CityDoctorParent/CityDoctorValidation/src/main/java/de/hft/stuttgart/citydoctor2/CityDoctorValidation.java index f1c04bbb..5b73190b 100644 --- a/CityDoctorParent/CityDoctorValidation/src/main/java/de/hft/stuttgart/citydoctor2/CityDoctorValidation.java +++ b/CityDoctorParent/CityDoctorValidation/src/main/java/de/hft/stuttgart/citydoctor2/CityDoctorValidation.java @@ -164,6 +164,9 @@ public class CityDoctorValidation { startFileValidation(inputFile, xmlOutput, pdfOutput, config, outputFile); } else if (inputFile.getName().endsWith(".zip")) { startZipValidation(input, xmlOutput, pdfOutput, config, outputFile); + } else { + logger.error("Input file '{}' does not end with .gml or .xml and is not a zip archive.", input); + System.exit(1); } } diff --git a/CityDoctorParent/CityDoctorValidation/src/main/java/de/hft/stuttgart/citydoctor2/CityDoctorValidationCLI.java b/CityDoctorParent/CityDoctorValidation/src/main/java/de/hft/stuttgart/citydoctor2/CityDoctorValidationCLI.java index 32adb499..505c5eb5 100644 --- a/CityDoctorParent/CityDoctorValidation/src/main/java/de/hft/stuttgart/citydoctor2/CityDoctorValidationCLI.java +++ b/CityDoctorParent/CityDoctorValidation/src/main/java/de/hft/stuttgart/citydoctor2/CityDoctorValidationCLI.java @@ -1,11 +1,9 @@ package de.hft.stuttgart.citydoctor2; -import picocli.CommandLine; +import java.util.concurrent.Callable; + import picocli.CommandLine.Command; import picocli.CommandLine.Option; -import picocli.CommandLine.Parameters; - -import java.util.concurrent.Callable; @Command(name = "citydoctor2", mixinStandardHelpOptions = true, description = "Validates CityGML files according to a provided validation-plan.") public class CityDoctorValidationCLI implements Callable { -- GitLab From 238071238bce88e213707817bf69c82bcae49797 Mon Sep 17 00:00:00 2001 From: Riegel Date: Fri, 11 Apr 2025 14:45:13 +0200 Subject: [PATCH 3/5] Build: Prepare Hotfix release --- CHANGELOG.md | 6 ++++++ CityDoctorParent/CityDoctorCheckResult/pom.xml | 2 +- CityDoctorParent/CityDoctorEdge/pom.xml | 2 +- CityDoctorParent/CityDoctorModel/pom.xml | 2 +- CityDoctorParent/CityDoctorValidation/pom.xml | 2 +- CityDoctorParent/Extensions/CityDoctorAutoPro/pom.xml | 2 +- CityDoctorParent/Extensions/CityDoctorGUI/pom.xml | 2 +- CityDoctorParent/Extensions/CityDoctorHealer/pom.xml | 2 +- CityDoctorParent/Extensions/CityDoctorHealerGUI/pom.xml | 2 +- CityDoctorParent/Extensions/CityDoctorHealerGenetic/pom.xml | 2 +- CityDoctorParent/pom.xml | 2 +- 11 files changed, 16 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 743f2c27..f2546642 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [3.17.1] (Upcoming) + +### Fixes + +- Fixed an oversight causing the CityDoctor CLI to ignore .xml files + ## [3.17.0] (2025-03-13) ### Added diff --git a/CityDoctorParent/CityDoctorCheckResult/pom.xml b/CityDoctorParent/CityDoctorCheckResult/pom.xml index 12744cc5..b1401b94 100644 --- a/CityDoctorParent/CityDoctorCheckResult/pom.xml +++ b/CityDoctorParent/CityDoctorCheckResult/pom.xml @@ -6,7 +6,7 @@ de.hft.stuttgart CityDoctorParent - 3.17.0 + 3.17.1 CityDoctorCheckResult diff --git a/CityDoctorParent/CityDoctorEdge/pom.xml b/CityDoctorParent/CityDoctorEdge/pom.xml index 17fb1424..f7e89693 100644 --- a/CityDoctorParent/CityDoctorEdge/pom.xml +++ b/CityDoctorParent/CityDoctorEdge/pom.xml @@ -6,7 +6,7 @@ de.hft.stuttgart CityDoctorParent - 3.17.0 + 3.17.1 CityDoctorEdge diff --git a/CityDoctorParent/CityDoctorModel/pom.xml b/CityDoctorParent/CityDoctorModel/pom.xml index eb8d75ca..0afb77c6 100644 --- a/CityDoctorParent/CityDoctorModel/pom.xml +++ b/CityDoctorParent/CityDoctorModel/pom.xml @@ -6,7 +6,7 @@ de.hft.stuttgart CityDoctorParent - 3.17.0 + 3.17.1 ${project.version}-${git.commit.id.abbrev} diff --git a/CityDoctorParent/CityDoctorValidation/pom.xml b/CityDoctorParent/CityDoctorValidation/pom.xml index 8a7b767a..73e05eb7 100644 --- a/CityDoctorParent/CityDoctorValidation/pom.xml +++ b/CityDoctorParent/CityDoctorValidation/pom.xml @@ -4,7 +4,7 @@ de.hft.stuttgart CityDoctorParent - 3.17.0 + 3.17.1 CityDoctorValidation CityDoctorValidation diff --git a/CityDoctorParent/Extensions/CityDoctorAutoPro/pom.xml b/CityDoctorParent/Extensions/CityDoctorAutoPro/pom.xml index 020667c8..17b943d1 100644 --- a/CityDoctorParent/Extensions/CityDoctorAutoPro/pom.xml +++ b/CityDoctorParent/Extensions/CityDoctorAutoPro/pom.xml @@ -6,7 +6,7 @@ de.hft.stuttgart CityDoctorParent - 3.17.0 + 3.17.1 ../../pom.xml CityDoctorAutoPro diff --git a/CityDoctorParent/Extensions/CityDoctorGUI/pom.xml b/CityDoctorParent/Extensions/CityDoctorGUI/pom.xml index fb86ae21..d1c839b5 100644 --- a/CityDoctorParent/Extensions/CityDoctorGUI/pom.xml +++ b/CityDoctorParent/Extensions/CityDoctorGUI/pom.xml @@ -6,7 +6,7 @@ de.hft.stuttgart CityDoctorParent - 3.17.0 + 3.17.1 ../../pom.xml CityDoctorGUI diff --git a/CityDoctorParent/Extensions/CityDoctorHealer/pom.xml b/CityDoctorParent/Extensions/CityDoctorHealer/pom.xml index 219f4903..811e9fd9 100644 --- a/CityDoctorParent/Extensions/CityDoctorHealer/pom.xml +++ b/CityDoctorParent/Extensions/CityDoctorHealer/pom.xml @@ -6,7 +6,7 @@ de.hft.stuttgart CityDoctorParent - 3.17.0 + 3.17.1 ../../pom.xml CityDoctorHealer diff --git a/CityDoctorParent/Extensions/CityDoctorHealerGUI/pom.xml b/CityDoctorParent/Extensions/CityDoctorHealerGUI/pom.xml index 23bae284..6269648f 100644 --- a/CityDoctorParent/Extensions/CityDoctorHealerGUI/pom.xml +++ b/CityDoctorParent/Extensions/CityDoctorHealerGUI/pom.xml @@ -7,7 +7,7 @@ de.hft.stuttgart CityDoctorParent - 3.17.0 + 3.17.1 ../../pom.xml CityDoctorHealerGUI diff --git a/CityDoctorParent/Extensions/CityDoctorHealerGenetic/pom.xml b/CityDoctorParent/Extensions/CityDoctorHealerGenetic/pom.xml index 37fd33f9..d0bc1925 100644 --- a/CityDoctorParent/Extensions/CityDoctorHealerGenetic/pom.xml +++ b/CityDoctorParent/Extensions/CityDoctorHealerGenetic/pom.xml @@ -4,7 +4,7 @@ de.hft.stuttgart CityDoctorParent - 3.17.0 + 3.17.1 ../../pom.xml CityDoctorHealerGenetic diff --git a/CityDoctorParent/pom.xml b/CityDoctorParent/pom.xml index f4df70b1..72407ada 100644 --- a/CityDoctorParent/pom.xml +++ b/CityDoctorParent/pom.xml @@ -5,7 +5,7 @@ 4.0.0 de.hft.stuttgart CityDoctorParent - 3.17.0 + 3.17.1 pom CityDoctorParent -- GitLab From cecc50837568d0afc24958cab20e313e45b45e94 Mon Sep 17 00:00:00 2001 From: Matthias Betz Date: Mon, 14 Apr 2025 14:20:45 +0200 Subject: [PATCH 4/5] update jre 17 version --- CityDoctorParent/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CityDoctorParent/pom.xml b/CityDoctorParent/pom.xml index 72407ada..e898381a 100644 --- a/CityDoctorParent/pom.xml +++ b/CityDoctorParent/pom.xml @@ -15,8 +15,8 @@ 2.18.0 ${project.version} ${project.baseUri}../non-maven-libs - 17.0.10 - ${jre-version-short}+13 + 17.0.14 + ${jre-version-short}+10 17.0.12 -- GitLab From d12da32aadfb072a40362ecb0a1b9c2176fb1915 Mon Sep 17 00:00:00 2001 From: Riegel Date: Mon, 14 Apr 2025 15:40:35 +0200 Subject: [PATCH 5/5] Docs: Add 3.17.1 release date --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f2546642..74413663 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,7 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). -## [3.17.1] (Upcoming) +## [3.17.1] (2025-04-14) ### Fixes -- GitLab