From b209a459b059fa0ec74f7faeab6e8578e9ec71ea Mon Sep 17 00:00:00 2001 From: Jim Garlick Date: Mon, 8 Jun 2020 08:50:39 -0400 Subject: [PATCH 01/26] Tried another repository to fix missing dependency --- build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/build.gradle b/build.gradle index da3de85..ad7c3bc 100644 --- a/build.gradle +++ b/build.gradle @@ -48,6 +48,7 @@ repositories { buildscript { repositories { mavenCentral() + jcenter() } dependencies { classpath "io.spring.gradle:dependency-management-plugin:1.0.3.RELEASE" From bbc85a3ff614c6e4fc41020beb7784077afc375b Mon Sep 17 00:00:00 2001 From: Jim Garlick Date: Mon, 8 Jun 2020 08:58:29 -0400 Subject: [PATCH 02/26] Setting artifact version --- .gitignore | 1 - gradle.properties | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 gradle.properties diff --git a/.gitignore b/.gitignore index c04bf53..ae14fc8 100644 --- a/.gitignore +++ b/.gitignore @@ -8,7 +8,6 @@ /bin/ /.vscode/ /.groovy -/gradle.properties .idea/ .externalToolBuilders/ /out diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..8d0c7be --- /dev/null +++ b/gradle.properties @@ -0,0 +1 @@ +version=1.0.0-SNAPSHOT From c2ae74adcce9968b15db9719fac3a47b75bc604a Mon Sep 17 00:00:00 2001 From: Jim Garlick Date: Mon, 8 Jun 2020 10:27:37 -0400 Subject: [PATCH 03/26] Set build to only publish SNAPSHOT from develop branch --- .github/workflows/main.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 04bdf66..70555ae 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -1,9 +1,9 @@ -name: CI +name: SNAPSHOT on: push: - branches: [ feature/* ] + branches: [ develop, feature/* ] pull_request: branches: [ master ] @@ -26,6 +26,7 @@ jobs: arguments: build - name: Upload Build Artifacts + if: github.ref == 'refs/heads/develop' uses: eskatos/gradle-command-action@v1 env: GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}} From 4b08aefa0ada816a52be22b24b63d6fdebee515f Mon Sep 17 00:00:00 2001 From: Jim Garlick Date: Thu, 11 Jun 2020 10:29:31 -0400 Subject: [PATCH 04/26] BRAVO-666 - Added release workflow --- .github/workflows/release.yml | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 .github/workflows/release.yml diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml new file mode 100644 index 0000000..f7bbf88 --- /dev/null +++ b/.github/workflows/release.yml @@ -0,0 +1,30 @@ + +name: RELEASE + +on: + release: + types: [created] +jobs: + build: + runs-on: ubuntu-latest + + steps: + - name: Checkout code + uses: actions/checkout@v2 + + - name: Setup Java + uses: actions/setup-java@v1 + with: + java-version: 11 + + - name: Set version var + run: echo ::set-env name=RELEASE_VERSION::${GITHUB_REF#refs/*/} + + - name: Publish Release Artifacts + if: github.ref == 'refs/heads/develop' + uses: eskatos/gradle-command-action@v1 + env: + GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}} + RELEASE_VERSION: ${{ steps.vars.outputs.tag }} + with: + arguments: -Pversion=${RELEASE_VERSION} publish From 1264645ec8ebd1151a40f3a0fbfbee367b3b3706 Mon Sep 17 00:00:00 2001 From: Jim Garlick Date: Thu, 11 Jun 2020 10:36:32 -0400 Subject: [PATCH 05/26] BRAVO-666 - Fixed typo --- .github/workflows/release.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f7bbf88..c995c4c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -4,6 +4,7 @@ name: RELEASE on: release: types: [created] + jobs: build: runs-on: ubuntu-latest @@ -17,14 +18,15 @@ jobs: with: java-version: 11 - - name: Set version var - run: echo ::set-env name=RELEASE_VERSION::${GITHUB_REF#refs/*/} + - name: Get the version + id: get_version + run: echo ::set-output name=VERSION::$(echo $GITHUB_REF | cut -d / -f 3) - name: Publish Release Artifacts if: github.ref == 'refs/heads/develop' uses: eskatos/gradle-command-action@v1 env: GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}} - RELEASE_VERSION: ${{ steps.vars.outputs.tag }} + RELEASE_VERSION: ${{ steps.get_version.outputs.VERSION }} with: arguments: -Pversion=${RELEASE_VERSION} publish From 70b7d1dce38ff7f484e9b1be23a0a29d987c6689 Mon Sep 17 00:00:00 2001 From: Jim Garlick Date: Thu, 11 Jun 2020 10:40:16 -0400 Subject: [PATCH 06/26] BRAVO-666 - Cleaned up and removed conditional --- .github/workflows/release.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c995c4c..b63a3f9 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -6,7 +6,7 @@ on: types: [created] jobs: - build: + perform-release: runs-on: ubuntu-latest steps: @@ -22,8 +22,7 @@ jobs: id: get_version run: echo ::set-output name=VERSION::$(echo $GITHUB_REF | cut -d / -f 3) - - name: Publish Release Artifacts - if: github.ref == 'refs/heads/develop' + - name: Publish Release Artifact uses: eskatos/gradle-command-action@v1 env: GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}} From 6dc4540c5403aa09600ff8fc6f8af8ede3ab6134 Mon Sep 17 00:00:00 2001 From: Jim Garlick Date: Thu, 11 Jun 2020 12:14:18 -0400 Subject: [PATCH 07/26] BRAVO-666 - Trying another thing --- .github/workflows/release.yml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b63a3f9..95aec37 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -13,14 +13,9 @@ jobs: - name: Checkout code uses: actions/checkout@v2 - - name: Setup Java - uses: actions/setup-java@v1 - with: - java-version: 11 - - name: Get the version id: get_version - run: echo ::set-output name=VERSION::$(echo $GITHUB_REF | cut -d / -f 3) + run: echo ::set-output name=VERSION::${GITHUB_REF/refs\/tags\//} - name: Publish Release Artifact uses: eskatos/gradle-command-action@v1 From 4cf50a76aa6086f5f32afbe051b8ce2e01ff7b02 Mon Sep 17 00:00:00 2001 From: Jim Garlick Date: Thu, 11 Jun 2020 12:37:15 -0400 Subject: [PATCH 08/26] BRAVO-666 - Debugging this tag version thing --- .github/workflows/release.yml | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 95aec37..5c998e9 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -15,12 +15,17 @@ jobs: - name: Get the version id: get_version - run: echo ::set-output name=VERSION::${GITHUB_REF/refs\/tags\//} + run: echo ::set-output name=VERSION::$(echo ${GITHUB_REF##*/}) - - name: Publish Release Artifact - uses: eskatos/gradle-command-action@v1 +# - name: Publish Release Artifact +# uses: eskatos/gradle-command-action@v1 +# env: +# GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}} +# RELEASE_VERSION: ${{ steps.get_version.outputs.VERSION }} +# with: +# arguments: -Pversion=${RELEASE_VERSION} publish + + - name: Show the version env: - GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}} RELEASE_VERSION: ${{ steps.get_version.outputs.VERSION }} - with: - arguments: -Pversion=${RELEASE_VERSION} publish + run: echo ${RELEASE_VERSION} From 4c1106c87e179b6f886942b0f2bd759ddf75fda9 Mon Sep 17 00:00:00 2001 From: Jim Garlick Date: Thu, 11 Jun 2020 12:47:37 -0400 Subject: [PATCH 09/26] BRAVO-666 - Adding package remover on delete of release --- .github/workflows/remove-package.yml | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 .github/workflows/remove-package.yml diff --git a/.github/workflows/remove-package.yml b/.github/workflows/remove-package.yml new file mode 100644 index 0000000..4549832 --- /dev/null +++ b/.github/workflows/remove-package.yml @@ -0,0 +1,24 @@ + +name: RELEASE + +on: + release: + types: [deleted] + +jobs: + perform-release: + runs-on: ubuntu-latest + + steps: + - name: Checkout code + uses: actions/checkout@v2 + + - name: Get the version + id: get_version + run: echo ::set-output name=VERSION::$(echo ${GITHUB_REF##*/}) + + - name: Remove Deleted Release Package + uses: actions/delete-package-versions@v1 + with: + package-name: 'com.lilly.opensource.edat.jenkinsdsl' + package-version-ids: ${{ steps.get_version.outputs.VERSION }} From d5bd6164151732fc39a7db0f3335bc79929b2b77 Mon Sep 17 00:00:00 2001 From: Jim Garlick Date: Thu, 11 Jun 2020 12:55:54 -0400 Subject: [PATCH 10/26] BRAVO-666 - Executing release a little differently. Cleanup of cleanup --- .github/workflows/release.yml | 19 ++++++++++--------- .github/workflows/remove-package.yml | 4 ++-- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 5c998e9..a5b5042 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -17,15 +17,16 @@ jobs: id: get_version run: echo ::set-output name=VERSION::$(echo ${GITHUB_REF##*/}) -# - name: Publish Release Artifact -# uses: eskatos/gradle-command-action@v1 -# env: -# GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}} -# RELEASE_VERSION: ${{ steps.get_version.outputs.VERSION }} -# with: -# arguments: -Pversion=${RELEASE_VERSION} publish + - name: Setup Java + uses: actions/setup-java@v1 + with: + java-version: 11 - - name: Show the version + - name: Publish artifact env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} RELEASE_VERSION: ${{ steps.get_version.outputs.VERSION }} - run: echo ${RELEASE_VERSION} + run: | + echo "New version: ${RELEASE_VERSION}" + echo "Github username: ${GITHUB_ACTOR}" + ./gradlew -Pversion=${RELEASE_VERSION} publish diff --git a/.github/workflows/remove-package.yml b/.github/workflows/remove-package.yml index 4549832..db401f2 100644 --- a/.github/workflows/remove-package.yml +++ b/.github/workflows/remove-package.yml @@ -1,12 +1,12 @@ -name: RELEASE +name: REMOVE-PACKAGE on: release: types: [deleted] jobs: - perform-release: + remove-package: runs-on: ubuntu-latest steps: From 3bf500173c5de128b987eee1ff6da0a6594d549c Mon Sep 17 00:00:00 2001 From: Jim Garlick Date: Thu, 11 Jun 2020 13:26:36 -0400 Subject: [PATCH 11/26] BRAVO-666 - Removed cleanup script --- .github/workflows/remove-package.yml | 24 ------------------------ 1 file changed, 24 deletions(-) delete mode 100644 .github/workflows/remove-package.yml diff --git a/.github/workflows/remove-package.yml b/.github/workflows/remove-package.yml deleted file mode 100644 index db401f2..0000000 --- a/.github/workflows/remove-package.yml +++ /dev/null @@ -1,24 +0,0 @@ - -name: REMOVE-PACKAGE - -on: - release: - types: [deleted] - -jobs: - remove-package: - runs-on: ubuntu-latest - - steps: - - name: Checkout code - uses: actions/checkout@v2 - - - name: Get the version - id: get_version - run: echo ::set-output name=VERSION::$(echo ${GITHUB_REF##*/}) - - - name: Remove Deleted Release Package - uses: actions/delete-package-versions@v1 - with: - package-name: 'com.lilly.opensource.edat.jenkinsdsl' - package-version-ids: ${{ steps.get_version.outputs.VERSION }} From 07963329d12a37b5e2f7acabd0f82f919443d9d2 Mon Sep 17 00:00:00 2001 From: Jim Garlick Date: Thu, 11 Jun 2020 15:30:24 -0400 Subject: [PATCH 12/26] BRAVO-666 - Tiny tweak to publish from master branch --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 70555ae..8e18585 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -3,7 +3,7 @@ name: SNAPSHOT on: push: - branches: [ develop, feature/* ] + branches: [ master, develop, feature/* ] pull_request: branches: [ master ] @@ -26,7 +26,7 @@ jobs: arguments: build - name: Upload Build Artifacts - if: github.ref == 'refs/heads/develop' + if: github.ref == 'refs/heads/master' uses: eskatos/gradle-command-action@v1 env: GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}} From a178e59ef39fa0e4c31f262bc4bf4f2a569a4c8b Mon Sep 17 00:00:00 2001 From: Jim Garlick Date: Mon, 15 Jun 2020 12:07:01 -0400 Subject: [PATCH 13/26] BRAVO-666 - Added snyk monitor check to normal build --- .github/workflows/main.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 8e18585..a3f8819 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -20,6 +20,14 @@ jobs: with: java-version: 11 + - name: Run Snyk to check for vulnerabilities + uses: snyk/actions/gradle-jdk11@master + env: + SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }} + with: + args: --severity-threshold=high + command: monitor + - name: Gradle Build uses: eskatos/gradle-command-action@v1 with: From 124ff03a62197443985b2601aefa0c8d6401edfb Mon Sep 17 00:00:00 2001 From: Jim Garlick Date: Mon, 15 Jun 2020 12:54:57 -0400 Subject: [PATCH 14/26] BRAVO-666 - Trying to fix gradle/snyk issue --- .github/workflows/main.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index a3f8819..dd45330 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -15,11 +15,6 @@ jobs: - name: Checkout code uses: actions/checkout@v2 - - name: Setup Java - uses: actions/setup-java@v1 - with: - java-version: 11 - - name: Run Snyk to check for vulnerabilities uses: snyk/actions/gradle-jdk11@master env: @@ -28,6 +23,11 @@ jobs: args: --severity-threshold=high command: monitor + - name: Setup Java + uses: actions/setup-java@v1 + with: + java-version: 11 + - name: Gradle Build uses: eskatos/gradle-command-action@v1 with: From 125d0d143283e23a17abef6f20a79b85a783635e Mon Sep 17 00:00:00 2001 From: Jim Garlick Date: Mon, 15 Jun 2020 13:23:45 -0400 Subject: [PATCH 15/26] BRAVO-666 - Moved Snyk check to it's own action --- .github/workflows/main.yml | 8 -------- .github/workflows/snyk.yml | 24 ++++++++++++++++++++++++ 2 files changed, 24 insertions(+), 8 deletions(-) create mode 100644 .github/workflows/snyk.yml diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index dd45330..8e18585 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -15,14 +15,6 @@ jobs: - name: Checkout code uses: actions/checkout@v2 - - name: Run Snyk to check for vulnerabilities - uses: snyk/actions/gradle-jdk11@master - env: - SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }} - with: - args: --severity-threshold=high - command: monitor - - name: Setup Java uses: actions/setup-java@v1 with: diff --git a/.github/workflows/snyk.yml b/.github/workflows/snyk.yml new file mode 100644 index 0000000..929939f --- /dev/null +++ b/.github/workflows/snyk.yml @@ -0,0 +1,24 @@ + +name: SNAPSHOT + +on: + push: + branches: [ master, develop, feature/* ] + pull_request: + branches: [ master ] + +jobs: + build: + runs-on: ubuntu-latest + + steps: + - name: Checkout code + uses: actions/checkout@v2 + + - name: Run Snyk to check for vulnerabilities + uses: snyk/actions/gradle-jdk11@master + env: + SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }} + with: + args: --severity-threshold=high + command: monitor From 0b8e90f4b4dd1b44891dd6b7894eb8aa9e051a05 Mon Sep 17 00:00:00 2001 From: Jim Garlick Date: Mon, 15 Jun 2020 13:25:21 -0400 Subject: [PATCH 16/26] BRAVO-666 - Adding test phase to publish during release --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a5b5042..d60bf3d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -29,4 +29,4 @@ jobs: run: | echo "New version: ${RELEASE_VERSION}" echo "Github username: ${GITHUB_ACTOR}" - ./gradlew -Pversion=${RELEASE_VERSION} publish + ./gradlew -Pversion=${RELEASE_VERSION} test publish From 746946e03955f6aa02aa4f4a39135f4044dc734b Mon Sep 17 00:00:00 2001 From: Jim Garlick Date: Mon, 15 Jun 2020 13:26:09 -0400 Subject: [PATCH 17/26] BRAVO-666 - Renamed snyk check --- .github/workflows/snyk.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/snyk.yml b/.github/workflows/snyk.yml index 929939f..671aa8f 100644 --- a/.github/workflows/snyk.yml +++ b/.github/workflows/snyk.yml @@ -1,5 +1,5 @@ -name: SNAPSHOT +name: SNYK on: push: @@ -8,7 +8,7 @@ on: branches: [ master ] jobs: - build: + run_snyk: runs-on: ubuntu-latest steps: From bdbdfaffe0bd9ef6620d7498cb5d17d5dabd1fc3 Mon Sep 17 00:00:00 2001 From: Jim Garlick Date: Mon, 15 Jun 2020 14:35:15 -0400 Subject: [PATCH 18/26] BRAVO-666 - Changing the trigger to just PRs --- .github/workflows/snyk.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/snyk.yml b/.github/workflows/snyk.yml index 671aa8f..83a1a31 100644 --- a/.github/workflows/snyk.yml +++ b/.github/workflows/snyk.yml @@ -2,8 +2,6 @@ name: SNYK on: - push: - branches: [ master, develop, feature/* ] pull_request: branches: [ master ] From ae29c3d313aa2fb3e08b1d413d892780b415c286 Mon Sep 17 00:00:00 2001 From: Jim Garlick Date: Tue, 16 Jun 2020 16:17:47 -0400 Subject: [PATCH 19/26] BRAVO-666 - Updating dependencies to newer versions - Added the dependency vulnerability checker - Added the dependency version checker --- build.gradle | 33 +++++++++++++++++++-------------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/build.gradle b/build.gradle index ad7c3bc..a38ad37 100644 --- a/build.gradle +++ b/build.gradle @@ -6,6 +6,8 @@ apply plugin: 'java' apply plugin: 'maven-publish' apply plugin: 'jacoco' apply plugin: "io.spring.dependency-management" +apply plugin: 'org.owasp.dependencycheck' +apply plugin: 'com.github.ben-manes.versions' //// Configuration group = 'com.lilly.opensource.edat' @@ -40,9 +42,10 @@ test.testLogging { } repositories { - maven { - url 'https://elilillyco.jfrog.io/elilillyco/Lilly-Maven' - } + mavenCentral() + jcenter() + maven { url 'https://repo1.maven.org/maven2/' } + maven { url 'https://repo.jenkins-ci.org/releases/' } } buildscript { @@ -51,7 +54,9 @@ buildscript { jcenter() } dependencies { - classpath "io.spring.gradle:dependency-management-plugin:1.0.3.RELEASE" + classpath "io.spring.gradle:dependency-management-plugin:1.0.3.RELEASE" + classpath 'org.owasp:dependency-check-gradle:5.3.2' + classpath 'com.github.ben-manes:gradle-versions-plugin:0.28.0' } } @@ -79,18 +84,18 @@ dependencies { implementation group: 'com.cloudbees', name: 'groovy-cps', version: '1.24', ext: 'jar' implementation group: 'org.jenkins-ci.plugins.workflow', name: 'workflow-durable-task-step', version: '2.26', ext: 'jar' implementation group: 'org.jenkins-ci.plugins', name: 'durable-task', version: '1.28', ext: 'jar' - implementation 'com.amazonaws:aws-java-sdk-core' - implementation 'com.amazonaws:aws-java-sdk-s3' - implementation 'com.amazonaws:aws-java-sdk-sts' + implementation group: 'com.amazonaws', name: 'aws-java-sdk-core', version: '1.11.803', ext: 'jar' + implementation group: 'com.amazonaws', name: 'aws-java-sdk-s3', version: '1.11.803', ext: 'jar' + implementation group: 'com.amazonaws', name: 'aws-java-sdk-sts', version: '1.11.803', ext: 'jar' implementation group: 'org.jenkins-ci.plugins', name: 'cloudbees-folder', version: '6.7', ext: 'jar' implementation group: 'org.apache.ivy', name: 'ivy', version: '2.4.0', ext: 'jar' - implementation 'javax.servlet:javax.servlet-api:4.0.1' - implementation 'org.spockframework:spock-core:1.2-groovy-2.4' - implementation 'org.yaml:snakeyaml:1.23' - testImplementation 'junit:junit:4.12' - testRuntimeOnly 'net.bytebuddy:byte-buddy:1.8.21' - testRuntimeOnly 'org.objenesis:objenesis:2.6' - testRuntimeOnly 'org.slf4j:slf4j-simple:1.7.25' + implementation group: 'javax.servlet', name: 'javax.servlet-api', version: '4.0.1', ext: 'jar' + implementation group: 'org.spockframework', name: 'spock-core', version: '1.2-groovy-2.4', ext: 'jar' + implementation group: 'org.yaml', name: 'snakeyaml', version: '1.23', ext: 'jar' + testImplementation group: 'junit', name: 'junit', version: '4.12', ext: 'jar' + testRuntimeOnly group: 'net.bytebuddy', name: 'byte-buddy', version: '1.8.21', ext: 'jar' + testRuntimeOnly group: 'org.objenesis', name: 'objenesis', version: '2.6', ext: 'jar' + testRuntimeOnly group: 'org.slf4j', name: 'slf4j-simple', version: '1.7.25', ext: 'jar' } //// Sources and GroovyDoc Jars From f8d29186d232a4a6c84335c0167a919cef5587e8 Mon Sep 17 00:00:00 2001 From: Jim Garlick Date: Tue, 16 Jun 2020 16:26:50 -0400 Subject: [PATCH 20/26] BRAVO-666 - Updated a couple jenkins dependencies --- build.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index a38ad37..d1e3232 100644 --- a/build.gradle +++ b/build.gradle @@ -69,9 +69,9 @@ dependencyManagement { dependencies { implementation 'org.codehaus.groovy:groovy-all:2.4.15' - implementation 'org.jenkins-ci.main:jenkins-core:2.141' - implementation group: 'org.jenkins-ci.plugins.workflow', name: 'workflow-cps', version: '2.57', ext: 'jar' - implementation group: 'org.jenkins-ci.plugins', name: 'credentials-binding', version: '1.17', ext: 'jar' + implementation 'org.jenkins-ci.main:jenkins-core:2.238' + implementation group: 'org.jenkins-ci.plugins.workflow', name: 'workflow-cps', version: '2.80', ext: 'jar' + implementation group: 'org.jenkins-ci.plugins', name: 'credentials-binding', version: '1.23', ext: 'jar' implementation group: 'org.jenkins-ci.plugins', name: 'branch-api', version: '2.0.21', ext: 'jar' implementation group: 'org.jenkins-ci.plugins', name: 'cloudbees-folder', version: '6.7', ext: 'jar' implementation group: 'org.jenkins-ci.plugins', name: 'scm-api', version: '2.3.0', ext: 'jar' From dea35cb66d84c25aeda85cda140e5104ae055b46 Mon Sep 17 00:00:00 2001 From: Jim Garlick Date: Tue, 16 Jun 2020 16:45:10 -0400 Subject: [PATCH 21/26] BRAVO-666 - Forced updated of two vulnerable transient dependencies --- build.gradle | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/build.gradle b/build.gradle index d1e3232..b0bff82 100644 --- a/build.gradle +++ b/build.gradle @@ -60,6 +60,13 @@ buildscript { } } +configurations { + // Monitor these when upgrading jenkins-core + compileClasspath { + resolutionStrategy.force 'commons-beanutils:commons-beanutils:1.9.4' + resolutionStrategy.force 'commons-fileupload:commons-fileupload:1.3.3' + } +} dependencyManagement { imports { From 83a47741ffea80fa45fa168f11a5ed725dfb991e Mon Sep 17 00:00:00 2001 From: Jim Garlick Date: Tue, 16 Jun 2020 16:49:28 -0400 Subject: [PATCH 22/26] BRAVO-666 - These changes didn't have any effect. Removing --- build.gradle | 8 -------- 1 file changed, 8 deletions(-) diff --git a/build.gradle b/build.gradle index b0bff82..61be87f 100644 --- a/build.gradle +++ b/build.gradle @@ -60,14 +60,6 @@ buildscript { } } -configurations { - // Monitor these when upgrading jenkins-core - compileClasspath { - resolutionStrategy.force 'commons-beanutils:commons-beanutils:1.9.4' - resolutionStrategy.force 'commons-fileupload:commons-fileupload:1.3.3' - } -} - dependencyManagement { imports { mavenBom 'com.amazonaws:aws-java-sdk-bom:1.11.485' From 44d01daaa36af3db1ddaa410749eea3091446804 Mon Sep 17 00:00:00 2001 From: Nick Liffen Date: Thu, 18 Jun 2020 12:38:19 +0100 Subject: [PATCH 23/26] Create SECURITY.md --- SECURITY.md | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 SECURITY.md diff --git a/SECURITY.md b/SECURITY.md new file mode 100644 index 0000000..2b42e47 --- /dev/null +++ b/SECURITY.md @@ -0,0 +1,18 @@ +# Security Policy + +## Supported Versions + +The versions of this project which are currently being supported with security updates are: + +| Version | Supported | +| ------- | ------------------ | +| 1.x | :white_check_mark: | + +## Reporting a Vulnerability + +If you find a vulnerability assosiated with this source code please contact either: + +- [Jarrett Alexander](mailto:alexander_jarrett@lilly.com). +- [Nick Liffen](mailto:liffen_nicholas@lilly.com). + +For the moment in time, **please do not** open a GitHub issue on the repository to report a vulnerability. From 0a199c4c44f015c967c06219d5beda9a785ccff7 Mon Sep 17 00:00:00 2001 From: Nick Liffen Date: Thu, 18 Jun 2020 12:40:36 +0100 Subject: [PATCH 24/26] Update CHANGELOG.md --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9b1d0cd..844a553 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,10 +4,14 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## 1.0.1 +### Created +- `SECURITY.md` file creation. ## 1.0.0 ### Created - Initial release of JenkinsDSL core. +[1.0.1]: https://github.com/EliLillyCo/CIRR_JenkinsPipelineLibraries/releases/v1.0.1...v1.0.0 [1.0.0]: https://github.com/EliLillyCo/CIRR_JenkinsPipelineLibraries/releases/v1.0.0 From 62be35101ed8d23086d68d4ef06a5c677218ccc0 Mon Sep 17 00:00:00 2001 From: Nick Liffen Date: Thu, 18 Jun 2020 12:40:53 +0100 Subject: [PATCH 25/26] Update CHANGELOG.md --- CHANGELOG.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 844a553..432c0c1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,11 +4,11 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). -## 1.0.1 +## [1.0.1] ### Created - `SECURITY.md` file creation. -## 1.0.0 +## [1.0.0] ### Created - Initial release of JenkinsDSL core. From e7246ce4bdf28187dc13791cca5b091529c2f5a5 Mon Sep 17 00:00:00 2001 From: Nick Liffen Date: Thu, 18 Jun 2020 12:45:12 +0100 Subject: [PATCH 26/26] Update CHANGELOG.md --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 432c0c1..7829266 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), ## [1.0.1] ### Created - `SECURITY.md` file creation. +- GitHub Actions Workflow Creation. +- Updated dependenices resolving security problems. ## [1.0.0] ### Created