From f4c69c741d77f1df5619f4ca903ad7f8094e3792 Mon Sep 17 00:00:00 2001 From: BirSikanderMahajan Date: Fri, 13 Aug 2021 19:45:01 +0530 Subject: [PATCH 1/9] Updating cd.yml file --- .github/workflows/cd.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 91a52f1..e204882 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -40,7 +40,6 @@ jobs: release: runs-on: ubuntu-latest needs: [validate] - if: needs.validate.outputs.should_release == 'true' steps: - name: Check out uses: actions/checkout@v2.3.4 From f7e6b22b0fa29f7ef932c5b3ebd477a49600be05 Mon Sep 17 00:00:00 2001 From: BirSikanderMahajan Date: Fri, 13 Aug 2021 20:03:26 +0530 Subject: [PATCH 2/9] adding yaml file --- .github/workflows/{cd.yml => cd.yaml} | 1 + 1 file changed, 1 insertion(+) rename .github/workflows/{cd.yml => cd.yaml} (96%) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yaml similarity index 96% rename from .github/workflows/cd.yml rename to .github/workflows/cd.yaml index e204882..91a52f1 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yaml @@ -40,6 +40,7 @@ jobs: release: runs-on: ubuntu-latest needs: [validate] + if: needs.validate.outputs.should_release == 'true' steps: - name: Check out uses: actions/checkout@v2.3.4 From e8b3d521738544f797e2f5b2cfdfbd651bcdc389 Mon Sep 17 00:00:00 2001 From: Mark Waite Date: Fri, 13 Aug 2021 13:26:27 -0600 Subject: [PATCH 3/9] Do not ignore .mvn dir contents --- .gitignore | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitignore b/.gitignore index 667e0df..5d8ecee 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,5 @@ /.classpath /.project /.metadata/* -/.mvn/* /.settings/* /pom.xml.versionsBackup From d13bd9239576d881090ae6f1eab005e5dd12f04a Mon Sep 17 00:00:00 2001 From: Mark Waite Date: Fri, 13 Aug 2021 13:27:14 -0600 Subject: [PATCH 4/9] Use parent pom 4.24 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2a2118a..21ecc63 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.jenkins-ci.plugins plugin - 4.23 + 4.24 io.jenkins.plugins From 09fa8dc4c188a5234ff465844e052ae8fae6d612 Mon Sep 17 00:00:00 2001 From: Mark Waite Date: Fri, 13 Aug 2021 13:30:12 -0600 Subject: [PATCH 5/9] Use changelist property for version (incrementals) --- .mvn/extensions.xml | 7 +++++++ .mvn/maven.config | 3 +++ pom.xml | 5 +++-- 3 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 .mvn/extensions.xml create mode 100644 .mvn/maven.config diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml new file mode 100644 index 0000000..43d6281 --- /dev/null +++ b/.mvn/extensions.xml @@ -0,0 +1,7 @@ + + + io.jenkins.tools.incrementals + git-changelist-maven-extension + 1.2 + + diff --git a/.mvn/maven.config b/.mvn/maven.config new file mode 100644 index 0000000..f7daf60 --- /dev/null +++ b/.mvn/maven.config @@ -0,0 +1,3 @@ +-Pconsume-incrementals +-Pmight-produce-incrementals +-Dchangelist.format=%d.v%s diff --git a/pom.xml b/pom.xml index 21ecc63..fec6e86 100644 --- a/pom.xml +++ b/pom.xml @@ -9,9 +9,10 @@ io.jenkins.plugins leapwork - 4.0.1-SNAPSHOT - hpi + ${changelist} + hpi + 999999-SNAPSHOT 4.0.1 -SNAPSHOT io.jenkins.tools.bom bom-2.277.x - 25 + 923.v08bdc07cd40f import pom From 99fc9be312ba757ed8217352a60d3b50b7e4ae92 Mon Sep 17 00:00:00 2001 From: Mark Waite Date: Fri, 13 Aug 2021 14:24:29 -0600 Subject: [PATCH 8/9] Use most recent JQuery plugin release The JQuery plugin is deprecated and JQuedry 1.12 is no longer receiving updates. If you truly need JQuery, you may want to consider using the https://plugins.jenkins.io/jquery3-api/ JQuery 3 API plugin. It has an active maintainer and regularly receives updates. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e7a470a..ec76e46 100644 --- a/pom.xml +++ b/pom.xml @@ -80,7 +80,7 @@ org.jenkins-ci.plugins jquery - 1.11.2-1 + 1.12.4-1 org.jenkins-ci.plugins From 83c9b7cd6dd7df11d4473c2b455a1e51d5f946f6 Mon Sep 17 00:00:00 2001 From: Mark Waite Date: Fri, 13 Aug 2021 14:27:19 -0600 Subject: [PATCH 9/9] Remove unused dependency, do not include jsr305 jar in hpi The spotbugs-annotations package is actively maintained and has recent releases. Use it instead of outdated com.google.code.findbugs that has not been released in 4 years. Removes other dependencies that are not required for compilation or tests so that unnecessary classes are not loaded into Jenkins. --- pom.xml | 42 ++++++++++++------------------------------ 1 file changed, 12 insertions(+), 30 deletions(-) diff --git a/pom.xml b/pom.xml index ec76e46..22617d3 100644 --- a/pom.xml +++ b/pom.xml @@ -61,17 +61,6 @@ async-http-client 1.9.40 - - org.slf4j - slf4j-api - 1.7.32 - - - org.slf4j - slf4j-nop - 1.7.32 - test - com.google.code.gson gson @@ -93,25 +82,18 @@ 2.4.0-b180830.0359 - - - javax.activation - activation - 1.1.1 - - - - - org.glassfish.jaxb - jaxb-runtime - 2.3.0-b170127.1453 - - - - com.google.code.findbugs - annotations - 3.0.1u2 - + + com.github.spotbugs + spotbugs-annotations + 4.3.0 + + + com.google.code.findbugs + jsr305 + + + true +