From d0f69b5f7f00c75a7152c562defbe0e9aa3e3334 Mon Sep 17 00:00:00 2001
From: Jakob Heher <jakob.heher@iaik.tugraz.at>
Date: Tue, 3 May 2022 12:21:08 +0200
Subject: truezip-plugin cleanup

---
 pdf-over-gui/pom.xml | 31 ++++++++++---------------------
 pom.xml              |  4 ++--
 2 files changed, 12 insertions(+), 23 deletions(-)

diff --git a/pdf-over-gui/pom.xml b/pdf-over-gui/pom.xml
index a9ad40ce..14001aa2 100644
--- a/pdf-over-gui/pom.xml
+++ b/pdf-over-gui/pom.xml
@@ -244,23 +244,16 @@
 							<goal>copy</goal>
 						</goals>
 						<configuration>
-							<fileset>
-								<directory>${pdfover-build.staging-dir}</directory>
-								<outputDirectory>${pdfover-build.output-dir}/${pdfover-build.output-filename}/</outputDirectory>
-							</fileset>
-						</configuration>
-					</execution>
-					<execution>
-						<id>bundle-jre</id>
-						<phase>install</phase> <!-- linux profile: none -->
-						<goals>
-							<goal>copy</goal>
-						</goals>
-						<configuration>
-							<fileset>
-								<directory>${project.basedir}/../jre-bundles/${pdfover-build.bundled-jre.archive-filename}/${pdfover-build.bundled-jre.folder-in-archive}</directory>
-								<outputDirectory>${pdfover-build.output-dir}/${pdfover-build.output-filename}/jre</outputDirectory>
-							</fileset>
+							<filesets>
+								<fileset>
+									<directory>${pdfover-build.staging-dir}</directory>
+									<outputDirectory>${pdfover-build.output-dir}/${pdfover-build.output-filename}/</outputDirectory>
+								</fileset>
+								<fileset>
+									<directory>${pdfover-build.root-dir}/jre-bundles/${pdfover-build.bundled-jre.archive-filename}/${pdfover-build.bundled-jre.folder-in-archive}</directory>
+									<outputDirectory>${pdfover-build.output-dir}/${pdfover-build.output-filename}/jre</outputDirectory>
+								</fileset>
+							</filesets>
 						</configuration>
 					</execution>
 				</executions>
@@ -541,10 +534,6 @@
 						<artifactId>truezip-maven-plugin</artifactId>
 						<version>1.2</version>
 						<executions>
-							<execution>
-								<id>bundle-jre</id>
-								<phase>none</phase>
-							</execution>
 							<execution>
 								<id>build-archive</id>
 								<phase>none</phase>
diff --git a/pom.xml b/pom.xml
index 99e46a7e..a7e8ab2a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -72,8 +72,8 @@
 		<connection>scm:git:http://git.egiz.gv.at/git/pdf-over</connection>
 		<developerConnection>scm:git:git@gitlab.iaik.tugraz.at:egiz/pdf-over.git</developerConnection>
 		<url>http://git.egiz.gv.at/pdf-over</url>
-     <tag>HEAD</tag>
-  </scm>
+		<tag>HEAD</tag>
+	</scm>
 
 	<issueManagement>
 		<system>JIRA</system>
-- 
cgit v1.2.3