Merge tag 'rel/1.18' and prepare next iteration

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

Branch: refs/heads/master
Commit: a7a95f04bfe2c0a855ff3081099f0ef82d32f35a
Parents: 0326bd9 b95d5cd
Author: Stefan Bodewig <bode...@apache.org>
Authored: Thu Aug 16 10:13:59 2018 +0200
Committer: Stefan Bodewig <bode...@apache.org>
Committed: Thu Aug 16 10:34:27 2018 +0200

----------------------------------------------------------------------
 README.md                           |  2 +-
 pom.xml                             |  2 +-
 src/changes/changes.xml             |  5 ++++-
 src/site/site.xml                   |  1 +
 src/site/xdoc/download_compress.xml | 26 +++++++++++++-------------
 src/site/xdoc/index.xml             | 18 ++++--------------
 6 files changed, 24 insertions(+), 30 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/commons-compress/blob/a7a95f04/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index 5e0ffdd,9a85a35..1e3953b
--- a/pom.xml
+++ b/pom.xml
@@@ -24,7 -24,7 +24,7 @@@
    </parent>
  
    <artifactId>commons-compress</artifactId>
-   <version>1.18-SNAPSHOT</version>
 -  <version>1.18</version>
++  <version>1.19-SNAPSHOT</version>
    <name>Apache Commons Compress</name>
    <url>https://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/a7a95f04/src/changes/changes.xml
----------------------------------------------------------------------
diff --cc src/changes/changes.xml
index 9e84003,9e84003..24948ce
--- 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.18" date="not released, yet"
++    <release version="1.19" date="not released, yet"
++             description="Release 1.19">
++    </release>
++    <release version="1.18" date="2018-08-16"
               description="Release 1.18">
        <action type="fix" date="2018-06-15" due-to="DidierLoiseau">
          The example Expander class has been vulnerable to a path

http://git-wip-us.apache.org/repos/asf/commons-compress/blob/a7a95f04/src/site/xdoc/index.xml
----------------------------------------------------------------------

Reply via email to