Commit 278c59ab authored by Dr. Martin Goik's avatar Dr. Martin Goik

Plugin updates

parent 97dca73a
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<includeBaseDirectory>false</includeBaseDirectory> <includeBaseDirectory>false</includeBaseDirectory>
<dependencySets> <dependencySets>
<dependencySet> <dependencySet>
<outputDirectory>/</outputDirectory> <outputDirectory/>
<useProjectArtifact>true</useProjectArtifact> <useProjectArtifact>true</useProjectArtifact>
<unpack>true</unpack> <unpack>true</unpack>
<scope>test</scope> <scope>test</scope>
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
<fileSets> <fileSets>
<fileSet> <fileSet>
<directory>${project.build.directory}/test-classes</directory> <directory>${project.build.directory}/test-classes</directory>
<outputDirectory>/</outputDirectory> <outputDirectory/>
<includes> <includes>
<include>**/*.class</include> <include>**/*.class</include>
</includes> </includes>
...@@ -26,11 +26,11 @@ ...@@ -26,11 +26,11 @@
</fileSet> </fileSet>
<fileSet> <fileSet>
<directory>${project.build.directory}/classes</directory> <directory>${project.build.directory}/classes</directory>
<outputDirectory>/</outputDirectory> <outputDirectory/>
<includes> <includes>
<include>**/*.class</include> <include>**/*.class</include>
</includes> </includes>
<useDefaultExcludes>true</useDefaultExcludes> <useDefaultExcludes>true</useDefaultExcludes>
</fileSet> </fileSet>
</fileSets> </fileSets>
</assembly> </assembly>
\ No newline at end of file
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<includeBaseDirectory>false</includeBaseDirectory> <includeBaseDirectory>false</includeBaseDirectory>
<dependencySets> <dependencySets>
<dependencySet> <dependencySet>
<outputDirectory>/</outputDirectory> <outputDirectory/>
<useProjectArtifact>true</useProjectArtifact> <useProjectArtifact>true</useProjectArtifact>
<unpack>true</unpack> <unpack>true</unpack>
<scope>test</scope> <scope>test</scope>
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
<fileSets> <fileSets>
<fileSet> <fileSet>
<directory>${project.build.directory}/test-classes</directory> <directory>${project.build.directory}/test-classes</directory>
<outputDirectory>/</outputDirectory> <outputDirectory/>
<includes> <includes>
<include>**/*.class</include> <include>**/*.class</include>
</includes> </includes>
...@@ -26,11 +26,11 @@ ...@@ -26,11 +26,11 @@
</fileSet> </fileSet>
<fileSet> <fileSet>
<directory>${project.build.directory}/classes</directory> <directory>${project.build.directory}/classes</directory>
<outputDirectory>/</outputDirectory> <outputDirectory/>
<includes> <includes>
<include>**/*.class</include> <include>**/*.class</include>
</includes> </includes>
<useDefaultExcludes>true</useDefaultExcludes> <useDefaultExcludes>true</useDefaultExcludes>
</fileSet> </fileSet>
</fileSets> </fileSets>
</assembly> </assembly>
\ No newline at end of file
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<name>sd1_2017winter_exam</name> <name>sd1_2017winter_exam</name>
<url>http://www.mi.hdm-stuttgart.de/freedocs/topic/de.hdm_stuttgart.mi.lectures/sd1SectUsingMaven.html</url> <url>https://freedocs.mi.hdm-stuttgart.de/sd1_sect_mavenCli.html</url>
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
...@@ -18,11 +18,10 @@ ...@@ -18,11 +18,10 @@
<repositories> <repositories>
<repository> <repository>
<id>hdm-mi-internal-maven-repo</id> <id>hdm-mi-internal-maven-repo</id>
<url>https://maven.mi.hdm-stuttgart.de/artifacts</url> <url>https://maven.mi.hdm-stuttgart.de/nexus/repository/mi-maven</url>
</repository> </repository>
</repositories> </repositories>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>junit</groupId> <groupId>junit</groupId>
...@@ -34,13 +33,19 @@ ...@@ -34,13 +33,19 @@
<dependency> <dependency>
<groupId>org.apache.logging.log4j</groupId> <groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId> <artifactId>log4j-core</artifactId>
<version>2.6</version> <version>2.11.1</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<version>5.1.4.RELEASE</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>de.hdm_stuttgart.mi.exam</groupId> <groupId>de.hdm_stuttgart.mi.exam</groupId>
<artifactId>unitmarking</artifactId> <artifactId>unitmarking</artifactId>
<version>0.9</version> <version>1.0</version>
</dependency> </dependency>
</dependencies> </dependencies>
...@@ -51,30 +56,42 @@ ...@@ -51,30 +56,42 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<version>3.5.1</version> <version>3.8.1</version>
<configuration> <configuration>
<source>1.8</source> <source>11</source>
<target>1.8</target> <target>11</target>
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId> <artifactId>maven-javadoc-plugin</artifactId>
<version>3.0.1</version> <version>3.1.0</version>
<configuration> <configuration>
<linksource>true</linksource> <javaApiLinks>
<additionalOptions> <property>
<additionalOption>-html5</additionalOption> <name>api_11</name>
</additionalOptions> <value>https://klausur.mi.hdm-stuttgart.de/doc/openjdk-11-doc/api/</value>
</property>
</javaApiLinks>
<stylesheetfile>localstyles.css</stylesheetfile>
<additionalJOptions>
<additionalJOption>-html5</additionalJOption>
</additionalJOptions>
<javadocExecutable>${java.home}/bin/javadoc</javadocExecutable>
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>
<artifactId>maven-assembly-plugin</artifactId> <artifactId>maven-assembly-plugin</artifactId>
<version>2.3</version> <version>3.1.1</version>
<configuration> <configuration>
<descriptor>src/main/assembly/assembly.xml</descriptor> <descriptors>
<descriptor>src/main/assembly/assembly.xml</descriptor>
</descriptors>
</configuration> </configuration>
<executions> <executions>
<execution> <execution>
...@@ -93,7 +110,6 @@ ...@@ -93,7 +110,6 @@
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
</project> </project>
\ No newline at end of file
This diff is collapsed.
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<name>sd1_2017winter_solve</name> <name>sd1_2017winter_solve</name>
<url>http://www.mi.hdm-stuttgart.de/freedocs/topic/de.hdm_stuttgart.mi.lectures/sd1SectUsingMaven.html</url> <url>https://freedocs.mi.hdm-stuttgart.de/sd1_sect_mavenCli.html</url>
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
...@@ -18,11 +18,10 @@ ...@@ -18,11 +18,10 @@
<repositories> <repositories>
<repository> <repository>
<id>hdm-mi-internal-maven-repo</id> <id>hdm-mi-internal-maven-repo</id>
<url>https://maven.mi.hdm-stuttgart.de/artifacts</url> <url>https://maven.mi.hdm-stuttgart.de/nexus/repository/mi-maven</url>
</repository> </repository>
</repositories> </repositories>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>junit</groupId> <groupId>junit</groupId>
...@@ -34,13 +33,19 @@ ...@@ -34,13 +33,19 @@
<dependency> <dependency>
<groupId>org.apache.logging.log4j</groupId> <groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId> <artifactId>log4j-core</artifactId>
<version>2.6</version> <version>2.11.1</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<version>5.1.4.RELEASE</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>de.hdm_stuttgart.mi.exam</groupId> <groupId>de.hdm_stuttgart.mi.exam</groupId>
<artifactId>unitmarking</artifactId> <artifactId>unitmarking</artifactId>
<version>0.9</version> <version>1.0</version>
</dependency> </dependency>
</dependencies> </dependencies>
...@@ -51,30 +56,42 @@ ...@@ -51,30 +56,42 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<version>3.5.1</version> <version>3.8.1</version>
<configuration> <configuration>
<source>1.8</source> <source>11</source>
<target>1.8</target> <target>11</target>
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId> <artifactId>maven-javadoc-plugin</artifactId>
<version>3.0.1</version> <version>3.1.0</version>
<configuration> <configuration>
<linksource>true</linksource> <javaApiLinks>
<additionalOptions> <property>
<additionalOption>-html5</additionalOption> <name>api_11</name>
</additionalOptions> <value>https://klausur.mi.hdm-stuttgart.de/doc/openjdk-11-doc/api/</value>
</property>
</javaApiLinks>
<stylesheetfile>localstyles.css</stylesheetfile>
<additionalJOptions>
<additionalJOption>-html5</additionalJOption>
</additionalJOptions>
<javadocExecutable>${java.home}/bin/javadoc</javadocExecutable>
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>
<artifactId>maven-assembly-plugin</artifactId> <artifactId>maven-assembly-plugin</artifactId>
<version>2.3</version> <version>3.1.1</version>
<configuration> <configuration>
<descriptor>src/main/assembly/assembly.xml</descriptor> <descriptors>
<descriptor>src/main/assembly/assembly.xml</descriptor>
</descriptors>
</configuration> </configuration>
<executions> <executions>
<execution> <execution>
...@@ -93,7 +110,6 @@ ...@@ -93,7 +110,6 @@
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
</project> </project>
\ No newline at end of file
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<name>sd1_2018winter_exam</name> <name>sd1_2018winter_exam</name>
<url>http://www.mi.hdm-stuttgart.de/freedocs/topic/de.hdm_stuttgart.mi.lectures/sd1SectUsingMaven.html</url> <url>https://freedocs.mi.hdm-stuttgart.de/sd1_sect_mavenCli.html</url>
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
...@@ -56,34 +56,42 @@ ...@@ -56,34 +56,42 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<version>3.8.0</version> <version>3.8.1</version>
<configuration> <configuration>
<source>1.9</source> <source>11</source>
<target>1.9</target> <target>11</target>
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId> <artifactId>maven-javadoc-plugin</artifactId>
<version>3.0.1</version> <version>3.1.0</version>
<configuration> <configuration>
<links> <javaApiLinks>
<link>https://docs.oracle.com/javase/10/docs/api</link> <property>
</links> <name>api_11</name>
<value>https://klausur.mi.hdm-stuttgart.de/doc/openjdk-11-doc/api/</value>
</property>
</javaApiLinks>
<stylesheetfile>localstyles.css</stylesheetfile>
<additionalJOptions> <additionalJOptions>
<additionalJOption>-html5</additionalJOption> <additionalJOption>-html5</additionalJOption>
</additionalJOptions> </additionalJOptions>
<javadocExecutable>${java.home}/bin/javadoc</javadocExecutable>
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>
<artifactId>maven-assembly-plugin</artifactId> <artifactId>maven-assembly-plugin</artifactId>
<version>3.1.1</version> <version>3.1.1</version>
<configuration>
<descriptors> <configuration>
<descriptor>src/main/assembly/assembly.xml</descriptor> <descriptors>
</descriptors> <descriptor>src/main/assembly/assembly.xml</descriptor>
</descriptors>
</configuration> </configuration>
<executions> <executions>
<execution> <execution>
...@@ -104,4 +112,4 @@ ...@@ -104,4 +112,4 @@
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
</project> </project>
\ No newline at end of file
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<includeBaseDirectory>false</includeBaseDirectory> <includeBaseDirectory>false</includeBaseDirectory>
<dependencySets> <dependencySets>
<dependencySet> <dependencySet>
<outputDirectory></outputDirectory> <outputDirectory/>
<useProjectArtifact>true</useProjectArtifact> <useProjectArtifact>true</useProjectArtifact>
<unpack>true</unpack> <unpack>true</unpack>
<scope>test</scope> <scope>test</scope>
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
<fileSets> <fileSets>
<fileSet> <fileSet>
<directory>${project.build.directory}/test-classes</directory> <directory>${project.build.directory}/test-classes</directory>
<outputDirectory></outputDirectory> <outputDirectory/>
<includes> <includes>
<include>**/*.class</include> <include>**/*.class</include>
</includes> </includes>
...@@ -26,11 +26,11 @@ ...@@ -26,11 +26,11 @@
</fileSet> </fileSet>
<fileSet> <fileSet>
<directory>${project.build.directory}/classes</directory> <directory>${project.build.directory}/classes</directory>
<outputDirectory></outputDirectory> <outputDirectory/>
<includes> <includes>
<include>**/*.class</include> <include>**/*.class</include>
</includes> </includes>
<useDefaultExcludes>true</useDefaultExcludes> <useDefaultExcludes>true</useDefaultExcludes>
</fileSet> </fileSet>
</fileSets> </fileSets>
</assembly> </assembly>
\ No newline at end of file
...@@ -67,15 +67,33 @@ public class Helper { ...@@ -67,15 +67,33 @@ public class Helper {
} }
/** /**
* <p>Ersetze jedes Leerzeichen (char ' ') zur besseren Erkennung durch ein '_'. Beispiel:</p> * <p>Ersetze jedes Leerzeichen <code>' '</code> zur besseren Erkennung durch ein '_'. Beispiel:</p>
* *
* <pre style="background:LightCyan;width: 70ex;" *<table>
* >"Ein und mehrere Leerzeichen" --&gt; "Ein_und_mehrere___Leerzeichen"</pre> * <tr>
* <th>Code</th>
* <th>Ergebnis</th>
* </tr>
* <tr>
* <td style="vertical-align:top">
* <pre> System.out.println(
* Helper.markiereLeerzeichen(
* "This is important! "));</pre>
* </td>
* <td style="vertical-align:top">
* <pre>This<span style="color:red;">_</span>is<span
* style="color:red;">__</span>important!<span style="color:red;">_</span></pre>
* </td>
* </tr>
* </table>
* *
* <p><b style="color:red;">Tip:</b> {@link String#toCharArray()}</p> * <section class="implementationHints">
* <h3>Hinweis:</h3>
* <p>{@link String#replace(char, char)}.</p>
* </section>
* *
* @param s Eingabestring * @param s Eingabestring
* @return Eingabestring mit '_' statt Leerzeichen ' '. * @return Eingabestring mit <code>'_'</code> statt Leerzeichen <code>' '</code>.
*/ */
public static String markiereLeerzeichen(final String s) { public static String markiereLeerzeichen(final String s) {
return "Irgendein Müll kommt hier zurück!"; // TODO: Implementiere mich richtig! return "Irgendein Müll kommt hier zurück!"; // TODO: Implementiere mich richtig!
......
This diff is collapsed.
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<name>sd1_2018winter_solve</name> <name>sd1_2018winter_solve</name>
<url>http://www.mi.hdm-stuttgart.de/freedocs/topic/de.hdm_stuttgart.mi.lectures/sd1SectUsingMaven.html</url> <url>https://freedocs.mi.hdm-stuttgart.de/sd1_sect_mavenCli.html</url>
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
...@@ -56,34 +56,42 @@ ...@@ -56,34 +56,42 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<version>3.8.0</version> <version>3.8.1</version>
<configuration> <configuration>
<source>1.9</source> <source>11</source>
<target>1.9</target> <target>11</target>
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId> <artifactId>maven-javadoc-plugin</artifactId>
<version>3.0.1</version> <version>3.1.0</version>
<configuration> <configuration>
<links> <javaApiLinks>
<link>https://docs.oracle.com/javase/10/docs/api</link> <property>
</links> <name>api_11</name>
<value>https://klausur.mi.hdm-stuttgart.de/doc/openjdk-11-doc/api/</value>
</property>
</javaApiLinks>
<stylesheetfile>localstyles.css</stylesheetfile>
<additionalJOptions> <additionalJOptions>
<additionalJOption>-html5</additionalJOption> <additionalJOption>-html5</additionalJOption>
</additionalJOptions> </additionalJOptions>
<javadocExecutable>${java.home}/bin/javadoc</javadocExecutable>
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>
<artifactId>maven-assembly-plugin</artifactId> <artifactId>maven-assembly-plugin</artifactId>
<version>3.1.1</version> <version>3.1.1</version>
<configuration>
<descriptors> <configuration>
<descriptor>src/main/assembly/assembly.xml</descriptor> <descriptors>
</descriptors> <descriptor>src/main/assembly/assembly.xml</descriptor>
</descriptors>
</configuration> </configuration>
<executions> <executions>
<execution> <execution>
...@@ -104,4 +112,4 @@ ...@@ -104,4 +112,4 @@
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
</project> </project>
\ No newline at end of file
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<includeBaseDirectory>false</includeBaseDirectory> <includeBaseDirectory>false</includeBaseDirectory>
<dependencySets> <dependencySets>
<dependencySet> <dependencySet>
<outputDirectory></outputDirectory> <outputDirectory/>
<useProjectArtifact>true</useProjectArtifact> <useProjectArtifact>true</useProjectArtifact>
<unpack>true</unpack> <unpack>true</unpack>
<scope>test</scope> <scope>test</scope>
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
<fileSets> <fileSets>
<fileSet> <fileSet>
<directory>${project.build.directory}/test-classes</directory> <directory>${project.build.directory}/test-classes</directory>
<outputDirectory></outputDirectory> <outputDirectory/>
<includes> <includes>
<include>**/*.class</include> <include>**/*.class</include>
</includes> </includes>
...@@ -26,11 +26,11 @@ ...@@ -26,11 +26,11 @@
</fileSet> </fileSet>
<fileSet> <fileSet>
<directory>${project.build.directory}/classes</directory> <directory>${project.build.directory}/classes</directory>
<outputDirectory></outputDirectory> <outputDirectory/>
<includes> <includes>
<include>**/*.class</include> <include>**/*.class</include>
</includes> </includes>
<useDefaultExcludes>true</useDefaultExcludes> <useDefaultExcludes>true</useDefaultExcludes>
</fileSet> </fileSet>
</fileSets> </fileSets>
</assembly> </assembly>
\ No newline at end of file
...@@ -67,17 +67,35 @@ public class Helper { ...@@ -67,17 +67,35 @@ public class Helper {
} }
/** /**
* <p>Ersetze jedes Leerzeichen (char ' ') zur besseren Erkennung durch ein '_'. Beispiel:</p> * <p>Ersetze jedes Leerzeichen <code>' '</code> zur besseren Erkennung durch ein '_'. Beispiel:</p>
* *
* <pre style="background:LightCyan;width: 70ex;" *<table>
* <tr>
* <th>Code</th>