From 39477278d794bf5117dcc5fa4ca60894fd6b8d85 Mon Sep 17 00:00:00 2001
From: Manuel Bentele
Date: Thu, 4 Mar 2021 16:55:07 +0100
Subject: [client,server] Remove shaded packaging

WARNING: As a result of this change, the normal Jar packages can no
longer be executed independently. Therefore, please publish from now
on only the fully packed Jar files which are suffixed with
"-jar-with-dependencies.jar".
---
 dozentenmodulserver/pom.xml | 57 ++++++++++-----------------------------------
 1 file changed, 12 insertions(+), 45 deletions(-)

(limited to 'dozentenmodulserver/pom.xml')

diff --git a/dozentenmodulserver/pom.xml b/dozentenmodulserver/pom.xml
index ac41c772..08be1a2d 100644
--- a/dozentenmodulserver/pom.xml
+++ b/dozentenmodulserver/pom.xml
@@ -42,6 +42,17 @@
 					<target>1.8</target>
 				</configuration>
 			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-jar-plugin</artifactId>
+				<version>2.4</version>
+				<executions>
+					<execution>
+						<id>default-jar</id>
+						<phase>none</phase>
+					</execution>
+				</executions>
+			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-assembly-plugin</artifactId>
@@ -73,51 +84,6 @@
                 	<useSystemClassLoader>false</useSystemClassLoader>
             	</configuration>
 			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-shade-plugin</artifactId>
-				<version>3.0.0</version>
-				<executions>
-					<execution>
-						<phase>package</phase>
-						<goals>
-							<goal>shade</goal>
-						</goals>
-						<configuration>
-							<minimizeJar>true</minimizeJar>
-							<filters>
-								<filter>
-									<artifact>mysql:*</artifact>
-									<includes>
-										<include>**</include>
-									</includes>
-								</filter>
-								<filter>
-									<artifact>org.lz4:*</artifact>
-									<includes>
-										<include>**</include>
-									</includes>
-								</filter>
-								<filter>
-									<artifact>*:*</artifact>
-									<excludes>
-										<exclude>META-INF/*.SF</exclude>
-										<exclude>META-INF/*.DSA</exclude>
-										<exclude>META-INF/*.RSA</exclude>
-										<exclude>META-INF/maven/**</exclude>
-									</excludes>
-								</filter>
-							</filters>
-							<transformers>
-								<transformer
-									implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
-									<mainClass>${main.class}</mainClass>
-								</transformer>
-							</transformers>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
 		</plugins>
 	</build>
 
@@ -168,6 +134,7 @@
 			<groupId>org.kamranzafar</groupId>
 			<artifactId>jtar</artifactId>
 			<version>2.3</version>
+			<scope>compile</scope>
 		</dependency>
 	</dependencies>
 </project>
-- 
cgit v1.2.3-55-g7522