diff --git a/Doc/Sd1/gettingStarted.xml b/Doc/Sd1/gettingStarted.xml index 533daf2ced6d9ba7dcf916257485d1932b9bc7e3..3e25b542c0d483290580ca9aaf75d22c84aac313 100644 --- a/Doc/Sd1/gettingStarted.xml +++ b/Doc/Sd1/gettingStarted.xml @@ -949,7 +949,7 @@ loop # 12</screen> -DinteractiveMode=false \ -DgroupId=de.hdm_stuttgart.mi.sd1 \ -DartifactId=gettingstarted -Dversion=0.9 -DarchetypeGroupId=de.hdm_stuttgart.mi \ --DarchetypeArtifactId=mi-maven-archetype-quickstart -DarchetypeVersion=1.1</screen> +-DarchetypeArtifactId=mi-maven-archetype-quickstart -DarchetypeVersion=1.2</screen> <para>Execution requires Maven to be installed and configured properly (<command>mvn</command> command) and should result in the @@ -994,7 +994,7 @@ loop # 12</screen> linkends="sd1CalloutMavenCmdLine-2" xml:id="sd1CalloutMavenCmdLine-2-co"/> -DarchetypeArtifactId=mi-maven-archetype-quickstart \ - -DarchetypeVersion=1.1 \ + -DarchetypeVersion=1.2 \ -DgroupId=de.hdm_stuttgart.mi.sd1 <co linkends="sd1CalloutMavenCmdLine-3.2" xml:id="sd1CalloutMavenCmdLine-3.2-co"/> \ -DartifactId=gettingstarted \ diff --git a/ws/Archetypes/mi-maven-archetype-quickstart/pom.xml b/ws/Archetypes/mi-maven-archetype-quickstart/pom.xml index 18abef6af2c8c937e727fff2812d53a902ccfb40..112981e4489621dc79ab50a80c232d397791f070 100644 --- a/ws/Archetypes/mi-maven-archetype-quickstart/pom.xml +++ b/ws/Archetypes/mi-maven-archetype-quickstart/pom.xml @@ -15,7 +15,7 @@ <description> This archetype has been derived from https://maven.apache.org/archetypes/maven-archetype-quickstart - demonstrating core Java project functionality including logging and Junit-5 based testing. + providing Junit 4 tests and log4j2 logging. </description> <properties> diff --git a/ws/Archetypes/mi-maven-archetype-quickstart/src/main/resources/archetype-resources/pom.xml b/ws/Archetypes/mi-maven-archetype-quickstart/src/main/resources/archetype-resources/pom.xml index b3640b06d06d037bdd155ce14567282880d61233..fca1a6d61556a7eddbb3545b26e7a9944b8822af 100644 --- a/ws/Archetypes/mi-maven-archetype-quickstart/src/main/resources/archetype-resources/pom.xml +++ b/ws/Archetypes/mi-maven-archetype-quickstart/src/main/resources/archetype-resources/pom.xml @@ -11,15 +11,17 @@ <url>https://freedocs.mi.hdm-stuttgart.de/sd1SectToolsOfTheTrade2.html</url> + <description>Basic Java project providing Junit 4 testing and log4j2 logging.</description> + <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> </properties> <dependencies> <dependency> - <groupId>org.junit.jupiter</groupId> - <artifactId>junit-jupiter-api</artifactId> - <version>5.1.0</version> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.12</version> <scope>test</scope> </dependency> @@ -77,4 +79,4 @@ </plugins> </build> -</project> +</project> \ No newline at end of file diff --git a/ws/Archetypes/mi-maven-archetype-quickstart/src/main/resources/archetype-resources/src/main/java/App.java b/ws/Archetypes/mi-maven-archetype-quickstart/src/main/resources/archetype-resources/src/main/java/App.java index 686389d710c25199309e744052d33222d5db5337..c5963d4ce14a55688ff7a45dc759550a5fb7af52 100644 --- a/ws/Archetypes/mi-maven-archetype-quickstart/src/main/resources/archetype-resources/src/main/java/App.java +++ b/ws/Archetypes/mi-maven-archetype-quickstart/src/main/resources/archetype-resources/src/main/java/App.java @@ -21,10 +21,8 @@ public class App { public static void main( String[] args ) { System.out.println( "Hello World!" ); - log.debug("With respect to logging you may want to configure file "); - log.debug("'src/main/resources/log4j2.xml' to suit your needs."); - log.debug("This config file 'log4j2.xml' will result in 'A1.log'"); - log.debug("file containing logging output as well."); + log.debug("You may configure 'src/main/resources/log4j2.xml' "); + log.debug("for adapting both console and 'A1.log' file output"); } /** @@ -37,4 +35,4 @@ public class App { public static int add(final int a, final int b) { return a + b; } -} +} \ No newline at end of file diff --git a/ws/Archetypes/mi-maven-archetype-quickstart/src/main/resources/archetype-resources/src/test/java/AppTest.java b/ws/Archetypes/mi-maven-archetype-quickstart/src/main/resources/archetype-resources/src/test/java/AppTest.java index 6b7fb8955f53e8ad733cdadb2ef45b965823ef3f..00567f40439b777774153f6e53ce9a3b623d8e66 100644 --- a/ws/Archetypes/mi-maven-archetype-quickstart/src/main/resources/archetype-resources/src/test/java/AppTest.java +++ b/ws/Archetypes/mi-maven-archetype-quickstart/src/main/resources/archetype-resources/src/test/java/AppTest.java @@ -1,17 +1,17 @@ package $package; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; +import org.junit.Assert; +import org.junit.Test; /** - * Unit test for simple App. + * Unit test of {@link App}. */ public class AppTest { /** - * Dummy test method + * Test for correct sum of two arguments. */ @Test public void testApp() { - Assertions.assertEquals( 33, App.add(30, 3)); + Assert.assertEquals( 33, App.add(30, 3)); } -} +} \ No newline at end of file