diff --git a/CHANGELOG.md b/CHANGELOG.md index 743f2c2775f500ac47fa89336067a62fe96d1cca..74413663622dc5c5ecaab8af71a726344e3bfa71 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] (2025-04-14) + +### 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 12744cc50271f2e691ae708bd1abf8f4f5415a89..b1401b94ca037fe3c581c0b4d5ad8e493379da2e 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 17fb142481833925a692f060d635226764685ed5..f7e896937ca44043fb9139bc03db803bdd6288d6 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 eb8d75ca5f283853abaa8f301cd38c85c263bbf8..0afb77c633af0711702223144cab02284e90aec7 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 8a7b767a85e221f6d8b82ba5ab080f7e9e659432..73e05eb74c7b8058008b8fa567816ca676fef313 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/CityDoctorValidation/src/main/java/de/hft/stuttgart/citydoctor2/CityDoctorValidation.java b/CityDoctorParent/CityDoctorValidation/src/main/java/de/hft/stuttgart/citydoctor2/CityDoctorValidation.java index a85e86912795b2ea674310baad3af2be8aaa5753..5b73190bff2699949f020a921782e01e5d369988 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,10 +160,13 @@ 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); + } 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 32adb49937a61ebeb967e7b16b41637ce52c356f..505c5eb54a7d32e60cee219350bb1795a859868f 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 { diff --git a/CityDoctorParent/Extensions/CityDoctorAutoPro/pom.xml b/CityDoctorParent/Extensions/CityDoctorAutoPro/pom.xml index 020667c80bf94731072bd9963e511e5e6917e044..17b943d12e27448071c4d139d1177b3f6c3f16f9 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 fb86ae21a597e29645ff7fb467cfe34d84c22bbb..d1c839b5fa90557d16daf0f1a0ba1ba57564cd3f 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 219f4903f4ea69f214e8d9f1f628236db3eaa459..811e9fd9246e2521fb2c38443bdf1d3a36273454 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 23bae2844ad793976f9c8a65f346067e7ca9665f..6269648fcff482b887bbd9bd9c3fd6f27d9e472e 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 37fd33f923ba2dde941e06372ed125eb65ca0d27..d0bc1925cb2df12ff43aae3a24f9eb62c6e6fd6d 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 f4df70b17761144e456a8985dffc92a15eb512d2..e898381a5b60914d2f097571960a67accb693234 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 @@ -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