Commit 33075438 authored by Matthias Betz's avatar Matthias Betz
Browse files

changed assemby to execute on install phase

parent 8339e876
Pipeline #7491 failed with stage
in 42 seconds
......@@ -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);
......
CityDoctorValidation.Version=@cdVersion@-@gitVersion@
CityDoctorValidation.Version=${versionString}
DistanceError.distanceFromPlane=distance from plane
AboutDialog.developedBy=Developed by
AboutDialog.contact=Contact
......
<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>
......
<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
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment