From 3801a6c98785cca208e269858c63efacf7a6ed98 Mon Sep 17 00:00:00 2001 From: Florian Benz Date: Fri, 23 Mar 2018 14:38:06 +0100 Subject: [PATCH] 1.0.12 Release (#211) * 1.0.12 Release * Add the 1.0.x branch to the safelist --- .travis.yml | 3 ++- docs/index.html | 14 +++++++------- pom.xml | 2 +- spring-auto-restdocs-core/pom.xml | 2 +- spring-auto-restdocs-docs/pom.xml | 4 ++-- spring-auto-restdocs-example/build.gradle | 2 +- spring-auto-restdocs-example/pom.xml | 4 ++-- spring-auto-restdocs-json-doclet/pom.xml | 2 +- 8 files changed, 17 insertions(+), 16 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3837cb19..15705b62 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,7 +22,7 @@ script: - ./gradlew check - cd .. after_success: -- test "$TRAVIS_BRANCH" = "master" +- test "$TRAVIS_BRANCH" = "master" -o "$TRAVIS_BRANCH" = "1.0.x" && test "$TRAVIS_PULL_REQUEST" = "false" && test "$TRAVIS_JDK_VERSION" = "oraclejdk7" && "$DEPLOY_DIR/decrypt.sh" @@ -30,6 +30,7 @@ after_success: branches: only: - master + - 1.0.x env: global: - DEPLOY_DIR="$TRAVIS_BUILD_DIR/deploy" diff --git a/docs/index.html b/docs/index.html index b483ce8d..f4af8aa9 100644 --- a/docs/index.html +++ b/docs/index.html @@ -425,7 +425,7 @@

Spring Auto REST Docs

Scalable Capital
-version 1.0.12-SNAPSHOT +version 1.0.12
Table of Contents
@@ -595,7 +595,7 @@

Usage
<dependency>
     <groupId>capital.scalable</groupId>
     <artifactId>spring-auto-restdocs-core</artifactId>
-    <version>1.0.11</version>
+    <version>1.0.12</version>
     <scope>test</scope> (1)
 </dependency>
 
@@ -632,7 +632,7 @@ 

Usage <docletArtifact> <groupId>capital.scalable</groupId> <artifactId>spring-auto-restdocs-json-doclet</artifactId> - <version>1.0.11</version> + <version>1.0.12</version> </docletArtifact> <destDir>generated-javadoc-json</destDir> (3) <reportOutputDirectory>${project.build.directory}</reportOutputDirectory> (3) @@ -677,8 +677,8 @@

Usage } dependencies { - testCompile group: 'capital.scalable', name: 'spring-auto-restdocs-core', version: '1.0.11' (1) - jsondoclet group: 'capital.scalable', name: 'spring-auto-restdocs-json-doclet', version: '1.0.11' + testCompile group: 'capital.scalable', name: 'spring-auto-restdocs-core', version: '1.0.12' (1) + jsondoclet group: 'capital.scalable', name: 'spring-auto-restdocs-json-doclet', version: '1.0.12' } task jsonDoclet(type: Javadoc, dependsOn: compileJava) { @@ -1841,8 +1841,8 @@

diff --git a/pom.xml b/pom.xml index 24055593..5b089ff6 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ capital.scalable spring-auto-restdocs-parent - 1.0.12-SNAPSHOT + 1.0.12 pom Spring Auto REST Docs Parent POM diff --git a/spring-auto-restdocs-core/pom.xml b/spring-auto-restdocs-core/pom.xml index eedec3a1..fda4284e 100644 --- a/spring-auto-restdocs-core/pom.xml +++ b/spring-auto-restdocs-core/pom.xml @@ -7,7 +7,7 @@ capital.scalable spring-auto-restdocs-parent - 1.0.12-SNAPSHOT + 1.0.12 .. diff --git a/spring-auto-restdocs-docs/pom.xml b/spring-auto-restdocs-docs/pom.xml index b203339d..8c48fe7d 100644 --- a/spring-auto-restdocs-docs/pom.xml +++ b/spring-auto-restdocs-docs/pom.xml @@ -6,7 +6,7 @@ capital.scalable spring-auto-restdocs-parent - 1.0.12-SNAPSHOT + 1.0.12 .. @@ -18,7 +18,7 @@ ${project.basedir}/../docs - 1.0.11 + 1.0.12 diff --git a/spring-auto-restdocs-example/build.gradle b/spring-auto-restdocs-example/build.gradle index 6f184cde..9b2150b6 100644 --- a/spring-auto-restdocs-example/build.gradle +++ b/spring-auto-restdocs-example/build.gradle @@ -17,7 +17,7 @@ apply plugin: "org.springframework.boot" apply plugin: "org.asciidoctor.convert" group = "capital.scalable" -version = "1.0.12-SNAPSHOT" +version = "1.0.12" description = """Spring Auto REST Docs Example Project""" diff --git a/spring-auto-restdocs-example/pom.xml b/spring-auto-restdocs-example/pom.xml index 47af75ee..2da42ec5 100644 --- a/spring-auto-restdocs-example/pom.xml +++ b/spring-auto-restdocs-example/pom.xml @@ -13,7 +13,7 @@ capital.scalable spring-auto-restdocs-example - 1.0.12-SNAPSHOT + 1.0.12 Spring Auto REST Docs Example Project Example project for Spring Auto REST Docs @@ -36,7 +36,7 @@ UTF-8 capital.scalable.restdocs.example.Application 1.2.3.RELEASE - 1.0.12-SNAPSHOT + 1.0.12 diff --git a/spring-auto-restdocs-json-doclet/pom.xml b/spring-auto-restdocs-json-doclet/pom.xml index 482febe6..b6bee132 100644 --- a/spring-auto-restdocs-json-doclet/pom.xml +++ b/spring-auto-restdocs-json-doclet/pom.xml @@ -5,7 +5,7 @@ capital.scalable spring-auto-restdocs-parent - 1.0.12-SNAPSHOT + 1.0.12 ..