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".
---
 dozentenmodul/pom.xml | 72 ++++++++++++---------------------------------------
 1 file changed, 16 insertions(+), 56 deletions(-)

(limited to 'dozentenmodul/pom.xml')

diff --git a/dozentenmodul/pom.xml b/dozentenmodul/pom.xml
index e4cfa85f..bc73b103 100755
--- a/dozentenmodul/pom.xml
+++ b/dozentenmodul/pom.xml
@@ -77,6 +77,17 @@
 					<target>1.7</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>
@@ -107,56 +118,6 @@
 					</descriptorRefs>
 				</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>commons-logging:*</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>
-									<manifestEntries>
-										<Build-Timestamp>${maven.build.timestamp}</Build-Timestamp>
-										<Build-Revision>${buildNumber}</Build-Revision>
-										<Build-Revision-Timestamp>${revision.timestamp}</Build-Revision-Timestamp>
-									</manifestEntries>
-								</transformer>
-							</transformers>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
 		</plugins>
 
 		<resources>
@@ -182,26 +143,23 @@
 			<version>1.1-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<version>4.12</version>
-			<scope>test</scope>
-		</dependency>
 		<dependency>
 			<groupId>org.openslx.ecp</groupId>
 			<artifactId>ecp-client-lean</artifactId>
 			<version>0.0.3-SNAPSHOT</version>
+			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>joda-time</groupId>
 			<artifactId>joda-time</artifactId>
 			<version>2.9.9</version>
+			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>com.github.decbin</groupId>
 			<artifactId>JDatePicker</artifactId>
 			<version>af657d4d12645efa2eb211d780779e4712d94673</version>
+			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.openslx</groupId>
@@ -213,6 +171,7 @@
 			<groupId>org.apache.httpcomponents</groupId>
 			<artifactId>httpclient</artifactId>
 			<version>[4.5.3,4.5.99]</version>
+			<scope>compile</scope>
 		</dependency>
 				<dependency>
 			<groupId>commons-io</groupId>
@@ -224,6 +183,7 @@
 			<groupId>org.kamranzafar</groupId>
 			<artifactId>jtar</artifactId>
 			<version>2.3</version>
+			<scope>compile</scope>
 		</dependency>
 	</dependencies>
 </project>
-- 
cgit v1.2.3-55-g7522