Bump org.apache.maven.plugins:maven-resources-plugin from 3.3.1 to 3.4.0

.semaphore/semaphore.yml

@@ -23,6 +23,7 @@ execution_time_limit:
   # Allow up to 5 to 6 Dependabot-triggered parallel branches
   hours: 18
 fail_fast:
+  # Stop the workflow as soon as a job fails
   cancel:
     when: 'true'
 global_job_config:
@@ -107,7 +108,7 @@ blocks:
             - export JAVA_HOME=/tmp/cargo-build-binaries/jdk1.8.0_202
             - cd $ORIGINAL_PWD
             - mvn -version
-            - cp ~/.m2/repository/org/apache/tomcat/tomcat/9.*/tomcat-*.zip core/samples/java/installs
+            - cp ~/.m2/repository/org/apache/tomcat/tomcat/9.*/tomcat-*.zip core/samples/java/installs ; RM=0
             - mvn clean install -T 1C || mvn clean install -e --fail-at-end
   - name: Prepare for containers running on Java 6
     dependencies:
@@ -144,7 +145,7 @@ blocks:
             - sem-version java 17
             - cd $ORIGINAL_PWD
             - mvn -version
-            - cp ~/.m2/repository/org/apache/tomcat/tomcat/9.*/tomcat-*.zip core/samples/java/installs
+            - cp ~/.m2/repository/org/apache/tomcat/tomcat/9.*/tomcat-*.zip core/samples/java/installs ; RM=0
             - mvn clean install -T 1C || mvn clean install -e --fail-at-end
   - name: Build on Java 21
     dependencies:
@@ -161,7 +162,7 @@ blocks:
             - export JAVA_HOME=/tmp/cargo-build-binaries/jdk-21
             - cd $ORIGINAL_PWD
             - mvn -version
-            - cp ~/.m2/repository/org/apache/tomcat/tomcat/9.*/tomcat-*.zip core/samples/java/installs
+            - cp ~/.m2/repository/org/apache/tomcat/tomcat/9.*/tomcat-*.zip core/samples/java/installs ; RM=0
             - mvn clean install -T 1C || mvn clean install -e --fail-at-end
   - name: Geronimo 1.x
     dependencies:
@@ -581,11 +582,12 @@ blocks:
             - chmod +x jdk-6u45-linux-x64.bin
             - ./jdk-6u45-linux-x64.bin < <(echo y)
             - mvn -version
-            - cd $ORIGINAL_PWD/core/samples/installs
+            - cd $ORIGINAL_PWD/core/samples/java/installs
             - 'find . -type f -name resin-3.0.27.zip -size -5M -print -exec rm {} +'
-            - 'wget -N --continue https://caucho.com/download/resin-3.0.27.zip ; RM=0'
+            - 'wget -N --continue --no-check-certificate https://caucho.com/download/resin-3.0.27.zip ; RM=0'
             - cd $ORIGINAL_PWD/core/samples
             - mvn clean install -e -Presin3x -Dsurefire.rerunFailingTestsCount=2 -Dcargo.java.home.1_5=/tmp/cargo-build-binaries/jdk1.6.0_45
+            - cd $ORIGINAL_PWD/core/samples/java
             - installs_size="`du -shb installs | cut -f1`" ; [ $installs_size -gt 5000000 ] && cache store "codehaus-cargo-cache-containers-$CARGO_BRANCH_ID" installs
   - name: Resin 3.1.x
     dependencies:
@@ -600,11 +602,12 @@ blocks:
             - chmod +x jdk-6u45-linux-x64.bin
             - ./jdk-6u45-linux-x64.bin < <(echo y)
             - mvn -version
-            - cd $ORIGINAL_PWD/core/samples/installs
+            - cd $ORIGINAL_PWD/core/samples/java/installs
             - 'find . -type f -name resin-3.1.16.zip -size -5M -print -exec rm {} +'
-            - 'wget -N --continue https://caucho.com/download/resin-3.1.16.zip ; RM=0'
+            - 'wget -N --continue --no-check-certificate https://caucho.com/download/resin-3.1.16.zip ; RM=0'
             - cd $ORIGINAL_PWD/core/samples
             - mvn clean install -e -Presin31x -Dsurefire.rerunFailingTestsCount=2 -Dcargo.java.home.1_5=/tmp/cargo-build-binaries/jdk1.6.0_45
+            - cd $ORIGINAL_PWD/core/samples/java
             - installs_size="`du -shb installs | cut -f1`" ; [ $installs_size -gt 5000000 ] && cache store "codehaus-cargo-cache-containers-$CARGO_BRANCH_ID" installs
   - name: Tomcat 4.x
     dependencies:
@@ -886,11 +889,12 @@ blocks:
             - tar -xvzf jdk-8u202-linux-x64.tar.gz
             - export JAVA_HOME=/tmp/cargo-build-binaries/jdk1.8.0_202
             - mvn -version
-            - cd $ORIGINAL_PWD/core/samples/installs
+            - cd $ORIGINAL_PWD/core/samples/java/installs
             - 'find . -type f -name resin-resin-4.0.67.zip -size -5M -print -exec rm {} +'
-            - 'wget -N --continue https://caucho.com/download/resin-4.0.67.zip ; RM=0'
+            - 'wget -N --continue --no-check-certificate https://caucho.com/download/resin-4.0.67.zip ; RM=0'
             - cd $ORIGINAL_PWD/core/samples
             - mvn clean install -e -Presin4x -Dsurefire.rerunFailingTestsCount=2
+            - cd $ORIGINAL_PWD/core/samples/java
             - installs_size="`du -shb installs | cut -f1`" ; [ $installs_size -gt 5000000 ] && cache store "codehaus-cargo-cache-containers-$CARGO_BRANCH_ID" installs
   - name: Tomcat 8.x
     dependencies:

core/documentation/src/main/java/org/codehaus/cargo/documentation/ConfluenceContainerDocumentationGenerator.java

@@ -2056,68 +2056,60 @@ protected String generateSamplesInfoText(String containerId)
             output.append(FileHandler.NEW_LINE);
             output.append(FileHandler.NEW_LINE);
 
-            if (url.startsWith("https://caucho.com/download/"))
+            output.append("This container is automatically tested by the "
+                + "[Continous Integration (CI) system|https://codehaus-cargo.semaphoreci.com/"
+                + "projects/cargo] every time there is a code change.");
+            output.append(FileHandler.NEW_LINE);
+            if (containerId.startsWith("wildfly-swarm"))
             {
-                output.append("Due incompatibilities between the Caucho Web site's SSL provider "
-                    + "and the Java stack, regular testing of the Resin containers is suspended.");
+                output.append("The WildFly Swarm version used during tests is: {{");
+                output.append(url);
+                output.append("}}");
             }
             else
             {
-                output.append("This container is automatically tested by the "
-                    + "[Continous Integration (CI) system|https://codehaus-cargo.semaphoreci.com/"
-                    + "projects/cargo] every time there is a code change.");
-                output.append(FileHandler.NEW_LINE);
-                if (containerId.startsWith("wildfly-swarm"))
-                {
-                    output.append("The WildFly Swarm version used during tests is: {{");
-                    output.append(url);
-                    output.append("}}");
-                }
-                else
+                output.append("The server used for tests is downloaded from: ");
+                output.append(url);
+
+                File pom = new File(SAMPLES_DIRECTORY, POM).getAbsoluteFile();
+                Document samples = XML_UTILS.loadXmlFromFile(pom.getAbsolutePath());
+                NodeList urls = samples.getElementsByTagName("cargo." + containerId + ".url");
+                if (urls.getLength() > 1)
                 {
-                    output.append("The server used for tests is downloaded from: ");
-                    output.append(url);
+                    output.append(FileHandler.NEW_LINE);
+                    output.append(FileHandler.NEW_LINE);
 
-                    File pom = new File(SAMPLES_DIRECTORY, POM).getAbsoluteFile();
-                    Document samples = XML_UTILS.loadXmlFromFile(pom.getAbsolutePath());
-                    NodeList urls = samples.getElementsByTagName("cargo." + containerId + ".url");
-                    if (urls.getLength() > 1)
+                    List<String> sortedUrls = new ArrayList<String>(urls.getLength() - 1);
+                    for (int i = 0; i < urls.getLength(); i++)
                     {
-                        output.append(FileHandler.NEW_LINE);
-                        output.append(FileHandler.NEW_LINE);
-
-                        List<String> sortedUrls = new ArrayList<String>(urls.getLength() - 1);
-                        for (int i = 0; i < urls.getLength(); i++)
+                        String otherUrl = urls.item(i).getTextContent().trim();
+                        if (!url.equals(otherUrl))
                         {
-                            String otherUrl = urls.item(i).getTextContent().trim();
-                            if (!url.equals(otherUrl))
-                            {
-                                sortedUrls.add(otherUrl);
-                            }
+                            sortedUrls.add(otherUrl);
                         }
-                        Collections.sort(sortedUrls);
+                    }
+                    Collections.sort(sortedUrls);
 
-                        output.append("Moreover, the below other branch");
-                        if (urls.getLength() > 2)
-                        {
-                            output.append("es are");
-                        }
-                        else
-                        {
-                            output.append(" is");
-                        }
-                        output.append(" also tested by the CI system:");
-                        for (String otherUrl : sortedUrls)
-                        {
-                            output.append(FileHandler.NEW_LINE);
-                            output.append("* ");
-                            output.append(otherUrl);
-                        }
-                        output.append(FileHandler.NEW_LINE);
+                    output.append("Moreover, the below other branch");
+                    if (urls.getLength() > 2)
+                    {
+                        output.append("es are");
+                    }
+                    else
+                    {
+                        output.append(" is");
+                    }
+                    output.append(" also tested by the CI system:");
+                    for (String otherUrl : sortedUrls)
+                    {
                         output.append(FileHandler.NEW_LINE);
-                        output.append(
-                            "Branches not tested by the CI might not be consistently supported.");
+                        output.append("* ");
+                        output.append(otherUrl);
                     }
+                    output.append(FileHandler.NEW_LINE);
+                    output.append(FileHandler.NEW_LINE);
+                    output.append(
+                        "Branches not tested by the CI might not be consistently supported.");
                 }
             }
             output.append(FileHandler.NEW_LINE);

pom.xml

@@ -1314,7 +1314,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-resources-plugin</artifactId>
-          <version>3.3.1</version>
+          <version>3.4.0</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>