diff --git a/CityDoctorBuildPlugin/src/main/java/de/hft/stuttgart/citydoctor/build/plugin/DownloadJreMojo.java b/CityDoctorBuildPlugin/src/main/java/de/hft/stuttgart/citydoctor/build/plugin/DownloadJreMojo.java index 08fe8b36c752a9f1b76f62c539a4cc957aa20dae..ba22003cd864f98f01d895b0cffa9f54d498ec98 100644 --- a/CityDoctorBuildPlugin/src/main/java/de/hft/stuttgart/citydoctor/build/plugin/DownloadJreMojo.java +++ b/CityDoctorBuildPlugin/src/main/java/de/hft/stuttgart/citydoctor/build/plugin/DownloadJreMojo.java @@ -19,7 +19,7 @@ import org.rauschig.jarchivelib.Archiver; import org.rauschig.jarchivelib.ArchiverFactory; import org.rauschig.jarchivelib.CompressionType; -@Mojo(name = "downloadJre", defaultPhase = LifecyclePhase.PREPARE_PACKAGE) +@Mojo(name = "downloadJre", defaultPhase = LifecyclePhase.INSTALL) public class DownloadJreMojo implements org.apache.maven.plugin.Mojo { private Log log; @@ -43,6 +43,7 @@ public class DownloadJreMojo implements org.apache.maven.plugin.Mojo { } outputDir.normalize(); createOutputFolder(outputDir); + log.info("Downloading runtime"); if (url.getFile().endsWith(".tar")) { // handle tar file extractTarFile(outputDir); diff --git a/CityDoctorParent/CityDoctorModel/src/main/resources/CityDoctorLocalization.properties b/CityDoctorParent/CityDoctorModel/src/main/resources/CityDoctorLocalization.properties index 918cef7d1b69a4fc6f3a0c3681a4f2d7218307c2..bc37e62a0cda1cbe7a85b4c25a1ba0360bf66a25 100644 --- a/CityDoctorParent/CityDoctorModel/src/main/resources/CityDoctorLocalization.properties +++ b/CityDoctorParent/CityDoctorModel/src/main/resources/CityDoctorLocalization.properties @@ -1,4 +1,4 @@ -CityDoctorValidation.Version=@cdVersion@-@gitVersion@ +CityDoctorValidation.Version=${versionString} DistanceError.distanceFromPlane=distance from plane AboutDialog.developedBy=Developed by AboutDialog.contact=Contact diff --git a/CityDoctorParent/CityDoctorValidation/pom.xml b/CityDoctorParent/CityDoctorValidation/pom.xml index c96330e96252ac195fc32dbc9979f20ccaa62851..d12fccba18594eef9e401d03b1121644751b50ee 100644 --- a/CityDoctorParent/CityDoctorValidation/pom.xml +++ b/CityDoctorParent/CityDoctorValidation/pom.xml @@ -1,6 +1,4 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="https://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>de.hft.stuttgart</groupId> @@ -75,7 +73,22 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> - <version>3.2.0</version> + <version>3.3.0</version> + </plugin> + <plugin> + <groupId>de.hft.stuttgart</groupId> + <artifactId>CityDoctorBuildPlugin</artifactId> + <version>1.0.0</version> + <executions> + <execution> + <goals> + <goal>downloadJre</goal> + </goals> + </execution> + </executions> + <configuration> + <url>https://download.bell-sw.com/java/17.0.7+7/bellsoft-jre17.0.7+7-windows-amd64.zip</url> + </configuration> </plugin> <plugin> <artifactId>maven-assembly-plugin</artifactId> @@ -89,7 +102,7 @@ <executions> <execution> <id>create-archive</id> - <phase>package</phase> + <phase>install</phase> <goals> <goal>single</goal> </goals> diff --git a/CityDoctorParent/CityDoctorValidation/src/assembly/assembly.xml b/CityDoctorParent/CityDoctorValidation/src/assembly/assembly.xml new file mode 100644 index 0000000000000000000000000000000000000000..95e825cb80755dbb4bfde0a89a9af54185d1cd5f --- /dev/null +++ b/CityDoctorParent/CityDoctorValidation/src/assembly/assembly.xml @@ -0,0 +1,38 @@ +<assembly + xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd"> + <id>zip</id> + <formats> + <format>zip</format> + </formats> + <includeBaseDirectory>false</includeBaseDirectory> + <dependencySets> + <dependencySet> + <outputDirectory>libs</outputDirectory> + <excludes> + <exclude>${project.groupId}:${project.artifactId}:jar:*</exclude> + </excludes> + </dependencySet> + </dependencySets> + <fileSets> + <fileSet> + <directory>${project.build.directory}</directory> + <outputDirectory>/</outputDirectory> + <includes> + <include>${project.artifactId}-${project.version}.jar</include> + </includes> + </fileSet> + <fileSet> + <directory>${project.basedir}/src/assembly</directory> + <outputDirectory>/</outputDirectory> + <includes> + <include>no_runtime/start.bat</include> + <include>common/testConfigWithStreaming.yml</include> + <include>common/REKaiserwall.gml</include> + <include>common/checkForSolid.xml</include> + </includes> + <filtered>true</filtered> + </fileSet> + </fileSets> +</assembly> \ No newline at end of file