diff --git a/Doc/Sd1/Ref/Fig/NewProjectMavenIntellij/s500_ImportMaven.png b/Doc/Sd1/Ref/Fig/NewProjectMavenIntellij/s500_ImportMaven.png
index 22cfc9bada0d29d1fbeb99b7847228ef83d9669e..0f735782f68ca201216fc3616f15b401ef22beb5 100644
Binary files a/Doc/Sd1/Ref/Fig/NewProjectMavenIntellij/s500_ImportMaven.png and b/Doc/Sd1/Ref/Fig/NewProjectMavenIntellij/s500_ImportMaven.png differ
diff --git a/Doc/Sd1/gettingStarted.xml b/Doc/Sd1/gettingStarted.xml
index fe08f1c8d5d18e8e2d368597c61459a3f1f51559..aa39a924924f8844c01ee34c7ad14f10c387d0ae 100644
--- a/Doc/Sd1/gettingStarted.xml
+++ b/Doc/Sd1/gettingStarted.xml
@@ -2508,7 +2508,7 @@ nano ~/.m2/settings.xml <co linkends="sd1_fig_mavenMiRepo-2"
<screen>mvn --batch-mode -e archetype:generate -DgroupId=de.hdm_stuttgart.mi.sd1 \
-DartifactId=second -Dversion=0.9 -DarchetypeGroupId=de.hdm_stuttgart.mi \
--DarchetypeArtifactId=<emphasis role="red">mi-maven-archetype-helloworld</emphasis> -DarchetypeVersion=1.3
+-DarchetypeArtifactId=<emphasis role="red">mi-maven-archetype-helloworld</emphasis> -DarchetypeVersion=1.4
[INFO] Scanning for projects...
...
@@ -2531,7 +2531,7 @@ nano ~/.m2/settings.xml <co linkends="sd1_fig_mavenMiRepo-2"
linkends="sd1_fig_mavenMiRepoCliDetails-3"
xml:id="sd1_fig_mavenMiRepoCliDetails-3-co"/>
-D<emphasis role="red">archetypeArtifactId</emphasis>=mi-maven-archetype-helloworld \
- -D<emphasis role="red">archetypeVersion</emphasis>=1.3 \
+ -D<emphasis role="red">archetypeVersion</emphasis>=1.4 \
\
-D<emphasis role="red">groupId</emphasis>=de.hdm_stuttgart.mi.sd1 <co
linkends="sd1_fig_mavenMiRepoCliDetails-4"
@@ -2645,7 +2645,8 @@ nano ~/.m2/settings.xml <co linkends="sd1_fig_mavenMiRepo-2"
> java <emphasis role="red">de.hdm_stuttgart.mi.sd1.App</emphasis> <co
linkends="sd1_fig_mavenExecute-2"
xml:id="sd1_fig_mavenExecute-2-co"/>
-Hello World! <co linkends="sd1_fig_mavenExecute-3"
+Hi there, let's have
+fun learning Java! <co linkends="sd1_fig_mavenExecute-3"
xml:id="sd1_fig_mavenExecute-3-co"/></screen>
<calloutlist>
@@ -2707,7 +2708,8 @@ Tests run: 1, Failures: 0, Errors: 0, Skipped: 0
<filename>first-0.9.jar</filename></title>
<screen>java -jar <emphasis role="red">target/first-0.9.jar</emphasis>
-Hello World!</screen>
+Hi there, let's have
+fun learning Java!</screen>
<para>Remark: This will execute <filename>HelloWorld.class</filename>
being contained in <filename>first-0.9.jar</filename>.</para>
@@ -2942,7 +2944,8 @@ Generating /ma/goik/First/target/site/apidocs/help-doc.html...
<listitem>
<para><property>archetypeVersion</property>:
- <option>1.3</option></para>
+ <option>1.4</option> (does not match screenshot value
+ 1.1)</para>
</listitem>
</itemizedlist>
@@ -3078,19 +3081,13 @@ Generating /ma/goik/First/target/site/apidocs/help-doc.html...
</figure>
<figure xml:id="sd1_fig_mavenIdeaPomAutoImport">
- <title><filename>pom.xml</filename> content change policy</title>
+ <title><filename>pom.xml</filename> content changes</title>
- <informaltable border="0">
- <tr>
- <td valign="top"><mediaobject>
- <imageobject>
- <imagedata fileref="Ref/Fig/NewProjectMavenIntellij/s500_ImportMaven.png"/>
- </imageobject>
- </mediaobject></td>
-
- <td valign="top"/>
- </tr>
- </informaltable>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="Ref/Fig/NewProjectMavenIntellij/s500_ImportMaven.png"/>
+ </imageobject>
+ </mediaobject>
<itemizedlist>
<listitem>
@@ -3099,8 +3096,7 @@ Generating /ma/goik/First/target/site/apidocs/help-doc.html...
</listitem>
<listitem>
- <para><option>Enable Auto-import</option> allows for automated
- re-reading of <filename>pom.xml</filename> content changes.</para>
+ <para> Reloading changed <filename>pom.xml</filename> file.</para>
</listitem>
</itemizedlist>
</figure>
diff --git a/ws/Archetypes/mi-maven-archetype-helloworld/pom.xml b/ws/Archetypes/mi-maven-archetype-helloworld/pom.xml
index b1a3761b439b64da2a3fdd2305b757d0602bbb9c..c044519aa84d86607418e7eed0959d7cf6363933 100644
--- a/ws/Archetypes/mi-maven-archetype-helloworld/pom.xml
+++ b/ws/Archetypes/mi-maven-archetype-helloworld/pom.xml
@@ -5,7 +5,7 @@
<groupId>de.hdm_stuttgart.mi</groupId>
<artifactId>mi-maven-archetype-helloworld</artifactId>
- <version>1.3</version>
+ <version>1.4</version>
<packaging>maven-archetype</packaging>
@@ -50,7 +50,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
- <version>3.1.0</version>
+ <version>3.2.0</version>
<configuration>
<!-- Required so that .gitignore gets included in archetypes; see https://issues.apache.org/jira/browse/MRESOURCES-190 -->
<addDefaultExcludes>false</addDefaultExcludes>
@@ -61,8 +61,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<configuration>
- <source>1.8</source>
- <target>1.8</target>
+ <source>15</source>
+ <target>15</target>
</configuration>
</plugin>
</plugins>
diff --git a/ws/Archetypes/mi-maven-archetype-helloworld/src/main/resources/archetype-resources/pom.xml b/ws/Archetypes/mi-maven-archetype-helloworld/src/main/resources/archetype-resources/pom.xml
index 57c5e53d40f34b4e461b465e233373853f5159e2..94d9ef6c932e79d216df7446c86275b52c950bb0 100644
--- a/ws/Archetypes/mi-maven-archetype-helloworld/src/main/resources/archetype-resources/pom.xml
+++ b/ws/Archetypes/mi-maven-archetype-helloworld/src/main/resources/archetype-resources/pom.xml
@@ -25,15 +25,15 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<configuration>
- <source>11</source>
- <target>11</target>
+ <source>15</source>
+ <target>15</target>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>3.1.1</version>
+ <version>3.2.0</version>
<configuration>
<linksource>true</linksource>
<additionalOptions>
diff --git a/ws/Archetypes/mi-maven-archetype-helloworld/src/main/resources/archetype-resources/src/main/java/App.java b/ws/Archetypes/mi-maven-archetype-helloworld/src/main/resources/archetype-resources/src/main/java/App.java
index 1d444e176b044c5342484c87f06faf19b719a219..ed8226fedb680a0a5fdd0059c1beb8c469011bba 100644
--- a/ws/Archetypes/mi-maven-archetype-helloworld/src/main/resources/archetype-resources/src/main/java/App.java
+++ b/ws/Archetypes/mi-maven-archetype-helloworld/src/main/resources/archetype-resources/src/main/java/App.java
@@ -12,6 +12,11 @@ public class App {
* @param args Yet unused
*/
public static void main( String[] args ) {
- System.out.println( "Hello World!" );
+ // Multiline text block requires Java 15+
+
+ System.out.println("""
+ Hi there, let's have
+ fun learning Java!""");
}
}
+
diff --git a/ws/Archetypes/mi-maven-archetype-quickstart/pom.xml b/ws/Archetypes/mi-maven-archetype-quickstart/pom.xml
index 7105d81523f194ec2cf2a5ea18f2fde51b26b25d..e8230cec9e73b447b491f64023d08b255600e53a 100644
--- a/ws/Archetypes/mi-maven-archetype-quickstart/pom.xml
+++ b/ws/Archetypes/mi-maven-archetype-quickstart/pom.xml
@@ -5,7 +5,7 @@
<groupId>de.hdm_stuttgart.mi</groupId>
<artifactId>mi-maven-archetype-quickstart</artifactId>
- <version>1.3</version>
+ <version>1.4</version>
<packaging>maven-archetype</packaging>
@@ -51,7 +51,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
- <version>3.1.0</version>
+ <version>3.2.0</version>
<configuration>
<!-- Required so that .gitignore gets included in archetypes; see https://issues.apache.org/jira/browse/MRESOURCES-190 -->
<addDefaultExcludes>false</addDefaultExcludes>
@@ -62,8 +62,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<configuration>
- <source>1.8</source>
- <target>1.8</target>
+ <source>15</source>
+ <target>15</target>
</configuration>
</plugin>
</plugins>
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 a1cbe7949c85e6aacf22d6abaf69edc2916bc09b..59b7768d494121d6e640f7a382b51ec379e129c0 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
@@ -41,15 +41,15 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<configuration>
- <source>11</source>
- <target>11</target>
+ <source>15</source>
+ <target>15</target>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>3.1.1</version>
+ <version>3.2.0</version>
<configuration>
<linksource>true</linksource>
<additionalOptions>
@@ -69,6 +69,7 @@
implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<manifestEntries>
<Main-Class>${package}.App</Main-Class>
+ <Multi-Release>true</Multi-Release>
</manifestEntries>
</transformer>
</transformers>
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 c5963d4ce14a55688ff7a45dc759550a5fb7af52..387076893cc85285941de3fe3a81681147b2f4cf 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
@@ -19,10 +19,12 @@ public class App {
* @param args Yet unused
*/
public static void main( String[] args ) {
- System.out.println( "Hello World!" );
+ System.out.println("""
+ Hi there, let's have
+ fun learning Java!""");
- log.debug("You may configure 'src/main/resources/log4j2.xml' ");
- log.debug("for adapting both console and 'A1.log' file output");
+ log.debug("You may configure 'src/main/resources/log4j2.xml' ");
+ log.debug("for adapting both console and 'A1.log' file output");
}
/**
@@ -35,4 +37,4 @@ public class App {
public static int add(final int a, final int b) {
return a + b;
}
-}
\ No newline at end of file
+}