From b909287d70f483437c0b9399e4827613e57aef81 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Thu, 28 Jun 2018 14:55:16 +0000 Subject: [PATCH 1/4] Update SNAPSHOT to 1.3.4.RELEASE --- docs/pom.xml | 2 +- pom.xml | 8 ++++---- spring-cloud-bus-dependencies/pom.xml | 4 ++-- spring-cloud-bus/pom.xml | 2 +- spring-cloud-starter-bus-amqp/pom.xml | 2 +- spring-cloud-starter-bus-kafka/pom.xml | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index b11056e..7e65c5d 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-bus-parent - 1.3.4.BUILD-SNAPSHOT + 1.3.4.RELEASE pom Spring Cloud Bus Docs diff --git a/pom.xml b/pom.xml index e6f95fe..0daed7d 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 spring-cloud-bus-parent - 1.3.4.BUILD-SNAPSHOT + 1.3.4.RELEASE pom spring-cloud-bus-parent @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-build - 1.3.8.RELEASE + 1.3.10.RELEASE @@ -26,8 +26,8 @@ - 1.3.0.RELEASE - Ditmars.RELEASE + 1.3.4.RELEASE + Ditmars.SR4 bus diff --git a/spring-cloud-bus-dependencies/pom.xml b/spring-cloud-bus-dependencies/pom.xml index d4510b7..c261713 100644 --- a/spring-cloud-bus-dependencies/pom.xml +++ b/spring-cloud-bus-dependencies/pom.xml @@ -5,11 +5,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 1.3.8.BUILD-SNAPSHOT + 1.3.10.RELEASE spring-cloud-bus-dependencies - 1.3.4.BUILD-SNAPSHOT + 1.3.4.RELEASE pom spring-cloud-bus-dependencies Spring Cloud Bus Dependencies diff --git a/spring-cloud-bus/pom.xml b/spring-cloud-bus/pom.xml index 8ae8b40..452f2da 100644 --- a/spring-cloud-bus/pom.xml +++ b/spring-cloud-bus/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-bus-parent - 1.3.4.BUILD-SNAPSHOT + 1.3.4.RELEASE .. diff --git a/spring-cloud-starter-bus-amqp/pom.xml b/spring-cloud-starter-bus-amqp/pom.xml index 85ba517..ebf9d68 100644 --- a/spring-cloud-starter-bus-amqp/pom.xml +++ b/spring-cloud-starter-bus-amqp/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-bus-parent - 1.3.4.BUILD-SNAPSHOT + 1.3.4.RELEASE .. spring-cloud-starter-bus-amqp diff --git a/spring-cloud-starter-bus-kafka/pom.xml b/spring-cloud-starter-bus-kafka/pom.xml index 7d87fc8..c9aad70 100644 --- a/spring-cloud-starter-bus-kafka/pom.xml +++ b/spring-cloud-starter-bus-kafka/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-bus-parent - 1.3.4.BUILD-SNAPSHOT + 1.3.4.RELEASE .. spring-cloud-starter-bus-kafka From 6394e7d4ffe721b2a3da496e9b5d9978e9455f6e Mon Sep 17 00:00:00 2001 From: buildmaster Date: Thu, 28 Jun 2018 14:56:09 +0000 Subject: [PATCH 2/4] Going back to snapshots --- docs/pom.xml | 2 +- pom.xml | 8 ++++---- spring-cloud-bus-dependencies/pom.xml | 4 ++-- spring-cloud-bus/pom.xml | 2 +- spring-cloud-starter-bus-amqp/pom.xml | 2 +- spring-cloud-starter-bus-kafka/pom.xml | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 7e65c5d..b11056e 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-bus-parent - 1.3.4.RELEASE + 1.3.4.BUILD-SNAPSHOT pom Spring Cloud Bus Docs diff --git a/pom.xml b/pom.xml index 0daed7d..e6f95fe 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 spring-cloud-bus-parent - 1.3.4.RELEASE + 1.3.4.BUILD-SNAPSHOT pom spring-cloud-bus-parent @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-build - 1.3.10.RELEASE + 1.3.8.RELEASE @@ -26,8 +26,8 @@ - 1.3.4.RELEASE - Ditmars.SR4 + 1.3.0.RELEASE + Ditmars.RELEASE bus diff --git a/spring-cloud-bus-dependencies/pom.xml b/spring-cloud-bus-dependencies/pom.xml index c261713..d4510b7 100644 --- a/spring-cloud-bus-dependencies/pom.xml +++ b/spring-cloud-bus-dependencies/pom.xml @@ -5,11 +5,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 1.3.10.RELEASE + 1.3.8.BUILD-SNAPSHOT spring-cloud-bus-dependencies - 1.3.4.RELEASE + 1.3.4.BUILD-SNAPSHOT pom spring-cloud-bus-dependencies Spring Cloud Bus Dependencies diff --git a/spring-cloud-bus/pom.xml b/spring-cloud-bus/pom.xml index 452f2da..8ae8b40 100644 --- a/spring-cloud-bus/pom.xml +++ b/spring-cloud-bus/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-bus-parent - 1.3.4.RELEASE + 1.3.4.BUILD-SNAPSHOT .. diff --git a/spring-cloud-starter-bus-amqp/pom.xml b/spring-cloud-starter-bus-amqp/pom.xml index ebf9d68..85ba517 100644 --- a/spring-cloud-starter-bus-amqp/pom.xml +++ b/spring-cloud-starter-bus-amqp/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-bus-parent - 1.3.4.RELEASE + 1.3.4.BUILD-SNAPSHOT .. spring-cloud-starter-bus-amqp diff --git a/spring-cloud-starter-bus-kafka/pom.xml b/spring-cloud-starter-bus-kafka/pom.xml index c9aad70..7d87fc8 100644 --- a/spring-cloud-starter-bus-kafka/pom.xml +++ b/spring-cloud-starter-bus-kafka/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-bus-parent - 1.3.4.RELEASE + 1.3.4.BUILD-SNAPSHOT .. spring-cloud-starter-bus-kafka From a5d7925d8f83ef804cdd0789f2c09aabcccf125d Mon Sep 17 00:00:00 2001 From: buildmaster Date: Thu, 28 Jun 2018 14:56:09 +0000 Subject: [PATCH 3/4] Bumping versions to 1.3.5.BUILD-SNAPSHOT after release --- docs/pom.xml | 2 +- pom.xml | 4 ++-- spring-cloud-bus-dependencies/pom.xml | 4 ++-- spring-cloud-bus/pom.xml | 2 +- spring-cloud-starter-bus-amqp/pom.xml | 2 +- spring-cloud-starter-bus-kafka/pom.xml | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index b11056e..7371a7f 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-bus-parent - 1.3.4.BUILD-SNAPSHOT + 1.3.5.BUILD-SNAPSHOT pom Spring Cloud Bus Docs diff --git a/pom.xml b/pom.xml index e6f95fe..8602271 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 spring-cloud-bus-parent - 1.3.4.BUILD-SNAPSHOT + 1.3.5.BUILD-SNAPSHOT pom spring-cloud-bus-parent @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-build - 1.3.8.RELEASE + 1.3.10.RELEASE diff --git a/spring-cloud-bus-dependencies/pom.xml b/spring-cloud-bus-dependencies/pom.xml index d4510b7..a4ab6d0 100644 --- a/spring-cloud-bus-dependencies/pom.xml +++ b/spring-cloud-bus-dependencies/pom.xml @@ -5,11 +5,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 1.3.8.BUILD-SNAPSHOT + 1.3.10.RELEASE spring-cloud-bus-dependencies - 1.3.4.BUILD-SNAPSHOT + 1.3.5.BUILD-SNAPSHOT pom spring-cloud-bus-dependencies Spring Cloud Bus Dependencies diff --git a/spring-cloud-bus/pom.xml b/spring-cloud-bus/pom.xml index 8ae8b40..59533db 100644 --- a/spring-cloud-bus/pom.xml +++ b/spring-cloud-bus/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-bus-parent - 1.3.4.BUILD-SNAPSHOT + 1.3.5.BUILD-SNAPSHOT .. diff --git a/spring-cloud-starter-bus-amqp/pom.xml b/spring-cloud-starter-bus-amqp/pom.xml index 85ba517..78f8390 100644 --- a/spring-cloud-starter-bus-amqp/pom.xml +++ b/spring-cloud-starter-bus-amqp/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-bus-parent - 1.3.4.BUILD-SNAPSHOT + 1.3.5.BUILD-SNAPSHOT .. spring-cloud-starter-bus-amqp diff --git a/spring-cloud-starter-bus-kafka/pom.xml b/spring-cloud-starter-bus-kafka/pom.xml index 7d87fc8..4ca287b 100644 --- a/spring-cloud-starter-bus-kafka/pom.xml +++ b/spring-cloud-starter-bus-kafka/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-bus-parent - 1.3.4.BUILD-SNAPSHOT + 1.3.5.BUILD-SNAPSHOT .. spring-cloud-starter-bus-kafka From 61cfe1c9196758b0fa974ad975f42732f7b3506a Mon Sep 17 00:00:00 2001 From: Ryan Baxter Date: Fri, 28 Sep 2018 11:15:04 -0400 Subject: [PATCH 4/4] Adding circleci config --- .circleci/config.yml | 40 ++++++++++++++++++++++++++++++++++++++++ .travis.yml | 32 -------------------------------- 2 files changed, 40 insertions(+), 32 deletions(-) create mode 100644 .circleci/config.yml delete mode 100644 .travis.yml diff --git a/.circleci/config.yml b/.circleci/config.yml new file mode 100644 index 0000000..90393c5 --- /dev/null +++ b/.circleci/config.yml @@ -0,0 +1,40 @@ +version: 2 +jobs: + build: + docker: + - image: springcloud/pipeline-base + user: appuser + environment: + _JAVA_OPTIONS: "-Xms1024m -Xmx2048m" + TERM: dumb + branches: + ignore: + - gh-pages # list of branches to ignore + resource_class: large + steps: + - checkout + - restore_cache: + key: sc-bus-{{ .Branch }} + - run: + name: "Download dependencies" + command: ./mvnw -s .settings.xml -U --fail-never dependency:go-offline || true + - save_cache: + key: sc-bus-{{ .Branch }} + paths: + - ~/.m2 + - run: + name: "Running build" + command: ./mvnw -s .settings.xml clean org.jacoco:jacoco-maven-plugin:prepare-agent install -U -P sonar -nsu --batch-mode -Dmaven.test.redirectTestOutputToFile=true -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn + - run: + name: "Aggregate test results" + when: always + command: | + mkdir -p ~/junit/ + find . -type f -regex ".*/target/.*-reports/.*" -exec cp {} ~/junit/ \; + bash <(curl -s https://codecov.io/bash) + - store_artifacts: + path: ~/junit/ + destination: artifacts + - store_test_results: + path: ~/junit/ + destination: testartifacts \ No newline at end of file diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index be4caac..0000000 --- a/.travis.yml +++ /dev/null @@ -1,32 +0,0 @@ -sudo: false -cache: - directories: - - $HOME/.m2 -language: java -jdk: - - oraclejdk8 -services: - - redis-server -before_install: - - git config user.name "$GIT_NAME" - - git config user.email "$GIT_EMAIL" - - git config credential.helper "store --file=.git/credentials" - - echo "https://$GH_TOKEN:@github.com" > .git/credentials - - gem install asciidoctor -install: -- ./mvnw install -P docs -q -U -DskipTests=true -Dmaven.test.redirectTestOutputToFile=true -- '[ "${MVN_GOAL}" == "deploy" ] && ./docs/src/main/asciidoc/ghpages.sh || echo "Not updating docs"' -script: -- './mvnw -s .settings.xml $MVN_GOAL $MVN_PROFILE -nsu -Dmaven.test.redirectTestOutputToFile=true' -env: - global: - - GIT_NAME="Dave Syer" - - GIT_EMAIL=dsyer@pivotal.io - - CI_DEPLOY_USERNAME=buildmaster - - FEATURE_BRANCH=$(echo ${TRAVIS_BRANCH} | grep -q "^.*/.*$" && echo true || echo false) - - SPRING_CLOUD_BUILD=$(echo ${TRAVIS_REPO_SLUG} | grep -q "^spring-cloud/.*$" && echo true || echo false) - - MVN_GOAL=install - - VERSION=$(mvn validate | grep Building | head -1 | sed -e 's/.* //') - - MILESTONE=$(echo ${VERSION} | egrep 'M|RC' && echo true || echo false) - - MVN_PROFILE=$([ "${MILESTONE}" == "true" ] && echo -P milestone) - - secure: eO6b1PT+fmGvNVVYa9WqMwr7d6RXOx/S0m51KfgpeflqMkMnhnAcC8hzPRA2vmQN1kqRdr3OjN6bazRYsRxlQOYsev4QzDv74E9CTXLXzVi+L98Oq7BqD6MpEAEfZVWz1lvGUiaGKTghS7Tseag3sK5CslPr2LA0UAZWd0v1GUo=