diff --git a/.circleci/config.yml b/.circleci/config.yml index bbe930e2..21b32d56 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: @@ -12,9 +14,9 @@ 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_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: @@ -40,7 +42,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_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} diff --git a/pom.xml b/pom.xml index ae2646f4..0f66a43c 100644 --- a/pom.xml +++ b/pom.xml @@ -5,14 +5,14 @@ org.springframework.boot spring-boot-starter-parent - 2.6.6 + 2.6.13 com.github.checkmarx-ltd cx-spring-boot-sdk - 0.5.29 + 0.5.30 cx-spring-boot-sdk @@ -40,6 +40,11 @@ httpclient 4.5.13 + + org.yaml + snakeyaml + 1.33 + org.apache.commons commons-compress @@ -68,7 +73,7 @@ com.google.code.gson gson - 2.8.8 + 2.8.9 org.apache.commons