From acd3d3194247c0c7c39213573b8b81c995cccf4c Mon Sep 17 00:00:00 2001
From: Duy Luong <duy.luong@katalon.com>
Date: Wed, 10 Apr 2024 14:55:21 +0200
Subject: [PATCH 1/7] Update to latest jenkins

---
 Jenkinsfile | 12 +++++++++++-
 pom.xml     |  4 ++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 48bf230..16809bb 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1 +1,11 @@
-buildPlugin()
\ No newline at end of file
+/*
+ See the documentation for more options:
+ https://github.com/jenkins-infra/pipeline-library/
+*/
+buildPlugin(
+  forkCount: '1C', // Run a JVM per core in tests
+  useContainerAgent: true, // Set to `false` if you need to use Docker for containerized tests
+  configurations: [
+    [platform: 'linux', jdk: 21],
+    [platform: 'windows', jdk: 17],
+])
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 458e615..5d09c74 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,8 +19,8 @@
 
     <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.440.2</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..

From 360f471e46a31ab9f0b9c4a07a7c4b156e60c0f7 Mon Sep 17 00:00:00 2001
From: Duy Luong <duy.luong@katalon.com>
Date: Wed, 10 Apr 2024 15:01:51 +0200
Subject: [PATCH 2/7] Update maven

---
 Jenkinsfile | 2 +-
 pom.xml     | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 16809bb..21e0777 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -6,6 +6,6 @@ buildPlugin(
   forkCount: '1C', // Run a JVM per core in tests
   useContainerAgent: true, // Set to `false` if you need to use Docker for containerized tests
   configurations: [
-    [platform: 'linux', jdk: 21],
+    [platform: 'linux', jdk: 17],
     [platform: 'windows', jdk: 17],
 ])
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 5d09c74..90149ec 100644
--- a/pom.xml
+++ b/pom.xml
@@ -115,8 +115,7 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
-                    <source>${java.level}</source>
-                    <target>${java.level}</target>
+                    <maven.compiler.release>${java.level}<maven.compiler.release>
                 </configuration>
             </plugin>
         </plugins>

From 629b23739d183371481b4f6156066399c750d5ce Mon Sep 17 00:00:00 2001
From: Duy Luong <duy.luong@katalon.com>
Date: Wed, 10 Apr 2024 15:03:36 +0200
Subject: [PATCH 3/7] Update maven

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 90149ec..0615f7f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -115,7 +115,7 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
-                    <maven.compiler.release>${java.level}<maven.compiler.release>
+                    <maven.compiler.release>${java.level}</maven.compiler.release>
                 </configuration>
             </plugin>
         </plugins>

From 62546c82ebc628f38acdff26051e261b64ef7d70 Mon Sep 17 00:00:00 2001
From: Duy Luong <duy.luong@katalon.com>
Date: Wed, 10 Apr 2024 15:09:37 +0200
Subject: [PATCH 4/7] Update maven

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 0615f7f..8dfcb7e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.jenkins-ci.plugins</groupId>
         <artifactId>plugin</artifactId>
-        <version>3.56</version>
+        <version>4.81</version>
         <relativePath />
     </parent>
 

From 6cc4799d6c7939bea4f453d1e5ba4d59f8815c8a Mon Sep 17 00:00:00 2001
From: Duy Luong <duy.luong@katalon.com>
Date: Wed, 10 Apr 2024 15:16:56 +0200
Subject: [PATCH 5/7] Update maven

---
 pom.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 8dfcb7e..5b8d9af 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,8 +28,7 @@
         -->
         <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>
 

From 36c0b7fbeab45038cfce7db0ff01e27e332451e0 Mon Sep 17 00:00:00 2001
From: Duy Luong <duy.luong@katalon.com>
Date: Wed, 10 Apr 2024 15:22:59 +0200
Subject: [PATCH 6/7] Update maven

---
 src/main/resources/index.jelly | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 src/main/resources/index.jelly

diff --git a/src/main/resources/index.jelly b/src/main/resources/index.jelly
new file mode 100644
index 0000000..244a8e1
--- /dev/null
+++ b/src/main/resources/index.jelly
@@ -0,0 +1,4 @@
+<?jelly escape-by-default='true'?>
+<div>
+    Katalon plugin for Jenkins
+</div>
\ No newline at end of file

From 921bb697e283c96a82d416266ae0dd035594f2b5 Mon Sep 17 00:00:00 2001
From: Duy Luong <duy.luong@katalon.com>
Date: Wed, 10 Apr 2024 15:30:06 +0200
Subject: [PATCH 7/7] Update maven

---
 .../plugin/helper/ExecuteKatalonStudioHelper.java        | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/katalon/jenkins/plugin/helper/ExecuteKatalonStudioHelper.java b/src/main/java/com/katalon/jenkins/plugin/helper/ExecuteKatalonStudioHelper.java
index af5ea76..b7e7488 100644
--- a/src/main/java/com/katalon/jenkins/plugin/helper/ExecuteKatalonStudioHelper.java
+++ b/src/main/java/com/katalon/jenkins/plugin/helper/ExecuteKatalonStudioHelper.java
@@ -7,6 +7,7 @@
 import hudson.FilePath;
 import hudson.Launcher;
 import hudson.model.TaskListener;
+import hudson.remoting.VirtualChannel;
 import jenkins.security.MasterToSlaveCallable;
 
 import java.util.HashMap;
@@ -26,7 +27,11 @@ public static boolean executeKatalon(
             String xvfbConfiguration) {
         Logger logger = new JenkinsLogger(taskListener);
         try {
-            return launcher.getChannel().call(new MasterToSlaveCallable<Boolean, Exception>() {
+            VirtualChannel channel = launcher.getChannel();
+            if (channel == null) {
+                throw new Exception("Channel not found!");
+            }
+            return channel.call(new MasterToSlaveCallable<Boolean, Exception>() {
                 @Override
                 public Boolean call() throws Exception {
 
@@ -60,4 +65,4 @@ public Boolean call() throws Exception {
             return false;
         }
     }
-}
+}
\ No newline at end of file