From 258c9d0b990bea0bdd5700f45ec8bffd3916e659 Mon Sep 17 00:00:00 2001 From: spring-builds Date: Mon, 13 Jan 2025 22:20:26 +0000 Subject: [PATCH 1/2] Bumping versions --- pom.xml | 2 +- spring-cloud-vault-dependencies/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 9bc626de..ac40ea88 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-build - 4.1.5-SNAPSHOT + 4.1.6-SNAPSHOT diff --git a/spring-cloud-vault-dependencies/pom.xml b/spring-cloud-vault-dependencies/pom.xml index 722c9ef2..506082c2 100644 --- a/spring-cloud-vault-dependencies/pom.xml +++ b/spring-cloud-vault-dependencies/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-dependencies-parent - 4.1.5-SNAPSHOT + 4.1.6-SNAPSHOT From f83ef748e9cd8063c9f24724abc70aebe276b6d4 Mon Sep 17 00:00:00 2001 From: spencergibb Date: Fri, 17 Jan 2025 15:06:26 -0500 Subject: [PATCH 2/2] Adds dco.yml --- .circleci/config.yml | 56 -------------------------------------------- .github/dco.yml | 2 ++ 2 files changed, 2 insertions(+), 56 deletions(-) delete mode 100644 .circleci/config.yml create mode 100644 .github/dco.yml diff --git a/.circleci/config.yml b/.circleci/config.yml deleted file mode 100644 index 519e7f9b..00000000 --- a/.circleci/config.yml +++ /dev/null @@ -1,56 +0,0 @@ -version: 2 - -jobs: - build: - docker: - - image: circleci/openjdk:8u151-jdk - environment: - JAVA_TOOL_OPTIONS: "-Xms512m -Xmx768m" - TERM: dumb - branches: - ignore: - - gh-pages # list of branches to ignore - steps: - - setup_remote_docker - - checkout - - restore_cache: - key: sc-vault-{{ .Branch }} - - run: - name: "Download dependencies" - command: ./mvnw -s .settings.xml -B -U --fail-never dependency:go-offline || true - - run: - name: "Download Vault" - command: src/test/bash/install_vault.sh - - save_cache: - key: sc-vault-{{ .Branch }} - paths: - - ~/.m2 - - "download" - - run: - name: "Create Certificates" - command: src/test/bash/create_certificates.sh - - run: - name: "Starting Vault" - command: src/test/bash/local_run_vault.sh - background: true - - run: - name: "Running build" - command: ./mvnw -s .settings.xml clean org.jacoco:jacoco-maven-plugin:prepare-agent install install -U -P sonar -nsu -B -Dmaven.test.redirectTestOutputToFile=true -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn - - run: - name: "Starting Vault" - command: pkill vault - when: always - - run: - name: "Aggregate test results" - when: always - command: | - mkdir -p junit/ - find . -type f -regex ".*/target/.*-reports/.*" -exec cp {} junit/ \; - find . -type f -regex ".*/build/test-results/.*" -exec cp {} junit/ \; - bash <(curl -s https://codecov.io/bash) - - store_artifacts: - path: junit/ - destination: artifacts - - store_test_results: - path: junit/ - destination: testartifacts diff --git a/.github/dco.yml b/.github/dco.yml new file mode 100644 index 00000000..0c4b142e --- /dev/null +++ b/.github/dco.yml @@ -0,0 +1,2 @@ +require: + members: false