Update to Java 17 and update dependencies

.github/workflows/cd.yaml

@@ -53,11 +53,11 @@ jobs:
       uses: actions/checkout@v2.4.0
       with:
         fetch-depth: 0
-    - name: Set up JDK 8
+    - name: Set up JDK 17
       uses: actions/setup-java@v2.5.0
       with:
         distribution: temurin
-        java-version: 8
+        java-version: 17
     - name: Check Secrets
       env:
         DEBUG_USERNAME: ${{ secrets.MAVEN_USERNAME }}

Jenkinsfile

@@ -1 +1,6 @@
-buildPlugin()
+buildPlugin(
+    useContainerAgent: true, // Set to `false` if you need to use Docker for containerized tests
+    configurations: [
+        [platform: 'linux', jdk: 17],
+    ]
+)

README.md

@@ -12,10 +12,16 @@ To learn more about using this plugin, you can refer to the following documents:
 
 ## Development
 
+Use `mvn` version from `3.8.1`.
+
 Use the command `mvn clean hpi:run -Djetty.port=8090` to debug the plugin.
 
 See the instructions at https://wiki.jenkins.io/display/JENKINS/Plugin+tutorial.
 
+### Requisition
+
+Jenkins: 2.448
+
 ## Companion products
 
 ### Katalon TestOps

pom.xml

@@ -5,31 +5,28 @@
     <parent>
         <groupId>org.jenkins-ci.plugins</groupId>
         <artifactId>plugin</artifactId>
-        <version>3.56</version>
+        <version>4.79</version>
         <relativePath />
     </parent>
 
     <groupId>org.jenkins-ci.plugins</groupId>
     <artifactId>katalon</artifactId>
-    <version>1.0.34</version>
+    <version>1.0.38</version>
     <packaging>hpi</packaging>
     <name>Katalon Plugin</name>
-    <description>Execute Katalon Studio in Jenkins</description>
-    <url>https://github.com/jenkinsci/katalon-plugin</url>
+    <url>https://github.com/katalon-studio/katalon-studio-jenkins-plugin</url>
 
     <properties>
         <!-- Baseline Jenkins version you use to build the plugin. Users must have this version or newer to run. -->
-        <jenkins.version>1.625.3</jenkins.version>
-        <java.level>8</java.level>
+        <jenkins.version>2.448</jenkins.version>
+        <java.level>17</java.level>
         <!-- Other properties you may want to use:
              ~ java.level: set to 6 if your jenkins.version <= 1.611 ~ jenkins-test-harness.version: Jenkins Test Harness version you use to test the plugin. For Jenkins version >= 1.580.1 use JTH 2.0 or higher.
              ~ hpi-plugin.version: The HPI Maven Plugin version used by the plugin..
              ~ stapler-plugin.version: The Stapler Maven plugin version required by the plugin.
         -->
         <junit.plugin.version>1.20</junit.plugin.version>
-        <jackson.version>2.13.13</jackson.version>
-        <commons-lang3.version>3.12.0</commons-lang3.version>
-        <utils.version>1.0.17</utils.version>
+        <utils.version>1.0.18</utils.version>
         <httpclient.version>4.5.13</httpclient.version>
     </properties>
 
@@ -49,9 +46,9 @@
 
     <developers>
       <developer>
-        <id>devalex88</id>
-        <name>Alex</name>
-        <email>dev.alex.88@gmail.com</email>
+        <id>thvu-katalon</id>
+        <name>Vu</name>
+        <email>vu.than@katalon.com</email>
       </developer>
     </developers>
 
@@ -60,7 +57,7 @@
       <developerConnection>scm:git:git@github.com:jenkinsci/${project.artifactId}-plugin.git</developerConnection>
       <url>https://github.com/jenkinsci/${project.artifactId}-plugin</url>
       <tag>HEAD</tag>
-  </scm>
+    </scm>
 
     <repositories>
         <repository>

src/main/java/com/katalon/jenkins/plugin/ExecuteKatalonStudioTask.java

@@ -85,7 +85,14 @@ public void setXvfbConfiguration(String xvfbConfiguration) {
 
     @Override
     public boolean perform(AbstractBuild<?, ?> abstractBuild, Launcher launcher, BuildListener buildListener)
-        throws InterruptedException, IOException {
+            throws InterruptedException, IOException {
+
+        // Check for interruption before starting
+        if (isInterrupted()) {
+            buildListener.getLogger().println("Build was cancelled before Katalon execution started");
+            throw new InterruptedException("Build was cancelled");
+        }
+
         FilePath workspace = abstractBuild.getWorkspace();
         EnvVars buildEnvironment = abstractBuild.getEnvironment(buildListener);
         return doPerform(workspace, buildEnvironment, launcher, buildListener);
@@ -94,24 +101,37 @@ public boolean perform(AbstractBuild<?, ?> abstractBuild, Launcher launcher, Bui
     @Override
     public void perform(@Nonnull Run<?, ?> run, @Nonnull FilePath filePath, @Nonnull Launcher launcher,
                         @Nonnull TaskListener taskListener)
-        throws InterruptedException, IOException {
+            throws InterruptedException, IOException {
+
+        // Check for interruption before starting
+        if (isInterrupted()) {
+            taskListener.getLogger().println("Build was cancelled before Katalon execution started");
+            throw new InterruptedException("Build was cancelled");
+        }
+
         EnvVars buildEnvironment = run.getEnvironment(taskListener);
         doPerform(filePath, buildEnvironment, launcher, taskListener);
     }
 
     private boolean doPerform(FilePath workspace, EnvVars buildEnvironment,
                               Launcher launcher, TaskListener taskListener)
-        throws IOException, InterruptedException {
-        return ExecuteKatalonStudioHelper.executeKatalon(
-            workspace,
-            buildEnvironment,
-            launcher,
-            taskListener,
-            version,
-            location,
-            executeArgs,
-            x11Display,
-            xvfbConfiguration);
+            throws IOException, InterruptedException {
+
+        try {
+            return ExecuteKatalonStudioHelper.executeKatalon(
+                    workspace,
+                    buildEnvironment,
+                    launcher,
+                    taskListener,
+                    version,
+                    location,
+                    executeArgs,
+                    x11Display,
+                    xvfbConfiguration);
+        } catch (InterruptedException e) {
+            taskListener.getLogger().println("Katalon execution was interrupted due to build cancellation");
+            throw e; // Re-throw to ensure proper build status
+        }
     }
 
     @Symbol("executeKatalon")
@@ -133,4 +153,8 @@ public boolean configure(StaplerRequest req, JSONObject formData) throws FormExc
             return super.configure(req, formData);
         }
     }
+
+    private static boolean isInterrupted() {
+        return Thread.currentThread().isInterrupted();
+    }
 }