From 5fefeeca126900a07e920470e993a290e4c37974 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Tue, 1 Sep 2015 17:16:57 +0200
Subject: [*] Clean up pom.xml, add shading to client, clean up .gitignore

---
 .gitignore                                         |  5 ++---
 dozentenmodul/pom.xml                              | 26 +++++++++++++++++++++-
 dozentenmodulserver/pom.xml                        | 10 ++++++---
 .../org/openslx/bwlp/sat/database/Database.java    |  1 -
 4 files changed, 34 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index d76cd3a3..84c4cf10 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,6 @@
 *.class
+*.jar
+*.exe
 .project
 .classpath
 .settings/
@@ -6,6 +8,3 @@ target/
 bin/
 gen-java/
 dependency-reduced-pom.xml
-C:*
-forms-1.3.0.jar
-forms-1.3.0-src.zip
diff --git a/dozentenmodul/pom.xml b/dozentenmodul/pom.xml
index 8f278d4b..42a16453 100644
--- a/dozentenmodul/pom.xml
+++ b/dozentenmodul/pom.xml
@@ -56,14 +56,16 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
-				<version>3.1</version>
+				<version>3.3</version>
 				<configuration>
 					<source>1.7</source>
 					<target>1.7</target>
 				</configuration>
 			</plugin>
 			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-assembly-plugin</artifactId>
+				<version>2.5.5</version>
 				<executions>
 					<execution>
 						<phase>package</phase>
@@ -83,6 +85,28 @@
 					</descriptorRefs>
 				</configuration>
 			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-shade-plugin</artifactId>
+				<version>2.4.1</version>
+				<executions>
+					<execution>
+						<phase>package</phase>
+						<goals>
+							<goal>shade</goal>
+						</goals>
+						<configuration>
+							<minimizeJar>true</minimizeJar>
+							<transformers>
+								<transformer
+									implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+									<mainClass>${main.class}</mainClass>
+								</transformer>
+							</transformers>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
 		</plugins>
 
 		<resources>
diff --git a/dozentenmodulserver/pom.xml b/dozentenmodulserver/pom.xml
index dc0067ce..9c801ba1 100644
--- a/dozentenmodulserver/pom.xml
+++ b/dozentenmodulserver/pom.xml
@@ -12,6 +12,7 @@
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<main.class>org.openslx.bwlp.sat.App</main.class>
 	</properties>
 
 	<repositories>
@@ -35,14 +36,16 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
-				<version>3.1</version>
+				<version>3.3</version>
 				<configuration>
 					<source>1.7</source>
 					<target>1.7</target>
 				</configuration>
 			</plugin>
 			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-assembly-plugin</artifactId>
+				<version>2.5.5</version>
 				<executions>
 					<execution>
 						<phase>package</phase>
@@ -54,7 +57,7 @@
 				<configuration>
 					<archive>
 						<manifest>
-							<mainClass>org.openslx.bwlp.sat.App</mainClass>
+							<mainClass>${main.class}</mainClass>
 						</manifest>
 					</archive>
 					<descriptorRefs>
@@ -65,6 +68,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-shade-plugin</artifactId>
+				<version>2.4.1</version>
 				<executions>
 					<execution>
 						<phase>package</phase>
@@ -84,7 +88,7 @@
 							<transformers>
 								<transformer
 									implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
-									<mainClass>org.openslx.bwlp.sat.App</mainClass>
+									<mainClass>${main.class}</mainClass>
 								</transformer>
 							</transformers>
 						</configuration>
diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/Database.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/Database.java
index 446cfbea..cfc6530b 100644
--- a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/Database.java
+++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/Database.java
@@ -11,7 +11,6 @@ import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentLinkedQueue;
 
 import org.apache.log4j.Logger;
-import org.openslx.bwlp.sat.App;
 import org.openslx.bwlp.sat.util.Configuration;
 
 public class Database {
-- 
cgit v1.2.3-55-g7522