Merge tag 'rel/1.14' and prepare for next cycle

Project: http://git-wip-us.apache.org/repos/asf/commons-compress/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-compress/commit/46975213
Tree: http://git-wip-us.apache.org/repos/asf/commons-compress/tree/46975213
Diff: http://git-wip-us.apache.org/repos/asf/commons-compress/diff/46975213

Branch: refs/heads/master
Commit: 469752132b291f3174af9679a5eb858aa7c1a04f
Parents: 46b2879 dd7c770
Author: Stefan Bodewig <bode...@apache.org>
Authored: Sun May 14 22:28:53 2017 +0200
Committer: Stefan Bodewig <bode...@apache.org>
Committed: Sun May 14 22:36:10 2017 +0200

----------------------------------------------------------------------
 README.md                           |  2 +-
 RELEASE-NOTES.txt                   | 61 +++++++++++++++++++++++++++++++-
 pom.xml                             |  2 +-
 src/changes/changes.xml             |  5 ++-
 src/site/xdoc/download_compress.xml | 26 +++++++-------
 src/site/xdoc/index.xml             | 24 ++-----------
 6 files changed, 82 insertions(+), 38 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/commons-compress/blob/46975213/README.md
----------------------------------------------------------------------
diff --cc README.md
index b5e06ad,b5e06ad..c0fcbbf
--- a/README.md
+++ b/README.md
@@@ -70,7 -70,7 +70,7 @@@ Alternatively you can pull it from the 
  <dependency>
    <groupId>org.apache.commons</groupId>
    <artifactId>commons-compress</artifactId>
--  <version>1.13</version>
++  <version>1.14</version>
  </dependency>
  ```
  

http://git-wip-us.apache.org/repos/asf/commons-compress/blob/46975213/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index 0eb9533,b126137..9a1e8de
--- a/pom.xml
+++ b/pom.xml
@@@ -25,7 -25,7 +25,7 @@@
  
    <groupId>org.apache.commons</groupId>
    <artifactId>commons-compress</artifactId>
-   <version>1.14-SNAPSHOT</version>
 -  <version>1.14</version>
++  <version>1.15-SNAPSHOT</version>
    <name>Apache Commons Compress</name>
    <url>http://commons.apache.org/proper/commons-compress/</url>
    <!-- The description is not indented to make it look better in the release 
notes -->

http://git-wip-us.apache.org/repos/asf/commons-compress/blob/46975213/src/changes/changes.xml
----------------------------------------------------------------------
diff --cc src/changes/changes.xml
index da4a177,da4a177..203a2fd
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@@ -42,7 -42,7 +42,10 @@@ The <action> type attribute can be add,
      <title>commons-compress</title>
    </properties>
    <body>
--    <release version="1.14" date="not released, yet"
++    <release version="1.15" date="not released, yet"
++             description="Release 1.15">
++    </release>
++    <release version="1.14" date="2017-05-14"
               description="Release 1.14">
        <action issue="COMPRESS-378" type="fix" date="2017-01-09">
          SnappyCompressorInputStream slides the window too early

Reply via email to