Compare commits

...
Author SHA1 Message Date
Ryan Baxter f67ba21d7b Version changes for 1.3.11.RELEASE 2018-10-12 10:41:08 -04:00
Ryan Baxter c937f501ce Bumping boot to 1.5.16 and moving back to 1.3.11 2018-10-12 10:36:18 -04:00
Ryan Baxter ff3bf15bd6 Merge remote-tracking branch 'origin/1.2.x' into 1.3.x 2018-09-28 10:28:38 -04:00
Ryan Baxter b2b515f04e Removing old circle config and adding new 2.0 config 2018-09-28 10:17:35 -04:00
buildmaster bb6f4b3763 Bumping versions to 1.3.12.BUILD-SNAPSHOT after release 2018-06-28 14:15:46 +00:00
buildmaster 167f2b2f7d Going back to snapshots 2018-06-28 14:15:46 +00:00
buildmaster d15f4f1ec7 Update SNAPSHOT to 1.3.10.RELEASE 2018-06-28 14:14:39 +00:00
buildmaster 5f3c88babc Bumping versions to 1.3.11.BUILD-SNAPSHOT after release 2018-06-28 13:39:47 +00:00
buildmaster 0e386af8ac Going back to snapshots 2018-06-28 13:39:47 +00:00
buildmaster 712ff51fb8 Update SNAPSHOT to 1.3.10.RELEASE 2018-06-28 13:38:58 +00:00
Ryan Baxter 75f490ffcf Bumping boot version 2018-06-27 14:05:06 -04:00
Dave Syer ae73ec3da9 Revert to snapshots 2018-04-24 10:15:55 +01:00
Dave Syer 4b2628d05a Update to Boot 1.5.12 2018-04-24 10:15:21 +01:00
Dave Syer c11c60b23b Bumnp Spring Boot to 1.5.12 2018-04-24 09:59:36 +01:00
Ryan Baxter f70adbbd74 Upgrade animal sniffer. Fixes #72 2018-04-18 16:11:19 -04:00
Marcin Grzejszczak bc394526fa Bumped boot to 1.5.11 2018-04-06 14:01:00 +02:00
Marcin Grzejszczak c3115313ac Added callout icons, fixes gh-70 2018-03-09 12:56:45 +01:00
Marcin Grzejszczak 80066daca7 Fails the build if generated HTML contains Unresolved (#68)
fixes #67
2018-02-12 17:09:59 +01:00
Ryan Baxter f020bf77a9 bumping version to next release 2018-02-07 15:56:36 -05:00
Ryan Baxter a2bb813307 Revert "1.3.8.RELEASE"
This reverts commit 136880ebe3.
2018-02-07 15:43:48 -05:00
Ryan Baxter 136880ebe3 1.3.8.RELEASE 2018-02-07 15:40:00 -05:00
Ryan Baxter e50d36b42a Bumping boot version 2018-02-07 15:33:23 -05:00
Ryan Baxter 2578cdbfa9 Fixing boot dependencies version 2018-01-03 17:25:08 -05:00
buildmaster 924ed94f88 Bumping versions to 1.3.8.BUILD-SNAPSHOT after release 2017-12-21 17:37:30 +00:00
buildmaster c508ad4a2f Going back to snapshots 2017-12-21 17:37:30 +00:00
buildmaster db230a7b3d Update SNAPSHOT to 1.3.7.RELEASE 2017-12-21 17:36:44 +00:00
Spencer Gibb f5a37ebb50 Update boot to 1.5.9.RELEASE 2017-11-28 12:42:05 -05:00
Spencer Gibb f4c22a5151 Fix docs whitelist branch 2017-11-28 12:20:09 -05:00
buildmaster 34aaa7e1f1 Bumping versions to 1.3.7.BUILD-SNAPSHOT after release 2017-11-20 10:34:54 +00:00
buildmaster e9ef6a7e53 Going back to snapshots 2017-11-20 10:34:54 +00:00
buildmaster 203d35ed0a Update SNAPSHOT to 1.3.6.RELEASE 2017-11-20 10:34:16 +00:00
Spencer Gibb b1475df241 Update to Spring Boot 1.5.8.RELEASE 2017-10-30 15:53:30 -04:00
Ryan Baxter bc6b006ea1 Bumping version for next release 2017-05-01 13:55:40 -04:00
Ryan Baxter 769fd97b4b Revert "Version changes for 1.2.3.RELEASE"
This reverts commit 9032d73724.
2017-05-01 12:01:14 -04:00
Ryan Baxter 9032d73724 Version changes for 1.2.3.RELEASE 2017-05-01 11:56:53 -04:00
Spencer Gibb 3f0164b477 Bump spring-boot version to 1.4.6 2017-04-20 09:30:34 -06:00
Ryan Baxter d124c23725 adding circle ci yaml 2017-03-17 14:43:51 -04:00
Ryan Baxter f7ac468ffb Bumping boot version 2017-03-17 12:06:58 -04:00
12 changed files with 70 additions and 37 deletions
+40
View File
@@ -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
-26
View File
@@ -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="
+2 -2
View File
@@ -9,12 +9,12 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-build</artifactId>
<version>1.3.6.BUILD-SNAPSHOT</version>
<version>1.3.11.RELEASE</version>
</parent>
<properties>
<docs.main>spring-cloud-build</docs.main>
<!-- Comma separated list of whitelisted branches -->
<docs.whitelisted.branches>1.2.x,2.0.x</docs.whitelisted.branches>
<docs.whitelisted.branches>1.2.x,1.3.x</docs.whitelisted.branches>
<main.basedir>${basedir}/..</main.basedir>
<docs.resources.dir>${basedir}/src/main</docs.resources.dir>
</properties>
Binary file not shown.

After

Width:  |  Height:  |  Size: 329 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 353 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 350 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 65 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 178 KiB

+23 -4
View File
@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-build</artifactId>
<version>1.3.6.BUILD-SNAPSHOT</version>
<version>1.3.11.RELEASE</version>
<packaging>pom</packaging>
<name>Spring Cloud Parent</name>
<description>Spring Cloud parent pom, managing plugins and dependencies for Spring Cloud projects</description>
@@ -27,8 +27,8 @@
<maven.compiler.target>${java.version}</maven.compiler.target>
<main.basedir>${basedir}</main.basedir>
<docs.main>${project.artifactId}</docs.main>
<spring-boot.version>1.5.7.RELEASE</spring-boot.version>
<spring-cloud-build.version>1.3.6.BUILD-SNAPSHOT</spring-cloud-build.version>
<spring-boot.version>1.5.16.RELEASE</spring-boot.version>
<spring-cloud-build.version>1.3.11.RELEASE</spring-cloud-build.version>
<docs.resources.dir>${project.build.directory}/build-docs</docs.resources.dir>
<!-- Sonar -->
@@ -588,7 +588,7 @@ limitations under the License.
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>animal-sniffer-maven-plugin</artifactId>
<version>1.14</version>
<version>1.16</version>
<configuration>
<signature>
<groupId>org.codehaus.mojo.signature</groupId>
@@ -950,6 +950,25 @@ limitations under the License.
</target>
</configuration>
</execution>
<execution>
<id>assert-no-unresolved-links</id>
<phase>prepare-package</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<target>
<fileset id="unresolved.file" dir="${basedir}/target/contents/reference/" includes="**/*.html">
<contains text="Unresolved"/>
</fileset>
<fail message="[Unresolved] Found...failing">
<condition>
<resourcecount when="greater" count="0" refid="unresolved.file" />
</condition>
</fail>
</target>
</configuration>
</execution>
<execution>
<id>setup-maven-properties</id>
<phase>validate</phase>
+3 -3
View File
@@ -5,19 +5,19 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-build-dependencies</artifactId>
<version>1.3.6.BUILD-SNAPSHOT</version>
<version>1.3.11.RELEASE</version>
<name>spring-cloud-build-tools</name>
<packaging>pom</packaging>
<description>Spring Cloud Build Dependencies: an internal BOM for use with Spring Cloud projects. Use as a BOM or by inheriting from the spring-cloud build parent.</description>
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
<version>1.5.7.RELEASE</version>
<version>1.5.16.RELEASE</version>
</parent>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<lombok.version>1.16.14</lombok.version>
<spring-boot.version>${parent.version}</spring-boot.version>
<spring-boot.version>1.5.16.RELEASE</spring-boot.version>
</properties>
<dependencyManagement>
<dependencies>
+1 -1
View File
@@ -11,7 +11,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-build</artifactId>
<version>1.3.6.BUILD-SNAPSHOT</version>
<version>1.3.11.RELEASE</version>
</parent>
<dependencies>
<dependency>
+1 -1
View File
@@ -3,7 +3,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.cloud</groupId>
<version>1.3.6.BUILD-SNAPSHOT</version>
<version>1.3.11.RELEASE</version>
<artifactId>spring-cloud-dependencies-parent</artifactId>
<packaging>pom</packaging>
<name>spring-cloud-dependencies-parent</name>