From 9a73864af1f2267be825964b50c305c06828a98d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20Skj=C3=B8lberg?= Date: Tue, 7 Apr 2020 20:21:23 +0200 Subject: [PATCH 1/7] Bruk enturs bygg-orber --- src/@orb.yml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/@orb.yml b/src/@orb.yml index 4f35557..7cbb9f1 100644 --- a/src/@orb.yml +++ b/src/@orb.yml @@ -55,8 +55,8 @@ examples: arguments: "--scan ./ --failOnCVSS 7 --suppression ./dependency-check-suppressions.xml" orbs: - gradle: circleci/gradle@1.0.11 - maven: circleci/maven@0.0.11 + gradle: entur/gradle-orb@dev:testing + maven: entur/maven-orb@dev:testing executors: default: @@ -92,23 +92,24 @@ aliases: steps: - checkout - gradle/with_cache: + cache_key: << parameters.cache_key >> steps: - generate_cache_keys: cache_key: gradle-<< parameters.cache_key >>-cache-key-v6 - restore_owasp_cache - run: name: Update OWASP Dependency-Check Database - command: ./gradlew dependencyCheckUpdate --info + command: ./gradlew dependencyCheckUpdate --info --no-daemon - store_owasp_cache: cve_data_directory: <> - run: name: Run OWASP Dependency-Check Analyzer - command: ./gradlew <> --info + command: ./gradlew <> --info --no-daemon - run: # note: Also run purge so so that vulernability data is not cached twice. # Run in seperate step so not run for each submodule. name: OWASP Dependency-Check cache cleanup - command: ./gradlew dependencyCheckPurge --info + command: ./gradlew dependencyCheckPurge --info --no-daemon - collect_reports: persist_to_workspace: <> @@ -291,6 +292,7 @@ jobs: - checkout - maven/with_cache: settings_file: << parameters.settings_file >> + cache_key: << parameters.cache_key >> steps: - generate_cache_keys: cache_key: maven-<< parameters.cache_key >>-cache-key-v6 From 0840747d1a6d1d2c6e2d35e5d908c2057129ded4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20Skj=C3=B8lberg?= Date: Tue, 7 Apr 2020 22:40:55 +0200 Subject: [PATCH 2/7] Update readme --- src/@orb.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/@orb.yml b/src/@orb.yml index 7cbb9f1..0c4220f 100644 --- a/src/@orb.yml +++ b/src/@orb.yml @@ -3,7 +3,7 @@ version: 2.1 description: | An orb for running OWASP vulnerability checks through command-line or tasks configured in Gradle and Maven builds. Reports are persisted as artifacts under the directory 'Report/OWASP'. - Source: https://github.com/entur/owasp-orb + Source: https://github.com/entur/owasp-orb. examples: gradle: From 9101e87936bc08852df728ec475ac37a2c3a90d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20Skj=C3=B8lberg?= Date: Tue, 7 Apr 2020 23:03:40 +0200 Subject: [PATCH 3/7] Oppdater readme --- src/@orb.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/src/@orb.yml b/src/@orb.yml index 0c4220f..0daa8d8 100644 --- a/src/@orb.yml +++ b/src/@orb.yml @@ -3,6 +3,7 @@ version: 2.1 description: | An orb for running OWASP vulnerability checks through command-line or tasks configured in Gradle and Maven builds. Reports are persisted as artifacts under the directory 'Report/OWASP'. + For Gradle and Maven, additional dependency caching is available. Source: https://github.com/entur/owasp-orb. examples: From bb9c81c52b19616025d341280eb918b42edd8ee1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20Skj=C3=B8lberg?= Date: Tue, 7 Apr 2020 23:17:23 +0200 Subject: [PATCH 4/7] =?UTF-8?q?Pr=C3=B8v=20igjen?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/@orb.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/@orb.yml b/src/@orb.yml index 0daa8d8..0344f5c 100644 --- a/src/@orb.yml +++ b/src/@orb.yml @@ -1,7 +1,8 @@ version: 2.1 description: | - An orb for running OWASP vulnerability checks through command-line or tasks configured in Gradle and Maven builds. + An orb for running OWASP vulnerability checks through command-line or + tasks configured in Gradle and Maven builds. Reports are persisted as artifacts under the directory 'Report/OWASP'. For Gradle and Maven, additional dependency caching is available. Source: https://github.com/entur/owasp-orb. From 02d05cf9661c9f627383fbc313a68a536990ad7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20Skj=C3=B8lberg?= Date: Tue, 7 Apr 2020 23:19:27 +0200 Subject: [PATCH 5/7] =?UTF-8?q?Pr=C3=B8v=20igjen?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/@orb.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/@orb.yml b/src/@orb.yml index 0344f5c..53528f4 100644 --- a/src/@orb.yml +++ b/src/@orb.yml @@ -1,7 +1,7 @@ version: 2.1 description: | - An orb for running OWASP vulnerability checks through command-line or + An orb for running OWASP vulnerability checks through command-line or tasks configured in Gradle and Maven builds. Reports are persisted as artifacts under the directory 'Report/OWASP'. For Gradle and Maven, additional dependency caching is available. From ebfcf47e5e83a1ca5af336810ecf2a96f90d71b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20Skj=C3=B8lberg?= Date: Wed, 8 Apr 2020 00:10:34 +0200 Subject: [PATCH 6/7] Print ut forbruk av disk --- src/@orb.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/@orb.yml b/src/@orb.yml index 53528f4..9b1eff3 100644 --- a/src/@orb.yml +++ b/src/@orb.yml @@ -4,7 +4,8 @@ description: | An orb for running OWASP vulnerability checks through command-line or tasks configured in Gradle and Maven builds. Reports are persisted as artifacts under the directory 'Report/OWASP'. - For Gradle and Maven, additional dependency caching is available. + For Gradle and Maven, additional dependency caching is available for + improved run times. Source: https://github.com/entur/owasp-orb. examples: From f38d0af388d8f11416a4c4f9321333539e1bec45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20Skj=C3=B8lberg?= Date: Wed, 8 Apr 2020 00:34:57 +0200 Subject: [PATCH 7/7] Endre cache keys --- src/@orb.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/@orb.yml b/src/@orb.yml index 9b1eff3..d132494 100644 --- a/src/@orb.yml +++ b/src/@orb.yml @@ -98,7 +98,7 @@ aliases: cache_key: << parameters.cache_key >> steps: - generate_cache_keys: - cache_key: gradle-<< parameters.cache_key >>-cache-key-v6 + cache_key: gradle-owasp-<< parameters.cache_key >>-cache-key-v6 - restore_owasp_cache - run: name: Update OWASP Dependency-Check Database @@ -298,7 +298,7 @@ jobs: cache_key: << parameters.cache_key >> steps: - generate_cache_keys: - cache_key: maven-<< parameters.cache_key >>-cache-key-v6 + cache_key: maven-owasp-<< parameters.cache_key >>-cache-key-v6 - restore_owasp_cache - run: name: Update OWASP Dependency-Check Database @@ -352,7 +352,7 @@ jobs: cache_key: << parameters.cache_key >> steps: - generate_cache_keys: - cache_key: commmandline-<< parameters.cache_key >>-cache-key-v6 + cache_key: commmandline-owasp-<< parameters.cache_key >>-cache-key-v6 - restore_owasp_cache - run: name: Update OWASP Dependency-Check Database