Merge branch 'master' into copilot/fix-1700

Author: maybeec

cobigen-cli/cli-systemtest/src/test/resources/testdata/AdaptTemplatesCommandIT/template-sets/adapted/crud-java-server-app-complex/pom.xml

@@ -69,10 +69,10 @@
               <goal>run</goal>
             </goals>
             <configuration>
-              <tasks>
+              <target>
                 <echo>Integrate POM manually</echo>
                 <copy file="pom.xml" tofile="${project.build.outputDirectory}/pom.xml"/>
-              </tasks>
+              </target>
             </configuration>
           </execution>
         </executions>

cobigen-cli/cli-systemtest/src/test/resources/testdata/AdaptTemplatesCommandIT/template-sets/adapted/crud-java-server-app/pom.xml

@@ -69,10 +69,10 @@
               <goal>run</goal>
             </goals>
             <configuration>
-              <tasks>
+              <target>
                 <echo>Integrate POM manually</echo>
                 <copy file="pom.xml" tofile="${project.build.outputDirectory}/pom.xml"/>
-              </tasks>
+              </target>
             </configuration>
           </execution>
         </executions>

cobigen-cli/cli-systemtest/src/test/resources/testdata/templatesproject/template-sets/adapted/crud-java-server-app/pom.xml

@@ -41,10 +41,10 @@
               <goal>run</goal>
             </goals>
             <configuration>
-              <tasks>
+              <target>
                 <echo>Integrate POM manually</echo>
                 <copy file="pom.xml" tofile="${project.build.outputDirectory}/pom.xml"/>
-              </tasks>
+              </target>
             </configuration>
           </execution>
         </executions>

cobigen-cli/cli-systemtest/src/test/resources/testdata/templatesproject/templates-devon4j/pom.xml

@@ -41,10 +41,10 @@
               <goal>run</goal>
             </goals>
             <configuration>
-              <tasks>
+              <target>
                 <echo>Integrate POM manually</echo>
                 <copy file="pom.xml" tofile="${project.build.outputDirectory}/pom.xml"/>
-              </tasks>
+              </target>
             </configuration>
           </execution>
         </executions>

cobigen-templates/pom.xml

@@ -114,7 +114,7 @@ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLS
               <goal>run</goal>
             </goals>
             <configuration>
-              <tasks>
+              <target>
                 <echo>Integrate flattened POM manually</echo>
                 <!-- Patching the flattened-pom file -->
                 <!-- Removing the last </project> line -->
@@ -139,7 +139,7 @@ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLS
                   </then>
                 </if>
                 <copy file=".flattened-pom.xml" tofile="${project.build.outputDirectory}/pom.xml" />
-              </tasks>
+              </target>
             </configuration>
           </execution>
         </executions>

cobigen-templates/templates-devon4j-utils/pom.xml

@@ -64,7 +64,7 @@
               <goal>run</goal>
             </goals>
             <configuration>
-              <tasks>
+              <target>
                 <!-- Patching the flattened-pom file -->
                 <!-- Removing the last </project> line -->
                 <replace file=".flattened-pom.xml" value="" token="&lt;/project>"></replace>
@@ -80,7 +80,7 @@
                 <replace file="./pom_patch.xml" value="{maven.compiler.target}" token="${maven.compiler.target}"></replace>
                 <!-- Restoring the last </project> line -->
                 <concat destfile=".flattened-pom.xml" append="true">&lt;/project></concat>
-              </tasks>
+              </target>
             </configuration>
           </execution>
         </executions>

cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/TemplateProcessingTest/template-sets/adapted/crud-java-server-app-complex/pom.xml

@@ -69,10 +69,10 @@
               <goal>run</goal>
             </goals>
             <configuration>
-              <tasks>
+              <target>
                 <echo>Integrate POM manually</echo>
                 <copy file="pom.xml" tofile="${project.build.outputDirectory}/pom.xml"/>
-              </tasks>
+              </target>
             </configuration>
           </execution>
         </executions>

cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/TemplateProcessingTest/template-sets/adapted/crud-java-server-app/pom.xml

@@ -69,10 +69,10 @@
               <goal>run</goal>
             </goals>
             <configuration>
-              <tasks>
+              <target>
                 <echo>Integrate POM manually</echo>
                 <copy file="pom.xml" tofile="${project.build.outputDirectory}/pom.xml"/>
-              </tasks>
+              </target>
             </configuration>
           </execution>
         </executions>

pom.xml

@@ -13,7 +13,7 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <github.project>devonfw/cobigen</github.project>
     <flatten.mode>ossrh</flatten.mode>
-    <slf4j.version>1.7.30</slf4j.version>
+    <slf4j.version>1.7.36</slf4j.version>
     <zeroturnaround.version>1.12</zeroturnaround.version>
     <skip.deployment>true</skip.deployment>
     <java.version>11</java.version>
@@ -711,4 +711,4 @@
       </releases>
     </repository>
   </repositories>
-</project>
+</project>