diff --git a/CityDoctorParent/CityDoctorValidation/pom.xml b/CityDoctorParent/CityDoctorValidation/pom.xml index 24bd6e3e77eb7c8c8315aba4c592e38d6b2131b1..4acf6a4554612a563e0de5352ef7b0a1734c2c71 100644 --- a/CityDoctorParent/CityDoctorValidation/pom.xml +++ b/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> diff --git a/CityDoctorParent/CityDoctorValidation/src/assembly/common/testConfigWithStreaming.yml b/CityDoctorParent/CityDoctorValidation/src/assembly/common/testConfigWithStreaming.yml index d7f7aecf257822d7fcdc5b77d7e1bc371f23c9a3..186ff37541f514fc63c69a465422b596a8fc0e67 100644 --- a/CityDoctorParent/CityDoctorValidation/src/assembly/common/testConfigWithStreaming.yml +++ b/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 diff --git a/CityDoctorParent/pom.xml b/CityDoctorParent/pom.xml index 51df164e867b298b19da0c30ca98c169ba762e36..34cc7cd0888b6dc666edea09372bfac54999f341 100644 --- a/CityDoctorParent/pom.xml +++ b/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> diff --git a/README.md b/README.md index cc5687b4064fd588025c9ca8844b33c6726e4f9f..de178766a3cda9189d584dcfdbc9a1c80082a7a9 100644 --- a/README.md +++ b/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.