From e26cd3b26aa0cc1eaa1337c418b89841aa84bb46 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Fri, 29 Jun 2018 17:10:34 +0000 Subject: [PATCH 1/4] Update SNAPSHOT to 1.1.2.RELEASE --- docs/pom.xml | 2 +- pom.xml | 8 ++++---- spring-cloud-cloudfoundry-dependencies/pom.xml | 4 ++-- spring-cloud-cloudfoundry-discovery/pom.xml | 2 +- spring-cloud-cloudfoundry-sample/pom.xml | 2 +- spring-cloud-cloudfoundry-web/pom.xml | 2 +- spring-cloud-starter-cloudfoundry/pom.xml | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 3e9b5ef..98dcf02 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-cloudfoundry - 1.1.2.BUILD-SNAPSHOT + 1.1.2.RELEASE spring-cloud-cloudfoundry-docs pom diff --git a/pom.xml b/pom.xml index f599cc7..4d96df5 100644 --- a/pom.xml +++ b/pom.xml @@ -4,21 +4,21 @@ 4.0.0 spring-cloud-cloudfoundry - 1.1.2.BUILD-SNAPSHOT + 1.1.2.RELEASE pom org.springframework.cloud spring-cloud-build - 1.3.5.BUILD-SNAPSHOT + 1.3.10.RELEASE cloudfoundry ${basedir} - 1.4.0.BUILD-SNAPSHOT - 1.3.0.BUILD-SNAPSHOT + 1.4.5.RELEASE + 1.3.4.RELEASE diff --git a/spring-cloud-cloudfoundry-dependencies/pom.xml b/spring-cloud-cloudfoundry-dependencies/pom.xml index d39823f..ac03c29 100644 --- a/spring-cloud-cloudfoundry-dependencies/pom.xml +++ b/spring-cloud-cloudfoundry-dependencies/pom.xml @@ -5,11 +5,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 1.3.5.BUILD-SNAPSHOT + 1.3.10.RELEASE spring-cloud-cloudfoundry-dependencies - 1.1.2.BUILD-SNAPSHOT + 1.1.2.RELEASE pom spring-cloud-cloudfoundry-dependencies Spring Cloud Cloudfoundry Dependencies diff --git a/spring-cloud-cloudfoundry-discovery/pom.xml b/spring-cloud-cloudfoundry-discovery/pom.xml index e91d476..e4a94fe 100644 --- a/spring-cloud-cloudfoundry-discovery/pom.xml +++ b/spring-cloud-cloudfoundry-discovery/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-cloudfoundry - 1.1.2.BUILD-SNAPSHOT + 1.1.2.RELEASE .. diff --git a/spring-cloud-cloudfoundry-sample/pom.xml b/spring-cloud-cloudfoundry-sample/pom.xml index 441dfeb..4e29519 100644 --- a/spring-cloud-cloudfoundry-sample/pom.xml +++ b/spring-cloud-cloudfoundry-sample/pom.xml @@ -9,7 +9,7 @@ org.springframework.cloud spring-cloud-cloudfoundry - 1.1.2.BUILD-SNAPSHOT + 1.1.2.RELEASE .. diff --git a/spring-cloud-cloudfoundry-web/pom.xml b/spring-cloud-cloudfoundry-web/pom.xml index 3ea2e55..0b301a3 100644 --- a/spring-cloud-cloudfoundry-web/pom.xml +++ b/spring-cloud-cloudfoundry-web/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-cloudfoundry - 1.1.2.BUILD-SNAPSHOT + 1.1.2.RELEASE .. diff --git a/spring-cloud-starter-cloudfoundry/pom.xml b/spring-cloud-starter-cloudfoundry/pom.xml index 4eabbd6..b6a297f 100644 --- a/spring-cloud-starter-cloudfoundry/pom.xml +++ b/spring-cloud-starter-cloudfoundry/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-cloudfoundry - 1.1.2.BUILD-SNAPSHOT + 1.1.2.RELEASE .. spring-cloud-starter-cloudfoundry From d2654d38947ceb515a480410bf173d01c7c24995 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Fri, 29 Jun 2018 17:12:00 +0000 Subject: [PATCH 2/4] Going back to snapshots --- docs/pom.xml | 2 +- pom.xml | 8 ++++---- spring-cloud-cloudfoundry-dependencies/pom.xml | 4 ++-- spring-cloud-cloudfoundry-discovery/pom.xml | 2 +- spring-cloud-cloudfoundry-sample/pom.xml | 2 +- spring-cloud-cloudfoundry-web/pom.xml | 2 +- spring-cloud-starter-cloudfoundry/pom.xml | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 98dcf02..3e9b5ef 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-cloudfoundry - 1.1.2.RELEASE + 1.1.2.BUILD-SNAPSHOT spring-cloud-cloudfoundry-docs pom diff --git a/pom.xml b/pom.xml index 4d96df5..f599cc7 100644 --- a/pom.xml +++ b/pom.xml @@ -4,21 +4,21 @@ 4.0.0 spring-cloud-cloudfoundry - 1.1.2.RELEASE + 1.1.2.BUILD-SNAPSHOT pom org.springframework.cloud spring-cloud-build - 1.3.10.RELEASE + 1.3.5.BUILD-SNAPSHOT cloudfoundry ${basedir} - 1.4.5.RELEASE - 1.3.4.RELEASE + 1.4.0.BUILD-SNAPSHOT + 1.3.0.BUILD-SNAPSHOT diff --git a/spring-cloud-cloudfoundry-dependencies/pom.xml b/spring-cloud-cloudfoundry-dependencies/pom.xml index ac03c29..d39823f 100644 --- a/spring-cloud-cloudfoundry-dependencies/pom.xml +++ b/spring-cloud-cloudfoundry-dependencies/pom.xml @@ -5,11 +5,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 1.3.10.RELEASE + 1.3.5.BUILD-SNAPSHOT spring-cloud-cloudfoundry-dependencies - 1.1.2.RELEASE + 1.1.2.BUILD-SNAPSHOT pom spring-cloud-cloudfoundry-dependencies Spring Cloud Cloudfoundry Dependencies diff --git a/spring-cloud-cloudfoundry-discovery/pom.xml b/spring-cloud-cloudfoundry-discovery/pom.xml index e4a94fe..e91d476 100644 --- a/spring-cloud-cloudfoundry-discovery/pom.xml +++ b/spring-cloud-cloudfoundry-discovery/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-cloudfoundry - 1.1.2.RELEASE + 1.1.2.BUILD-SNAPSHOT .. diff --git a/spring-cloud-cloudfoundry-sample/pom.xml b/spring-cloud-cloudfoundry-sample/pom.xml index 4e29519..441dfeb 100644 --- a/spring-cloud-cloudfoundry-sample/pom.xml +++ b/spring-cloud-cloudfoundry-sample/pom.xml @@ -9,7 +9,7 @@ org.springframework.cloud spring-cloud-cloudfoundry - 1.1.2.RELEASE + 1.1.2.BUILD-SNAPSHOT .. diff --git a/spring-cloud-cloudfoundry-web/pom.xml b/spring-cloud-cloudfoundry-web/pom.xml index 0b301a3..3ea2e55 100644 --- a/spring-cloud-cloudfoundry-web/pom.xml +++ b/spring-cloud-cloudfoundry-web/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-cloudfoundry - 1.1.2.RELEASE + 1.1.2.BUILD-SNAPSHOT .. diff --git a/spring-cloud-starter-cloudfoundry/pom.xml b/spring-cloud-starter-cloudfoundry/pom.xml index b6a297f..4eabbd6 100644 --- a/spring-cloud-starter-cloudfoundry/pom.xml +++ b/spring-cloud-starter-cloudfoundry/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-cloudfoundry - 1.1.2.RELEASE + 1.1.2.BUILD-SNAPSHOT .. spring-cloud-starter-cloudfoundry From b64020f78abce6bc5571873988dba4c8ad98c6d2 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Fri, 29 Jun 2018 17:12:00 +0000 Subject: [PATCH 3/4] Bumping versions to 1.1.3.BUILD-SNAPSHOT after release --- docs/pom.xml | 2 +- pom.xml | 4 ++-- spring-cloud-cloudfoundry-dependencies/pom.xml | 4 ++-- spring-cloud-cloudfoundry-discovery/pom.xml | 2 +- spring-cloud-cloudfoundry-sample/pom.xml | 2 +- spring-cloud-cloudfoundry-web/pom.xml | 2 +- spring-cloud-starter-cloudfoundry/pom.xml | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 3e9b5ef..e069ca5 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-cloudfoundry - 1.1.2.BUILD-SNAPSHOT + 1.1.3.BUILD-SNAPSHOT spring-cloud-cloudfoundry-docs pom diff --git a/pom.xml b/pom.xml index f599cc7..edc3642 100644 --- a/pom.xml +++ b/pom.xml @@ -4,13 +4,13 @@ 4.0.0 spring-cloud-cloudfoundry - 1.1.2.BUILD-SNAPSHOT + 1.1.3.BUILD-SNAPSHOT pom org.springframework.cloud spring-cloud-build - 1.3.5.BUILD-SNAPSHOT + 1.3.10.RELEASE diff --git a/spring-cloud-cloudfoundry-dependencies/pom.xml b/spring-cloud-cloudfoundry-dependencies/pom.xml index d39823f..78e3a9a 100644 --- a/spring-cloud-cloudfoundry-dependencies/pom.xml +++ b/spring-cloud-cloudfoundry-dependencies/pom.xml @@ -5,11 +5,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 1.3.5.BUILD-SNAPSHOT + 1.3.10.RELEASE spring-cloud-cloudfoundry-dependencies - 1.1.2.BUILD-SNAPSHOT + 1.1.3.BUILD-SNAPSHOT pom spring-cloud-cloudfoundry-dependencies Spring Cloud Cloudfoundry Dependencies diff --git a/spring-cloud-cloudfoundry-discovery/pom.xml b/spring-cloud-cloudfoundry-discovery/pom.xml index e91d476..3634ff7 100644 --- a/spring-cloud-cloudfoundry-discovery/pom.xml +++ b/spring-cloud-cloudfoundry-discovery/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-cloudfoundry - 1.1.2.BUILD-SNAPSHOT + 1.1.3.BUILD-SNAPSHOT .. diff --git a/spring-cloud-cloudfoundry-sample/pom.xml b/spring-cloud-cloudfoundry-sample/pom.xml index 441dfeb..47d5262 100644 --- a/spring-cloud-cloudfoundry-sample/pom.xml +++ b/spring-cloud-cloudfoundry-sample/pom.xml @@ -9,7 +9,7 @@ org.springframework.cloud spring-cloud-cloudfoundry - 1.1.2.BUILD-SNAPSHOT + 1.1.3.BUILD-SNAPSHOT .. diff --git a/spring-cloud-cloudfoundry-web/pom.xml b/spring-cloud-cloudfoundry-web/pom.xml index 3ea2e55..25266d3 100644 --- a/spring-cloud-cloudfoundry-web/pom.xml +++ b/spring-cloud-cloudfoundry-web/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-cloudfoundry - 1.1.2.BUILD-SNAPSHOT + 1.1.3.BUILD-SNAPSHOT .. diff --git a/spring-cloud-starter-cloudfoundry/pom.xml b/spring-cloud-starter-cloudfoundry/pom.xml index 4eabbd6..b833991 100644 --- a/spring-cloud-starter-cloudfoundry/pom.xml +++ b/spring-cloud-starter-cloudfoundry/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-cloudfoundry - 1.1.2.BUILD-SNAPSHOT + 1.1.3.BUILD-SNAPSHOT .. spring-cloud-starter-cloudfoundry From 6e00837968930a1b42d398a2861129a9846a450d Mon Sep 17 00:00:00 2001 From: Ryan Baxter Date: Thu, 14 Mar 2019 07:43:02 -0400 Subject: [PATCH 4/4] Adding circle 2.0 config --- .circleci/config.yml | 40 ++++++++++++++++++++++++++++++++++++++++ circle.yml | 20 -------------------- 2 files changed, 40 insertions(+), 20 deletions(-) create mode 100644 .circleci/config.yml delete mode 100644 circle.yml diff --git a/.circleci/config.yml b/.circleci/config.yml new file mode 100644 index 0000000..d186f79 --- /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-cloudfoundry-{{ .Branch }} + - run: + name: "Download dependencies" + command: ./mvnw -s .settings.xml -U --fail-never dependency:go-offline || true + - save_cache: + key: sc-cloudfoundry-{{ .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/circle.yml b/circle.yml deleted file mode 100644 index 3e841d9..0000000 --- a/circle.yml +++ /dev/null @@ -1,20 +0,0 @@ -general: - branches: - ignore: - - gh-pages # list of branches to ignore -machine: - java: - version: oraclejdk8 - 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 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)