Merge branch 'main' into develop-v2

# Conflicts:
#	imagetool/pom.xml
#	installer/pom.xml
#	pom.xml
#	tests/pom.xml

Author: ddsharpe

Jenkinsfile

@@ -114,8 +114,8 @@ pipeline {
                 }
                 failure {
                     mail to: "${env.WIT_BUILD_NOTIFICATION_EMAIL_TO}", from: '[email protected]',
-                    subject: "WebLogic Image Tool: ${env.JOB_NAME} - Failed",
-                    body: "Job Failed - \"${env.JOB_NAME}\" build: ${env.BUILD_NUMBER}\n\nView the log at:\n ${env.BUILD_URL}\n"
+                            subject: "WebLogic Image Tool: ${env.JOB_NAME} - Failed",
+                            body: "Job Failed - \"${env.JOB_NAME}\" build: ${env.BUILD_NUMBER}\n\nView the log at:\n ${env.BUILD_URL}\n"
                 }
             }
         }
@@ -137,9 +137,12 @@ pipeline {
                 tag 'release-*'
             }
             steps {
+                script {
+                    env.TAG_VERSION_NUMBER = env.TAG_NAME.replaceAll('release-','').trim()
+                }
+
                 sh """
                     echo '${env.GITHUB_API_TOKEN}' | ${GH_TOOL}/bin/gh auth login --with-token
-                    TAG_VERSION_NUMBER=sh("echo ${TAG_NAME} | sed 's/release-//'"), returnStdout: true).trim(), 
                     ${GH_TOOL}/bin/gh release create ${TAG_NAME} \
                         --draft \
                         --generate-notes \
@@ -149,7 +152,7 @@ pipeline {
                 """
             }
         }
-     }
+    }
 }
 
 void runSonarScanner() {
@@ -165,7 +168,7 @@ void runSonarScanner() {
             -Dsonar.pullrequest.branch=${env.CHANGE_BRANCH} \
             -Dsonar.pullrequest.base=${env.CHANGE_TARGET}"
     } else {
-       sh "mvn -B sonar:sonar \
+        sh "mvn -B sonar:sonar \
            -Dsonar.projectKey=${org}_${repo} \
            -Dsonar.branch.name=${env.BRANCH_NAME}"
     }

pom.xml

@@ -85,7 +85,7 @@
             <dependency>
                 <groupId>org.jetbrains</groupId>
                 <artifactId>annotations</artifactId>
-                <version>24.0.0</version>
+                <version>24.0.1</version>
             </dependency>
             <dependency>
                 <groupId>org.yaml</groupId>
@@ -155,7 +155,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-failsafe-plugin</artifactId>
-                    <version>2.22.2</version>
+                    <version>3.0.0</version>
                     <configuration>
                         <groups>${test.groups}</groups>
                     </configuration>
@@ -241,14 +241,14 @@
                         <dependency>
                             <groupId>com.puppycrawl.tools</groupId>
                             <artifactId>checkstyle</artifactId>
-                            <version>10.8.0</version>
+                            <version>10.8.1</version>
                         </dependency>
                     </dependencies>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-surefire-plugin</artifactId>
-                    <version>2.22.2</version>
+                    <version>3.0.0</version>
                     <configuration>
                         <groups>unit</groups>
                         <excludedGroups>failing</excludedGroups>