Merge remote-tracking branch 'remotes/origin/master' into dev

CityDoctorParent/CityDoctorValidation/pom.xml

@@ -85,9 +85,9 @@
 		<profile>
 			<id>create-binaries</id>
 			<properties>
-				<win-jre>jre-17.0.7</win-jre>
-				<lin-jre>jre-17.0.7</lin-jre>
-				<mac-jre>jre-17.0.7.jre</mac-jre>
+				<win-jre>jre-${jre-version-short}</win-jre>
+				<lin-jre>${win-jre}</lin-jre>
+				<mac-jre>${win-jre}.jre</mac-jre>
 			</properties>
 			<build>
 				<plugins>
@@ -103,7 +103,7 @@
 									<goal>wget</goal>
 								</goals>
 								<configuration>
-									<uri>https://download.bell-sw.com/java/17.0.7+7/bellsoft-jre17.0.7+7-windows-amd64.zip</uri>
+									<uri>https://download.bell-sw.com/java/${jre-version}/bellsoft-jre${jre-version}-windows-amd64.zip</uri>
 									<unpack>false</unpack>
 									<outputDirectory>${project.build.directory}/jre/jre-win</outputDirectory>
 									<outputFileName>win-runtime.zip</outputFileName>
@@ -116,7 +116,7 @@
 									<goal>wget</goal>
 								</goals>
 								<configuration>
-									<uri>https://download.bell-sw.com/java/17.0.7+7/bellsoft-jre17.0.7+7-linux-amd64.tar.gz</uri>
+									<uri>https://download.bell-sw.com/java/${jre-version}/bellsoft-jre${jre-version}-linux-amd64.tar.gz</uri>
 									<unpack>false</unpack>
 									<outputDirectory>${project.build.directory}/jre/jre-lin</outputDirectory>
 									<outputFileName>lin-runtime.tar.gz</outputFileName>
@@ -129,7 +129,7 @@
 									<goal>wget</goal>
 								</goals>
 								<configuration>
-									<uri>https://download.bell-sw.com/java/17.0.7+7/bellsoft-jre17.0.7+7-macos-amd64.zip</uri>
+									<uri>https://download.bell-sw.com/java/${jre-version}/bellsoft-jre${jre-version}-macos-amd64.zip</uri>
 									<unpack>false</unpack>
 									<outputDirectory>${project.build.directory}/jre/jre-mac</outputDirectory>
 									<outputFileName>mac-runtime.zip</outputFileName>

CityDoctorParent/CityDoctorValidation/src/assembly/common/testConfigWithStreaming.yml

@@ -60,4 +60,6 @@ requirements:
    R_SE_BS_IS_GROUND:
       enabled: false
    R_SE_BS_IS_CEILING:
+      enabled: false
+   R_SE_POLYGON_WITHOUT_SURFACE:
       enabled: false
\ No newline at end of file

CityDoctorParent/pom.xml

@@ -13,6 +13,8 @@
 		<log4j.version>2.18.0</log4j.version>
 		<revision>${project.version}</revision>
 		<nonMavenLibsPath>${project.baseUri}../non-maven-libs</nonMavenLibsPath>
+		<jre-version-short>17.0.10</jre-version-short>
+		<jre-version>${jre-version-short}+13</jre-version>
 	</properties>
 	<repositories>
 		<repository>

README.md

@@ -4,9 +4,15 @@
 
 CityDoctor2 is a Java program for validating CityGML files. It checks whether certain criteria for e.g. geometries are met and outputs a report on the results.
 
+## Homepage
+
+[Here](https://transfer.hft-stuttgart.de/pages/citydoctor/citydoctorhomepage/de/) is a homepage with more detailed installation instruction and more information about the quality management process itself.
+
 ## Releases
 
-You can download releases from the BHT page [here](https://projekt.bht-berlin.de/citydoctor2/downloads/) or from a git repository [here](https://gitlab.com/volkercoors/CiD4Sim/-/tree/master/CityDoctorExtension).
+The newest releases can be found in this [gitlab repository](https://transfer.hft-stuttgart.de/gitlab/citydoctor/citydoctorreleases).
+
+You can download older releases from the BHT page [here](https://projekt.bht-berlin.de/citydoctor2/downloads/) or from a git repository [here](https://gitlab.com/volkercoors/CiD4Sim/-/tree/master/CityDoctorExtension).
 
 Since version 3.12.0 CityDoctor2 requires java version 17, older version are based on version 1.8. The GUI version requires Javafx which is included in Java 1.8 but not in Java 17. You can download a Java version with Javafx included from [here](https://bell-sw.com/pages/downloads/#/java-17-lts). Choose your platform and then choose to download the full JRE or JDK which includes Javafx.