1.0.12 Release (#211)

* 1.0.12 Release * Add the 1.0.x branch to the safelist
ScaCap · Mar 23, 2018 · 3801a6c · 3801a6c
1 parent d542336
commit 3801a6c
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 16 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -22,14 +22,15 @@ 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"
   && mvn deploy --settings "$DEPLOY_DIR/travis-settings.xml" -DskipTests=true -B -V
 branches:
   only:
   - master
+  - 1.0.x
 env:
   global:
   - DEPLOY_DIR="$TRAVIS_BUILD_DIR/deploy"

diff --git a/docs/index.html b/docs/index.html
@@ -425,7 +425,7 @@
 <h1>Spring Auto REST Docs</h1>
 <div class="details">
 <span id="author" class="author">Scalable Capital</span><br>
-<span id="revnumber">version 1.0.12-SNAPSHOT</span>
+<span id="revnumber">version 1.0.12</span>
 </div>
 <div id="toc" class="toc2">
 <div id="toctitle">Table of Contents</div>
@@ -595,7 +595,7 @@ <h3 id="gettingstarted-usage"><a class="link" href="#gettingstarted-usage">Usage
 <pre class="highlightjs highlight"><code class="language-xml" data-lang="xml">&lt;dependency&gt;
     &lt;groupId&gt;capital.scalable&lt;/groupId&gt;
     &lt;artifactId&gt;spring-auto-restdocs-core&lt;/artifactId&gt;
-    &lt;version&gt;1.0.11&lt;/version&gt;
+    &lt;version&gt;1.0.12&lt;/version&gt;
     &lt;scope&gt;test&lt;/scope&gt; <i class="conum" data-value="1"></i><b>(1)</b>
 &lt;/dependency&gt;
 
@@ -632,7 +632,7 @@ <h3 id="gettingstarted-usage"><a class="link" href="#gettingstarted-usage">Usage
                         &lt;docletArtifact&gt;
                             &lt;groupId&gt;capital.scalable&lt;/groupId&gt;
                             &lt;artifactId&gt;spring-auto-restdocs-json-doclet&lt;/artifactId&gt;
-                            &lt;version&gt;1.0.11&lt;/version&gt;
+                            &lt;version&gt;1.0.12&lt;/version&gt;
                         &lt;/docletArtifact&gt;
                         &lt;destDir&gt;generated-javadoc-json&lt;/destDir&gt; <i class="conum" data-value="3"></i><b>(3)</b>
                         &lt;reportOutputDirectory&gt;${project.build.directory}&lt;/reportOutputDirectory&gt; <i class="conum" data-value="3"></i><b>(3)</b>
@@ -677,8 +677,8 @@ <h3 id="gettingstarted-usage"><a class="link" href="#gettingstarted-usage">Usage
 }
 
 dependencies {
-    testCompile group: 'capital.scalable', name: 'spring-auto-restdocs-core', version: '1.0.11' <i class="conum" data-value="1"></i><b>(1)</b>
-    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' <i class="conum" data-value="1"></i><b>(1)</b>
+    jsondoclet group: 'capital.scalable', name: 'spring-auto-restdocs-json-doclet', version: '1.0.12'
 }
 
 task jsonDoclet(type: Javadoc, dependsOn: compileJava) {
@@ -1841,8 +1841,8 @@ <h4 id="contributing-building-build"><a class="link" href="#contributing-buildin
 </div>
 <div id="footer">
 <div id="footer-text">
-Version 1.0.12-SNAPSHOT<br>
-Last updated 2018-01-11 09:25:58 CET
+Version 1.0.12<br>
+Last updated 2018-03-23 13:37:35 CET
 </div>
 </div>
 <link rel="stylesheet" href="highlight/styles/github.min.css">

diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>capital.scalable</groupId>
     <artifactId>spring-auto-restdocs-parent</artifactId>
-    <version>1.0.12-SNAPSHOT</version>
+    <version>1.0.12</version>
     <packaging>pom</packaging>
 
     <name>Spring Auto REST Docs Parent POM</name>

diff --git a/spring-auto-restdocs-core/pom.xml b/spring-auto-restdocs-core/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>capital.scalable</groupId>
         <artifactId>spring-auto-restdocs-parent</artifactId>
-        <version>1.0.12-SNAPSHOT</version>
+        <version>1.0.12</version>
         <relativePath>..</relativePath>
     </parent>
 

diff --git a/spring-auto-restdocs-docs/pom.xml b/spring-auto-restdocs-docs/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>capital.scalable</groupId>
         <artifactId>spring-auto-restdocs-parent</artifactId>
-        <version>1.0.12-SNAPSHOT</version>
+        <version>1.0.12</version>
         <relativePath>..</relativePath>
     </parent>
 
@@ -18,7 +18,7 @@
 
     <properties>
         <docs.dir>${project.basedir}/../docs</docs.dir>
-        <latestRelease>1.0.11</latestRelease> <!-- change this when releasing 1.0.12-SNAPSHOT -->
+        <latestRelease>1.0.12</latestRelease> <!-- change this when releasing 1.0.13-SNAPSHOT -->
     </properties>
 
     <build>

diff --git 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
@@ -13,7 +13,7 @@
 
     <groupId>capital.scalable</groupId>
     <artifactId>spring-auto-restdocs-example</artifactId>
-    <version>1.0.12-SNAPSHOT</version> <!-- not related to spring-auto-restdocs version -->
+    <version>1.0.12</version> <!-- not related to spring-auto-restdocs version -->
 
     <name>Spring Auto REST Docs Example Project</name>
     <description>Example project for Spring Auto REST Docs</description>
@@ -36,7 +36,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <start-class>capital.scalable.restdocs.example.Application</start-class>
         <spring-restdocs.version>1.2.3.RELEASE</spring-restdocs.version>
-        <spring-auto-restdocs.version>1.0.12-SNAPSHOT</spring-auto-restdocs.version>
+        <spring-auto-restdocs.version>1.0.12</spring-auto-restdocs.version>
     </properties>
 
     <dependencies>

diff --git a/spring-auto-restdocs-json-doclet/pom.xml b/spring-auto-restdocs-json-doclet/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>capital.scalable</groupId>
         <artifactId>spring-auto-restdocs-parent</artifactId>
-        <version>1.0.12-SNAPSHOT</version>
+        <version>1.0.12</version>
         <relativePath>..</relativePath>
     </parent>