diff --git a/Klausuren/Sd1/2017summer/Extras/.gitignore b/Klausuren/Sd1/2017summer/Extras/.gitignore
index a1c3ab4d08c0f9f91918f21c730272a4711885e8..5ff6309b7199129c1afe4f4ec1906e640bec48c6 100644
--- a/Klausuren/Sd1/2017summer/Extras/.gitignore
+++ b/Klausuren/Sd1/2017summer/Extras/.gitignore
@@ -1,4 +1,38 @@
-/target/
-/.settings/
+target/
+!.mvn/wrapper/maven-wrapper.jar
+!**/src/main/**/target/
+!**/src/test/**/target/
+
+### IntelliJ IDEA ###
+.idea/modules.xml
+.idea/jarRepositories.xml
+.idea/compiler.xml
+.idea/libraries/
+*.iws
+*.iml
+*.ipr
+
+### Eclipse ###
+.apt_generated
.classpath
+.factorypath
.project
+.settings
+.springBeans
+.sts4-cache
+
+### NetBeans ###
+/nbproject/private/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
+build/
+!**/src/main/**/build/
+!**/src/test/**/build/
+
+### VS Code ###
+.vscode/
+
+### Mac OS ###
+.DS_Store
\ No newline at end of file
diff --git a/Klausuren/Sd1/2017summer/Extras/pom.xml b/Klausuren/Sd1/2017summer/Extras/pom.xml
index ba1c2d200f656cc92c6fff3139a2b697ced91379..25fccae7ba4b5128f5f6f0b5a9ade5a32f202316 100644
--- a/Klausuren/Sd1/2017summer/Extras/pom.xml
+++ b/Klausuren/Sd1/2017summer/Extras/pom.xml
@@ -1,140 +1,78 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>de.hdm_stuttgart.mi.sd1</groupId>
- <artifactId>sd1_sose2017_extras</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <artifactId>Extra2</artifactId>
+ <version>1.0-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>sd1_sose2017_Extras</name>
-
- <url>http://www.mi.hdm-stuttgart.de/freedocs/topic/de.hdm_stuttgart.mi.lectures/sd1SectUsingMaven.html</url>
-
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-
- <maven.compiler.target>17</maven.compiler.target>
- <maven.compiler.source>17</maven.compiler.source>
-
- <freedocs.url>https://freedocs.mi.hdm-stuttgart.de</freedocs.url>
- <jdk.api_17.url>${freedocs.url}/doc/openjdk-17-doc/api/</jdk.api_17.url>
- <mathjax.url>${freedocs.url}/lib/MathJax/es5/tex-chtml.js</mathjax.url>
- <libhighlight.url>${freedocs.url}/lib/highlight.js</libhighlight.url>
- </properties>
-
- <repositories>
- <repository>
- <id>hdm-mi-internal-maven-repo</id>
- <url>https://maven.mi.hdm-stuttgart.de/nexus/repository/mi-maven</url>
- </repository>
- </repositories>
-
- <dependencies>
- <dependency>
- <groupId>de.hdm_stuttgart.mi.exam</groupId>
- <artifactId>unitmarking</artifactId>
- <version>1.2</version>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>3.11.0</version>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <version>3.1.0</version>
- <executions>
- <execution>
- <phase>generate-sources</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <target>
- <echo>Javadoc root at file://${project.basedir}/target/site/apidocs/index.html</echo>
- </target>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>3.5.0</version>
- <configuration>
- <release>17</release>
- <doclint>all</doclint>
- <show>public</show>
- <docfilessubdirs>true</docfilessubdirs>
- <addStylesheets>
- <stylesheet>resources/jdocSupplement.css</stylesheet>
- </addStylesheets>
-
- <windowtitle>Exam documentation</windowtitle>
-
- <links>
- <link>https://freedocs.mi.hdm-stuttgart.de/doc/openjdk-17-doc/api/</link>
- </links>
-
- <additionalOptions>
- <additionalOption>-html5 --allow-script-in-comments</additionalOption>
- </additionalOptions>
- <nohelp>true</nohelp>
-
- <header><![CDATA[
- <script>
- MathJax = {
- chtml: { displayAlign: 'left',
- displayIndent: '5ex'}
- };
- </script>
- <script type="text/javascript" src="${mathjax.url}"></script>
- <script type="text/javascript" src="{@docRoot}/resources/jdocSupplement.js"></script>
-
- <link rel="stylesheet" href="${libhighlight.url}/styles/idea.min.css">
- <script src="${libhighlight.url}/highlight.min.js"></script>
- <script type="text/javascript">hljs.highlightAll();</script>]]>
- </header>
- <bottom><![CDATA[Copyright © 2023 Stuttgart Media University / MI. Licensed under
- <a style="font-weight:bold;" href="https://creativecommons.org/licenses/by/4.0/legalcode" target="_blank"
- >Creative Commons Attribution 4.0 International Public License</a>.]]></bottom>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>3.6.0</version>
- <configuration>
- <descriptors>
- <descriptor>src/main/assembly/assembly.xml</descriptor>
- </descriptors>
- </configuration>
- <executions>
- <execution>
- <id>make-assembly</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <archive>
- <manifest>
- <mainClass>de.hdm_stuttgart.mi.sd1.ShowReachedPoints</mainClass>
- </manifest>
- </archive>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
+ <name>Extra2</name>
+
+ <url>https://freedocs.mi.hdm-stuttgart.de/sd1_sect_mavenCli.html</url>
+
+ <description>Basic Java project.</description>
+
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ </properties>
+
+ <build>
+ <plugins>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.10.1</version>
+ <configuration>
+ <source>17</source>
+ <target>17</target>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>3.4.0</version>
+ <configuration>
+ <linksource>true</linksource>
+ <additionalOptions>
+ <additionalOption>-html5</additionalOption>
+ </additionalOptions>
+ <javadocExecutable>${java.home}/bin/javadoc</javadocExecutable>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <version>3.12.0</version>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <version>3.3.0</version>
+ <configuration>
+ <transformers>
+ <transformer
+ implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+ <manifestEntries>
+ <Main-Class>de.hdm_stuttgart.mi.sd1.sd1_sose2017.App</Main-Class>
+ <Multi-Release>true</Multi-Release>
+ </manifestEntries>
+ </transformer>
+ </transformers>
+ </configuration>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>shade</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff --git a/Klausuren/Sd1/2017summer/Extras/src/main/java/de/hdm_stuttgart/mi/sd1/sd1_sose2017/App.java b/Klausuren/Sd1/2017summer/Extras/src/main/java/de/hdm_stuttgart/mi/sd1/sd1_sose2017/App.java
index e06c444078be6e2a49235cd3447a02a22b84686d..38caf2285d1e5431646919fafa66fb6a31a9fe04 100644
--- a/Klausuren/Sd1/2017summer/Extras/src/main/java/de/hdm_stuttgart/mi/sd1/sd1_sose2017/App.java
+++ b/Klausuren/Sd1/2017summer/Extras/src/main/java/de/hdm_stuttgart/mi/sd1/sd1_sose2017/App.java
@@ -1,17 +1,10 @@
package de.hdm_stuttgart.mi.sd1.sd1_sose2017;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-
-
/**
- * A simple http://logging.apache.org/log4j/2.x demo,
- * see file log4j2.xml for configuration options.
+ * Supplementary exam task related code.
*
*/
public class App {
- private static Logger log = LogManager.getLogger(App.class);
-
public App() {}
/**
* @param args Unused
diff --git a/Klausuren/Sd1/2017summer/Extras/src/main/java/de/hdm_stuttgart/mi/sd1/sd1_sose2017/StringCreation.java b/Klausuren/Sd1/2017summer/Extras/src/main/java/de/hdm_stuttgart/mi/sd1/sd1_sose2017/StringCreation.java
index 0b10bb7a5069a65f1ae4bce87beab6ff5df09fe3..ff929f22d7f17958b29fc33c0a8d467cec65c7a8 100644
--- a/Klausuren/Sd1/2017summer/Extras/src/main/java/de/hdm_stuttgart/mi/sd1/sd1_sose2017/StringCreation.java
+++ b/Klausuren/Sd1/2017summer/Extras/src/main/java/de/hdm_stuttgart/mi/sd1/sd1_sose2017/StringCreation.java
@@ -8,6 +8,6 @@ public class StringCreation {
s.toLowerCase();
System.out.print(s);
- // Wieviele Strings wurden erzeugt?
+ // Wie viele Strings wurden erzeugt?
}
}
diff --git a/Klausuren/Sd1/2017summer/Extras/src/main/resources/log4j2.xml b/Klausuren/Sd1/2017summer/Extras/src/main/resources/log4j2.xml
deleted file mode 100644
index 0f9edbc70ed5eacdb7bb3fbe8aa76bb9b7812b74..0000000000000000000000000000000000000000
--- a/Klausuren/Sd1/2017summer/Extras/src/main/resources/log4j2.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Configuration>
- <Appenders>
- <File name="A1" fileName="A1.log" append="false">
- <PatternLayout pattern="%t %-5p %c{2} - %m%n"/>
- </File>
- <Console name="STDOUT" target="SYSTEM_OUT">
- <PatternLayout pattern="%d %-5p [%t] %C{2} (%F:%L) - %m%n"/>
- </Console>
- </Appenders>
- <Loggers>
-
- <!-- You my want to define class or package level per-logger rules -->
- <Logger name="de.hdm_stuttgart.mi.sd1.sd1_sose2017.App" level="debug">
- <AppenderRef ref="A1"/>
- </Logger>
- <Root level="info">
- <AppenderRef ref="STDOUT"/>
- </Root>
- </Loggers>
-</Configuration>
\ No newline at end of file
diff --git a/Klausuren/Sd1/2017summer/Extras/src/test/java/de/hdm_stuttgart/mi/sd1/sd1_sose2017/AppTest.java b/Klausuren/Sd1/2017summer/Extras/src/test/java/de/hdm_stuttgart/mi/sd1/sd1_sose2017/AppTest.java
deleted file mode 100644
index 6591ee7e3f8919b978f02739c7752948b4109e5c..0000000000000000000000000000000000000000
--- a/Klausuren/Sd1/2017summer/Extras/src/test/java/de/hdm_stuttgart/mi/sd1/sd1_sose2017/AppTest.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package de.hdm_stuttgart.mi.sd1.sd1_sose2017;
-
-import org.junit.Assert;
-import org.junit.Test;
-
-/**
- * Unit test for simple App.
- */
-@SuppressWarnings({"UnusedDeclaration"})
-public class AppTest {
- /**
- * Dummy test method
- */
- @Test
- public void testApp() {
- Assert.assertTrue( true );
- }
-}