From 332ee67647c37dec2aeca5bc6e7a48948ffe951f Mon Sep 17 00:00:00 2001 From: satyamchaurasiapersistent <102941840+satyamchaurasiapersistent@users.noreply.github.com> Date: Sun, 13 Nov 2022 14:32:27 +0530 Subject: [PATCH 01/44] GEP GEN Key added --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index bbe930e2..e9238f8c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -12,7 +12,7 @@ jobs: keys: - v1-dependencies-{{ checksum "pom.xml" }} - v1-dependencies- - - run: echo $GPG_ASC_BASE64 | base64 --decode | gpg --batch --no-tty --import --yes + - run: echo $GPG_ASC_BASE64 | base64 --decode | gpg --gen-key --batch --no-tty --import --yes - run: chmod u+x mvnw - run: ./mvnw -s .circleci/maven.settings.xml clean verify - run: mvn help:evaluate -Dexpression=project.version -q -DforceStdout > target/version.txt From 4d9ec8d8aaee5b23f52c2ca4498f9cbc1d0b6630 Mon Sep 17 00:00:00 2001 From: satyamchaurasiapersistent <102941840+satyamchaurasiapersistent@users.noreply.github.com> Date: Sun, 13 Nov 2022 14:41:29 +0530 Subject: [PATCH 02/44] GEP GEN Key added --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index e9238f8c..3abad28d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -12,7 +12,7 @@ jobs: keys: - v1-dependencies-{{ checksum "pom.xml" }} - v1-dependencies- - - run: echo $GPG_ASC_BASE64 | base64 --decode | gpg --gen-key --batch --no-tty --import --yes + - run: echo $GPG_ASC_BASE64 | base64 --decode | gpg --generate-key --batch --no-tty --import --yes - run: chmod u+x mvnw - run: ./mvnw -s .circleci/maven.settings.xml clean verify - run: mvn help:evaluate -Dexpression=project.version -q -DforceStdout > target/version.txt From 06a5fd1cb911eef2e2ec8156855aa12cae59cc0b Mon Sep 17 00:00:00 2001 From: satyamchaurasiapersistent <102941840+satyamchaurasiapersistent@users.noreply.github.com> Date: Sun, 13 Nov 2022 14:44:35 +0530 Subject: [PATCH 03/44] GEP GEN Key added --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 3abad28d..c49f917d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -12,7 +12,7 @@ jobs: keys: - v1-dependencies-{{ checksum "pom.xml" }} - v1-dependencies- - - run: echo $GPG_ASC_BASE64 | base64 --decode | gpg --generate-key --batch --no-tty --import --yes + - run: echo $GPG_ASC_BASE64 | base64 --decode | gpg --pinentry-mode loopback --passphrase='' --generate-key - run: chmod u+x mvnw - run: ./mvnw -s .circleci/maven.settings.xml clean verify - run: mvn help:evaluate -Dexpression=project.version -q -DforceStdout > target/version.txt From 1adfbf32c69753728c8e75c1d826f3b15348b273 Mon Sep 17 00:00:00 2001 From: satyamchaurasiapersistent <102941840+satyamchaurasiapersistent@users.noreply.github.com> Date: Sun, 13 Nov 2022 14:48:34 +0530 Subject: [PATCH 04/44] GEP GEN Key added --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index c49f917d..2da498ee 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -12,7 +12,7 @@ jobs: keys: - v1-dependencies-{{ checksum "pom.xml" }} - v1-dependencies- - - run: echo $GPG_ASC_BASE64 | base64 --decode | gpg --pinentry-mode loopback --passphrase='' --generate-key + - run: echo $GPG_ASC_BASE64 | base64 --decode | gpg --export-secret-key | base64 - run: chmod u+x mvnw - run: ./mvnw -s .circleci/maven.settings.xml clean verify - run: mvn help:evaluate -Dexpression=project.version -q -DforceStdout > target/version.txt From 8853dc0ef2a824a91b780fb254b20751c3fa26a2 Mon Sep 17 00:00:00 2001 From: satyamchaurasiapersistent <102941840+satyamchaurasiapersistent@users.noreply.github.com> Date: Sun, 13 Nov 2022 14:58:01 +0530 Subject: [PATCH 05/44] GEP GEN Key added --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 2da498ee..bacf8be5 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -40,7 +40,7 @@ jobs: keys: - v1-dependencies-{{ checksum "pom.xml" }} - v1-dependencies- - - run: echo $GPG_ASC_BASE64 | base64 --decode | gpg --batch --no-tty --import --yes + - run: echo $GPG_ASC_BASE64 | base64 --decode | gpg --full-generate-key - run: chmod u+x mvnw - run: ./mvnw -s .circleci/maven.settings.xml clean deploy -DskipTests - save_cache: From 0184f90e0deb08d16b3f4fa09b23a83e2986992d Mon Sep 17 00:00:00 2001 From: satyamchaurasiapersistent <102941840+satyamchaurasiapersistent@users.noreply.github.com> Date: Sun, 13 Nov 2022 14:59:00 +0530 Subject: [PATCH 06/44] GEP GEN Key added --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index bacf8be5..2da498ee 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -40,7 +40,7 @@ jobs: keys: - v1-dependencies-{{ checksum "pom.xml" }} - v1-dependencies- - - run: echo $GPG_ASC_BASE64 | base64 --decode | gpg --full-generate-key + - run: echo $GPG_ASC_BASE64 | base64 --decode | gpg --batch --no-tty --import --yes - run: chmod u+x mvnw - run: ./mvnw -s .circleci/maven.settings.xml clean deploy -DskipTests - save_cache: From ec828b8eba23655cacb240966649e00a85c3bf9b Mon Sep 17 00:00:00 2001 From: satyamchaurasiapersistent <102941840+satyamchaurasiapersistent@users.noreply.github.com> Date: Sun, 13 Nov 2022 15:00:08 +0530 Subject: [PATCH 07/44] GEP GEN Key added --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 2da498ee..bbe930e2 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -12,7 +12,7 @@ jobs: keys: - v1-dependencies-{{ checksum "pom.xml" }} - v1-dependencies- - - run: echo $GPG_ASC_BASE64 | base64 --decode | gpg --export-secret-key | base64 + - run: echo $GPG_ASC_BASE64 | base64 --decode | gpg --batch --no-tty --import --yes - run: chmod u+x mvnw - run: ./mvnw -s .circleci/maven.settings.xml clean verify - run: mvn help:evaluate -Dexpression=project.version -q -DforceStdout > target/version.txt From 5865cb30d0f94353e95ee43a5bcf605d62dcc537 Mon Sep 17 00:00:00 2001 From: satyamchaurasiapersistent <102941840+satyamchaurasiapersistent@users.noreply.github.com> Date: Sun, 13 Nov 2022 15:02:14 +0530 Subject: [PATCH 08/44] GEP GEN Key added --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index bbe930e2..578f1f7d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -12,7 +12,7 @@ jobs: keys: - v1-dependencies-{{ checksum "pom.xml" }} - v1-dependencies- - - run: echo $GPG_ASC_BASE64 | base64 --decode | gpg --batch --no-tty --import --yes + - run: chmod u+x mvnw - run: ./mvnw -s .circleci/maven.settings.xml clean verify - run: mvn help:evaluate -Dexpression=project.version -q -DforceStdout > target/version.txt From 61ad28e70ff5ec55bd466af4aca33c10e1af8f1e Mon Sep 17 00:00:00 2001 From: satyamchaurasiapersistent <102941840+satyamchaurasiapersistent@users.noreply.github.com> Date: Sun, 13 Nov 2022 15:06:59 +0530 Subject: [PATCH 09/44] GEP GEN Key added --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 578f1f7d..bbe930e2 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -12,7 +12,7 @@ jobs: keys: - v1-dependencies-{{ checksum "pom.xml" }} - v1-dependencies- - + - run: echo $GPG_ASC_BASE64 | base64 --decode | gpg --batch --no-tty --import --yes - run: chmod u+x mvnw - run: ./mvnw -s .circleci/maven.settings.xml clean verify - run: mvn help:evaluate -Dexpression=project.version -q -DforceStdout > target/version.txt From 5bb7f62bd6b3696b122c5b836e49f763eb0785c8 Mon Sep 17 00:00:00 2001 From: satyamchaurasiapersistent <102941840+satyamchaurasiapersistent@users.noreply.github.com> Date: Sun, 13 Nov 2022 15:17:14 +0530 Subject: [PATCH 10/44] GEP GEN Key added --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index bbe930e2..6d099c0b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -14,7 +14,7 @@ jobs: - v1-dependencies- - run: echo $GPG_ASC_BASE64 | base64 --decode | gpg --batch --no-tty --import --yes - run: chmod u+x mvnw - - run: ./mvnw -s .circleci/maven.settings.xml clean verify + - run: ./mvnw -s .circleci/maven.settings.xml clean verify -DskipTests - run: mvn help:evaluate -Dexpression=project.version -q -DforceStdout > target/version.txt - save_cache: paths: From b24227a6111f94fef52ee2decfb9752fa3f26dfd Mon Sep 17 00:00:00 2001 From: satyamchaurasiapersistent <102941840+satyamchaurasiapersistent@users.noreply.github.com> Date: Sun, 13 Nov 2022 15:19:08 +0530 Subject: [PATCH 11/44] GEP GEN Key added --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 6d099c0b..acb678c3 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -14,7 +14,7 @@ jobs: - v1-dependencies- - run: echo $GPG_ASC_BASE64 | base64 --decode | gpg --batch --no-tty --import --yes - run: chmod u+x mvnw - - run: ./mvnw -s .circleci/maven.settings.xml clean verify -DskipTests + - run: ./mvnw -s .circleci/maven.settings.xml clean -DskipTests - run: mvn help:evaluate -Dexpression=project.version -q -DforceStdout > target/version.txt - save_cache: paths: From ec04cd1527452bd850f1662638daff7ed4b4006d Mon Sep 17 00:00:00 2001 From: satyamchaurasiapersistent <102941840+satyamchaurasiapersistent@users.noreply.github.com> Date: Sun, 13 Nov 2022 15:21:01 +0530 Subject: [PATCH 12/44] GEP GEN Key added --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index acb678c3..13aebc03 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -14,7 +14,7 @@ jobs: - v1-dependencies- - run: echo $GPG_ASC_BASE64 | base64 --decode | gpg --batch --no-tty --import --yes - run: chmod u+x mvnw - - run: ./mvnw -s .circleci/maven.settings.xml clean -DskipTests + - run: ./mvnw -s .circleci/maven.settings.xml clean deploy -DskipTests - run: mvn help:evaluate -Dexpression=project.version -q -DforceStdout > target/version.txt - save_cache: paths: From 307215395e8283e6d7c4f27d216fff4db48adcd2 Mon Sep 17 00:00:00 2001 From: satyamchaurasiapersistent <102941840+satyamchaurasiapersistent@users.noreply.github.com> Date: Sun, 13 Nov 2022 15:22:11 +0530 Subject: [PATCH 13/44] GEP GEN Key added --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 13aebc03..bbe930e2 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -14,7 +14,7 @@ jobs: - v1-dependencies- - run: echo $GPG_ASC_BASE64 | base64 --decode | gpg --batch --no-tty --import --yes - run: chmod u+x mvnw - - run: ./mvnw -s .circleci/maven.settings.xml clean deploy -DskipTests + - run: ./mvnw -s .circleci/maven.settings.xml clean verify - run: mvn help:evaluate -Dexpression=project.version -q -DforceStdout > target/version.txt - save_cache: paths: From 88ba27534ea72c04ff3dec4fc1286381ba3b5419 Mon Sep 17 00:00:00 2001 From: satyamchaurasiapersistent <102941840+satyamchaurasiapersistent@users.noreply.github.com> Date: Wed, 16 Nov 2022 11:51:59 +0530 Subject: [PATCH 14/44] GNU Removed --- .circleci/config.yml | 4 ++-- .circleci/maven.settings.xml | 13 +------------ 2 files changed, 3 insertions(+), 14 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index bbe930e2..a27d22d7 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -12,7 +12,7 @@ jobs: keys: - v1-dependencies-{{ checksum "pom.xml" }} - v1-dependencies- - - run: echo $GPG_ASC_BASE64 | base64 --decode | gpg --batch --no-tty --import --yes + - run: chmod u+x mvnw - run: ./mvnw -s .circleci/maven.settings.xml clean verify - run: mvn help:evaluate -Dexpression=project.version -q -DforceStdout > target/version.txt @@ -40,7 +40,7 @@ jobs: keys: - v1-dependencies-{{ checksum "pom.xml" }} - v1-dependencies- - - run: echo $GPG_ASC_BASE64 | base64 --decode | gpg --batch --no-tty --import --yes + - run: chmod u+x mvnw - run: ./mvnw -s .circleci/maven.settings.xml clean deploy -DskipTests - save_cache: diff --git a/.circleci/maven.settings.xml b/.circleci/maven.settings.xml index fdfd40f5..adf2d6c2 100644 --- a/.circleci/maven.settings.xml +++ b/.circleci/maven.settings.xml @@ -16,16 +16,5 @@ - - - gpg - - gpg - ${env.GPG_PASSPHRASE} - - - - - gpg - + From 5d82297c5d4afc4eb1fe3a866602470c6ada950b Mon Sep 17 00:00:00 2001 From: satyamchaurasiapersistent <102941840+satyamchaurasiapersistent@users.noreply.github.com> Date: Wed, 16 Nov 2022 11:57:42 +0530 Subject: [PATCH 15/44] GNU Delete Revert --- .circleci/config.yml | 4 ++-- .circleci/maven.settings.xml | 13 ++++++++++++- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index a27d22d7..bbe930e2 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -12,7 +12,7 @@ jobs: keys: - v1-dependencies-{{ checksum "pom.xml" }} - v1-dependencies- - + - run: echo $GPG_ASC_BASE64 | base64 --decode | gpg --batch --no-tty --import --yes - run: chmod u+x mvnw - run: ./mvnw -s .circleci/maven.settings.xml clean verify - run: mvn help:evaluate -Dexpression=project.version -q -DforceStdout > target/version.txt @@ -40,7 +40,7 @@ jobs: keys: - v1-dependencies-{{ checksum "pom.xml" }} - v1-dependencies- - + - run: echo $GPG_ASC_BASE64 | base64 --decode | gpg --batch --no-tty --import --yes - run: chmod u+x mvnw - run: ./mvnw -s .circleci/maven.settings.xml clean deploy -DskipTests - save_cache: diff --git a/.circleci/maven.settings.xml b/.circleci/maven.settings.xml index adf2d6c2..fdfd40f5 100644 --- a/.circleci/maven.settings.xml +++ b/.circleci/maven.settings.xml @@ -16,5 +16,16 @@ - + + + gpg + + gpg + ${env.GPG_PASSPHRASE} + + + + + gpg + From 066888939c4833426f4992eb4c823a42273b833c Mon Sep 17 00:00:00 2001 From: satyamchaurasiapersistent <102941840+satyamchaurasiapersistent@users.noreply.github.com> Date: Wed, 16 Nov 2022 12:00:39 +0530 Subject: [PATCH 16/44] Gen List keys --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index bbe930e2..025b1367 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -12,7 +12,7 @@ jobs: keys: - v1-dependencies-{{ checksum "pom.xml" }} - v1-dependencies- - - run: echo $GPG_ASC_BASE64 | base64 --decode | gpg --batch --no-tty --import --yes + - run: echo $GPG_ASC_BASE64 | base64 --decode | gpg --list-keys - run: chmod u+x mvnw - run: ./mvnw -s .circleci/maven.settings.xml clean verify - run: mvn help:evaluate -Dexpression=project.version -q -DforceStdout > target/version.txt From 4ed231d4e06277c0dd0799c8219f887e6389c0bf Mon Sep 17 00:00:00 2001 From: satyamchaurasiapersistent <102941840+satyamchaurasiapersistent@users.noreply.github.com> Date: Wed, 16 Nov 2022 15:26:20 +0530 Subject: [PATCH 17/44] GPG Version add --- .circleci/config.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 025b1367..fcf6dabe 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -12,7 +12,7 @@ jobs: keys: - v1-dependencies-{{ checksum "pom.xml" }} - v1-dependencies- - - run: echo $GPG_ASC_BASE64 | base64 --decode | gpg --list-keys + - run: echo $GPG_ASC_BASE64 | base64 --decode | gpg --batch --no-tty --import --yes - run: chmod u+x mvnw - run: ./mvnw -s .circleci/maven.settings.xml clean verify - run: mvn help:evaluate -Dexpression=project.version -q -DforceStdout > target/version.txt @@ -41,6 +41,7 @@ jobs: - v1-dependencies-{{ checksum "pom.xml" }} - v1-dependencies- - run: echo $GPG_ASC_BASE64 | base64 --decode | gpg --batch --no-tty --import --yes + - run: echo gpg --version - run: chmod u+x mvnw - run: ./mvnw -s .circleci/maven.settings.xml clean deploy -DskipTests - save_cache: From 045104f72ccc4034f4407809f5b2c2500d0f31f0 Mon Sep 17 00:00:00 2001 From: satyamchaurasiapersistent <102941840+satyamchaurasiapersistent@users.noreply.github.com> Date: Wed, 16 Nov 2022 15:27:35 +0530 Subject: [PATCH 18/44] GPG Version add --- .circleci/config.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index fcf6dabe..7a18f390 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -40,8 +40,7 @@ jobs: keys: - v1-dependencies-{{ checksum "pom.xml" }} - v1-dependencies- - - run: echo $GPG_ASC_BASE64 | base64 --decode | gpg --batch --no-tty --import --yes - - run: echo gpg --version + - run: echo $GPG_ASC_BASE64 | base64 --decode | gpg --version --batch --no-tty --import --yes - run: chmod u+x mvnw - run: ./mvnw -s .circleci/maven.settings.xml clean deploy -DskipTests - save_cache: From e592615e7c2396504fb02090bad32fc2a87d1b8e Mon Sep 17 00:00:00 2001 From: satyamchaurasiapersistent <102941840+satyamchaurasiapersistent@users.noreply.github.com> Date: Wed, 16 Nov 2022 15:29:09 +0530 Subject: [PATCH 19/44] GPG Version add --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 7a18f390..ebf4789f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -12,7 +12,7 @@ jobs: keys: - v1-dependencies-{{ checksum "pom.xml" }} - v1-dependencies- - - run: echo $GPG_ASC_BASE64 | base64 --decode | gpg --batch --no-tty --import --yes + - run: echo $GPG_ASC_BASE64 | base64 --decode | gpg --version --batch --no-tty --import --yes - run: chmod u+x mvnw - run: ./mvnw -s .circleci/maven.settings.xml clean verify - run: mvn help:evaluate -Dexpression=project.version -q -DforceStdout > target/version.txt From c7fa370e6b55dc0f6a3221c7b3b10c770e23bc34 Mon Sep 17 00:00:00 2001 From: satyamchaurasiapersistent <102941840+satyamchaurasiapersistent@users.noreply.github.com> Date: Wed, 16 Nov 2022 15:31:41 +0530 Subject: [PATCH 20/44] GPG Version add --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index ebf4789f..2ffd6664 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -12,7 +12,7 @@ jobs: keys: - v1-dependencies-{{ checksum "pom.xml" }} - v1-dependencies- - - run: echo $GPG_ASC_BASE64 | base64 --decode | gpg --version --batch --no-tty --import --yes + - run: echo $GPG_ASC_BASE64 | base64 --decode | gpg --version --batch --no-tty --import --yes --gen-key - run: chmod u+x mvnw - run: ./mvnw -s .circleci/maven.settings.xml clean verify - run: mvn help:evaluate -Dexpression=project.version -q -DforceStdout > target/version.txt From 3e6c4b8bc50f4a164fcb6585f271bd31e77b963e Mon Sep 17 00:00:00 2001 From: satyamchaurasiapersistent <102941840+satyamchaurasiapersistent@users.noreply.github.com> Date: Wed, 16 Nov 2022 15:33:23 +0530 Subject: [PATCH 21/44] GPG Version add --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 2ffd6664..544db42a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -12,7 +12,7 @@ jobs: keys: - v1-dependencies-{{ checksum "pom.xml" }} - v1-dependencies- - - run: echo $GPG_ASC_BASE64 | base64 --decode | gpg --version --batch --no-tty --import --yes --gen-key + - run: echo $GPG_ASC_BASE64 | base64 --decode | gpg --version --batch --no-tty --import --yes --gen-key --sign-key - run: chmod u+x mvnw - run: ./mvnw -s .circleci/maven.settings.xml clean verify - run: mvn help:evaluate -Dexpression=project.version -q -DforceStdout > target/version.txt From 3642bd4ccb964f81474745bbcde4c3529468e3e7 Mon Sep 17 00:00:00 2001 From: satyamchaurasiapersistent <102941840+satyamchaurasiapersistent@users.noreply.github.com> Date: Wed, 16 Nov 2022 15:35:11 +0530 Subject: [PATCH 22/44] GPG Version add --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 544db42a..d4149925 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -14,7 +14,7 @@ jobs: - v1-dependencies- - run: echo $GPG_ASC_BASE64 | base64 --decode | gpg --version --batch --no-tty --import --yes --gen-key --sign-key - run: chmod u+x mvnw - - run: ./mvnw -s .circleci/maven.settings.xml clean verify + - run: ./mvnw -s .circleci/maven.settings.xml clean verify -DskipTests - run: mvn help:evaluate -Dexpression=project.version -q -DforceStdout > target/version.txt - save_cache: paths: From 72da7a7eaf1d458a2cd51072f5a82e1484f92244 Mon Sep 17 00:00:00 2001 From: satyamchaurasiapersistent <102941840+satyamchaurasiapersistent@users.noreply.github.com> Date: Wed, 16 Nov 2022 15:42:42 +0530 Subject: [PATCH 23/44] GPG Version add --- .circleci/config.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index d4149925..05c8aba8 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -12,7 +12,8 @@ jobs: keys: - v1-dependencies-{{ checksum "pom.xml" }} - v1-dependencies- - - run: echo $GPG_ASC_BASE64 | base64 --decode | gpg --version --batch --no-tty --import --yes --gen-key --sign-key + - run: echo $GPG_ASC_BASE64 | base64 --decode | gpg --version --batch --no-tty --import --yes + - run: gpg --list-keys - run: chmod u+x mvnw - run: ./mvnw -s .circleci/maven.settings.xml clean verify -DskipTests - run: mvn help:evaluate -Dexpression=project.version -q -DforceStdout > target/version.txt From 139c82f5ed53b12303fd1873aed42c538789d816 Mon Sep 17 00:00:00 2001 From: satyamchaurasiapersistent <102941840+satyamchaurasiapersistent@users.noreply.github.com> Date: Wed, 16 Nov 2022 15:50:22 +0530 Subject: [PATCH 24/44] GPG Version add --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 05c8aba8..31143b6f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -12,7 +12,7 @@ jobs: keys: - v1-dependencies-{{ checksum "pom.xml" }} - v1-dependencies- - - run: echo $GPG_ASC_BASE64 | base64 --decode | gpg --version --batch --no-tty --import --yes + - run: echo $GPG_ASC_BASE64 | base64 --decode | gpg --version --batch --no-tty --import --yes -b - run: gpg --list-keys - run: chmod u+x mvnw - run: ./mvnw -s .circleci/maven.settings.xml clean verify -DskipTests From bfbcba592eaf9ed1584d6a063d9293d8fce4dda9 Mon Sep 17 00:00:00 2001 From: satyamchaurasiapersistent <102941840+satyamchaurasiapersistent@users.noreply.github.com> Date: Wed, 16 Nov 2022 16:05:12 +0530 Subject: [PATCH 25/44] GPG Version add --- .circleci/config.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 31143b6f..9fd44e94 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -12,8 +12,7 @@ jobs: keys: - v1-dependencies-{{ checksum "pom.xml" }} - v1-dependencies- - - run: echo $GPG_ASC_BASE64 | base64 --decode | gpg --version --batch --no-tty --import --yes -b - - run: gpg --list-keys + - run: echo $GPG_ASC_BASE64 | base64 --decode | gpg --version --batch --no-tty --import --yes --generate-key - run: chmod u+x mvnw - run: ./mvnw -s .circleci/maven.settings.xml clean verify -DskipTests - run: mvn help:evaluate -Dexpression=project.version -q -DforceStdout > target/version.txt From 254a7fae64060157b53434acc1eebb2ee2b6ad0d Mon Sep 17 00:00:00 2001 From: satyamchaurasiapersistent <102941840+satyamchaurasiapersistent@users.noreply.github.com> Date: Wed, 16 Nov 2022 16:13:29 +0530 Subject: [PATCH 26/44] GPG Version add --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 9fd44e94..d9aa345e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -12,7 +12,7 @@ jobs: keys: - v1-dependencies-{{ checksum "pom.xml" }} - v1-dependencies- - - run: echo $GPG_ASC_BASE64 | base64 --decode | gpg --version --batch --no-tty --import --yes --generate-key + - run: echo $GPG_ASC_BASE64 | base64 --decode | gpg --generate-key - run: chmod u+x mvnw - run: ./mvnw -s .circleci/maven.settings.xml clean verify -DskipTests - run: mvn help:evaluate -Dexpression=project.version -q -DforceStdout > target/version.txt From 9a5b493a67ec7ae7ca3568f463b8e1416830419f Mon Sep 17 00:00:00 2001 From: satyamchaurasiapersistent <102941840+satyamchaurasiapersistent@users.noreply.github.com> Date: Thu, 17 Nov 2022 11:59:28 +0530 Subject: [PATCH 27/44] Adding New Keys --- .circleci/config.yml | 4 ++-- .circleci/maven.settings.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index d9aa345e..84e2a125 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -12,7 +12,7 @@ jobs: keys: - v1-dependencies-{{ checksum "pom.xml" }} - v1-dependencies- - - run: echo $GPG_ASC_BASE64 | base64 --decode | gpg --generate-key + - run: echo $GPG_ASC_BASE64NEW | base64 --decode | gpg --version --batch --no-tty --import --yes - run: chmod u+x mvnw - run: ./mvnw -s .circleci/maven.settings.xml clean verify -DskipTests - run: mvn help:evaluate -Dexpression=project.version -q -DforceStdout > target/version.txt @@ -40,7 +40,7 @@ jobs: keys: - v1-dependencies-{{ checksum "pom.xml" }} - v1-dependencies- - - run: echo $GPG_ASC_BASE64 | base64 --decode | gpg --version --batch --no-tty --import --yes + - run: echo $GPG_ASC_BASE64NEW | base64 --decode | gpg --version --batch --no-tty --import --yes - run: chmod u+x mvnw - run: ./mvnw -s .circleci/maven.settings.xml clean deploy -DskipTests - save_cache: diff --git a/.circleci/maven.settings.xml b/.circleci/maven.settings.xml index fdfd40f5..34e4c866 100644 --- a/.circleci/maven.settings.xml +++ b/.circleci/maven.settings.xml @@ -21,7 +21,7 @@ gpg gpg - ${env.GPG_PASSPHRASE} + ${env.GPG_PASSPHRASENEW} From e3eaff23e76612124705c014fb65c91917422138 Mon Sep 17 00:00:00 2001 From: satyamchaurasiapersistent <102941840+satyamchaurasiapersistent@users.noreply.github.com> Date: Thu, 17 Nov 2022 12:02:23 +0530 Subject: [PATCH 28/44] Adding New Keys --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 84e2a125..ac5c2fe5 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -12,7 +12,7 @@ jobs: keys: - v1-dependencies-{{ checksum "pom.xml" }} - v1-dependencies- - - run: echo $GPG_ASC_BASE64NEW | base64 --decode | gpg --version --batch --no-tty --import --yes + - run: echo $GPG_ASC_BASE64NEW | base64 --decode | gpg --batch --no-tty --import --yes - run: chmod u+x mvnw - run: ./mvnw -s .circleci/maven.settings.xml clean verify -DskipTests - run: mvn help:evaluate -Dexpression=project.version -q -DforceStdout > target/version.txt From bd29c968b9eabc029fe0121e7ae4602442ed4079 Mon Sep 17 00:00:00 2001 From: satyamchaurasiapersistent <102941840+satyamchaurasiapersistent@users.noreply.github.com> Date: Thu, 17 Nov 2022 12:11:58 +0530 Subject: [PATCH 29/44] Adding New Keys --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index ac5c2fe5..3b3f52c3 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -12,7 +12,7 @@ jobs: keys: - v1-dependencies-{{ checksum "pom.xml" }} - v1-dependencies- - - run: echo $GPG_ASC_BASE64NEW | base64 --decode | gpg --batch --no-tty --import --yes + - run: echo $GPG_ASC_BASE64NEW | gpg --batch --no-tty --import --yes - run: chmod u+x mvnw - run: ./mvnw -s .circleci/maven.settings.xml clean verify -DskipTests - run: mvn help:evaluate -Dexpression=project.version -q -DforceStdout > target/version.txt From b9c8c06a9e15bf66cf6c9edaeb8036199c41f425 Mon Sep 17 00:00:00 2001 From: satyamchaurasiapersistent <102941840+satyamchaurasiapersistent@users.noreply.github.com> Date: Thu, 17 Nov 2022 12:14:58 +0530 Subject: [PATCH 30/44] Adding New Keys --- .circleci/config.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 3b3f52c3..a5fe5760 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -12,7 +12,9 @@ jobs: keys: - v1-dependencies-{{ checksum "pom.xml" }} - v1-dependencies- - - run: echo $GPG_ASC_BASE64NEW | gpg --batch --no-tty --import --yes + - run: apt-get update + - run: apt-get install ca-certificates + - run: echo $GPG_ASC_BASE64NEW | base64 --decode | gpg --batch --no-tty --import --yes - run: chmod u+x mvnw - run: ./mvnw -s .circleci/maven.settings.xml clean verify -DskipTests - run: mvn help:evaluate -Dexpression=project.version -q -DforceStdout > target/version.txt From 530c230e956ac28cb0781a7d7b82e10666b917b3 Mon Sep 17 00:00:00 2001 From: satyamchaurasiapersistent <102941840+satyamchaurasiapersistent@users.noreply.github.com> Date: Thu, 17 Nov 2022 12:16:38 +0530 Subject: [PATCH 31/44] Adding New Keys --- .circleci/config.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index a5fe5760..8a28aa81 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -12,7 +12,6 @@ jobs: keys: - v1-dependencies-{{ checksum "pom.xml" }} - v1-dependencies- - - run: apt-get update - run: apt-get install ca-certificates - run: echo $GPG_ASC_BASE64NEW | base64 --decode | gpg --batch --no-tty --import --yes - run: chmod u+x mvnw From 8b8c502985a37cd018a6b00c9dd93b2099197f63 Mon Sep 17 00:00:00 2001 From: satyamchaurasiapersistent <102941840+satyamchaurasiapersistent@users.noreply.github.com> Date: Thu, 17 Nov 2022 12:20:22 +0530 Subject: [PATCH 32/44] Adding New Keys --- .circleci/config.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 8a28aa81..ac5c2fe5 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -12,7 +12,6 @@ jobs: keys: - v1-dependencies-{{ checksum "pom.xml" }} - v1-dependencies- - - run: apt-get install ca-certificates - run: echo $GPG_ASC_BASE64NEW | base64 --decode | gpg --batch --no-tty --import --yes - run: chmod u+x mvnw - run: ./mvnw -s .circleci/maven.settings.xml clean verify -DskipTests From 3b85f66d46a1c06c0ced4214dc753ae528e126a4 Mon Sep 17 00:00:00 2001 From: satyamchaurasiapersistent <102941840+satyamchaurasiapersistent@users.noreply.github.com> Date: Thu, 17 Nov 2022 13:36:23 +0530 Subject: [PATCH 33/44] Adding New Keys --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index ac5c2fe5..487c8d3b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -14,7 +14,7 @@ jobs: - v1-dependencies- - run: echo $GPG_ASC_BASE64NEW | base64 --decode | gpg --batch --no-tty --import --yes - run: chmod u+x mvnw - - run: ./mvnw -s .circleci/maven.settings.xml clean verify -DskipTests + - run: ./mvnw -s .circleci/maven.settings.xml clean verify - run: mvn help:evaluate -Dexpression=project.version -q -DforceStdout > target/version.txt - save_cache: paths: From f5d7fd083b1a62c9a0831935f7835cd53d72ce28 Mon Sep 17 00:00:00 2001 From: satyamchaurasiapersistent <102941840+satyamchaurasiapersistent@users.noreply.github.com> Date: Thu, 17 Nov 2022 13:49:51 +0530 Subject: [PATCH 34/44] GPG2 --- pom.xml | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/pom.xml b/pom.xml index ae2646f4..a56c3661 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ cx-spring-boot-sdk - 0.5.29 + 0.5.30 cx-spring-boot-sdk @@ -193,6 +193,7 @@ sign + gpg2 --pinentry-mode loopback @@ -268,13 +269,7 @@ - - - GNU General Public License, version 3 - http://www.gnu.org/licenses/gpl-3.0.txt - repo - - + scm:git:https://github.com/checkmarx-ts/checkmarx-spring-boot-java-sdk.git From af4db88c963fb640e294329d7dfc341586c67844 Mon Sep 17 00:00:00 2001 From: satyamchaurasiapersistent <102941840+satyamchaurasiapersistent@users.noreply.github.com> Date: Thu, 17 Nov 2022 13:53:18 +0530 Subject: [PATCH 35/44] Adding debug --- .circleci/config.yml | 2 +- pom.xml | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 487c8d3b..ab83a041 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -14,7 +14,7 @@ jobs: - v1-dependencies- - run: echo $GPG_ASC_BASE64NEW | base64 --decode | gpg --batch --no-tty --import --yes - run: chmod u+x mvnw - - run: ./mvnw -s .circleci/maven.settings.xml clean verify + - run: ./mvnw -s .circleci/maven.settings.xml clean verify -X - run: mvn help:evaluate -Dexpression=project.version -q -DforceStdout > target/version.txt - save_cache: paths: diff --git a/pom.xml b/pom.xml index a56c3661..8690217d 100644 --- a/pom.xml +++ b/pom.xml @@ -193,7 +193,6 @@ sign - gpg2 --pinentry-mode loopback From 7b6bb677eb508b7553b2284b6020f9d03e057d38 Mon Sep 17 00:00:00 2001 From: satyamchaurasiapersistent <102941840+satyamchaurasiapersistent@users.noreply.github.com> Date: Thu, 17 Nov 2022 14:29:55 +0530 Subject: [PATCH 36/44] Adding debug --- pom.xml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8690217d..5ad18112 100644 --- a/pom.xml +++ b/pom.xml @@ -268,7 +268,13 @@ - + + + GNU General Public License, version 3 + http://www.gnu.org/licenses/gpl-3.0.txt + repo + + scm:git:https://github.com/checkmarx-ts/checkmarx-spring-boot-java-sdk.git From 93be34b4cdb9933ea016239b74673f59788e4486 Mon Sep 17 00:00:00 2001 From: satyamchaurasiapersistent <102941840+satyamchaurasiapersistent@users.noreply.github.com> Date: Thu, 17 Nov 2022 15:42:56 +0530 Subject: [PATCH 37/44] Gpg2 --- .circleci/maven.settings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/maven.settings.xml b/.circleci/maven.settings.xml index 34e4c866..c126c62f 100644 --- a/.circleci/maven.settings.xml +++ b/.circleci/maven.settings.xml @@ -20,7 +20,7 @@ gpg - gpg + gpg2 ${env.GPG_PASSPHRASENEW} From ee1241fe3c79a5a22055ffc4f99f9bd0a6b89035 Mon Sep 17 00:00:00 2001 From: satyamchaurasiapersistent <102941840+satyamchaurasiapersistent@users.noreply.github.com> Date: Thu, 17 Nov 2022 15:48:36 +0530 Subject: [PATCH 38/44] Gpg2 --- .circleci/maven.settings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/maven.settings.xml b/.circleci/maven.settings.xml index c126c62f..34e4c866 100644 --- a/.circleci/maven.settings.xml +++ b/.circleci/maven.settings.xml @@ -20,7 +20,7 @@ gpg - gpg2 + gpg ${env.GPG_PASSPHRASENEW} From 80947ca9fc52d486656513de16a13a274caa093f Mon Sep 17 00:00:00 2001 From: satyamchaurasiapersistent <102941840+satyamchaurasiapersistent@users.noreply.github.com> Date: Thu, 17 Nov 2022 17:55:28 +0530 Subject: [PATCH 39/44] Added ORB --- .circleci/config.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index ab83a041..89a700cb 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,4 +1,6 @@ -version: 2 +version: '2.1' +orbs: + circleci-maven-release-orb: sonatype-nexus-community/circleci-maven-release-orb@0.0.18 jobs: build: docker: From 2014f5b4b76827d0f0eb56aba1638d11e1d97bd5 Mon Sep 17 00:00:00 2001 From: satyamchaurasiapersistent <102941840+satyamchaurasiapersistent@users.noreply.github.com> Date: Fri, 18 Nov 2022 08:13:33 +0530 Subject: [PATCH 40/44] Update config.yml --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 89a700cb..f54b3745 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -14,7 +14,7 @@ jobs: keys: - v1-dependencies-{{ checksum "pom.xml" }} - v1-dependencies- - - run: echo $GPG_ASC_BASE64NEW | base64 --decode | gpg --batch --no-tty --import --yes + - run: echo $GPG_ASC_BASE64NEW | base64 --decode | gpg --batch --no-tty - run: chmod u+x mvnw - run: ./mvnw -s .circleci/maven.settings.xml clean verify -X - run: mvn help:evaluate -Dexpression=project.version -q -DforceStdout > target/version.txt From 028d11c4a50b62361b70b67aae2e289f9c196a59 Mon Sep 17 00:00:00 2001 From: satyamchaurasiapersistent <102941840+satyamchaurasiapersistent@users.noreply.github.com> Date: Fri, 18 Nov 2022 08:17:15 +0530 Subject: [PATCH 41/44] Update config.yml --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index f54b3745..f2d85268 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -14,7 +14,7 @@ jobs: keys: - v1-dependencies-{{ checksum "pom.xml" }} - v1-dependencies- - - run: echo $GPG_ASC_BASE64NEW | base64 --decode | gpg --batch --no-tty + - run: echo $GPG_ASC_BASE64 | base64 --decode | gpg --batch --no-tty - run: chmod u+x mvnw - run: ./mvnw -s .circleci/maven.settings.xml clean verify -X - run: mvn help:evaluate -Dexpression=project.version -q -DforceStdout > target/version.txt From ae1ddda50c4e190870d7a2b6a66684f67fdff161 Mon Sep 17 00:00:00 2001 From: satyamchaurasiapersistent <102941840+satyamchaurasiapersistent@users.noreply.github.com> Date: Fri, 18 Nov 2022 08:22:21 +0530 Subject: [PATCH 42/44] Update maven.settings.xml --- .circleci/maven.settings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/maven.settings.xml b/.circleci/maven.settings.xml index 34e4c866..fdfd40f5 100644 --- a/.circleci/maven.settings.xml +++ b/.circleci/maven.settings.xml @@ -21,7 +21,7 @@ gpg gpg - ${env.GPG_PASSPHRASENEW} + ${env.GPG_PASSPHRASE} From 4749d306682c83f9510cbdc63913b56b1244b2b4 Mon Sep 17 00:00:00 2001 From: satyamchaurasiapersistent <102941840+satyamchaurasiapersistent@users.noreply.github.com> Date: Fri, 18 Nov 2022 11:56:51 +0530 Subject: [PATCH 43/44] Old commands added --- .circleci/config.yml | 2 +- .circleci/maven.settings.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index f2d85268..21b32d56 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -14,7 +14,7 @@ jobs: keys: - v1-dependencies-{{ checksum "pom.xml" }} - v1-dependencies- - - run: echo $GPG_ASC_BASE64 | base64 --decode | gpg --batch --no-tty + - run: echo $GPG_ASC_BASE64NEW | base64 --decode | gpg --batch --no-tty --import --yes - run: chmod u+x mvnw - run: ./mvnw -s .circleci/maven.settings.xml clean verify -X - run: mvn help:evaluate -Dexpression=project.version -q -DforceStdout > target/version.txt diff --git a/.circleci/maven.settings.xml b/.circleci/maven.settings.xml index fdfd40f5..34e4c866 100644 --- a/.circleci/maven.settings.xml +++ b/.circleci/maven.settings.xml @@ -21,7 +21,7 @@ gpg gpg - ${env.GPG_PASSPHRASE} + ${env.GPG_PASSPHRASENEW} From 8dd950db81f9c7a135deda73940b4aa244c7e2b3 Mon Sep 17 00:00:00 2001 From: satyamchaurasiapersistent <102941840+satyamchaurasiapersistent@users.noreply.github.com> Date: Sun, 20 Nov 2022 12:56:04 +0530 Subject: [PATCH 44/44] 1086 Changes Commited --- .../checkmarx/sdk/dto/cx/CxScanParams.java | 11 +- .../com/checkmarx/sdk/service/CxService.java | 214 +++++++++--------- 2 files changed, 120 insertions(+), 105 deletions(-) diff --git a/src/main/java/com/checkmarx/sdk/dto/cx/CxScanParams.java b/src/main/java/com/checkmarx/sdk/dto/cx/CxScanParams.java index 79878896..c6a6e373 100644 --- a/src/main/java/com/checkmarx/sdk/dto/cx/CxScanParams.java +++ b/src/main/java/com/checkmarx/sdk/dto/cx/CxScanParams.java @@ -1,6 +1,7 @@ package com.checkmarx.sdk.dto.cx; import lombok.Getter; +import lombok.Setter; import java.util.List; import java.util.Map; @@ -36,6 +37,9 @@ public class CxScanParams { @Getter private String clientSecret; + @Getter @Setter + private String modifiedProjectName; + public String getTeamName() { return teamName; } @@ -247,6 +251,11 @@ public CxScanParams withScanPreset(String scanPreset) { return this; } + public CxScanParams withModifiedProjectName(String modifiedProjectName) { + this.modifiedProjectName = modifiedProjectName; + return this; + } + public CxScanParams withScanConfiguration(String scanConfiguration) { this.scanConfiguration = scanConfiguration; return this; @@ -354,7 +363,7 @@ public boolean isGitSource(){ public boolean isFileSource(){ return getSourceType().equals(Type.FILE); } - + @Override public String toString() { return "CxScanParams{" + diff --git a/src/main/java/com/checkmarx/sdk/service/CxService.java b/src/main/java/com/checkmarx/sdk/service/CxService.java index 0f1a7d3a..6c18e4bb 100644 --- a/src/main/java/com/checkmarx/sdk/service/CxService.java +++ b/src/main/java/com/checkmarx/sdk/service/CxService.java @@ -85,7 +85,7 @@ public class CxService implements CxClient { private static final Integer SCAN_STATUS_SOURCE_PULLING = 10; private static final Integer SCAN_STATUS_NONE = 1001; - + /* report statuses - there are only 2: InProcess (1) @@ -140,7 +140,7 @@ public class CxService implements CxClient { private final FilterInputFactory filterInputFactory; private final FilterValidator filterValidator; private final CxRepoFileHelper cxRepoFileHelper; - + public CxService(CxAuthService authClient, CxProperties cxProperties, CxLegacyService cxLegacyService, @@ -148,7 +148,7 @@ public CxService(CxAuthService authClient, ScanSettingsClient scanSettingsClient, FilterInputFactory filterInputFactory, FilterValidator filterValidator) { - + this.cxRepoFileHelper = new CxRepoFileHelper(cxProperties); this.authClient = authClient; this.cxProperties = cxProperties; @@ -598,14 +598,14 @@ protected Map getAdditionalScanDetails(CxXMLResultsType cxResult // Add custom field values if requested Map customFields = getCustomFields(Integer.valueOf(cxResults.getProjectId())); additionalDetails.put("customFields", customFields); -} - } catch (JSONException e) { - log.error("Error Occurred in JSON Parsing"); - log.error(ExceptionUtils.getStackTrace(e)); - } catch (NullPointerException e) { - log.error("Null Pointer occurred while getting additional scan details."); - log.error(ExceptionUtils.getStackTrace(e)); } + } catch (JSONException e) { + log.error("Error Occurred in JSON Parsing"); + log.error(ExceptionUtils.getStackTrace(e)); + } catch (NullPointerException e) { + log.error("Null Pointer occurred while getting additional scan details."); + log.error(ExceptionUtils.getStackTrace(e)); + } return additionalDetails; } @@ -889,7 +889,7 @@ private Map getIssues(FilterConfiguration filter, String sessio } return summary; } - + private Map getAdditionalIssueDetails(QueryType q, ResultType r) { Map additionalDetails = new HashMap<>(); additionalDetails.put("categories", q.getCategories()); @@ -911,8 +911,8 @@ private Map getAdditionalIssueDetails(QueryType q, ResultType r) result.put("sink", getNodeData(nodes, nodes.size() - 1)); // Last node in dataFlow AtomicInteger counter = new AtomicInteger(0); nodes.forEach(node->{result.put(node.getNodeId(),getNodeData(nodes, counter.get())); - counter.getAndIncrement(); - }); + counter.getAndIncrement(); + }); } else { log.debug(String.format("Result %s%s did not have node paths to process.", q.getName(), r.getNodeId())); } @@ -956,71 +956,71 @@ private Map getNodeData(List nodes, int nodeIndex) private void prepareIssuesRemoveDuplicates(List cxIssueList, ResultType resultType, Map details, boolean falsePositive, ScanResults.XIssue issue, Map summary) { - try { - if (!cxProperties.getDisableClubbing() && cxIssueList.contains(issue)) { - /*Get existing issue of same vuln+filename*/ - ScanResults.XIssue existingIssue = cxIssueList.get(cxIssueList.indexOf(issue)); - /*If no reference exists for this particular line, append it to the details (line+snippet)*/ - if (!existingIssue.getDetails().containsKey(Integer.parseInt(resultType.getLine()))) { - if (falsePositive) { - existingIssue.setFalsePositiveCount((existingIssue.getFalsePositiveCount() + 1)); - } else { - if (!summary.containsKey(resultType.getSeverity())) { - summary.put(resultType.getSeverity(), 0); - } - int severityCount = summary.get(resultType.getSeverity()); - severityCount++; - summary.put(resultType.getSeverity(), severityCount); - } - existingIssue.getDetails().putAll(details); - } else { //reference exists, ensure fp flag is maintained - ScanResults.IssueDetails existingDetails = existingIssue.getDetails().get(Integer.parseInt(resultType.getLine())); - ScanResults.IssueDetails newDetails = details.get(Integer.parseInt(resultType.getLine())); - if (newDetails.isFalsePositive() && !existingDetails.isFalsePositive()) { - existingDetails.setFalsePositive(true); - existingIssue.setFalsePositiveCount((existingIssue.getFalsePositiveCount() + 1)); - //bump down the count for the severity - int severityCount = summary.get(resultType.getSeverity()); - severityCount--; - summary.put(resultType.getSeverity(), severityCount); - } - } - //adding description if existing ref found - - StringBuilder stringBuilder = new StringBuilder(); - if (issue.getVulnerabilityStatus() == null) { - cxIssueList.get(cxIssueList.indexOf(issue)).setDescription(existingIssue.getDescription()); - } else if (existingIssue.getVulnerabilityStatus() != null) { - String existingIssueDescription = existingIssue.getDescription(); - String newIssueDescription = issue.getDescription(); - if (!existingIssueDescription.contains(newIssueDescription)) { - stringBuilder.append(existingIssueDescription).append("\r\n").append("\r\n").append(newIssueDescription); - cxIssueList.get(cxIssueList.indexOf(issue)).setDescription(stringBuilder.toString()); - } - } else { - cxIssueList.get(cxIssueList.indexOf(issue)).setDescription(issue.getDescription()); - } - - // Copy additionalData.results from issue to existingIssue - List> results = (List>) existingIssue.getAdditionalDetails().get("results"); - results.addAll((List>) issue.getAdditionalDetails().get("results")); - } else { - if (falsePositive) { - issue.setFalsePositiveCount((issue.getFalsePositiveCount() + 1)); - } else { - if (!summary.containsKey(resultType.getSeverity())) { - summary.put(resultType.getSeverity(), 0); - } - int severityCount = summary.get(resultType.getSeverity()); - severityCount++; - summary.put(resultType.getSeverity(), severityCount); - } - cxIssueList.add(issue); - } - } catch (NullPointerException e) { - log.error("Null Error"); - log.error(ExceptionUtils.getStackTrace(e)); - } + try { + if (!cxProperties.getDisableClubbing() && cxIssueList.contains(issue)) { + /*Get existing issue of same vuln+filename*/ + ScanResults.XIssue existingIssue = cxIssueList.get(cxIssueList.indexOf(issue)); + /*If no reference exists for this particular line, append it to the details (line+snippet)*/ + if (!existingIssue.getDetails().containsKey(Integer.parseInt(resultType.getLine()))) { + if (falsePositive) { + existingIssue.setFalsePositiveCount((existingIssue.getFalsePositiveCount() + 1)); + } else { + if (!summary.containsKey(resultType.getSeverity())) { + summary.put(resultType.getSeverity(), 0); + } + int severityCount = summary.get(resultType.getSeverity()); + severityCount++; + summary.put(resultType.getSeverity(), severityCount); + } + existingIssue.getDetails().putAll(details); + } else { //reference exists, ensure fp flag is maintained + ScanResults.IssueDetails existingDetails = existingIssue.getDetails().get(Integer.parseInt(resultType.getLine())); + ScanResults.IssueDetails newDetails = details.get(Integer.parseInt(resultType.getLine())); + if (newDetails.isFalsePositive() && !existingDetails.isFalsePositive()) { + existingDetails.setFalsePositive(true); + existingIssue.setFalsePositiveCount((existingIssue.getFalsePositiveCount() + 1)); + //bump down the count for the severity + int severityCount = summary.get(resultType.getSeverity()); + severityCount--; + summary.put(resultType.getSeverity(), severityCount); + } + } + //adding description if existing ref found + + StringBuilder stringBuilder = new StringBuilder(); + if (issue.getVulnerabilityStatus() == null) { + cxIssueList.get(cxIssueList.indexOf(issue)).setDescription(existingIssue.getDescription()); + } else if (existingIssue.getVulnerabilityStatus() != null) { + String existingIssueDescription = existingIssue.getDescription(); + String newIssueDescription = issue.getDescription(); + if (!existingIssueDescription.contains(newIssueDescription)) { + stringBuilder.append(existingIssueDescription).append("\r\n").append("\r\n").append(newIssueDescription); + cxIssueList.get(cxIssueList.indexOf(issue)).setDescription(stringBuilder.toString()); + } + } else { + cxIssueList.get(cxIssueList.indexOf(issue)).setDescription(issue.getDescription()); + } + + // Copy additionalData.results from issue to existingIssue + List> results = (List>) existingIssue.getAdditionalDetails().get("results"); + results.addAll((List>) issue.getAdditionalDetails().get("results")); + } else { + if (falsePositive) { + issue.setFalsePositiveCount((issue.getFalsePositiveCount() + 1)); + } else { + if (!summary.containsKey(resultType.getSeverity())) { + summary.put(resultType.getSeverity(), 0); + } + int severityCount = summary.get(resultType.getSeverity()); + severityCount++; + summary.put(resultType.getSeverity(), severityCount); + } + cxIssueList.add(issue); + } + } catch (NullPointerException e) { + log.error("Null Error"); + log.error(ExceptionUtils.getStackTrace(e)); + } } private String getIssueDescription(String session, Long scanId, Long pathId) { @@ -1151,7 +1151,7 @@ public Integer getProjectId(String ownerId, String name) { .queryParam("teamId", ownerId) .build(); ResponseEntity projects = restTemplate.exchange(uriComponents.toUri(), HttpMethod.GET, httpEntity, String.class); - JSONArray arr = new JSONArray(projects.getBody()); + JSONArray arr = new JSONArray(projects.getBody()); if (arr.length() > 1) { return UNKNOWN_INT; } @@ -1339,18 +1339,18 @@ private String getSshKey(CxScanParams params) throws CheckmarxException { String sshKey = ""; if(!StringUtils.isEmpty(params.getSshKeyIdentifier())){ if( MapUtils.isNotEmpty(cxProperties.getSshKeyList()) && !StringUtils.isEmpty(cxProperties.getSshKeyList().get(params.getSshKeyIdentifier()))) { - log.debug("Using SSH Key configured for the repository."); - sshKey = cxProperties.getSshKeyList().get(params.getSshKeyIdentifier()); + log.debug("Using SSH Key configured for the repository."); + sshKey = cxProperties.getSshKeyList().get(params.getSshKeyIdentifier()); cxProperties.setSshKey(sshKey); }else { - throw new CheckmarxException("SSH Key corresponding to the identifier configured for the repository is not found."); + throw new CheckmarxException("SSH Key corresponding to the identifier configured for the repository is not found."); } } if(cxProperties.getSshKey() != null) { // THe readString() method is much nicer but not introduced until Java 11 // Path fileName = Path.of(cxProperties.getSshKey()); // sshKey = Files.readString(fileName); - log.debug("Using SSH Key configured at the CxFlow server level."); + log.debug("Using SSH Key configured at the CxFlow server level."); sshKey = readKeyFile(cxProperties.getSshKey()); } return sshKey; @@ -1372,18 +1372,18 @@ private String createGitURL(String srcURL) { */ public void setProjectRepositoryDetails(Integer projectId, String gitUrl, String branch, CxScanParams params) throws CheckmarxException { String sshKey = getSshKey(params); - CxProjectSource projectSource; + CxProjectSource projectSource; if(sshKey.length() > 0) { - projectSource = CxProjectSource.builder() - .url(createGitURL(gitUrl)) - .privateKey(sshKey) - .branch(branch) - .build(); + projectSource = CxProjectSource.builder() + .url(createGitURL(gitUrl)) + .privateKey(sshKey) + .branch(branch) + .build(); } else { projectSource = CxProjectSource.builder() - .url(gitUrl) - .branch(branch) - .build(); + .url(gitUrl) + .branch(branch) + .build(); } log.debug("branch {}", branch); log.debug("project {}", projectId); @@ -1697,7 +1697,7 @@ public String createTeamWS(String parentTeamId, String teamName) throws Checkmar String session = authClient.getLegacySession(); cxLegacyService.createTeam(session, parentTeamId, teamName); return getTeamId(parentTeamId, teamName); - } + } /** @@ -1785,7 +1785,7 @@ public void renameTeamWS(String teamId, String newTeamName) throws CheckmarxExce */ public Integer getScanConfiguration(String configuration) throws CheckmarxException { return scanSettingsClient.getEngineConfigurationId(configuration); - } + } @Override public String getScanConfigurationName(int configurationId) { @@ -1866,7 +1866,13 @@ public Integer createScan(CxScanParams params, String comment) throws CheckmarxE defaultBranch = defaultBranch.replaceAll("[^a-zA-Z0-9-_.]+", "-"); log.debug("Normalized name for current branch is {} and target/default branch is {}", currentBranch, defaultBranch); } - derivedProjectName = params.getProjectName().replace(currentBranch,defaultBranch); + + if(params.getProjectName().contains(currentBranch)){ + derivedProjectName = params.getProjectName().replace(currentBranch,defaultBranch); + }else{ + derivedProjectName = params.getProjectName().replace(params.getModifiedProjectName(),defaultBranch); + } + log.debug("Derived project name : {}", derivedProjectName); baseProjectId = getProjectId(teamId,derivedProjectName); if(baseProjectId.equals(UNKNOWN_INT)){ @@ -1918,7 +1924,7 @@ public Integer createScan(CxScanParams params, String comment) throws CheckmarxE log.debug("cxProject: {}", cxProject); updateProjectCustomFields(cxProject); } - } + } prepareSources(params, projectId); if(params.isIncremental() && projectExistedBeforeScan) { LocalDateTime scanDate = getLastScanDate(projectId); @@ -1975,7 +1981,7 @@ public Integer createScan(CxScanParams params, String comment) throws CheckmarxE private void prepareSources(CxScanParams params, Integer projectId) throws CheckmarxException { if (params.isFileSource()) { uploadProjectSource(projectId, new File(params.getFilePath())); - } + } else if (params.isGitSource()) { if (cxProperties.getEnabledZipScan()) { String clonedRepoPath = cxRepoFileHelper.prepareRepoFile(params); @@ -2489,7 +2495,7 @@ public Integer getLdapServerId(String serverName) throws CheckmarxException { return UNKNOWN_INT; } } - + private void validateScanParams(CxScanParams params) throws CheckmarxException { log.debug(params.toString()); if(ScanUtils.empty(params.getProjectName())){ @@ -2555,7 +2561,7 @@ public void waitForScanCompletion(Integer scanId) throws CheckmarxException{ timer += cxProperties.getScanPolling(); //Scan Queuing Timeout = '0' and Scan Queuing = true would be waiting forever with the scan in the queue - if(cxProperties.getScanQueuing() && status.equals(CxService.SCAN_STATUS_QUEUED)){ + if(cxProperties.getScanQueuing() && status.equals(CxService.SCAN_STATUS_QUEUED)){ queueTimer += cxProperties.getScanPolling(); if (cxProperties.getScanQueuingTimeout() != 0 && queueTimer >= (cxProperties.getScanQueuingTimeout() * 60000)) { log.error("Scan queued time exceded. {} minutes ", cxProperties.getScanQueuingTimeout()); @@ -2585,9 +2591,9 @@ public CxPropertiesBase getCxPropertiesBase() { return cxProperties; } - @Override - public void setProjectRepositoryDetails(Integer projectId, String gitUrl, String branch) throws CheckmarxException { - // TODO Auto-generated method stub - - } + @Override + public void setProjectRepositoryDetails(Integer projectId, String gitUrl, String branch) throws CheckmarxException { + // TODO Auto-generated method stub + + } }