From f7ac468ffbeeee094632af1c2c6fa3837ca29d1f Mon Sep 17 00:00:00 2001 From: Ryan Baxter Date: Fri, 17 Mar 2017 12:06:58 -0400 Subject: [PATCH 1/7] Bumping boot version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ce1a5f72..f8127d52 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ 1.16.6 ${basedir} ${project.artifactId} - 1.4.2.RELEASE + 1.4.5.RELEASE jacoco From d124c23725eab27f1e665128b92440bd5157a115 Mon Sep 17 00:00:00 2001 From: Ryan Baxter Date: Fri, 17 Mar 2017 14:43:51 -0400 Subject: [PATCH 2/7] adding circle ci yaml --- circle.yml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 circle.yml diff --git a/circle.yml b/circle.yml new file mode 100644 index 00000000..97a07c1c --- /dev/null +++ b/circle.yml @@ -0,0 +1,20 @@ +general: + branches: + ignore: + - gh-pages # list of branches to ignore +machine: + java: + version: openjdk8 #Open JDK has the JCE extentions installed by default + environment: + _JAVA_OPTIONS: "-Xms1024m -Xmx2048m" +dependencies: + override: + - ./mvnw -s .settings.xml -U --fail-never dependency:go-offline || true +test: + override: + - ./mvnw -s .settings.xml clean install 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 + post: + - find . -type f -regex ".*/spring-cloud-*.*/target/*.*" | cpio -pdm $CIRCLE_ARTIFACTS + - mkdir -p $CIRCLE_TEST_REPORTS/junit/ + - find . -type f -regex ".*/target/.*-reports/.*" -exec cp {} $CIRCLE_TEST_REPORTS/junit/ \; + - bash <(curl -s https://codecov.io/bash) \ No newline at end of file From 3f0164b4771ee026ec60397dc97149dcf81866f5 Mon Sep 17 00:00:00 2001 From: Spencer Gibb Date: Thu, 20 Apr 2017 09:30:34 -0600 Subject: [PATCH 3/7] Bump spring-boot version to 1.4.6 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f8127d52..a019c51b 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ 1.16.6 ${basedir} ${project.artifactId} - 1.4.5.RELEASE + 1.4.6.RELEASE jacoco From 9032d7372466f8d50023caa7f9ffe7e329a6e080 Mon Sep 17 00:00:00 2001 From: Ryan Baxter Date: Mon, 1 May 2017 11:56:53 -0400 Subject: [PATCH 4/7] Version changes for 1.2.3.RELEASE --- pom.xml | 2 +- spring-cloud-build-tools/pom.xml | 4 ++-- spring-cloud-dependencies-parent/pom.xml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index a019c51b..de6eb7ff 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.cloud spring-cloud-build - 1.2.3.BUILD-SNAPSHOT + 1.2.3.RELEASE pom Spring Cloud Parent Spring Cloud parent pom, managing plugins and dependencies for Spring Cloud projects diff --git a/spring-cloud-build-tools/pom.xml b/spring-cloud-build-tools/pom.xml index 50b4ab52..dca2131a 100644 --- a/spring-cloud-build-tools/pom.xml +++ b/spring-cloud-build-tools/pom.xml @@ -5,14 +5,14 @@ 4.0.0 org.springframework.cloud spring-cloud-build-tools - 1.2.3.BUILD-SNAPSHOT + 1.2.3.RELEASE spring-cloud-build-tools jar Spring Cloud Build Tools org.springframework.cloud spring-cloud-build - 1.2.3.BUILD-SNAPSHOT + 1.2.3.RELEASE diff --git a/spring-cloud-dependencies-parent/pom.xml b/spring-cloud-dependencies-parent/pom.xml index 7d984f08..4eee43c6 100644 --- a/spring-cloud-dependencies-parent/pom.xml +++ b/spring-cloud-dependencies-parent/pom.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.springframework.cloud - 1.2.3.BUILD-SNAPSHOT + 1.2.3.RELEASE spring-cloud-dependencies-parent pom spring-cloud-dependencies-parent From 769fd97b4b76fa9977d28f9420589208554a6660 Mon Sep 17 00:00:00 2001 From: Ryan Baxter Date: Mon, 1 May 2017 12:01:14 -0400 Subject: [PATCH 5/7] Revert "Version changes for 1.2.3.RELEASE" This reverts commit 9032d7372466f8d50023caa7f9ffe7e329a6e080. --- pom.xml | 2 +- spring-cloud-build-tools/pom.xml | 4 ++-- spring-cloud-dependencies-parent/pom.xml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index de6eb7ff..a019c51b 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.cloud spring-cloud-build - 1.2.3.RELEASE + 1.2.3.BUILD-SNAPSHOT pom Spring Cloud Parent Spring Cloud parent pom, managing plugins and dependencies for Spring Cloud projects diff --git a/spring-cloud-build-tools/pom.xml b/spring-cloud-build-tools/pom.xml index dca2131a..50b4ab52 100644 --- a/spring-cloud-build-tools/pom.xml +++ b/spring-cloud-build-tools/pom.xml @@ -5,14 +5,14 @@ 4.0.0 org.springframework.cloud spring-cloud-build-tools - 1.2.3.RELEASE + 1.2.3.BUILD-SNAPSHOT spring-cloud-build-tools jar Spring Cloud Build Tools org.springframework.cloud spring-cloud-build - 1.2.3.RELEASE + 1.2.3.BUILD-SNAPSHOT diff --git a/spring-cloud-dependencies-parent/pom.xml b/spring-cloud-dependencies-parent/pom.xml index 4eee43c6..7d984f08 100644 --- a/spring-cloud-dependencies-parent/pom.xml +++ b/spring-cloud-dependencies-parent/pom.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.springframework.cloud - 1.2.3.RELEASE + 1.2.3.BUILD-SNAPSHOT spring-cloud-dependencies-parent pom spring-cloud-dependencies-parent From bc6b006ea1d9055f7ad58e066a503a9ff401a573 Mon Sep 17 00:00:00 2001 From: Ryan Baxter Date: Mon, 1 May 2017 13:55:40 -0400 Subject: [PATCH 6/7] Bumping version for next release --- pom.xml | 2 +- spring-cloud-build-tools/pom.xml | 4 ++-- spring-cloud-dependencies-parent/pom.xml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index a019c51b..1494cb10 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.cloud spring-cloud-build - 1.2.3.BUILD-SNAPSHOT + 1.2.4.BUILD-SNAPSHOT pom Spring Cloud Parent Spring Cloud parent pom, managing plugins and dependencies for Spring Cloud projects diff --git a/spring-cloud-build-tools/pom.xml b/spring-cloud-build-tools/pom.xml index 50b4ab52..0a315f1c 100644 --- a/spring-cloud-build-tools/pom.xml +++ b/spring-cloud-build-tools/pom.xml @@ -5,14 +5,14 @@ 4.0.0 org.springframework.cloud spring-cloud-build-tools - 1.2.3.BUILD-SNAPSHOT + 1.2.4.BUILD-SNAPSHOT spring-cloud-build-tools jar Spring Cloud Build Tools org.springframework.cloud spring-cloud-build - 1.2.3.BUILD-SNAPSHOT + 1.2.4.BUILD-SNAPSHOT diff --git a/spring-cloud-dependencies-parent/pom.xml b/spring-cloud-dependencies-parent/pom.xml index 7d984f08..1323e7f0 100644 --- a/spring-cloud-dependencies-parent/pom.xml +++ b/spring-cloud-dependencies-parent/pom.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.springframework.cloud - 1.2.3.BUILD-SNAPSHOT + 1.2.4.BUILD-SNAPSHOT spring-cloud-dependencies-parent pom spring-cloud-dependencies-parent From b2b515f04ea490c4ea3ed951005be8fc907c72c1 Mon Sep 17 00:00:00 2001 From: Ryan Baxter Date: Fri, 28 Sep 2018 10:17:35 -0400 Subject: [PATCH 7/7] Removing old circle config and adding new 2.0 config --- .circleci/config.yml | 40 ++++++++++++++++++++++++++++++++++++++++ .travis.yml | 26 -------------------------- circle.yml | 20 -------------------- 3 files changed, 40 insertions(+), 46 deletions(-) create mode 100644 .circleci/config.yml delete mode 100644 .travis.yml delete mode 100644 circle.yml diff --git a/.circleci/config.yml b/.circleci/config.yml new file mode 100644 index 00000000..3cbd16ff --- /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-build-{{ .Branch }} + - run: + name: "Download dependencies" + command: ./mvnw -s .settings.xml -U --fail-never dependency:go-offline || true + - save_cache: + key: sc-build-{{ .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 f8d83069..00000000 --- a/.travis.yml +++ /dev/null @@ -1,26 +0,0 @@ -sudo: false -language: java -before_install: - - echo Using MVN_GOAL=${MVN_GOAL} for SPRING_CLOUD_BUILD=${SPRING_CLOUD_BUILD} - - 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 "^.*/.*$" && echo true || echo false) - - SPRING_CLOUD_BUILD=$(echo ${TRAVIS_REPO_SLUG} | grep -q "^spring-cloud/.*$" && echo true || echo false) - - MVN_GOAL=$([ "${TRAVIS_PULL_REQUEST}" == "false" -a "${TRAVIS_TAG}" == "" -a "${FEATURE_BRANCH}" == "false" -a "${SPRING_CLOUD_BUILD}" == "true" ] && echo deploy || echo 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: "KRJQg6soMWudREJ11ocGK8I4OuhIehvy/ehTjBxvyATEwL6rXA9dKPGfb0OAscEgIpNxW1cezH8vUSaSZGFhx6LF5VnJ9Mh39pi9uYm9GMjQ61B4d5GaRjbGj/fXBd8kGubDO8kmjkDGGgkjWXfYZa/WIQ4kVWCIB5dVV9XJ0Lw=" diff --git a/circle.yml b/circle.yml deleted file mode 100644 index 97a07c1c..00000000 --- a/circle.yml +++ /dev/null @@ -1,20 +0,0 @@ -general: - branches: - ignore: - - gh-pages # list of branches to ignore -machine: - java: - version: openjdk8 #Open JDK has the JCE extentions installed by default - environment: - _JAVA_OPTIONS: "-Xms1024m -Xmx2048m" -dependencies: - override: - - ./mvnw -s .settings.xml -U --fail-never dependency:go-offline || true -test: - override: - - ./mvnw -s .settings.xml clean install 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 - post: - - find . -type f -regex ".*/spring-cloud-*.*/target/*.*" | cpio -pdm $CIRCLE_ARTIFACTS - - mkdir -p $CIRCLE_TEST_REPORTS/junit/ - - find . -type f -regex ".*/target/.*-reports/.*" -exec cp {} $CIRCLE_TEST_REPORTS/junit/ \; - - bash <(curl -s https://codecov.io/bash) \ No newline at end of file