From 0bbbd401dcc93778d6003f7516c8f227e3d248e8 Mon Sep 17 00:00:00 2001
From: Martin Goik <goik@hdm-stuttgart.de>
Date: Thu, 16 Jun 2016 10:01:08 +0200
Subject: [PATCH] Unified project structure

---
 Klausuren/Sd1/SoSe2015/Exam/pom.xml           |  14 +-
 Klausuren/Sd1/SoSe2015/Solution/pom.xml       |  30 ++--
 .../mi/bitte_ignorieren/Marking.java          |  14 --
 .../mi/bitte_ignorieren/MarkingTest.java      |  29 ----
 .../mi/bitte_ignorieren/ResultCollector.java  | 157 ------------------
 .../mi/bitte_ignorieren/TestResult.java       |  19 ---
 .../eval/DetailedTestResults.java             |  30 ----
 .../bitte_ignorieren/eval/ReachedPoints.java  |  27 ---
 .../mi/bitte_ignorieren/eval/Run.java         |   9 -
 .../klausur/test/Test_MorseExceptions.java    |   8 +-
 .../klausur/test/Test_StringTransforms.java   |   9 +-
 Klausuren/Sd1/Ws2015/Exam/pom.xml             |  69 ++------
 Klausuren/Sd1/Ws2015/Solution/pom.xml         |  50 +-----
 13 files changed, 49 insertions(+), 416 deletions(-)
 delete mode 100644 Klausuren/Sd1/SoSe2015/Solution/src/test/java/de/hdm_stuttgart/mi/bitte_ignorieren/Marking.java
 delete mode 100644 Klausuren/Sd1/SoSe2015/Solution/src/test/java/de/hdm_stuttgart/mi/bitte_ignorieren/MarkingTest.java
 delete mode 100644 Klausuren/Sd1/SoSe2015/Solution/src/test/java/de/hdm_stuttgart/mi/bitte_ignorieren/ResultCollector.java
 delete mode 100644 Klausuren/Sd1/SoSe2015/Solution/src/test/java/de/hdm_stuttgart/mi/bitte_ignorieren/TestResult.java
 delete mode 100644 Klausuren/Sd1/SoSe2015/Solution/src/test/java/de/hdm_stuttgart/mi/bitte_ignorieren/eval/DetailedTestResults.java
 delete mode 100644 Klausuren/Sd1/SoSe2015/Solution/src/test/java/de/hdm_stuttgart/mi/bitte_ignorieren/eval/ReachedPoints.java
 delete mode 100644 Klausuren/Sd1/SoSe2015/Solution/src/test/java/de/hdm_stuttgart/mi/bitte_ignorieren/eval/Run.java

diff --git a/Klausuren/Sd1/SoSe2015/Exam/pom.xml b/Klausuren/Sd1/SoSe2015/Exam/pom.xml
index bac6d3003..23d033c6c 100644
--- a/Klausuren/Sd1/SoSe2015/Exam/pom.xml
+++ b/Klausuren/Sd1/SoSe2015/Exam/pom.xml
@@ -14,12 +14,12 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 	</properties>
 
-        <repositories>
-                <repository>
-                        <id>hdm-mi-internal-maven-repo</id>
-                        <url>https://maven.mi.hdm-stuttgart.de/artifacts</url>
-                </repository>
-        </repositories>
+	<repositories>
+		<repository>
+			<id>hdm-mi-internal-maven-repo</id>
+			<url>https://maven.mi.hdm-stuttgart.de/artifacts</url>
+		</repository>
+	</repositories>
 
 	<build>
 		<plugins>
@@ -62,4 +62,4 @@
 		</dependency>
 
 	</dependencies>
-</project>
+</project>
\ No newline at end of file
diff --git a/Klausuren/Sd1/SoSe2015/Solution/pom.xml b/Klausuren/Sd1/SoSe2015/Solution/pom.xml
index 5296239b7..58f59e44c 100644
--- a/Klausuren/Sd1/SoSe2015/Solution/pom.xml
+++ b/Klausuren/Sd1/SoSe2015/Solution/pom.xml
@@ -3,27 +3,26 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<groupId>de.hdm-stuttgart.sw1.klausur</groupId>
-	<artifactId>sw1klausur</artifactId>
+	<artifactId>sw1_2015sommer_solve</artifactId>
 	<version>0.9</version>
 	<packaging>jar</packaging>
 
-	<name>sw1klausur</name>
-	<url>http://maven.apache.org</url>
+	<name>sw1_2015sommer_solve</name>
+	<url>https://freedocs.mi.hdm-stuttgart.de</url>
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 	</properties>
 
-        <repositories>
-                <repository>
-                        <id>hdm-mi-internal-maven-repo</id>
-                        <url>https://maven.mi.hdm-stuttgart.de/artifacts</url>
-                </repository>
-        </repositories>
+	<repositories>
+		<repository>
+			<id>hdm-mi-internal-maven-repo</id>
+			<url>https://maven.mi.hdm-stuttgart.de/artifacts</url>
+		</repository>
+	</repositories>
 
 	<build>
 		<plugins>
-
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
@@ -33,7 +32,6 @@
 					<target>1.8</target>
 				</configuration>
 			</plugin>
-
 		</plugins>
 	</build>
 
@@ -42,6 +40,7 @@
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
 			<version>4.12</version>
+			<scope>test</scope>
 		</dependency>
 
 		<dependency>
@@ -49,11 +48,18 @@
 			<artifactId>log4j-api</artifactId>
 			<version>2.1</version>
 		</dependency>
+		
 		<dependency>
 			<groupId>org.apache.logging.log4j</groupId>
 			<artifactId>log4j-core</artifactId>
 			<version>2.1</version>
 		</dependency>
 
+		<dependency>
+			<groupId>de.hdm_stuttgart.mi.exam</groupId>
+			<artifactId>unitmarking</artifactId>
+			<version>0.9</version>
+		</dependency>
+
 	</dependencies>
-</project>
+</project>
\ No newline at end of file
diff --git a/Klausuren/Sd1/SoSe2015/Solution/src/test/java/de/hdm_stuttgart/mi/bitte_ignorieren/Marking.java b/Klausuren/Sd1/SoSe2015/Solution/src/test/java/de/hdm_stuttgart/mi/bitte_ignorieren/Marking.java
deleted file mode 100644
index b9b00c7cf..000000000
--- a/Klausuren/Sd1/SoSe2015/Solution/src/test/java/de/hdm_stuttgart/mi/bitte_ignorieren/Marking.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package de.hdm_stuttgart.mi.bitte_ignorieren;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-
-@Retention( value = RetentionPolicy.RUNTIME)
-@Target( value = { ElementType.METHOD})
-public @interface Marking {
-
-	int points ();
-}
diff --git a/Klausuren/Sd1/SoSe2015/Solution/src/test/java/de/hdm_stuttgart/mi/bitte_ignorieren/MarkingTest.java b/Klausuren/Sd1/SoSe2015/Solution/src/test/java/de/hdm_stuttgart/mi/bitte_ignorieren/MarkingTest.java
deleted file mode 100644
index fe99181ad..000000000
--- a/Klausuren/Sd1/SoSe2015/Solution/src/test/java/de/hdm_stuttgart/mi/bitte_ignorieren/MarkingTest.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package de.hdm_stuttgart.mi.bitte_ignorieren;
-
-import org.junit.AfterClass;
-import org.junit.Rule;
-import org.junit.runner.Description;
-
-public class MarkingTest {
-	
-	static public Description currentTestClass = null;
-	
-	static public boolean provideExtraInfo = false;
-	
-	public final static ResultCollector globalresultCollector = new ResultCollector();
-	
-	@Rule
-	public ResultCollector collectedResults = globalresultCollector;
-
-	@AfterClass public static void showResults() {
-		if (provideExtraInfo) {
-			System.out.println("Local:----------------------------------");
-			System.out.println(globalresultCollector.currentToString());
-			System.out.println("Global:++++++++++++++++++++++++++++++++++");
-			System.out.println("Global:++++++++++++++++++++++++++++++++++");
-			System.out.println(globalresultCollector.toString());
-			System.out.println("Global:++++++++++++++++++++++++++++++++++");
-			System.out.println("Global:++++++++++++++++++++++++++++++++++");
-		}
-	}
-}
diff --git a/Klausuren/Sd1/SoSe2015/Solution/src/test/java/de/hdm_stuttgart/mi/bitte_ignorieren/ResultCollector.java b/Klausuren/Sd1/SoSe2015/Solution/src/test/java/de/hdm_stuttgart/mi/bitte_ignorieren/ResultCollector.java
deleted file mode 100644
index 63f497581..000000000
--- a/Klausuren/Sd1/SoSe2015/Solution/src/test/java/de/hdm_stuttgart/mi/bitte_ignorieren/ResultCollector.java
+++ /dev/null
@@ -1,157 +0,0 @@
-package de.hdm_stuttgart.mi.bitte_ignorieren;
-
-import java.lang.annotation.Annotation;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Vector;
-
-import org.junit.rules.TestWatcher;
-import org.junit.runner.Description;
-
-public class ResultCollector extends TestWatcher {
-
-	public final Map<String, List<TestResult>> 
-	failedByDescription = new HashMap<String,  List<TestResult>>(),
-	successByDescription = new HashMap<String, List<TestResult>>();
-
-	@Override
-	protected void starting(Description description) {
-		MarkingTest.currentTestClass = description;
-	}
-
-	@Override
-	protected void failed(final Throwable e, final Description description) {
-		putAppend(failedByDescription, description.getClassName(), new TestResult(description,
-				getMarking(description), false));
-	}
-
-	@Override
-	protected void succeeded(final Description description) {
-		putAppend(successByDescription, description.getClassName(), new TestResult(description,
-				getMarking(description), true));
-	}
-
-	private static void putAppend(final Map<String, List<TestResult>> map, final String key, final TestResult testresult) {
-		List<TestResult> results = map.get(key);
-		if (null == results) {
-			results = new Vector<TestResult>();
-			map.put(key, results);
-		}
-		results.add(testresult);
-	}
-	private static Marking getMarking(final Description description) {
-
-		final Marking marking = description.getAnnotation(Marking.class);
-		if (null == marking) { // Default values: 1 point
-			return new Marking() {
-
-				@Override
-				public Class<? extends Annotation> annotationType() {
-					return Marking.class;
-				}
-
-				@Override
-				public int points() {
-					return 1;
-				}
-			};
-
-		}
-		return marking;
-	}
-
-	public String currentToString() {
-		
-		final String currentTestClassName = MarkingTest.currentTestClass.getClassName();
-
-		int reachablePoints = 0, reachedPoints = 0, numSuccessfulTests = 0;
-
-		final List<TestResult> successfulTestResults = successByDescription.get(currentTestClassName);
-
-		if (null != successfulTestResults) {
-			for (final TestResult t : successfulTestResults) {
-				reachablePoints += t.marking.points();
-				reachedPoints += t.marking.points();
-				numSuccessfulTests++;
-			}
-		}
-
-		final StringBuffer failBuffer = new StringBuffer();
-
-		final List<TestResult> failedTestResults = failedByDescription.get(currentTestClassName);
-
-		if (null != failedTestResults) {
-			for (final TestResult t : failedTestResults) {
-				reachablePoints += t.marking.points();
-				failBuffer.append("  -" + t.testMethodDisplayName + "\n");
-			}
-		}
-
-		final StringBuffer buffer = new StringBuffer();
-
-		buffer.append(currentTestClassName + ":\nYou have reached " + reachedPoints + " of "
-				+ reachablePoints + " possible points in " + numSuccessfulTests + " successful tests. ");
-
-		if (null != failedTestResults) {
-
-			final int numFailed = failedTestResults.size();
-			if (1 == numFailed) {
-				buffer.append(" The following test still fails:\n");
-			} else if (1 <  numFailed) {
-				buffer.append("\n\nThe following " + numFailed + " tests still fail:\n");
-			}
-			buffer.append(failBuffer + "\n");
-		}
-		buffer.append("\n");
-		return buffer.toString();
-	}
-	public int getReachedPoints() {
-	  int reachedPoints = 0;
-
-    for (final Entry<String, List<TestResult>> successEntries: successByDescription.entrySet()) {
-      for (final TestResult t : successEntries.getValue()) {
-        reachedPoints += t.marking.points();
-      }
-    }
-    return reachedPoints;
-	}
-	
-	@Override
-	public String toString() {
-
-		int reachablePoints = 0, reachedPoints = 0, successfulTests = 0, failedTests = 0;
-
-		for (final Entry<String, List<TestResult>> successEntries: successByDescription.entrySet()) {
-			for (final TestResult t : successEntries.getValue()) {
-				successfulTests++;
-				reachablePoints += t.marking.points();
-				reachedPoints += t.marking.points();
-			}
-		}
-
-		final StringBuffer failBuffer = new StringBuffer();
-		for (final Entry<String, List<TestResult>> failEntries: failedByDescription.entrySet()) {
-			for (final TestResult t : failEntries.getValue()) {
-				failedTests++;
-				reachablePoints += t.marking.points();
-				failBuffer.append("  -" + t.testMethodDisplayName + "\n");
-			}
-		}
-
-		final StringBuffer buffer = new StringBuffer();
-
-		buffer.append("You have reached " + reachedPoints + " of "
-				+ reachablePoints + " possible points in "
-				+ successfulTests + " successful tests\n");
-		if (1 == failedTests) {
-			buffer.append("\n\nThe following test still fails:\n");
-		} else if (1 < failedTests) {
-			buffer.append("\n\nThe following " + failedTests
-					+ " tests still fail:\n");
-		}
-		buffer.append(failBuffer + "\n");
-		return buffer.toString();
-	}
-}
\ No newline at end of file
diff --git a/Klausuren/Sd1/SoSe2015/Solution/src/test/java/de/hdm_stuttgart/mi/bitte_ignorieren/TestResult.java b/Klausuren/Sd1/SoSe2015/Solution/src/test/java/de/hdm_stuttgart/mi/bitte_ignorieren/TestResult.java
deleted file mode 100644
index d32e9e9de..000000000
--- a/Klausuren/Sd1/SoSe2015/Solution/src/test/java/de/hdm_stuttgart/mi/bitte_ignorieren/TestResult.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package de.hdm_stuttgart.mi.bitte_ignorieren;
-
-import org.junit.runner.Description;
-
-public class TestResult {
-
-	public final Description testMethodDisplayName;
-	public final Marking marking;
-	public final boolean success;
-	
-	public TestResult(final Description testMethodDisplayName,
-			final Marking marking,
-			final boolean success) {
-		
-		this.testMethodDisplayName = testMethodDisplayName;
-		this.marking = marking;
-		this.success = success;
-	}
-}
diff --git a/Klausuren/Sd1/SoSe2015/Solution/src/test/java/de/hdm_stuttgart/mi/bitte_ignorieren/eval/DetailedTestResults.java b/Klausuren/Sd1/SoSe2015/Solution/src/test/java/de/hdm_stuttgart/mi/bitte_ignorieren/eval/DetailedTestResults.java
deleted file mode 100644
index 20f469f45..000000000
--- a/Klausuren/Sd1/SoSe2015/Solution/src/test/java/de/hdm_stuttgart/mi/bitte_ignorieren/eval/DetailedTestResults.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package de.hdm_stuttgart.mi.bitte_ignorieren.eval;
-
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-
-import de.hdm_stuttgart.mi.bitte_ignorieren.MarkingTest;
-import de.hdm_stuttgart.sw1.klausur.test.Test_MorseExceptions;
-import de.hdm_stuttgart.sw1.klausur.test.Test_StringTransforms;
-
-@RunWith(Suite.class)
-@Suite.SuiteClasses({
-	Test_StringTransforms.class,	
-	Test_MorseExceptions.class,	
-})
-
-public class DetailedTestResults {
-	
-	@BeforeClass public static void init() {
-		MarkingTest.provideExtraInfo = true;
-	}
-	
-	@AfterClass public static void showResults() {
-		System.out.println("---final------------------");
-		System.out.println(MarkingTest.globalresultCollector.toString());
-		//System.out.println(MarkingTest.globalresultCollector.);
-	}
-	
-}
diff --git a/Klausuren/Sd1/SoSe2015/Solution/src/test/java/de/hdm_stuttgart/mi/bitte_ignorieren/eval/ReachedPoints.java b/Klausuren/Sd1/SoSe2015/Solution/src/test/java/de/hdm_stuttgart/mi/bitte_ignorieren/eval/ReachedPoints.java
deleted file mode 100644
index 8b0cd3f1f..000000000
--- a/Klausuren/Sd1/SoSe2015/Solution/src/test/java/de/hdm_stuttgart/mi/bitte_ignorieren/eval/ReachedPoints.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package de.hdm_stuttgart.mi.bitte_ignorieren.eval;
-
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-
-import de.hdm_stuttgart.mi.bitte_ignorieren.MarkingTest;
-import de.hdm_stuttgart.sw1.klausur.test.Test_MorseExceptions;
-import de.hdm_stuttgart.sw1.klausur.test.Test_StringTransforms;
-
-@RunWith(Suite.class)
-@Suite.SuiteClasses({
-	Test_StringTransforms.class,	
-	Test_MorseExceptions.class,	
-})
-
-public class ReachedPoints {
-	
-	@BeforeClass public static void init() {
-		MarkingTest.provideExtraInfo = false;
-	}
-	
-	@AfterClass public static void showResults() {
-		System.out.println("myGoikKlausurMarkeri:" + MarkingTest.globalresultCollector.getReachedPoints());
-	}
-}
diff --git a/Klausuren/Sd1/SoSe2015/Solution/src/test/java/de/hdm_stuttgart/mi/bitte_ignorieren/eval/Run.java b/Klausuren/Sd1/SoSe2015/Solution/src/test/java/de/hdm_stuttgart/mi/bitte_ignorieren/eval/Run.java
deleted file mode 100644
index bbd8cafd1..000000000
--- a/Klausuren/Sd1/SoSe2015/Solution/src/test/java/de/hdm_stuttgart/mi/bitte_ignorieren/eval/Run.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package de.hdm_stuttgart.mi.bitte_ignorieren.eval;
-
-import org.junit.runner.JUnitCore;
-
-public class Run {
-  public static void main(String[] args) {
-    JUnitCore.runClasses(ReachedPoints.class);
-  }
-}
diff --git a/Klausuren/Sd1/SoSe2015/Solution/src/test/java/de/hdm_stuttgart/sw1/klausur/test/Test_MorseExceptions.java b/Klausuren/Sd1/SoSe2015/Solution/src/test/java/de/hdm_stuttgart/sw1/klausur/test/Test_MorseExceptions.java
index 37550b957..23439d026 100644
--- a/Klausuren/Sd1/SoSe2015/Solution/src/test/java/de/hdm_stuttgart/sw1/klausur/test/Test_MorseExceptions.java
+++ b/Klausuren/Sd1/SoSe2015/Solution/src/test/java/de/hdm_stuttgart/sw1/klausur/test/Test_MorseExceptions.java
@@ -3,12 +3,12 @@ package de.hdm_stuttgart.sw1.klausur.test;
 import org.junit.Assert;
 import org.junit.Test;
 
-import de.hdm_stuttgart.mi.bitte_ignorieren.Marking;
-import de.hdm_stuttgart.mi.bitte_ignorieren.MarkingTest;
+import de.hdm_stuttgart.mi.exam.unitmarking.Marking;
+
 import static de.hdm_stuttgart.sw1.klausur.StringTransforms.morsen;
 
-@SuppressWarnings({"static-method", "javadoc"})
-public class Test_MorseExceptions  extends MarkingTest {
+@SuppressWarnings({"javadoc"})
+public class Test_MorseExceptions {
 	
 	@Test
 	@Marking(points=5)
diff --git a/Klausuren/Sd1/SoSe2015/Solution/src/test/java/de/hdm_stuttgart/sw1/klausur/test/Test_StringTransforms.java b/Klausuren/Sd1/SoSe2015/Solution/src/test/java/de/hdm_stuttgart/sw1/klausur/test/Test_StringTransforms.java
index ceb88a6ec..7201d13c4 100644
--- a/Klausuren/Sd1/SoSe2015/Solution/src/test/java/de/hdm_stuttgart/sw1/klausur/test/Test_StringTransforms.java
+++ b/Klausuren/Sd1/SoSe2015/Solution/src/test/java/de/hdm_stuttgart/sw1/klausur/test/Test_StringTransforms.java
@@ -3,15 +3,14 @@ package de.hdm_stuttgart.sw1.klausur.test;
 import org.junit.Assert;
 import org.junit.Test;
 
-import de.hdm_stuttgart.mi.bitte_ignorieren.Marking;
-import de.hdm_stuttgart.mi.bitte_ignorieren.MarkingTest;
+import de.hdm_stuttgart.mi.exam.unitmarking.Marking;
+
 import static de.hdm_stuttgart.sw1.klausur.StringTransforms.chinesischerAkzent;
 import static de.hdm_stuttgart.sw1.klausur.StringTransforms.entferneVokale;
 import static de.hdm_stuttgart.sw1.klausur.StringTransforms.morsen;
 
-@SuppressWarnings({"static-method", "javadoc"})
-public class Test_StringTransforms extends MarkingTest {
-
+@SuppressWarnings({"javadoc"})
+public class Test_StringTransforms {
 
 	// Tests zu chinesischerAkzent(final String input)
 	//
diff --git a/Klausuren/Sd1/Ws2015/Exam/pom.xml b/Klausuren/Sd1/Ws2015/Exam/pom.xml
index 2bcbd5b23..b8b15b944 100644
--- a/Klausuren/Sd1/Ws2015/Exam/pom.xml
+++ b/Klausuren/Sd1/Ws2015/Exam/pom.xml
@@ -13,61 +13,16 @@
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 	</properties>
-	
-        <repositories>
-                <repository>
-                        <id>hdm-mi-internal-maven-repo</id>
-                        <url>https://maven.mi.hdm-stuttgart.de/artifacts</url>
-                </repository>
-	</repositories>	
-	
-	<build>
-		<plugins>
-
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>build-helper-maven-plugin</artifactId>
-				<version>1.9.1</version>
-				<executions>
 
-					<execution>
-						<id>add-source</id>
-						<phase>generate-sources</phase>
-						<goals>
-							<goal>add-source</goal>
-						</goals>
-						<configuration>
-							<sources>
-								<source>${project.basedir}/src/test/java/</source>
-							</sources>
-						</configuration>
-					</execution>
+	<repositories>
+		<repository>
+			<id>hdm-mi-internal-maven-repo</id>
+			<url>https://maven.mi.hdm-stuttgart.de/artifacts</url>
+		</repository>
+	</repositories>
 
-				</executions>
-			</plugin>
-
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-shade-plugin</artifactId>
-				<version>2.4.3</version>
-				<executions>
-					<execution>
-						<phase>package</phase>
-						<goals>
-							<goal>shade</goal>
-						</goals>
-						<configuration>
-							<shadeTestJar>true</shadeTestJar>
-							<transformers>
-								<transformer
-									implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
-									<mainClass>de.hdm_stuttgart.mi.bitte_ignorieren.Run</mainClass>
-								</transformer>
-							</transformers>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
+	<build>
+		<plugins>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
@@ -81,11 +36,11 @@
 	</build>
 
 	<dependencies>
-	
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
 			<version>4.12</version>
+			<scope>test</scope>
 		</dependency>
 
 		<dependency>
@@ -93,13 +48,13 @@
 			<artifactId>log4j-api</artifactId>
 			<version>2.1</version>
 		</dependency>
-		
+
 		<dependency>
 			<groupId>org.apache.logging.log4j</groupId>
 			<artifactId>log4j-core</artifactId>
 			<version>2.1</version>
 		</dependency>
-		
+
 		<dependency>
 			<groupId>de.hdm_stuttgart.mi.exam</groupId>
 			<artifactId>unitmarking</artifactId>
@@ -107,4 +62,4 @@
 		</dependency>
 
 	</dependencies>
-</project>
+</project>
\ No newline at end of file
diff --git a/Klausuren/Sd1/Ws2015/Solution/pom.xml b/Klausuren/Sd1/Ws2015/Solution/pom.xml
index c7d9c13a8..fe5fea595 100644
--- a/Klausuren/Sd1/Ws2015/Solution/pom.xml
+++ b/Klausuren/Sd1/Ws2015/Solution/pom.xml
@@ -23,51 +23,6 @@
 
 	<build>
 		<plugins>
-
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>build-helper-maven-plugin</artifactId>
-				<version>1.9.1</version>
-				<executions>
-
-					<execution>
-						<id>add-source</id>
-						<phase>generate-sources</phase>
-						<goals>
-							<goal>add-source</goal>
-						</goals>
-						<configuration>
-							<sources>
-								<source>${project.basedir}/src/test/java/</source>
-							</sources>
-						</configuration>
-					</execution>
-
-				</executions>
-			</plugin>
-
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-shade-plugin</artifactId>
-				<version>2.4.3</version>
-				<executions>
-					<execution>
-						<phase>package</phase>
-						<goals>
-							<goal>shade</goal>
-						</goals>
-						<configuration>
-							<shadeTestJar>true</shadeTestJar>
-							<transformers>
-								<transformer
-									implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
-									<mainClass>de.hdm_stuttgart.sw1.klausur.test.GetMarks</mainClass>
-								</transformer>
-							</transformers>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
@@ -85,6 +40,7 @@
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
 			<version>4.12</version>
+			<scope>test</scope>
 		</dependency>
 
 		<dependency>
@@ -92,11 +48,13 @@
 			<artifactId>log4j-api</artifactId>
 			<version>2.1</version>
 		</dependency>
+
 		<dependency>
 			<groupId>org.apache.logging.log4j</groupId>
 			<artifactId>log4j-core</artifactId>
 			<version>2.1</version>
 		</dependency>
+
 		<dependency>
 			<groupId>de.hdm_stuttgart.mi.exam</groupId>
 			<artifactId>unitmarking</artifactId>
@@ -104,4 +62,4 @@
 		</dependency>
 
 	</dependencies>
-</project>
+</project>
\ No newline at end of file
-- 
GitLab