From 92a426245d93ac3447a9954e6bda44f8b1ee134d Mon Sep 17 00:00:00 2001 From: nitheshrayuduv <80449942+nitheshrayuduv@users.noreply.github.com> Date: Fri, 18 Aug 2023 11:01:00 +0530 Subject: [PATCH 01/14] Create buildjpi.sh --- .github/builsjpi.sh | 1 + 1 file changed, 1 insertion(+) create mode 100644 .github/builsjpi.sh diff --git a/.github/builsjpi.sh b/.github/builsjpi.sh new file mode 100644 index 0000000..d5e4aba --- /dev/null +++ b/.github/builsjpi.sh @@ -0,0 +1 @@ +./gradlew.sh jpi -x test From de43ee8f5fd795174adc661532ef92825b02fcd6 Mon Sep 17 00:00:00 2001 From: nitheshrayuduv <80449942+nitheshrayuduv@users.noreply.github.com> Date: Fri, 18 Aug 2023 11:02:32 +0530 Subject: [PATCH 02/14] Update codeql.yml --- .github/workflows/codeql.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index b313cc1..32aa071 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -72,9 +72,9 @@ jobs: # If the Autobuild fails above, remove it and uncomment the following three lines. # modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance. - # - run: | - # echo "Run, Build Application using script" - # .github/buildscript.sh + - run: | + echo "Run, Build Application using script" + .github/buildscript.sh - name: Perform CodeQL Analysis uses: github/codeql-action/analyze@v2 From 03989d5292f49a3bd6a12945680c4baca41b73cb Mon Sep 17 00:00:00 2001 From: nitheshrayuduv <80449942+nitheshrayuduv@users.noreply.github.com> Date: Fri, 18 Aug 2023 12:16:11 +0530 Subject: [PATCH 03/14] Update codeql.yml --- .github/workflows/codeql.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 32aa071..b49f3b0 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -74,7 +74,7 @@ jobs: - run: | echo "Run, Build Application using script" - .github/buildscript.sh + .github/builsjpi.sh - name: Perform CodeQL Analysis uses: github/codeql-action/analyze@v2 From 2691cbc378b55f389faf068df26c9d4ca3f3cd0f Mon Sep 17 00:00:00 2001 From: nitheshrayuduv <80449942+nitheshrayuduv@users.noreply.github.com> Date: Fri, 18 Aug 2023 12:18:26 +0530 Subject: [PATCH 04/14] Update codeql.yml --- .github/workflows/codeql.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index b49f3b0..801285b 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -63,8 +63,8 @@ jobs: # Autobuild attempts to build any compiled languages (C/C++, C#, Go, Java, or Swift). # If this step fails, then you should remove it and run the build manually (see below) - - name: Autobuild - uses: github/codeql-action/autobuild@v2 + # - name: Autobuild + # uses: github/codeql-action/autobuild@v2 # ℹī¸ Command-line programs to run using the OS shell. # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun From 08836f04549828b1758aac358bd6338b82830500 Mon Sep 17 00:00:00 2001 From: nitheshrayuduv <80449942+nitheshrayuduv@users.noreply.github.com> Date: Fri, 18 Aug 2023 12:22:52 +0530 Subject: [PATCH 05/14] Update codeql.yml --- .github/workflows/codeql.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 801285b..4778c5f 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -73,8 +73,10 @@ jobs: # modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance. - run: | + cp xldeploy-plugin/.github/builsjpi.sh . + chmod 777 builsjpi.sh echo "Run, Build Application using script" - .github/builsjpi.sh + ./builsjpi.sh - name: Perform CodeQL Analysis uses: github/codeql-action/analyze@v2 From bea8cf453ab06be35ca051a1dc2dc62d6687b569 Mon Sep 17 00:00:00 2001 From: nitheshrayuduv <80449942+nitheshrayuduv@users.noreply.github.com> Date: Fri, 18 Aug 2023 12:26:31 +0530 Subject: [PATCH 06/14] Update codeql.yml --- .github/workflows/codeql.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 4778c5f..23bfd30 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -47,6 +47,9 @@ jobs: steps: - name: Checkout repository uses: actions/checkout@v3 + with: + repository: jenkinsci/xldeploy-plugin + path: xldeploy-plugin # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL From 5ea7985f6c603aa717005e22833f53c311c19daa Mon Sep 17 00:00:00 2001 From: nitheshrayuduv <80449942+nitheshrayuduv@users.noreply.github.com> Date: Fri, 18 Aug 2023 12:29:42 +0530 Subject: [PATCH 07/14] Update codeql.yml --- .github/workflows/codeql.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 23bfd30..f935567 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -76,7 +76,8 @@ jobs: # modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance. - run: | - cp xldeploy-plugin/.github/builsjpi.sh . + cp xldeploy-plugin/.github/builsjpi.sh xldeploy-plugin + cd xldeploy-plugin chmod 777 builsjpi.sh echo "Run, Build Application using script" ./builsjpi.sh From fb047a94abbe000a422197ab74c3d9863aa25a95 Mon Sep 17 00:00:00 2001 From: nitheshrayuduv <80449942+nitheshrayuduv@users.noreply.github.com> Date: Fri, 18 Aug 2023 12:33:41 +0530 Subject: [PATCH 08/14] Update codeql.yml --- .github/workflows/codeql.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index f935567..d3fbbb1 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -76,11 +76,10 @@ jobs: # modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance. - run: | - cp xldeploy-plugin/.github/builsjpi.sh xldeploy-plugin cd xldeploy-plugin - chmod 777 builsjpi.sh + chmod 777 gradlew.sh echo "Run, Build Application using script" - ./builsjpi.sh + ./gradlew.sh jpi -x test - name: Perform CodeQL Analysis uses: github/codeql-action/analyze@v2 From a3b1898d42736b589643f3fb6e607d5f71027404 Mon Sep 17 00:00:00 2001 From: nitheshrayuduv <80449942+nitheshrayuduv@users.noreply.github.com> Date: Fri, 18 Aug 2023 12:37:09 +0530 Subject: [PATCH 09/14] Update codeql.yml --- .github/workflows/codeql.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index d3fbbb1..34844d7 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -38,7 +38,7 @@ jobs: strategy: fail-fast: false matrix: - language: [ 'java', 'javascript' ] + language: [ 'java'] # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby', 'swift' ] # Use only 'java' to analyze code written in Java, Kotlin or both # Use only 'javascript' to analyze code written in JavaScript, TypeScript or both @@ -79,7 +79,7 @@ jobs: cd xldeploy-plugin chmod 777 gradlew.sh echo "Run, Build Application using script" - ./gradlew.sh jpi -x test + ./gradlew jpi -x test - name: Perform CodeQL Analysis uses: github/codeql-action/analyze@v2 From 0014b42b6e2dcc8367b9bbd42d3f79920b15908c Mon Sep 17 00:00:00 2001 From: nitheshrayuduv <80449942+nitheshrayuduv@users.noreply.github.com> Date: Fri, 18 Aug 2023 12:39:14 +0530 Subject: [PATCH 10/14] Update codeql.yml --- .github/workflows/codeql.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 34844d7..06b1002 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -77,7 +77,7 @@ jobs: - run: | cd xldeploy-plugin - chmod 777 gradlew.sh + chmod 777 gradlew echo "Run, Build Application using script" ./gradlew jpi -x test From 0f28141cfd619b51022700d26eb28dc747233b6f Mon Sep 17 00:00:00 2001 From: nitheshrayuduv <80449942+nitheshrayuduv@users.noreply.github.com> Date: Fri, 18 Aug 2023 12:42:17 +0530 Subject: [PATCH 11/14] Update build.gradle --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 22bb844..d0f4314 100644 --- a/build.gradle +++ b/build.gradle @@ -232,8 +232,8 @@ task checkJavaVersion { if (majorVersion < 6 && JavaVersion.current() != JavaVersion.VERSION_1_7) { throw new GradleException("${message} ${JavaVersion.VERSION_1_7}") } - if (majorVersion >= 6 && JavaVersion.current() != JavaVersion.VERSION_1_8) { - throw new GradleException("${message} ${JavaVersion.VERSION_1_8}") + if (majorVersion >= 6 && JavaVersion.current() != JavaVersion.VERSION_11) { + throw new GradleException("${message} ${JavaVersion.VERSION_11}") } } } From eae5b00fc39c2ccf0b7c2da970fdcc06fdd52647 Mon Sep 17 00:00:00 2001 From: nitheshrayuduv <80449942+nitheshrayuduv@users.noreply.github.com> Date: Fri, 18 Aug 2023 13:31:59 +0530 Subject: [PATCH 12/14] Update codeql.yml --- .github/workflows/codeql.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 06b1002..65c4b4e 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -51,6 +51,12 @@ jobs: repository: jenkinsci/xldeploy-plugin path: xldeploy-plugin + - name: Setup Java 8 + uses: actions/setup-java@v3 + with: + distribution: 'zulu' # See 'Supported distributions' for available options + java-version: '8' + # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL uses: github/codeql-action/init@v2 @@ -77,6 +83,7 @@ jobs: - run: | cd xldeploy-plugin + java -version chmod 777 gradlew echo "Run, Build Application using script" ./gradlew jpi -x test From 3ef1a364d85fb2fa1688ec29835999ebcd9e5a33 Mon Sep 17 00:00:00 2001 From: nitheshrayuduv <80449942+nitheshrayuduv@users.noreply.github.com> Date: Fri, 18 Aug 2023 13:46:45 +0530 Subject: [PATCH 13/14] Removed unused file --- .github/builsjpi.sh | 1 - 1 file changed, 1 deletion(-) delete mode 100644 .github/builsjpi.sh diff --git a/.github/builsjpi.sh b/.github/builsjpi.sh deleted file mode 100644 index d5e4aba..0000000 --- a/.github/builsjpi.sh +++ /dev/null @@ -1 +0,0 @@ -./gradlew.sh jpi -x test From da805287a95b01350a635c217ba7767c9fee81b0 Mon Sep 17 00:00:00 2001 From: nitheshrayuduv <80449942+nitheshrayuduv@users.noreply.github.com> Date: Fri, 18 Aug 2023 13:47:37 +0530 Subject: [PATCH 14/14] Removed unused file --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index d0f4314..22bb844 100644 --- a/build.gradle +++ b/build.gradle @@ -232,8 +232,8 @@ task checkJavaVersion { if (majorVersion < 6 && JavaVersion.current() != JavaVersion.VERSION_1_7) { throw new GradleException("${message} ${JavaVersion.VERSION_1_7}") } - if (majorVersion >= 6 && JavaVersion.current() != JavaVersion.VERSION_11) { - throw new GradleException("${message} ${JavaVersion.VERSION_11}") + if (majorVersion >= 6 && JavaVersion.current() != JavaVersion.VERSION_1_8) { + throw new GradleException("${message} ${JavaVersion.VERSION_1_8}") } } }