You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by ch...@apache.org on 2017/11/29 14:40:12 UTC

[01/50] commons-build-plugin git commit: Updated version of 1.4 download file showing changes

Repository: commons-build-plugin
Updated Branches:
  refs/heads/master [created] bee0b6ec7


Updated version of 1.4 download file showing changes

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/commons-build-plugin/trunk@1716456 13f79535-47bb-0310-9956-ffa450edef68


Project: http://git-wip-us.apache.org/repos/asf/commons-build-plugin/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-build-plugin/commit/020fa568
Tree: http://git-wip-us.apache.org/repos/asf/commons-build-plugin/tree/020fa568
Diff: http://git-wip-us.apache.org/repos/asf/commons-build-plugin/diff/020fa568

Branch: refs/heads/master
Commit: 020fa568c1acd9406e3c85cf645855083499fe62
Parents: 0031832
Author: Sebastian Bazley <se...@apache.org>
Authored: Wed Nov 25 16:07:04 2015 +0000
Committer: Sebastian Bazley <se...@apache.org>
Committed: Wed Nov 25 16:07:04 2015 +0000

----------------------------------------------------------------------
 src/site/xdoc/download_commons-build-plugin.xml | 24 ++++++++++++++------
 1 file changed, 17 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/commons-build-plugin/blob/020fa568/src/site/xdoc/download_commons-build-plugin.xml
----------------------------------------------------------------------
diff --git a/src/site/xdoc/download_commons-build-plugin.xml b/src/site/xdoc/download_commons-build-plugin.xml
index b35a935..8ea3e75 100644
--- a/src/site/xdoc/download_commons-build-plugin.xml
+++ b/src/site/xdoc/download_commons-build-plugin.xml
@@ -31,10 +31,19 @@ limitations under the License.
  | 2) Set the following properties in the component's pom:              |
  |    - commons.componentid (required, alphabetic, lower case)          |
  |    - commons.release.version (required)                              |
+ |    - commons.release.name    (required)                              |
  |    - commons.binary.suffix (optional)                                |
  |      (defaults to "-bin", set to "" for pre-maven2 releases)         |
+ |    - commons.release.desc    (optional)                              |
+ |                                                                      |
+ |    - commons.release.2/3.version       (conditional)                 |
+ |    - commons.release.2/3.name          (conditional)                 |
+ |    - commons.release.2/3.binary.suffix (optional)                    |
+ |    - commons.release.2/3.desc          (optional)                    |
  |                                                                      |
  | 3) Example Properties                                                |
+ |    (commons.release.name inherited by parent:                        |
+ |     ${project.artifactId}-${commons.release.version}                 |
  |                                                                      |
  |  <properties>                                                        |
  |    <commons.componentid>math</commons.componentid>                   |
@@ -88,14 +97,15 @@ limitations under the License.
       </form>
 
       <p>
-        Please <a href="https://www.apache.org/info/verification.html">verify the integrity</a>
-        of downloaded files against the public code signing
-        <a href="https://www.apache.org/dist/commons/KEYS">KEYS</a>
-        used by the Apache Commons developers.
+        It is essential that you
+        <a href="https://www.apache.org/info/verification.html">verify the integrity</a>
+        of downloaded files, preferably using the <code>PGP</code> signature (<code>*.asc</code> files);
+        failing that using the <code>MD5</code> hash (<code>*.md5</code> checksum files).
       </p>
       <p>
-        The <code>pgp</code> link downloads the OpenPGP compatible signature (*.asc) from our main site.
-        The <code>md5</code> link downloads the checksum file (MD5 hash) from the main site.
+        The <a href="https://www.apache.org/dist/commons/KEYS">KEYS</a>
+        file contains the public PGP keys used by Apache Commons developers
+        to sign releases.
       </p>
     </subsection>
     </section>
@@ -135,7 +145,7 @@ limitations under the License.
         </p>
         <ul>
           <li class="download"><a href="[preferred]/commons/commons-build-plugin/">browse download area</a></li>
-          <li><a href="http://archive.apache.org/dist/commons/commons-build-plugin/">archives...</a></li>
+          <li><a href="https://archive.apache.org/dist/commons/commons-build-plugin/">archives...</a></li>
         </ul>
     </section>
   </body>


[48/50] commons-build-plugin git commit: .travis.yml: remove oraclejdk7 as travis does not support it anymore

Posted by ch...@apache.org.
.travis.yml: remove oraclejdk7 as travis does not support it anymore

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/commons-build-plugin/trunk@1811492 13f79535-47bb-0310-9956-ffa450edef68


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

Branch: refs/heads/master
Commit: e297d568b236e823962cb5b972a6142b0b60b8fa
Parents: 6806d89
Author: Pascal Schumacher <pa...@apache.org>
Authored: Sun Oct 8 14:42:57 2017 +0000
Committer: Pascal Schumacher <pa...@apache.org>
Committed: Sun Oct 8 14:42:57 2017 +0000

----------------------------------------------------------------------
 .travis.yml | 1 -
 1 file changed, 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/commons-build-plugin/blob/e297d568/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index ce012fd..f60f4bc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,5 +18,4 @@ sudo: false
 
 jdk:
   - openjdk7
-  - oraclejdk7
   - oraclejdk8


[15/50] commons-build-plugin git commit: Use full project name. Drop Ant suffix as the implementation mechanism is not relevant

Posted by ch...@apache.org.
Use full project name.
Drop Ant suffix as the implementation mechanism is not relevant

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/commons-build-plugin/trunk@1739782 13f79535-47bb-0310-9956-ffa450edef68


Project: http://git-wip-us.apache.org/repos/asf/commons-build-plugin/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-build-plugin/commit/78ca8833
Tree: http://git-wip-us.apache.org/repos/asf/commons-build-plugin/tree/78ca8833
Diff: http://git-wip-us.apache.org/repos/asf/commons-build-plugin/diff/78ca8833

Branch: refs/heads/master
Commit: 78ca8833a133d94299ef064f5cb62d81c04cf78f
Parents: 5b36920
Author: Sebastian Bazley <se...@apache.org>
Authored: Mon Apr 18 16:12:40 2016 +0000
Committer: Sebastian Bazley <se...@apache.org>
Committed: Mon Apr 18 16:12:40 2016 +0000

----------------------------------------------------------------------
 src/main/scripts/generate-xdocs.mojos.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/commons-build-plugin/blob/78ca8833/src/main/scripts/generate-xdocs.mojos.xml
----------------------------------------------------------------------
diff --git a/src/main/scripts/generate-xdocs.mojos.xml b/src/main/scripts/generate-xdocs.mojos.xml
index 75ba37d..5d461cc 100644
--- a/src/main/scripts/generate-xdocs.mojos.xml
+++ b/src/main/scripts/generate-xdocs.mojos.xml
@@ -27,7 +27,7 @@
         <mojo>
             <goal>mail-page</goal>
             <call>mail-page</call>
-            <description>Commons Build Ant Mojo: Generate Mailing List page</description>
+            <description>Apache Commons Build Mojo: Generate Mailing List page</description>
             <requiresProject>true</requiresProject>
             <parameters>
                 <parameter>
@@ -53,7 +53,7 @@
         <mojo>
             <goal>jira-page</goal>
             <call>jira-page</call>
-            <description>Commons Build Ant Mojo: Generate Issue Tracking page</description>
+            <description>Apache Commons Build Mojo: Generate Issue Tracking page</description>
             <requiresProject>true</requiresProject>
             <parameters>
                 <parameter>
@@ -88,7 +88,7 @@
         <mojo>
             <goal>sandbox-jira-page</goal>
             <call>sandbox-jira-page</call>
-            <description>Commons Build Ant Mojo: Generate Sandbox Issue Tracking page</description>
+            <description>Apache Commons Build Mojo: Generate Sandbox Issue Tracking page</description>
             <requiresProject>true</requiresProject>
             <parameters>
                 <parameter>
@@ -114,7 +114,7 @@
         <mojo>
             <goal>download-page</goal>
             <call>download-page</call>
-            <description>Commons Build Ant Mojo: Generate Download page</description>
+            <description>Apache Commons Build Mojo: Generate Download page</description>
             <requiresProject>true</requiresProject>
             <parameters>
                 <parameter>
@@ -286,7 +286,7 @@
         <mojo>
             <goal>readme-md</goal>
             <call>readme-md</call>
-            <description>Commons Build Ant Mojo: Generate README.md</description>
+            <description>Apache Commons Build Mojo: Generate README.md</description>
             <requiresProject>true</requiresProject>
             <parameters>
                 <parameter>
@@ -348,7 +348,7 @@
         <mojo>
             <goal>contributing-md</goal>
             <call>contributing-md</call>
-            <description>Commons Build Ant Mojo: Generate CONTRIBUTING.md</description>
+            <description>Apache Commons Build Mojo: Generate CONTRIBUTING.md</description>
             <requiresProject>true</requiresProject>
             <parameters>
                 <parameter>


[14/50] commons-build-plugin git commit: Apache

Posted by ch...@apache.org.
Apache

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/commons-build-plugin/trunk@1739781 13f79535-47bb-0310-9956-ffa450edef68


Project: http://git-wip-us.apache.org/repos/asf/commons-build-plugin/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-build-plugin/commit/5b369202
Tree: http://git-wip-us.apache.org/repos/asf/commons-build-plugin/tree/5b369202
Diff: http://git-wip-us.apache.org/repos/asf/commons-build-plugin/diff/5b369202

Branch: refs/heads/master
Commit: 5b369202cdb5a7aeff71984e822170fa08440a12
Parents: f778536
Author: Sebastian Bazley <se...@apache.org>
Authored: Mon Apr 18 16:11:45 2016 +0000
Committer: Sebastian Bazley <se...@apache.org>
Committed: Mon Apr 18 16:11:45 2016 +0000

----------------------------------------------------------------------
 RELEASE-NOTES.txt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/commons-build-plugin/blob/5b369202/RELEASE-NOTES.txt
----------------------------------------------------------------------
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index 3fd32c3..e5b17c8 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -1,10 +1,10 @@
-			 Commons Build Plugin
-			   Release Notes
+			 Apache Commons Build Plugin
+			       Release Notes
 
 
 INTRODUCTION:
 
-Commons Build Plugin is a Maven Plugin which can be used by Apache Commons components.
+The Apache Commons Build Plugin is a Maven Plugin which can be used by Apache Commons components.
 
 See:
    http://commons.apache.org/commons-build-plugin/


[12/50] commons-build-plugin git commit: Drop Ant ref

Posted by ch...@apache.org.
Drop Ant ref

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/commons-build-plugin/trunk@1739617 13f79535-47bb-0310-9956-ffa450edef68


Project: http://git-wip-us.apache.org/repos/asf/commons-build-plugin/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-build-plugin/commit/1feaa851
Tree: http://git-wip-us.apache.org/repos/asf/commons-build-plugin/tree/1feaa851
Diff: http://git-wip-us.apache.org/repos/asf/commons-build-plugin/diff/1feaa851

Branch: refs/heads/master
Commit: 1feaa851e1af926fb6f5f440b79749c438bcf934
Parents: 5527e31
Author: Sebastian Bazley <se...@apache.org>
Authored: Sun Apr 17 14:04:10 2016 +0000
Committer: Sebastian Bazley <se...@apache.org>
Committed: Sun Apr 17 14:04:10 2016 +0000

----------------------------------------------------------------------
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/commons-build-plugin/blob/1feaa851/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 6630d3b..0d78164 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
     <version>1.6-SNAPSHOT</version>
     <name>Apache Commons Build Plugin Maven Mojo</name>
     <description>
-        Apache Maven Ant mojo for Apache Commons Build tasks.
+        Apache Maven Mojo for Apache Commons Build tasks.
     </description>
     <url>http://commons.apache.org/proper/commons-build-plugin/</url>
     <issueManagement>


[07/50] commons-build-plugin git commit: Bump version

Posted by ch...@apache.org.
Bump version

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/commons-build-plugin/trunk@1739603 13f79535-47bb-0310-9956-ffa450edef68


Project: http://git-wip-us.apache.org/repos/asf/commons-build-plugin/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-build-plugin/commit/5ca2c868
Tree: http://git-wip-us.apache.org/repos/asf/commons-build-plugin/tree/5ca2c868
Diff: http://git-wip-us.apache.org/repos/asf/commons-build-plugin/diff/5ca2c868

Branch: refs/heads/master
Commit: 5ca2c8685e179c1d037cc5fd0c5036d6c0386af0
Parents: 5d4032c
Author: Sebastian Bazley <se...@apache.org>
Authored: Sun Apr 17 13:12:37 2016 +0000
Committer: Sebastian Bazley <se...@apache.org>
Committed: Sun Apr 17 13:12:37 2016 +0000

----------------------------------------------------------------------
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/commons-build-plugin/blob/5ca2c868/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 153f498..6630d3b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@
     <groupId>org.apache.commons</groupId>
     <artifactId>commons-build-plugin</artifactId>
     <packaging>maven-plugin</packaging>
-    <version>1.5-SNAPSHOT</version>
+    <version>1.6-SNAPSHOT</version>
     <name>Apache Commons Build Plugin Maven Mojo</name>
     <description>
         Apache Maven Ant mojo for Apache Commons Build tasks.


[35/50] commons-build-plugin git commit: Add CONTRIBUTING.md.

Posted by ch...@apache.org.
Add CONTRIBUTING.md.

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/commons-build-plugin/trunk@1770453 13f79535-47bb-0310-9956-ffa450edef68


Project: http://git-wip-us.apache.org/repos/asf/commons-build-plugin/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-build-plugin/commit/11460fbb
Tree: http://git-wip-us.apache.org/repos/asf/commons-build-plugin/tree/11460fbb
Diff: http://git-wip-us.apache.org/repos/asf/commons-build-plugin/diff/11460fbb

Branch: refs/heads/master
Commit: 11460fbb468646c6f188d014c533d182b28a8051
Parents: f85d793
Author: Gary D. Gregory <gg...@apache.org>
Authored: Sat Nov 19 01:15:46 2016 +0000
Committer: Gary D. Gregory <gg...@apache.org>
Committed: Sat Nov 19 01:15:46 2016 +0000

----------------------------------------------------------------------
 CONTRIBUTING.md      | 97 +++++++++++++++++++++++++++++++++++++++++++++++
 src/assembly/src.xml |  3 +-
 2 files changed, 99 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/commons-build-plugin/blob/11460fbb/CONTRIBUTING.md
----------------------------------------------------------------------
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
new file mode 100644
index 0000000..50521a6
--- /dev/null
+++ b/CONTRIBUTING.md
@@ -0,0 +1,97 @@
+<!---
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<!---
+ +======================================================================+
+ |****                                                              ****|
+ |****      THIS FILE IS GENERATED BY THE COMMONS BUILD PLUGIN      ****|
+ |****                    DO NOT EDIT DIRECTLY                      ****|
+ |****                                                              ****|
+ +======================================================================+
+ | TEMPLATE FILE: contributing-md-template.md                           |
+ | commons-build-plugin/trunk/src/main/resources/commons-xdoc-templates |
+ +======================================================================+
+ |                                                                      |
+ | 1) Re-generate using: mvn commons:contributing-md                    |
+ |                                                                      |
+ | 2) Set the following properties in the component's pom:              |
+ |    - commons.jira.id  (required, alphabetic, upper case)             |
+ |                                                                      |
+ | 3) Example Properties                                                |
+ |                                                                      |
+ |  <properties>                                                        |
+ |    <commons.jira.id>MATH</commons.jira.id>                           |
+ |  </properties>                                                       |
+ |                                                                      |
+ +======================================================================+
+--->
+Contributing to Apache Commons Build Plugin Maven Mojo
+======================
+
+You have found a bug or you have an idea for a cool new feature? Contributing code is a great way to give something back to
+the open source community. Before you dig right into the code there are a few guidelines that we need contributors to
+follow so that we can have a chance of keeping on top of things.
+
+Getting Started
+---------------
+
++ Make sure you have a [JIRA account](https://issues.apache.org/jira/).
++ Make sure you have a [GitHub account](https://github.com/signup/free).
++ If you're planning to implement a new feature it makes sense to discuss you're changes on the [dev list](https://commons.apache.org/mail-lists.html) first. This way you can make sure you're not wasting your time on something that isn't considered to be in Apache Commons Build Plugin Maven Mojo's scope.
++ Submit a ticket for your issue, assuming one does not already exist.
+  + Clearly describe the issue including steps to reproduce when it is a bug.
+  + Make sure you fill in the earliest version that you know has the issue.
++ Fork the repository on GitHub.
+
+Making Changes
+--------------
+
++ Create a topic branch from where you want to base your work (this is usually the master/trunk branch).
++ Make commits of logical units.
++ Respect the original code style:
+  + Only use spaces for indentation.
+  + Create minimal diffs - disable on save actions like reformat source code or organize imports. If you feel the source code should be reformatted create a separate PR for this change.
+  + Check for unnecessary whitespace with git diff --check before committing.
++ Make sure your commit messages are in the proper format. Your commit message should contain the key of the JIRA issue.
++ Make sure you have added the necessary tests for your changes.
++ Run all the tests with `mvn clean verify` to assure nothing else was accidentally broken.
+
+Making Trivial Changes
+----------------------
+
+For changes of a trivial nature to comments and documentation, it is not always necessary to create a new ticket in JIRA.
+In this case, it is appropriate to start the first line of a commit with '(doc)' instead of a ticket number.
+
+Submitting Changes
+------------------
+
++ Sign the [Contributor License Agreement][cla] if you haven't already.
++ Push your changes to a topic branch in your fork of the repository.
++ Submit a pull request to the repository in the apache organization.
++ Update your JIRA ticket and include a link to the pull request in the ticket.
+
+Additional Resources
+--------------------
+
++ [Contributing patches](https://commons.apache.org/patches.html)
++ [Apache Commons Build Plugin Maven Mojo JIRA project page](https://issues.apache.org/jira/browse/COMMONSSITE)
++ [Contributor License Agreement][cla]
++ [General GitHub documentation](https://help.github.com/)
++ [GitHub pull request documentation](https://help.github.com/send-pull-requests/)
++ [Apache Commons Twitter Account](https://twitter.com/ApacheCommons)
++ #apachecommons IRC channel on freenode.org
+
+[cla]:https://www.apache.org/licenses/#clas

http://git-wip-us.apache.org/repos/asf/commons-build-plugin/blob/11460fbb/src/assembly/src.xml
----------------------------------------------------------------------
diff --git a/src/assembly/src.xml b/src/assembly/src.xml
index 4a3bc74..019f95c 100644
--- a/src/assembly/src.xml
+++ b/src/assembly/src.xml
@@ -24,10 +24,11 @@
     <fileSets>
         <fileSet>
             <includes>
+                <include>CONTRIBUTING.md</include>
                 <include>LICENSE.txt</include>
                 <include>NOTICE.txt</include>
                 <include>pom.xml</include>
-                <include>RELEASE-NOTES.txt</include>
+                <include>RELEASE-NOTES.txt</include>                
             </includes>
         </fileSet>
         <fileSet>


[11/50] commons-build-plugin git commit: Prepare for 1.6 release

Posted by ch...@apache.org.
Prepare for 1.6 release

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/commons-build-plugin/trunk@1739613 13f79535-47bb-0310-9956-ffa450edef68


Project: http://git-wip-us.apache.org/repos/asf/commons-build-plugin/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-build-plugin/commit/5527e31f
Tree: http://git-wip-us.apache.org/repos/asf/commons-build-plugin/tree/5527e31f
Diff: http://git-wip-us.apache.org/repos/asf/commons-build-plugin/diff/5527e31f

Branch: refs/heads/master
Commit: 5527e31ffbab03013b8520628ddb15249b70fc40
Parents: 070b5e5
Author: Sebastian Bazley <se...@apache.org>
Authored: Sun Apr 17 13:49:50 2016 +0000
Committer: Sebastian Bazley <se...@apache.org>
Committed: Sun Apr 17 13:49:50 2016 +0000

----------------------------------------------------------------------
 RELEASE-NOTES.txt | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/commons-build-plugin/blob/5527e31f/RELEASE-NOTES.txt
----------------------------------------------------------------------
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index 990bd4f..3fd32c3 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -4,12 +4,19 @@
 
 INTRODUCTION:
 
-Commons Build Plugin is a Maven Ant Plugin which can be used by Apache Commons components.
+Commons Build Plugin is a Maven Plugin which can be used by Apache Commons components.
 
 See:
    http://commons.apache.org/commons-build-plugin/
 
 
+VERSION 1.6 - 2016-04-20
+------------------------
+
+Changes since the last release
+1. Added new download-page layout property: 
+   set this to 'version' to use a single directory of the form commons-build-plugin-1.6 rather than binaries/source 
+
 VERSION 1.5 - 2015-11-28
 ------------------------
 


[42/50] commons-build-plugin git commit: Minor fix to sort out EOLs

Posted by ch...@apache.org.
Minor fix to sort out EOLs

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/commons-build-plugin/trunk@1782638 13f79535-47bb-0310-9956-ffa450edef68


Project: http://git-wip-us.apache.org/repos/asf/commons-build-plugin/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-build-plugin/commit/58b1621d
Tree: http://git-wip-us.apache.org/repos/asf/commons-build-plugin/tree/58b1621d
Diff: http://git-wip-us.apache.org/repos/asf/commons-build-plugin/diff/58b1621d

Branch: refs/heads/master
Commit: 58b1621d2e64e9fc7dca42c8caecd5caeaa11ff9
Parents: 2b81506
Author: Sebastian Bazley <se...@apache.org>
Authored: Sat Feb 11 22:10:25 2017 +0000
Committer: Sebastian Bazley <se...@apache.org>
Committed: Sat Feb 11 22:10:25 2017 +0000

----------------------------------------------------------------------
 RELEASE-NOTES.txt       | 6 ++++++
 src/changes/changes.xml | 8 ++++++--
 2 files changed, 12 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/commons-build-plugin/blob/58b1621d/RELEASE-NOTES.txt
----------------------------------------------------------------------
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index 09750b9..5fd1d17 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -10,6 +10,12 @@ See:
    http://commons.apache.org/commons-build-plugin/
 
 
+VERSION 1.8 - 2017-MM-DD
+------------------------
+
+Changes since the last release
+1. Fix EOL-style so generate files have correct setting
+
 VERSION 1.7 - 2016-11-18
 ------------------------
 

http://git-wip-us.apache.org/repos/asf/commons-build-plugin/blob/58b1621d/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 7f0a4dd..0009d14 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -25,8 +25,12 @@
   </properties>
 
   <body>
-
-    <release version="1.7" date="2016-MM-DD" description="Feature release">
+    <release version="1.8" date="2017-MM-DD" description="Feature release">
+      <action dev="sebb" type="fix">
+        Add eol-style:native otherwise generated files can cause commit errors
+      </action>
+    </release>
+    <release version="1.7" date="2016-11-18" description="Feature release">
       <action dev="ggregory" type="add" issue="COMMONSSITE-90">
         Include badges in the README.md file. 
       </action>


[43/50] commons-build-plugin git commit: New Year

Posted by ch...@apache.org.
New Year

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/commons-build-plugin/trunk@1782639 13f79535-47bb-0310-9956-ffa450edef68


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

Branch: refs/heads/master
Commit: c05669c899f0b6761f77fcf616928c717190ebe6
Parents: 58b1621
Author: Sebastian Bazley <se...@apache.org>
Authored: Sat Feb 11 22:10:49 2017 +0000
Committer: Sebastian Bazley <se...@apache.org>
Committed: Sat Feb 11 22:10:49 2017 +0000

----------------------------------------------------------------------
 NOTICE.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/commons-build-plugin/blob/c05669c8/NOTICE.txt
----------------------------------------------------------------------
diff --git a/NOTICE.txt b/NOTICE.txt
index ad29fd7..c6952f6 100644
--- a/NOTICE.txt
+++ b/NOTICE.txt
@@ -1,5 +1,5 @@
 Apache Commons Build Plugin
-Copyright 2008-2016 The Apache Software Foundation
+Copyright 2008-2017 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).


[24/50] commons-build-plugin git commit: clarify contributions and CLA requirements

Posted by ch...@apache.org.
clarify contributions and CLA requirements

(or when CLA is not required :)


git-svn-id: https://svn.apache.org/repos/asf/commons/proper/commons-build-plugin/trunk@1750670 13f79535-47bb-0310-9956-ffa450edef68


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

Branch: refs/heads/master
Commit: c68648565a40b6136602a25f7bd6c93efa6bd3d7
Parents: b240367
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Wed Jun 29 16:43:47 2016 +0000
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Wed Jun 29 16:43:47 2016 +0000

----------------------------------------------------------------------
 .../contributing-md-template.md                 | 39 ++++++++++++++------
 1 file changed, 28 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/commons-build-plugin/blob/c6864856/src/main/resources/commons-xdoc-templates/contributing-md-template.md
----------------------------------------------------------------------
diff --git a/src/main/resources/commons-xdoc-templates/contributing-md-template.md b/src/main/resources/commons-xdoc-templates/contributing-md-template.md
index 13ad7ab..f9558e8 100644
--- a/src/main/resources/commons-xdoc-templates/contributing-md-template.md
+++ b/src/main/resources/commons-xdoc-templates/contributing-md-template.md
@@ -51,47 +51,64 @@ Getting Started
 + Make sure you have a [JIRA account](https://issues.apache.org/jira/).
 + Make sure you have a [GitHub account](https://github.com/signup/free).
 + If you're planning to implement a new feature it makes sense to discuss you're changes on the [dev list](https://commons.apache.org/mail-lists.html) first. This way you can make sure you're not wasting your time on something that isn't considered to be in @NAME@'s scope.
-+ Submit a ticket for your issue, assuming one does not already exist.
++ Submit a [Jira Ticket][jira] for your issue, assuming one does not already exist.
   + Clearly describe the issue including steps to reproduce when it is a bug.
   + Make sure you fill in the earliest version that you know has the issue.
-+ Fork the repository on GitHub.
++ Find the corresponding [repository on GitHub](https://github.com/apache/?query=commons-),
+[fork](https://help.github.com/articles/fork-a-repo/) and check out your forked repository.
 
 Making Changes
 --------------
 
-+ Create a topic branch from where you want to base your work (this is usually the master/trunk branch).
++ Create a _topic branch_ for your isolated work.
+  * Usually you should base your branch on the `master` or `trunk` branch.
+  * A good topic branch name can be the JIRA bug id plus a keyword, e.g. `VFS-614-MonitorInputStream`.
+  * If you have submitted multiple JIRA issues, try to maintain separate branches and pull requests.
 + Make commits of logical units.
+  * Make sure your commit messages are meaningful and in the proper format. Your commit message should contain the key of the JIRA issue.
+  * e.g. `VFS-614: Close input stream early`
 + Respect the original code style:
   + Only use spaces for indentation.
-  + Create minimal diffs - disable on save actions like reformat source code or organize imports. If you feel the source code should be reformatted create a separate PR for this change.
-  + Check for unnecessary whitespace with git diff --check before committing.
-+ Make sure your commit messages are in the proper format. Your commit message should contain the key of the JIRA issue.
-+ Make sure you have added the necessary tests for your changes.
+  + Create minimal diffs - disable _On Save_ actions like _Reformat Source Code_ or _Organize Imports_. If you feel the source code should be reformatted create a separate PR for this change first.
+  + Check for unnecessary whitespace with `git diff` -- check before committing.
++ Make sure you have added the necessary tests for your changes, typically in `src/test/java`.
 + Run all the tests with `mvn clean verify` to assure nothing else was accidentally broken.
 
 Making Trivial Changes
 ----------------------
 
+The JIRA tickets are used to generate the changelog for the next release.
+
 For changes of a trivial nature to comments and documentation, it is not always necessary to create a new ticket in JIRA.
 In this case, it is appropriate to start the first line of a commit with '(doc)' instead of a ticket number.
 
+
 Submitting Changes
 ------------------
 
-+ Sign the [Contributor License Agreement][cla] if you haven't already.
+* Small patches & typical bug-fixes do not require a CLA as they are covered by
+  [Apache License clause 5](https://www.apache.org/licenses/LICENSE-2.0.html#contributions),
+  but for anything else, sign and submit the Apache [Contributor License Agreement][cla] if you haven't already.
 + Push your changes to a topic branch in your fork of the repository.
-+ Submit a pull request to the repository in the apache organization.
++ Submit a _Pull Request_ to the corresponding repository in the `apache` organization.
+  * Verify _Files Changed_ shows only your intended changes and does not
+  include additional files like `target/*.class`
 + Update your JIRA ticket and include a link to the pull request in the ticket.
 
+If you prefer to not use GitHub, then you can instead use
+`git format-patch` (or `svn diff`) and attach the patch file to the JIRA issue.
+
+
 Additional Resources
 --------------------
 
 + [Contributing patches](https://commons.apache.org/patches.html)
-+ [@NAME@ JIRA project page](https://issues.apache.org/jira/browse/@JIRA_ID@)
++ [@NAME@ JIRA project page][jira]
 + [Contributor License Agreement][cla]
 + [General GitHub documentation](https://help.github.com/)
 + [GitHub pull request documentation](https://help.github.com/send-pull-requests/)
 + [Apache Commons Twitter Account](https://twitter.com/ApacheCommons)
-+ #apachecommons IRC channel on freenode.org
++ `#apache-commons` IRC channel on `irc.freenode.net`
 
 [cla]:https://www.apache.org/licenses/#clas
+[jira]:https://issues.apache.org/jira/browse/@JIRA_ID@


[31/50] commons-build-plugin git commit: Create a section for unreleased 1.7 in changes.xml.

Posted by ch...@apache.org.
Create a section for unreleased 1.7 in changes.xml.

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/commons-build-plugin/trunk@1770026 13f79535-47bb-0310-9956-ffa450edef68


Project: http://git-wip-us.apache.org/repos/asf/commons-build-plugin/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-build-plugin/commit/07d4c277
Tree: http://git-wip-us.apache.org/repos/asf/commons-build-plugin/tree/07d4c277
Diff: http://git-wip-us.apache.org/repos/asf/commons-build-plugin/diff/07d4c277

Branch: refs/heads/master
Commit: 07d4c2772923e963da5a089d4a70c272991e3b9a
Parents: 3852c31
Author: Gary D. Gregory <gg...@apache.org>
Authored: Wed Nov 16 18:13:04 2016 +0000
Committer: Gary D. Gregory <gg...@apache.org>
Committed: Wed Nov 16 18:13:04 2016 +0000

----------------------------------------------------------------------
 src/changes/changes.xml | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/commons-build-plugin/blob/07d4c277/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index c6d2aa7..7f0a4dd 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -26,10 +26,7 @@
 
   <body>
 
-    <release version="1.6" date="2016-04-24" description="Feature release">
-      <action dev="sebb" type="add">
-        Added new download-page subdir property: set this (e.g. to '1.2' or 'lang-1.2' etc) to override the default of binaries/source 
-      </action>
+    <release version="1.7" date="2016-MM-DD" description="Feature release">
       <action dev="ggregory" type="add" issue="COMMONSSITE-90">
         Include badges in the README.md file. 
       </action>
@@ -38,6 +35,12 @@
       </action>
     </release>
 
+    <release version="1.6" date="2016-04-24" description="Feature release">
+      <action dev="sebb" type="add">
+        Added new download-page subdir property: set this (e.g. to '1.2' or 'lang-1.2' etc) to override the default of binaries/source 
+      </action>
+    </release>
+
     <release version="1.5" date="2015-11-28" description="Feature and fix release">
       <action dev="ecki" type="update" issue="COMMONSSITE-81">
         commons-build-plugin README/CONTRIBUTING.md handle multi-modules


[44/50] commons-build-plugin git commit: EOL style

Posted by ch...@apache.org.
EOL style

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/commons-build-plugin/trunk@1800829 13f79535-47bb-0310-9956-ffa450edef68


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

Branch: refs/heads/master
Commit: b226356421330b802b5b34598ea3447500c9ada1
Parents: c05669c
Author: Sebastian Bazley <se...@apache.org>
Authored: Tue Jul 4 21:41:42 2017 +0000
Committer: Sebastian Bazley <se...@apache.org>
Committed: Tue Jul 4 21:41:42 2017 +0000

----------------------------------------------------------------------
 .travis.yml             |  44 ++++++-------
 src/changes/changes.xml | 144 +++++++++++++++++++++----------------------
 2 files changed, 94 insertions(+), 94 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/commons-build-plugin/blob/b2263564/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index a0e1204..ce012fd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,22 +1,22 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-language: java
-sudo: false
-
-jdk:
-  - openjdk7
-  - oraclejdk7
-  - oraclejdk8
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+language: java
+sudo: false
+
+jdk:
+  - openjdk7
+  - oraclejdk7
+  - oraclejdk8

http://git-wip-us.apache.org/repos/asf/commons-build-plugin/blob/b2263564/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 0009d14..4e701ef 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -1,72 +1,72 @@
-<?xml version="1.0"?>
-<!--
-   Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
--->
-
-<!-- Description: http://maven.apache.org/plugins/maven-changes-plugin/changes.html -->
-
-<document>
-  <properties>
-    <title>Apache Commons Build Plugin Changes</title>
-    <author email="dev@commons.apache.org">Apache Commons Developers</author>
-  </properties>
-
-  <body>
-    <release version="1.8" date="2017-MM-DD" description="Feature release">
-      <action dev="sebb" type="fix">
-        Add eol-style:native otherwise generated files can cause commit errors
-      </action>
-    </release>
-    <release version="1.7" date="2016-11-18" description="Feature release">
-      <action dev="ggregory" type="add" issue="COMMONSSITE-90">
-        Include badges in the README.md file. 
-      </action>
-      <action dev="ggregory" type="add" issue="COMMONSSITE-91">
-        Build plugin does not pass the JIRA_ID property when generating README.md.
-      </action>
-    </release>
-
-    <release version="1.6" date="2016-04-24" description="Feature release">
-      <action dev="sebb" type="add">
-        Added new download-page subdir property: set this (e.g. to '1.2' or 'lang-1.2' etc) to override the default of binaries/source 
-      </action>
-    </release>
-
-    <release version="1.5" date="2015-11-28" description="Feature and fix release">
-      <action dev="ecki" type="update" issue="COMMONSSITE-81">
-        commons-build-plugin README/CONTRIBUTING.md handle multi-modules
-      </action>
-      <action dev="ecki" type="update">
-        Download Page - Better describes KEYS file (and uses https links).
-      </action>
-      <action dev="britter" type="add">
-        CONTRIBUTING.md/README.md - New Goals to build Markdown formatted intro files for GitHub.
-      </action>
-    </release>
-
-    <release version="1.4" date="3 March 2012" description="Feature and fix release.">
-      <action dev="ggregory" type="fix" issue="COMMONSSITE-66">
-        Add support for a "commons.release.3" set of properties to offer a 3rd download option.
-      </action>
-      <action type="update">
-        Mailing List Page - Make it clear that you have to be subscribed to post.
-      </action>
-      <action type="fix">
-        Fix announce mod_mbox link
-      </action>
-    </release>
-  </body>
-</document>
+<?xml version="1.0"?>
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+-->
+
+<!-- Description: http://maven.apache.org/plugins/maven-changes-plugin/changes.html -->
+
+<document>
+  <properties>
+    <title>Apache Commons Build Plugin Changes</title>
+    <author email="dev@commons.apache.org">Apache Commons Developers</author>
+  </properties>
+
+  <body>
+    <release version="1.8" date="2017-MM-DD" description="Feature release">
+      <action dev="sebb" type="fix">
+        Add eol-style:native otherwise generated files can cause commit errors
+      </action>
+    </release>
+    <release version="1.7" date="2016-11-18" description="Feature release">
+      <action dev="ggregory" type="add" issue="COMMONSSITE-90">
+        Include badges in the README.md file. 
+      </action>
+      <action dev="ggregory" type="add" issue="COMMONSSITE-91">
+        Build plugin does not pass the JIRA_ID property when generating README.md.
+      </action>
+    </release>
+
+    <release version="1.6" date="2016-04-24" description="Feature release">
+      <action dev="sebb" type="add">
+        Added new download-page subdir property: set this (e.g. to '1.2' or 'lang-1.2' etc) to override the default of binaries/source 
+      </action>
+    </release>
+
+    <release version="1.5" date="2015-11-28" description="Feature and fix release">
+      <action dev="ecki" type="update" issue="COMMONSSITE-81">
+        commons-build-plugin README/CONTRIBUTING.md handle multi-modules
+      </action>
+      <action dev="ecki" type="update">
+        Download Page - Better describes KEYS file (and uses https links).
+      </action>
+      <action dev="britter" type="add">
+        CONTRIBUTING.md/README.md - New Goals to build Markdown formatted intro files for GitHub.
+      </action>
+    </release>
+
+    <release version="1.4" date="3 March 2012" description="Feature and fix release.">
+      <action dev="ggregory" type="fix" issue="COMMONSSITE-66">
+        Add support for a "commons.release.3" set of properties to offer a 3rd download option.
+      </action>
+      <action type="update">
+        Mailing List Page - Make it clear that you have to be subscribed to post.
+      </action>
+      <action type="fix">
+        Fix announce mod_mbox link
+      </action>
+    </release>
+  </body>
+</document>


[19/50] commons-build-plugin git commit: Update to next SNAPSHOT version

Posted by ch...@apache.org.
Update to next SNAPSHOT version

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/commons-build-plugin/trunk@1740692 13f79535-47bb-0310-9956-ffa450edef68


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

Branch: refs/heads/master
Commit: b5a10b41be75df2379933bbe0a080b98f3483858
Parents: f24d4a0
Author: Sebastian Bazley <se...@apache.org>
Authored: Sun Apr 24 13:03:51 2016 +0000
Committer: Sebastian Bazley <se...@apache.org>
Committed: Sun Apr 24 13:03:51 2016 +0000

----------------------------------------------------------------------
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/commons-build-plugin/blob/b5a10b41/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index dccdacb..44caafc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@
     <groupId>org.apache.commons</groupId>
     <artifactId>commons-build-plugin</artifactId>
     <packaging>maven-plugin</packaging>
-    <version>1.6-SNAPSHOT</version>
+    <version>1.7-SNAPSHOT</version>
     <name>Apache Commons Build Plugin Maven Mojo</name>
     <description>
         Apache Maven Mojo for Apache Commons Build tasks.


[06/50] commons-build-plugin git commit: Tweaks

Posted by ch...@apache.org.
Tweaks

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/commons-build-plugin/trunk@1739373 13f79535-47bb-0310-9956-ffa450edef68


Project: http://git-wip-us.apache.org/repos/asf/commons-build-plugin/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-build-plugin/commit/5d4032c9
Tree: http://git-wip-us.apache.org/repos/asf/commons-build-plugin/tree/5d4032c9
Diff: http://git-wip-us.apache.org/repos/asf/commons-build-plugin/diff/5d4032c9

Branch: refs/heads/master
Commit: 5d4032c92bee7fbef9312c85fa73ca1f1aefa009
Parents: 656f3ff
Author: Sebastian Bazley <se...@apache.org>
Authored: Fri Apr 15 21:24:05 2016 +0000
Committer: Sebastian Bazley <se...@apache.org>
Committed: Fri Apr 15 21:24:05 2016 +0000

----------------------------------------------------------------------
 src/site/xdoc/index.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/commons-build-plugin/blob/5d4032c9/src/site/xdoc/index.xml
----------------------------------------------------------------------
diff --git a/src/site/xdoc/index.xml b/src/site/xdoc/index.xml
index 7c9a8e7..c156569 100644
--- a/src/site/xdoc/index.xml
+++ b/src/site/xdoc/index.xml
@@ -31,7 +31,7 @@
         <section name="Build Plugin">
 
             <p>
-            This is a <a href="http://maven.apache.org/">Maven 2.x</a> 
+            This is a <a href="http://maven.apache.org/">Maven 2.x/3.x</a> 
             <a href="http://ant.apache.org/">Ant</a> Plugin which is
             used by <a href="http://commons.apache.org/">Apache Commons</a> builds. See
             the <a href="development.html">Development</a> page for information to
@@ -62,7 +62,7 @@
 <plugin>
   <groupId>org.apache.commons</groupId>
   <artifactId>commons-build-plugin</artifactId>
-  <version>1.4</version>
+  <version>1.5</version>
 </plugin>
 ]]></source>
             </p>


[33/50] commons-build-plugin git commit: Docs for README.md.

Posted by ch...@apache.org.
Docs for README.md.

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/commons-build-plugin/trunk@1770451 13f79535-47bb-0310-9956-ffa450edef68


Project: http://git-wip-us.apache.org/repos/asf/commons-build-plugin/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-build-plugin/commit/0d683cc1
Tree: http://git-wip-us.apache.org/repos/asf/commons-build-plugin/tree/0d683cc1
Diff: http://git-wip-us.apache.org/repos/asf/commons-build-plugin/diff/0d683cc1

Branch: refs/heads/master
Commit: 0d683cc195314a94390e568663cc309b21aa8f00
Parents: 9a64f01
Author: Gary D. Gregory <gg...@apache.org>
Authored: Sat Nov 19 00:58:10 2016 +0000
Committer: Gary D. Gregory <gg...@apache.org>
Committed: Sat Nov 19 00:58:10 2016 +0000

----------------------------------------------------------------------
 src/site/xdoc/readme-md.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/commons-build-plugin/blob/0d683cc1/src/site/xdoc/readme-md.xml
----------------------------------------------------------------------
diff --git a/src/site/xdoc/readme-md.xml b/src/site/xdoc/readme-md.xml
index c004b04..a9ca224 100644
--- a/src/site/xdoc/readme-md.xml
+++ b/src/site/xdoc/readme-md.xml
@@ -61,7 +61,8 @@
                 <p>
                 To generate a README.md, the following <a href="readme-md-mojo.html">properties</a>  are configured in the component's <code>pom.xml</code>
                 <ul>
-                    <li><b>commons.componentid</b> - Commons component id</li>
+                    <li><b>commons.componentid</b> - Commons component ID</li>
+                    <li><b>commons.jira.id</b> - Commons JIRA ID</li>
                     <li><b>commons.release.version</b> - The version number of the latest release of the component</li>
                 </ul>
                 </p>


[45/50] commons-build-plugin git commit: COMMONSSITE-94: Include JavaDoc badge in READM.md file.

Posted by ch...@apache.org.
COMMONSSITE-94: Include JavaDoc badge in READM.md file.

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/commons-build-plugin/trunk@1809654 13f79535-47bb-0310-9956-ffa450edef68


Project: http://git-wip-us.apache.org/repos/asf/commons-build-plugin/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-build-plugin/commit/9af4de0f
Tree: http://git-wip-us.apache.org/repos/asf/commons-build-plugin/tree/9af4de0f
Diff: http://git-wip-us.apache.org/repos/asf/commons-build-plugin/diff/9af4de0f

Branch: refs/heads/master
Commit: 9af4de0f85f84a814dc6072b36c984af833bf804
Parents: b226356
Author: Benedikt Ritter <br...@apache.org>
Authored: Mon Sep 25 18:43:44 2017 +0000
Committer: Benedikt Ritter <br...@apache.org>
Committed: Mon Sep 25 18:43:44 2017 +0000

----------------------------------------------------------------------
 src/changes/changes.xml                                         | 3 +++
 src/main/resources/commons-xdoc-templates/readme-md-template.md | 1 +
 2 files changed, 4 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/commons-build-plugin/blob/9af4de0f/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 4e701ef..19a093b 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -31,6 +31,9 @@
       </action>
     </release>
     <release version="1.7" date="2016-11-18" description="Feature release">
+      <action dev="britter" type="add" issue="COMMONSSITE-94">
+        Include JavaDoc badge in READM.md file.
+      </action>
       <action dev="ggregory" type="add" issue="COMMONSSITE-90">
         Include badges in the README.md file. 
       </action>

http://git-wip-us.apache.org/repos/asf/commons-build-plugin/blob/9af4de0f/src/main/resources/commons-xdoc-templates/readme-md-template.md
----------------------------------------------------------------------
diff --git a/src/main/resources/commons-xdoc-templates/readme-md-template.md b/src/main/resources/commons-xdoc-templates/readme-md-template.md
index 4bedf93..eac336a 100644
--- a/src/main/resources/commons-xdoc-templates/readme-md-template.md
+++ b/src/main/resources/commons-xdoc-templates/readme-md-template.md
@@ -46,6 +46,7 @@
 [![Build Status](https://travis-ci.org/apache/@ARTIFACTCOREID@.svg?branch=master)](https://travis-ci.org/apache/@ARTIFACTCOREID@)
 [![Coverage Status](https://coveralls.io/repos/apache/@ARTIFACTCOREID@/badge.svg?branch=master)](https://coveralls.io/r/apache/@ARTIFACTCOREID@)
 [![Maven Central](https://maven-badges.herokuapp.com/maven-central/@GROUPID@/@ARTIFACTCOREID@/badge.svg)](https://maven-badges.herokuapp.com/maven-central/@GROUPID@/@ARTIFACTCOREID@/)
+[![Javadocs](https://javadoc.io/badge/@GROUPID@/@ARTIFACTCOREID@/@VERSION@.svg)](https://javadoc.io/doc/@GROUPID@/@ARTIFACTCOREID@/@VERSION@)
 [![License](http://img.shields.io/:license-apache-blue.svg)](http://www.apache.org/licenses/LICENSE-2.0.html)
 
 @DESCRIPTION@


[26/50] commons-build-plugin git commit: Use @JIRA_ID@ instead of VFS as example

Posted by ch...@apache.org.
Use @JIRA_ID@ instead of VFS as example


git-svn-id: https://svn.apache.org/repos/asf/commons/proper/commons-build-plugin/trunk@1750673 13f79535-47bb-0310-9956-ffa450edef68


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

Branch: refs/heads/master
Commit: b1e36ffb03dffa92f75f940ca1791d089622fcc6
Parents: a649b14
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Wed Jun 29 16:58:50 2016 +0000
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Wed Jun 29 16:58:50 2016 +0000

----------------------------------------------------------------------
 .../resources/commons-xdoc-templates/contributing-md-template.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/commons-build-plugin/blob/b1e36ffb/src/main/resources/commons-xdoc-templates/contributing-md-template.md
----------------------------------------------------------------------
diff --git a/src/main/resources/commons-xdoc-templates/contributing-md-template.md b/src/main/resources/commons-xdoc-templates/contributing-md-template.md
index d309a3e..cd23388 100644
--- a/src/main/resources/commons-xdoc-templates/contributing-md-template.md
+++ b/src/main/resources/commons-xdoc-templates/contributing-md-template.md
@@ -62,11 +62,11 @@ Making Changes
 
 + Create a _topic branch_ for your isolated work.
   * Usually you should base your branch on the `master` or `trunk` branch.
-  * A good topic branch name can be the JIRA bug id plus a keyword, e.g. `VFS-614-MonitorInputStream`.
+  * A good topic branch name can be the JIRA bug id plus a keyword, e.g. `@JIRA_ID@-123-InputStream`.
   * If you have submitted multiple JIRA issues, try to maintain separate branches and pull requests.
 + Make commits of logical units.
   * Make sure your commit messages are meaningful and in the proper format. Your commit message should contain the key of the JIRA issue.
-  * e.g. `VFS-614: Close input stream early`
+  * e.g. `@JIRA_ID@-123: Close input stream earlier`
 + Respect the original code style:
   + Only use spaces for indentation.
   + Create minimal diffs - disable _On Save_ actions like _Reformat Source Code_ or _Organize Imports_. If you feel the source code should be reformatted create a separate PR for this change first.


[47/50] commons-build-plugin git commit: readme-md-template.md: remove license badge, as travis now displays license information at the top

Posted by ch...@apache.org.
readme-md-template.md: remove license badge, as travis now displays license information at the top

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/commons-build-plugin/trunk@1811491 13f79535-47bb-0310-9956-ffa450edef68


Project: http://git-wip-us.apache.org/repos/asf/commons-build-plugin/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-build-plugin/commit/6806d896
Tree: http://git-wip-us.apache.org/repos/asf/commons-build-plugin/tree/6806d896
Diff: http://git-wip-us.apache.org/repos/asf/commons-build-plugin/diff/6806d896

Branch: refs/heads/master
Commit: 6806d8969ec62dae99740208a6dbf092a5f55e85
Parents: f63b2ab
Author: Pascal Schumacher <pa...@apache.org>
Authored: Sun Oct 8 14:35:44 2017 +0000
Committer: Pascal Schumacher <pa...@apache.org>
Committed: Sun Oct 8 14:35:44 2017 +0000

----------------------------------------------------------------------
 src/main/resources/commons-xdoc-templates/readme-md-template.md | 1 -
 1 file changed, 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/commons-build-plugin/blob/6806d896/src/main/resources/commons-xdoc-templates/readme-md-template.md
----------------------------------------------------------------------
diff --git a/src/main/resources/commons-xdoc-templates/readme-md-template.md b/src/main/resources/commons-xdoc-templates/readme-md-template.md
index eac336a..c9ff71b 100644
--- a/src/main/resources/commons-xdoc-templates/readme-md-template.md
+++ b/src/main/resources/commons-xdoc-templates/readme-md-template.md
@@ -47,7 +47,6 @@
 [![Coverage Status](https://coveralls.io/repos/apache/@ARTIFACTCOREID@/badge.svg?branch=master)](https://coveralls.io/r/apache/@ARTIFACTCOREID@)
 [![Maven Central](https://maven-badges.herokuapp.com/maven-central/@GROUPID@/@ARTIFACTCOREID@/badge.svg)](https://maven-badges.herokuapp.com/maven-central/@GROUPID@/@ARTIFACTCOREID@/)
 [![Javadocs](https://javadoc.io/badge/@GROUPID@/@ARTIFACTCOREID@/@VERSION@.svg)](https://javadoc.io/doc/@GROUPID@/@ARTIFACTCOREID@/@VERSION@)
-[![License](http://img.shields.io/:license-apache-blue.svg)](http://www.apache.org/licenses/LICENSE-2.0.html)
 
 @DESCRIPTION@
 


[04/50] commons-build-plugin git commit: Update copyright for 2016 in NOTICE.txt

Posted by ch...@apache.org.
Update copyright for 2016 in NOTICE.txt

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/commons-build-plugin/trunk@1725419 13f79535-47bb-0310-9956-ffa450edef68


Project: http://git-wip-us.apache.org/repos/asf/commons-build-plugin/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-build-plugin/commit/5eb28b10
Tree: http://git-wip-us.apache.org/repos/asf/commons-build-plugin/tree/5eb28b10
Diff: http://git-wip-us.apache.org/repos/asf/commons-build-plugin/diff/5eb28b10

Branch: refs/heads/master
Commit: 5eb28b1084f4b9969ae0cd77cd0b622271ab8589
Parents: d661f99
Author: Gary D. Gregory <gg...@apache.org>
Authored: Tue Jan 19 06:20:04 2016 +0000
Committer: Gary D. Gregory <gg...@apache.org>
Committed: Tue Jan 19 06:20:04 2016 +0000

----------------------------------------------------------------------
 NOTICE.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/commons-build-plugin/blob/5eb28b10/NOTICE.txt
----------------------------------------------------------------------
diff --git a/NOTICE.txt b/NOTICE.txt
index dc5f5ff..ad29fd7 100644
--- a/NOTICE.txt
+++ b/NOTICE.txt
@@ -1,5 +1,5 @@
 Apache Commons Build Plugin
-Copyright 2008-2014 The Apache Software Foundation
+Copyright 2008-2016 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).


[16/50] commons-build-plugin git commit: Change to use variable subdir property whilst the exact format is worked out

Posted by ch...@apache.org.
Change to use variable subdir property whilst the exact format is worked out

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/commons-build-plugin/trunk@1739789 13f79535-47bb-0310-9956-ffa450edef68


Project: http://git-wip-us.apache.org/repos/asf/commons-build-plugin/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-build-plugin/commit/3ba2467e
Tree: http://git-wip-us.apache.org/repos/asf/commons-build-plugin/tree/3ba2467e
Diff: http://git-wip-us.apache.org/repos/asf/commons-build-plugin/diff/3ba2467e

Branch: refs/heads/master
Commit: 3ba2467e500b5a7527ca7600b116894192433749
Parents: 78ca883
Author: Sebastian Bazley <se...@apache.org>
Authored: Mon Apr 18 16:45:41 2016 +0000
Committer: Sebastian Bazley <se...@apache.org>
Committed: Mon Apr 18 16:45:41 2016 +0000

----------------------------------------------------------------------
 RELEASE-NOTES.txt                               |  5 +--
 .../download-page-head.xml                      |  6 +--
 src/main/scripts/generate-xdocs.build.xml       | 44 ++++++++++----------
 src/main/scripts/generate-xdocs.mojos.xml       | 24 +++++------
 src/site/xdoc/download-page-mojo.xml            | 12 +++---
 src/site/xdoc/download-page.xml                 |  2 +-
 6 files changed, 45 insertions(+), 48 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/commons-build-plugin/blob/3ba2467e/RELEASE-NOTES.txt
----------------------------------------------------------------------
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index e5b17c8..0d94500 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -10,12 +10,11 @@ See:
    http://commons.apache.org/commons-build-plugin/
 
 
-VERSION 1.6 - 2016-04-20
+VERSION 1.6 - 2016-04-21
 ------------------------
 
 Changes since the last release
-1. Added new download-page layout property: 
-   set this to 'version' to use a single directory of the form commons-build-plugin-1.6 rather than binaries/source 
+1. Added new download-page subdir property: set this (e.g. to '1.2' or 'lang-1.2' etc) to override the default of binaries/source 
 
 VERSION 1.5 - 2015-11-28
 ------------------------

http://git-wip-us.apache.org/repos/asf/commons-build-plugin/blob/3ba2467e/src/main/resources/commons-xdoc-templates/download-page-head.xml
----------------------------------------------------------------------
diff --git a/src/main/resources/commons-xdoc-templates/download-page-head.xml b/src/main/resources/commons-xdoc-templates/download-page-head.xml
index f6bd2ad..ee1ff15 100644
--- a/src/main/resources/commons-xdoc-templates/download-page-head.xml
+++ b/src/main/resources/commons-xdoc-templates/download-page-head.xml
@@ -35,15 +35,13 @@ limitations under the License.
  |    - commons.binary.suffix   (optional)                              |
  |      (defaults to "-bin", set to "" for pre-maven2 releases)         |
  |    - commons.release.desc    (optional)                              |
- |    - commons.release.layout  (optional)                              |
- |      (set to 'version' to use e.g. commons-net-3.5)                  |
+ |    - commons.release.subdir  (optional)                              |
  |                                                                      |
  |    - commons.release.2/3.version       (conditional)                 |
  |    - commons.release.2/3.name          (conditional)                 |
  |    - commons.release.2/3.binary.suffix (optional)                    |
  |    - commons.release.2/3.desc          (optional)                    |
- |    - commons.release.2/3.layout        (optional)                    |
- |      (set to 'version' to use e.g. commons-net-3.5)                  |
+ |    - commons.release.2/3.subdir        (optional)                    |
  |                                                                      |
  | 3) Example Properties                                                |
  |    (commons.release.name inherited by parent:                        |

http://git-wip-us.apache.org/repos/asf/commons-build-plugin/blob/3ba2467e/src/main/scripts/generate-xdocs.build.xml
----------------------------------------------------------------------
diff --git a/src/main/scripts/generate-xdocs.build.xml b/src/main/scripts/generate-xdocs.build.xml
index 7ba5b2e..af82135 100644
--- a/src/main/scripts/generate-xdocs.build.xml
+++ b/src/main/scripts/generate-xdocs.build.xml
@@ -149,17 +149,17 @@
         <echo level="${level}" message="commons.release.name     : ${commons.release.name}" />
         <echo level="${level}" message="commons.release.desc     : ${commons.release.desc}" />
         <echo level="${level}" message="commons.binary.suffix    : ${commons.binary.suffix}" />
-        <echo level="${level}" message="commons.release.layout   : ${commons.release.layout}" />
+        <echo level="${level}" message="commons.release.subdir   : ${commons.release.subdir}" />
         <echo level="${level}" message="commons.release.2.version: ${commons.release.2.version}" />
         <echo level="${level}" message="commons.release.2.name   : ${commons.release.2.name}" />
         <echo level="${level}" message="commons.release.2.desc   : ${commons.release.2.desc}" />
         <echo level="${level}" message="commons.release.2.binary.suffix: ${commons.release.2.binary.suffix}" />
-        <echo level="${level}" message="commons.release.2.layout : ${commons.release.2.layout}" />
+        <echo level="${level}" message="commons.release.2.subdir : ${commons.release.2.subdir}" />
         <echo level="${level}" message="commons.release.3.version: ${commons.release.3.version}" />
         <echo level="${level}" message="commons.release.3.name   : ${commons.release.3.name}" />
         <echo level="${level}" message="commons.release.3.desc   : ${commons.release.3.desc}" />
         <echo level="${level}" message="commons.release.3.binary.suffix: ${commons.release.3.binary.suffix}" />
-        <echo level="${level}" message="commons.release.3.layout : ${commons.release.3.layout}" />
+        <echo level="${level}" message="commons.release.3.subdir : ${commons.release.3.subdir}" />
         <echo level="${level}" message="----- commons:download-page - Parameters - END   -----" />
 
         <echo level="info" message="*** Generating ${project.name} ${commons.release.version} Download Page ***" />
@@ -200,11 +200,11 @@
     <target name="load-download-page-body-1" if="commons.release.version">
         <echo  level="info" message="*** loading download-page body(1) file***" />
 
-        <condition property="BINDIR" value="${commons.release.version}" else="binaries">
-          <equals arg1="${commons.release.layout}" arg2="version"/>
+        <condition property="BINDIR" value="${commons.release.subdir}" else="binaries">
+          <isset property="commons.release.subdir"/>
         </condition>
-        <condition property="SRCDIR" value="${commons.release.version}" else="source">
-          <equals arg1="${commons.release.layout}" arg2="version"/>
+        <condition property="SRCDIR" value="${commons.release.subdir}" else="source">
+          <isset property="commons.release.subdir"/>
         </condition>
 
         <!-- Load Body -->
@@ -228,14 +228,14 @@
     </target>
 
     <target name="load-download-page-body-2" if="commons.release.2.version">
-        <echo  level="info" message="*** loading download-page body(2) file***" />
+      <echo  level="info" message="*** loading download-page body(2) file***" />
 
-        <condition property="BINDIR" value="${commons.release.2.version}" else="binaries">
-          <equals arg1="${commons.release.2.layout}" arg2="version"/>
-        </condition>
-        <condition property="SRCDIR" value="${commons.release.2.version}" else="source">
-          <equals arg1="${commons.release.2.layout}" arg2="version"/>
-        </condition>
+      <condition property="BINDIR" value="${commons.release.2.subdir}" else="binaries">
+        <isset property="commons.release.2.subdir"/>
+      </condition>
+      <condition property="SRCDIR" value="${commons.release.2.subdir}" else="source">
+        <isset property="commons.release.2.subdir"/>
+      </condition>
 
         <!-- Load Body -->
         <loadresource property="download-page-body-2-xml">
@@ -258,14 +258,14 @@
     </target>
 
     <target name="load-download-page-body-3" if="commons.release.3.version">
-        <echo  level="info" message="*** loading download-page body(3) file***" />
-
-        <condition property="BINDIR" value="${commons.release.3.version}" else="binaries">
-          <equals arg1="${commons.release.3.layout}" arg2="version"/>
-        </condition>
-        <condition property="SRCDIR" value="${commons.release.3.version}" else="source">
-          <equals arg1="${commons.release.3.layout}" arg2="version"/>
-        </condition>
+      <echo  level="info" message="*** loading download-page body(3) file***" />
+
+      <condition property="BINDIR" value="${commons.release.3.subdir}" else="binaries">
+        <isset property="commons.release.3.subdir"/>
+      </condition>
+      <condition property="SRCDIR" value="${commons.release.3.subdir}" else="source">
+        <isset property="commons.release.3.subdir"/>
+      </condition>
 
         <!-- Load Body -->
         <loadresource property="download-page-body-3-xml">

http://git-wip-us.apache.org/repos/asf/commons-build-plugin/blob/3ba2467e/src/main/scripts/generate-xdocs.mojos.xml
----------------------------------------------------------------------
diff --git a/src/main/scripts/generate-xdocs.mojos.xml b/src/main/scripts/generate-xdocs.mojos.xml
index 5d461cc..e58056c 100644
--- a/src/main/scripts/generate-xdocs.mojos.xml
+++ b/src/main/scripts/generate-xdocs.mojos.xml
@@ -181,13 +181,13 @@
                     <description>Release Title or Description.</description>
                 </parameter>
                 <parameter>
-                    <name>commons.release.layout</name> 
-                    <property>commons.release.layout</property>
+                    <name>commons.release.subdir</name> 
+                    <property>commons.release.subdir</property>
                     <required>false</required>
                     <readonly>false</readonly>
-                    <defaultValue>${commons.release.layout}</defaultValue>
+                    <defaultValue>${commons.release.subdir}</defaultValue>
                     <type>java.lang.String</type>
-                    <description>Layout style (e.g. version)</description>
+                    <description>Subdirectory (instead of source/binaries)</description>
                 </parameter>
                 <!-- commons.release.2.* -->
                 <parameter>
@@ -227,13 +227,13 @@
                     <description>The suffix for the alternative release binary distro.</description>
                 </parameter>
                 <parameter>
-                    <name>commons.release.2.layout</name> 
-                    <property>commons.release.2.layout</property>
+                    <name>commons.release.2.subdir</name> 
+                    <property>commons.release.2.subdir</property>
                     <required>false</required>
                     <readonly>false</readonly>
-                    <defaultValue>${commons.release.2.layout}</defaultValue>
+                    <defaultValue>${commons.release.2.subdir}</defaultValue>
                     <type>java.lang.String</type>
-                    <description>Layout style (e.g. version)</description>
+                    <description>Subdirectory (instead of source/binaries)</description>
                 </parameter>
                 <!-- commons.release.3.* -->
                 <parameter>
@@ -273,13 +273,13 @@
                     <description>The suffix for the alternative release binary distro.</description>
                 </parameter>
                 <parameter>
-                    <name>commons.release.3.layout</name> 
-                    <property>commons.release.3.layout</property>
+                    <name>commons.release.3.subdir</name> 
+                    <property>commons.release.3.subdir</property>
                     <required>false</required>
                     <readonly>false</readonly>
-                    <defaultValue>${commons.release.3.layout}</defaultValue>
+                    <defaultValue>${commons.release.3.subdir}</defaultValue>
                     <type>java.lang.String</type>
-                    <description>Layout style (e.g. version)</description>
+                    <description>Subdirectory (instead of source/binaries)</description>
                 </parameter>
             </parameters>
         </mojo>

http://git-wip-us.apache.org/repos/asf/commons-build-plugin/blob/3ba2467e/src/site/xdoc/download-page-mojo.xml
----------------------------------------------------------------------
diff --git a/src/site/xdoc/download-page-mojo.xml b/src/site/xdoc/download-page-mojo.xml
index b6074d3..5b8dadb 100644
--- a/src/site/xdoc/download-page-mojo.xml
+++ b/src/site/xdoc/download-page-mojo.xml
@@ -95,10 +95,10 @@
             <td>Release Title or Description.<br/><strong>Default value is</strong>: <code>${commons.release.desc}</code>.</td>
           </tr>
           <tr>
-            <td><strong><a href="#commons.release.layout">commons.release.layout</a></strong></td>
+            <td><strong><a href="#commons.release.subdir">commons.release.subdir</a></strong></td>
             <td><code>String</code></td>
             <td><code>-</code></td>
-            <td>Layout Style (e.g. version)<br/><strong>Default value is</strong>: <code>${commons.release.layout}</code>.</td>
+            <td>Subdirectory (if not source/binaries)<br/><strong>Default value is</strong>: <code>${commons.release.subdir}</code>.</td>
           </tr>
           <!-- commons.release.2.* -->
           <tr>
@@ -120,10 +120,10 @@
             <td>The suffix for the alternative release binary distro.<br/><strong>Default value is</strong>: <code>${commons.release.2.binary.suffix}</code>.</td>
           </tr>
           <tr>
-            <td><strong><a href="#commons.release.layout">commons.release.2.layout</a></strong></td>
+            <td><strong><a href="#commons.release.subdir">commons.release.2.subdir</a></strong></td>
             <td><code>String</code></td>
             <td><code>-</code></td>
-            <td>Layout Style (e.g. version)<br/><strong>Default value is</strong>: <code>${commons.release.2.layout}</code>.</td>
+            <td>Subdirectory (if not source/binaries)<br/><strong>Default value is</strong>: <code>${commons.release.2.subdir}</code>.</td>
           </tr>
           <!-- commons.release.3.* -->
           <tr>
@@ -145,10 +145,10 @@
             <td>The suffix for the alternative release binary distro.<br/><strong>Default value is</strong>: <code>${commons.release.3.binary.suffix}</code>.</td>
           </tr>
           <tr>
-            <td><strong><a href="#commons.release.layout">commons.release.3.layout</a></strong></td>
+            <td><strong><a href="#commons.release.subdir">commons.release.3.subdir</a></strong></td>
             <td><code>String</code></td>
             <td><code>-</code></td>
-            <td>Layout Style (e.g. version)<br/><strong>Default value is</strong>: <code>${commons.release.3.layout}</code>.</td>
+            <td>Subdirectory (if not source/binaries)<br/><strong>Default value is</strong>: <code>${commons.release.3.subdir}</code>.</td>
           </tr>
           <!-- Miscellaneous -->
           <tr>

http://git-wip-us.apache.org/repos/asf/commons-build-plugin/blob/3ba2467e/src/site/xdoc/download-page.xml
----------------------------------------------------------------------
diff --git a/src/site/xdoc/download-page.xml b/src/site/xdoc/download-page.xml
index daba417..87a5fcb 100644
--- a/src/site/xdoc/download-page.xml
+++ b/src/site/xdoc/download-page.xml
@@ -77,7 +77,7 @@
                     <li><b>commons.release.desc</b> - (<i>optional</i>) The download links are shown in a section with the component name and release version - if this parameter is specified then this text is appended</li>
                     <li><b>commons.binary.suffix</b> - (<i>optional - defaults to <code>-bin</code></i>) The suffix for the binary release
                         (some components use "-bin", others have no suffix)</li>
-                    <li><b>commons.release.layout</b> - The layout style. This defaults to using source/binaries folders; use 'version' to use a single versioned folder (e.g. commons-build-23) fore binaries and source</li>
+                    <li><b>commons.release.subdir</b> - The subdirectory to use. This defaults to using separate source/binaries folders; it set it will be used as the dierctory for both.</li>
                 </ul>
                 </p>
                 <p>


[37/50] commons-build-plugin git commit: Use versions-maven-plugin 2.3. Version 2.2 causes an NPE with Maven 3.3.9.

Posted by ch...@apache.org.
Use versions-maven-plugin 2.3. Version 2.2 causes an NPE with Maven 3.3.9.

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/commons-build-plugin/trunk@1770455 13f79535-47bb-0310-9956-ffa450edef68


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

Branch: refs/heads/master
Commit: b6d87fc8a04108b2d94032a30448c724b7cc0090
Parents: a79d88b
Author: Gary D. Gregory <gg...@apache.org>
Authored: Sat Nov 19 01:23:20 2016 +0000
Committer: Gary D. Gregory <gg...@apache.org>
Committed: Sat Nov 19 01:23:20 2016 +0000

----------------------------------------------------------------------
 pom.xml | 6 ++++++
 1 file changed, 6 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/commons-build-plugin/blob/b6d87fc8/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index e1103ce..3c1c6bf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -142,6 +142,12 @@
                     </excludes>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>versions-maven-plugin</artifactId>
+                <!-- Version 2.2 causes an NPE with Maven 3.3.9 -->
+                <version>2.3</version>
+            </plugin>
         </plugins>
     </build>
     <reporting>


[49/50] commons-build-plugin git commit: README.md: fix travis badge and remove redundant license badge

Posted by ch...@apache.org.
README.md: fix travis badge and remove redundant license badge

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/commons-build-plugin/trunk@1811493 13f79535-47bb-0310-9956-ffa450edef68


Project: http://git-wip-us.apache.org/repos/asf/commons-build-plugin/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-build-plugin/commit/05827bc0
Tree: http://git-wip-us.apache.org/repos/asf/commons-build-plugin/tree/05827bc0
Diff: http://git-wip-us.apache.org/repos/asf/commons-build-plugin/diff/05827bc0

Branch: refs/heads/master
Commit: 05827bc037ea07408937ea5c0dad99bc044c7da0
Parents: e297d56
Author: Pascal Schumacher <pa...@apache.org>
Authored: Sun Oct 8 14:47:54 2017 +0000
Committer: Pascal Schumacher <pa...@apache.org>
Committed: Sun Oct 8 14:47:54 2017 +0000

----------------------------------------------------------------------
 README.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/commons-build-plugin/blob/05827bc0/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index efcdce8..15ba4a3 100644
--- a/README.md
+++ b/README.md
@@ -52,9 +52,8 @@ More information can be found on the [homepage](https://commons.apache.org/prope
 The [JavaDoc](https://commons.apache.org/proper/commons-commons-build-plugin/javadocs/api-release) can be browsed.
 Questions related to the usage of Apache Commons Build Plugin Maven Mojo should be posted to the [user mailing list][ml].
 
-[![Build Status](https://travis-ci.org/apache/commons-build-plugin.svg?branch=master)](https://travis-ci.org/apache/commons-build-plugin)
+[![Build Status](https://travis-ci.org/apache/commons-build-plugin.svg?branch=trunk)](https://travis-ci.org/apache/commons-build-plugin)
 [![Maven Central](https://maven-badges.herokuapp.com/maven-central/org.apache.commons/commons-build-plugin/badge.svg)](https://maven-badges.herokuapp.com/maven-central/org.apache.commons/commons-build-plugin)
-[![License](http://img.shields.io/:license-apache-blue.svg)](http://www.apache.org/licenses/LICENSE-2.0.html)
 
 Where can I get the latest release?
 -----------------------------------


[25/50] commons-build-plugin git commit: Grammar fixes

Posted by ch...@apache.org.
Grammar fixes

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/commons-build-plugin/trunk@1750671 13f79535-47bb-0310-9956-ffa450edef68


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

Branch: refs/heads/master
Commit: a649b14177fda7edc26f9ea2e05a6f64812afc12
Parents: c686485
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Wed Jun 29 16:47:46 2016 +0000
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Wed Jun 29 16:47:46 2016 +0000

----------------------------------------------------------------------
 .../commons-xdoc-templates/contributing-md-template.md        | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/commons-build-plugin/blob/a649b141/src/main/resources/commons-xdoc-templates/contributing-md-template.md
----------------------------------------------------------------------
diff --git a/src/main/resources/commons-xdoc-templates/contributing-md-template.md b/src/main/resources/commons-xdoc-templates/contributing-md-template.md
index f9558e8..d309a3e 100644
--- a/src/main/resources/commons-xdoc-templates/contributing-md-template.md
+++ b/src/main/resources/commons-xdoc-templates/contributing-md-template.md
@@ -86,9 +86,10 @@ In this case, it is appropriate to start the first line of a commit with '(doc)'
 Submitting Changes
 ------------------
 
-* Small patches & typical bug-fixes do not require a CLA as they are covered by
-  [Apache License clause 5](https://www.apache.org/licenses/LICENSE-2.0.html#contributions),
-  but for anything else, sign and submit the Apache [Contributor License Agreement][cla] if you haven't already.
++ Sign and submit the Apache [Contributor License Agreement][cla] if you haven't already.
+  * Note that small patches & typical bug fixes do not require a CLA as
+    clause 5 of the [Apache License](https://www.apache.org/licenses/LICENSE-2.0.html#contributions)
+    covers them.
 + Push your changes to a topic branch in your fork of the repository.
 + Submit a _Pull Request_ to the corresponding repository in the `apache` organization.
   * Verify _Files Changed_ shows only your intended changes and does not


[08/50] commons-build-plugin git commit: Implement commons.release.layout for download-page goal

Posted by ch...@apache.org.
Implement commons.release.layout for download-page goal

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/commons-build-plugin/trunk@1739607 13f79535-47bb-0310-9956-ffa450edef68


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

Branch: refs/heads/master
Commit: e761ec6dbb4610231229514f974435f9fffb112c
Parents: 5ca2c86
Author: Sebastian Bazley <se...@apache.org>
Authored: Sun Apr 17 13:23:46 2016 +0000
Committer: Sebastian Bazley <se...@apache.org>
Committed: Sun Apr 17 13:23:46 2016 +0000

----------------------------------------------------------------------
 .../download-page-body.xml                      | 24 ++++++++--------
 .../download-page-head.xml                      |  6 +++-
 src/main/scripts/generate-xdocs.build.xml       | 30 ++++++++++++++++++++
 src/main/scripts/generate-xdocs.mojos.xml       | 27 ++++++++++++++++++
 src/site/xdoc/download-page-mojo.xml            | 19 +++++++++++++
 src/site/xdoc/download-page.xml                 |  1 +
 6 files changed, 94 insertions(+), 13 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/commons-build-plugin/blob/e761ec6d/src/main/resources/commons-xdoc-templates/download-page-body.xml
----------------------------------------------------------------------
diff --git a/src/main/resources/commons-xdoc-templates/download-page-body.xml b/src/main/resources/commons-xdoc-templates/download-page-body.xml
index 4ad81e2..250f626 100644
--- a/src/main/resources/commons-xdoc-templates/download-page-body.xml
+++ b/src/main/resources/commons-xdoc-templates/download-page-body.xml
@@ -2,28 +2,28 @@
       <subsection name="Binaries">
         <table>
           <tr>
-              <td><a href="[preferred]/commons/@ID@/binaries/@FINAL_NAME@@BINARY-SUFFIX@.tar.gz">@FINAL_NAME@@BINARY-SUFFIX@.tar.gz</a></td>
-              <td><a href="https://www.apache.org/dist/commons/@ID@/binaries/@FINAL_NAME@@BINARY-SUFFIX@.tar.gz.md5">md5</a></td>
-              <td><a href="https://www.apache.org/dist/commons/@ID@/binaries/@FINAL_NAME@@BINARY-SUFFIX@.tar.gz.asc">pgp</a></td>
+              <td><a href="[preferred]/commons/@ID@/@BINDIR@/@FINAL_NAME@@BINARY-SUFFIX@.tar.gz">@FINAL_NAME@@BINARY-SUFFIX@.tar.gz</a></td>
+              <td><a href="https://www.apache.org/dist/commons/@ID@/@BINDIR@/@FINAL_NAME@@BINARY-SUFFIX@.tar.gz.md5">md5</a></td>
+              <td><a href="https://www.apache.org/dist/commons/@ID@/@BINDIR@/@FINAL_NAME@@BINARY-SUFFIX@.tar.gz.asc">pgp</a></td>
           </tr>
           <tr>
-              <td><a href="[preferred]/commons/@ID@/binaries/@FINAL_NAME@@BINARY-SUFFIX@.zip">@FINAL_NAME@@BINARY-SUFFIX@.zip</a></td>
-              <td><a href="https://www.apache.org/dist/commons/@ID@/binaries/@FINAL_NAME@@BINARY-SUFFIX@.zip.md5">md5</a></td>
-              <td><a href="https://www.apache.org/dist/commons/@ID@/binaries/@FINAL_NAME@@BINARY-SUFFIX@.zip.asc">pgp</a></td>
+              <td><a href="[preferred]/commons/@ID@/@BINDIR@/@FINAL_NAME@@BINARY-SUFFIX@.zip">@FINAL_NAME@@BINARY-SUFFIX@.zip</a></td>
+              <td><a href="https://www.apache.org/dist/commons/@ID@/@BINDIR@/@FINAL_NAME@@BINARY-SUFFIX@.zip.md5">md5</a></td>
+              <td><a href="https://www.apache.org/dist/commons/@ID@/@BINDIR@/@FINAL_NAME@@BINARY-SUFFIX@.zip.asc">pgp</a></td>
           </tr>
         </table>
       </subsection>
       <subsection name="Source">
         <table>
           <tr>
-              <td><a href="[preferred]/commons/@ID@/source/@FINAL_NAME@-src.tar.gz">@FINAL_NAME@-src.tar.gz</a></td>
-              <td><a href="https://www.apache.org/dist/commons/@ID@/source/@FINAL_NAME@-src.tar.gz.md5">md5</a></td>
-              <td><a href="https://www.apache.org/dist/commons/@ID@/source/@FINAL_NAME@-src.tar.gz.asc">pgp</a></td>
+              <td><a href="[preferred]/commons/@ID@/@SRCDIR@/@FINAL_NAME@-src.tar.gz">@FINAL_NAME@-src.tar.gz</a></td>
+              <td><a href="https://www.apache.org/dist/commons/@ID@/@SRCDIR@/@FINAL_NAME@-src.tar.gz.md5">md5</a></td>
+              <td><a href="https://www.apache.org/dist/commons/@ID@/@SRCDIR@/@FINAL_NAME@-src.tar.gz.asc">pgp</a></td>
           </tr>
           <tr>
-              <td><a href="[preferred]/commons/@ID@/source/@FINAL_NAME@-src.zip">@FINAL_NAME@-src.zip</a></td>
-              <td><a href="https://www.apache.org/dist/commons/@ID@/source/@FINAL_NAME@-src.zip.md5">md5</a></td>
-              <td><a href="https://www.apache.org/dist/commons/@ID@/source/@FINAL_NAME@-src.zip.asc">pgp</a></td>
+              <td><a href="[preferred]/commons/@ID@/@SRCDIR@/@FINAL_NAME@-src.zip">@FINAL_NAME@-src.zip</a></td>
+              <td><a href="https://www.apache.org/dist/commons/@ID@/@SRCDIR@/@FINAL_NAME@-src.zip.md5">md5</a></td>
+              <td><a href="https://www.apache.org/dist/commons/@ID@/@SRCDIR@/@FINAL_NAME@-src.zip.asc">pgp</a></td>
           </tr>
         </table>
       </subsection>

http://git-wip-us.apache.org/repos/asf/commons-build-plugin/blob/e761ec6d/src/main/resources/commons-xdoc-templates/download-page-head.xml
----------------------------------------------------------------------
diff --git a/src/main/resources/commons-xdoc-templates/download-page-head.xml b/src/main/resources/commons-xdoc-templates/download-page-head.xml
index 68d3b95..f6bd2ad 100644
--- a/src/main/resources/commons-xdoc-templates/download-page-head.xml
+++ b/src/main/resources/commons-xdoc-templates/download-page-head.xml
@@ -32,14 +32,18 @@ limitations under the License.
  |    - commons.componentid (required, alphabetic, lower case)          |
  |    - commons.release.version (required)                              |
  |    - commons.release.name    (required)                              |
- |    - commons.binary.suffix (optional)                                |
+ |    - commons.binary.suffix   (optional)                              |
  |      (defaults to "-bin", set to "" for pre-maven2 releases)         |
  |    - commons.release.desc    (optional)                              |
+ |    - commons.release.layout  (optional)                              |
+ |      (set to 'version' to use e.g. commons-net-3.5)                  |
  |                                                                      |
  |    - commons.release.2/3.version       (conditional)                 |
  |    - commons.release.2/3.name          (conditional)                 |
  |    - commons.release.2/3.binary.suffix (optional)                    |
  |    - commons.release.2/3.desc          (optional)                    |
+ |    - commons.release.2/3.layout        (optional)                    |
+ |      (set to 'version' to use e.g. commons-net-3.5)                  |
  |                                                                      |
  | 3) Example Properties                                                |
  |    (commons.release.name inherited by parent:                        |

http://git-wip-us.apache.org/repos/asf/commons-build-plugin/blob/e761ec6d/src/main/scripts/generate-xdocs.build.xml
----------------------------------------------------------------------
diff --git a/src/main/scripts/generate-xdocs.build.xml b/src/main/scripts/generate-xdocs.build.xml
index baa4533..7ba5b2e 100644
--- a/src/main/scripts/generate-xdocs.build.xml
+++ b/src/main/scripts/generate-xdocs.build.xml
@@ -149,14 +149,17 @@
         <echo level="${level}" message="commons.release.name     : ${commons.release.name}" />
         <echo level="${level}" message="commons.release.desc     : ${commons.release.desc}" />
         <echo level="${level}" message="commons.binary.suffix    : ${commons.binary.suffix}" />
+        <echo level="${level}" message="commons.release.layout   : ${commons.release.layout}" />
         <echo level="${level}" message="commons.release.2.version: ${commons.release.2.version}" />
         <echo level="${level}" message="commons.release.2.name   : ${commons.release.2.name}" />
         <echo level="${level}" message="commons.release.2.desc   : ${commons.release.2.desc}" />
         <echo level="${level}" message="commons.release.2.binary.suffix: ${commons.release.2.binary.suffix}" />
+        <echo level="${level}" message="commons.release.2.layout : ${commons.release.2.layout}" />
         <echo level="${level}" message="commons.release.3.version: ${commons.release.3.version}" />
         <echo level="${level}" message="commons.release.3.name   : ${commons.release.3.name}" />
         <echo level="${level}" message="commons.release.3.desc   : ${commons.release.3.desc}" />
         <echo level="${level}" message="commons.release.3.binary.suffix: ${commons.release.3.binary.suffix}" />
+        <echo level="${level}" message="commons.release.3.layout : ${commons.release.3.layout}" />
         <echo level="${level}" message="----- commons:download-page - Parameters - END   -----" />
 
         <echo level="info" message="*** Generating ${project.name} ${commons.release.version} Download Page ***" />
@@ -197,6 +200,13 @@
     <target name="load-download-page-body-1" if="commons.release.version">
         <echo  level="info" message="*** loading download-page body(1) file***" />
 
+        <condition property="BINDIR" value="${commons.release.version}" else="binaries">
+          <equals arg1="${commons.release.layout}" arg2="version"/>
+        </condition>
+        <condition property="SRCDIR" value="${commons.release.version}" else="source">
+          <equals arg1="${commons.release.layout}" arg2="version"/>
+        </condition>
+
         <!-- Load Body -->
         <loadresource property="download-page-body-1-xml">
             <javaresource name="${commonsMojoXdocDir}/download-page-body.xml"/>
@@ -208,6 +218,8 @@
                     <token key="ID"            value="${commons.componentid}"/>
                     <token key="FINAL_NAME"    value="${commons.release.name}"/>
                     <token key="BINARY-SUFFIX" value="${commons.binary.suffix}"/>
+                    <token key="BINDIR"        value="${BINDIR}"/>
+                    <token key="SRCDIR"        value="${SRCDIR}"/>
                 </replacetokens>
             </filterchain>
         </loadresource>
@@ -218,6 +230,13 @@
     <target name="load-download-page-body-2" if="commons.release.2.version">
         <echo  level="info" message="*** loading download-page body(2) file***" />
 
+        <condition property="BINDIR" value="${commons.release.2.version}" else="binaries">
+          <equals arg1="${commons.release.2.layout}" arg2="version"/>
+        </condition>
+        <condition property="SRCDIR" value="${commons.release.2.version}" else="source">
+          <equals arg1="${commons.release.2.layout}" arg2="version"/>
+        </condition>
+
         <!-- Load Body -->
         <loadresource property="download-page-body-2-xml">
             <javaresource name="${commonsMojoXdocDir}/download-page-body.xml"/>
@@ -229,6 +248,8 @@
                     <token key="ID"            value="${commons.componentid}"/>
                     <token key="FINAL_NAME"    value="${commons.release.2.name}"/>
                     <token key="BINARY-SUFFIX" value="${commons.release.2.binary.suffix}"/>
+                    <token key="BINDIR"        value="${BINDIR}"/>
+                    <token key="SRCDIR"        value="${SRCDIR}"/>
                 </replacetokens>
             </filterchain>
         </loadresource>
@@ -239,6 +260,13 @@
     <target name="load-download-page-body-3" if="commons.release.3.version">
         <echo  level="info" message="*** loading download-page body(3) file***" />
 
+        <condition property="BINDIR" value="${commons.release.3.version}" else="binaries">
+          <equals arg1="${commons.release.3.layout}" arg2="version"/>
+        </condition>
+        <condition property="SRCDIR" value="${commons.release.3.version}" else="source">
+          <equals arg1="${commons.release.3.layout}" arg2="version"/>
+        </condition>
+
         <!-- Load Body -->
         <loadresource property="download-page-body-3-xml">
             <javaresource name="${commonsMojoXdocDir}/download-page-body.xml"/>
@@ -250,6 +278,8 @@
                     <token key="ID"            value="${commons.componentid}"/>
                     <token key="FINAL_NAME"    value="${commons.release.3.name}"/>
                     <token key="BINARY-SUFFIX" value="${commons.release.3.binary.suffix}"/>
+                    <token key="BINDIR"        value="${BINDIR}"/>
+                    <token key="SRCDIR"        value="${SRCDIR}"/>
                 </replacetokens>
             </filterchain>
         </loadresource>

http://git-wip-us.apache.org/repos/asf/commons-build-plugin/blob/e761ec6d/src/main/scripts/generate-xdocs.mojos.xml
----------------------------------------------------------------------
diff --git a/src/main/scripts/generate-xdocs.mojos.xml b/src/main/scripts/generate-xdocs.mojos.xml
index 55be745..75ba37d 100644
--- a/src/main/scripts/generate-xdocs.mojos.xml
+++ b/src/main/scripts/generate-xdocs.mojos.xml
@@ -180,6 +180,15 @@
                     <type>java.lang.String</type>
                     <description>Release Title or Description.</description>
                 </parameter>
+                <parameter>
+                    <name>commons.release.layout</name> 
+                    <property>commons.release.layout</property>
+                    <required>false</required>
+                    <readonly>false</readonly>
+                    <defaultValue>${commons.release.layout}</defaultValue>
+                    <type>java.lang.String</type>
+                    <description>Layout style (e.g. version)</description>
+                </parameter>
                 <!-- commons.release.2.* -->
                 <parameter>
                     <name>commons.release.2.version</name> 
@@ -217,6 +226,15 @@
                     <type>java.lang.String</type>
                     <description>The suffix for the alternative release binary distro.</description>
                 </parameter>
+                <parameter>
+                    <name>commons.release.2.layout</name> 
+                    <property>commons.release.2.layout</property>
+                    <required>false</required>
+                    <readonly>false</readonly>
+                    <defaultValue>${commons.release.2.layout}</defaultValue>
+                    <type>java.lang.String</type>
+                    <description>Layout style (e.g. version)</description>
+                </parameter>
                 <!-- commons.release.3.* -->
                 <parameter>
                     <name>commons.release.3.version</name> 
@@ -254,6 +272,15 @@
                     <type>java.lang.String</type>
                     <description>The suffix for the alternative release binary distro.</description>
                 </parameter>
+                <parameter>
+                    <name>commons.release.3.layout</name> 
+                    <property>commons.release.3.layout</property>
+                    <required>false</required>
+                    <readonly>false</readonly>
+                    <defaultValue>${commons.release.3.layout}</defaultValue>
+                    <type>java.lang.String</type>
+                    <description>Layout style (e.g. version)</description>
+                </parameter>
             </parameters>
         </mojo>
         <mojo>

http://git-wip-us.apache.org/repos/asf/commons-build-plugin/blob/e761ec6d/src/site/xdoc/download-page-mojo.xml
----------------------------------------------------------------------
diff --git a/src/site/xdoc/download-page-mojo.xml b/src/site/xdoc/download-page-mojo.xml
index 2ed6777..bc5dc5e 100644
--- a/src/site/xdoc/download-page-mojo.xml
+++ b/src/site/xdoc/download-page-mojo.xml
@@ -94,6 +94,12 @@
             <td><code>-</code></td>
             <td>Release Title or Description.<br/><strong>Default value is</strong>: <code>${commons.release.desc}</code>.</td>
           </tr>
+          <tr>
+            <td><strong><a href="#commons.release.layout">commons.release.layout</a></strong></td>
+            <td><code>String</code></td>
+            <td><code>-</code></td>
+            <td>Layout Style (e.g. version)<br/><strong>Default value is</strong>: <code>${commons.release.layout}</code>.</td>
+          </tr>
           <!-- commons.release.2.* -->
           <tr>
             <td><strong><a href="#commons.release.2.version">commons.release.2.version</a></strong></td>
@@ -113,6 +119,12 @@
             <td><code>-</code></td>
             <td>The suffix for the alternative release binary distro.<br/><strong>Default value is</strong>: <code>${commons.release.2.binary.suffix}</code>.</td>
           </tr>
+          <tr>
+            <td><strong><a href="#commons.release.layout">commons.release.2.layout</a></strong></td>
+            <td><code>String</code></td>
+            <td><code>-</code></td>
+            <td>Layout Style (e.g. version)<br/><strong>Default value is</strong>: <code>${commons.release.2.layout}</code>.</td>
+          </tr>
           <!-- commons.release.3.* -->
           <tr>
             <td><strong><a href="#commons.release.3.version">commons.release.3.version</a></strong></td>
@@ -133,6 +145,13 @@
             <td>The suffix for the alternative release binary distro.<br/><strong>Default value is</strong>: <code>${commons.release.3.binary.suffix}</code>.</td>
           </tr>
           <tr>
+            <td><strong><a href="#commons.release.layout">commons.release.3.layout</a></strong></td>
+            <td><code>String</code></td>
+            <td><code>-</code></td>
+            <td>Layout Style (e.g. version)<br/><strong>Default value is</strong>: <code>${commons.release.3.layout}</code>.</td>
+          </tr>
+          <!-- Miscellaneous -->
+          <tr>
             <td><strong><a href="#messageLevel">messageLevel</a></strong></td>
             <td><code>String</code></td>
             <td><code>-</code></td>

http://git-wip-us.apache.org/repos/asf/commons-build-plugin/blob/e761ec6d/src/site/xdoc/download-page.xml
----------------------------------------------------------------------
diff --git a/src/site/xdoc/download-page.xml b/src/site/xdoc/download-page.xml
index 9e4c5a6..daba417 100644
--- a/src/site/xdoc/download-page.xml
+++ b/src/site/xdoc/download-page.xml
@@ -77,6 +77,7 @@
                     <li><b>commons.release.desc</b> - (<i>optional</i>) The download links are shown in a section with the component name and release version - if this parameter is specified then this text is appended</li>
                     <li><b>commons.binary.suffix</b> - (<i>optional - defaults to <code>-bin</code></i>) The suffix for the binary release
                         (some components use "-bin", others have no suffix)</li>
+                    <li><b>commons.release.layout</b> - The layout style. This defaults to using source/binaries folders; use 'version' to use a single versioned folder (e.g. commons-build-23) fore binaries and source</li>
                 </ul>
                 </p>
                 <p>


[29/50] commons-build-plugin git commit: JIRA is more than a "Bugtracker" (sic) so use "Issue Tracker" instead.

Posted by ch...@apache.org.
JIRA is more than a "Bugtracker" (sic) so use "Issue Tracker" instead.

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/commons-build-plugin/trunk@1770024 13f79535-47bb-0310-9956-ffa450edef68


Project: http://git-wip-us.apache.org/repos/asf/commons-build-plugin/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-build-plugin/commit/351ed8cb
Tree: http://git-wip-us.apache.org/repos/asf/commons-build-plugin/tree/351ed8cb
Diff: http://git-wip-us.apache.org/repos/asf/commons-build-plugin/diff/351ed8cb

Branch: refs/heads/master
Commit: 351ed8cb97cd4e18a108ab99cde6511222f0d7c4
Parents: 0531923
Author: Gary D. Gregory <gg...@apache.org>
Authored: Wed Nov 16 17:49:12 2016 +0000
Committer: Gary D. Gregory <gg...@apache.org>
Committed: Wed Nov 16 17:49:12 2016 +0000

----------------------------------------------------------------------
 src/main/resources/commons-xdoc-templates/readme-md-template.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/commons-build-plugin/blob/351ed8cb/src/main/resources/commons-xdoc-templates/readme-md-template.md
----------------------------------------------------------------------
diff --git a/src/main/resources/commons-xdoc-templates/readme-md-template.md b/src/main/resources/commons-xdoc-templates/readme-md-template.md
index e39cb94..4bedf93 100644
--- a/src/main/resources/commons-xdoc-templates/readme-md-template.md
+++ b/src/main/resources/commons-xdoc-templates/readme-md-template.md
@@ -98,7 +98,7 @@ Additional Resources
 --------------------
 
 + [Apache Commons Homepage](https://commons.apache.org/)
-+ [Apache Bugtracker (JIRA)](https://issues.apache.org/jira/browse/@JIRA_ID@)
++ [Apache Issue Tracker (JIRA)](https://issues.apache.org/jira/browse/@JIRA_ID@)
 + [Apache Commons Twitter Account](https://twitter.com/ApacheCommons)
 + `#apache-commons` IRC channel on `irc.freenode.org`
 


[39/50] commons-build-plugin git commit: Add Travis CI configuration file. Add Badges.

Posted by ch...@apache.org.
Add Travis CI configuration file. Add Badges.

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/commons-build-plugin/trunk@1773305 13f79535-47bb-0310-9956-ffa450edef68


Project: http://git-wip-us.apache.org/repos/asf/commons-build-plugin/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-build-plugin/commit/83c33fd2
Tree: http://git-wip-us.apache.org/repos/asf/commons-build-plugin/tree/83c33fd2
Diff: http://git-wip-us.apache.org/repos/asf/commons-build-plugin/diff/83c33fd2

Branch: refs/heads/master
Commit: 83c33fd235f8e80d95820304866dcab214ea1474
Parents: 02cc0d4
Author: Gary D. Gregory <gg...@apache.org>
Authored: Thu Dec 8 22:13:35 2016 +0000
Committer: Gary D. Gregory <gg...@apache.org>
Committed: Thu Dec 8 22:13:35 2016 +0000

----------------------------------------------------------------------
 .travis.yml | 22 ++++++++++++++++++++++
 README.md   |  4 ++++
 2 files changed, 26 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/commons-build-plugin/blob/83c33fd2/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..a0e1204
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,22 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+language: java
+sudo: false
+
+jdk:
+  - openjdk7
+  - oraclejdk7
+  - oraclejdk8

http://git-wip-us.apache.org/repos/asf/commons-build-plugin/blob/83c33fd2/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index d5cd7ad..efcdce8 100644
--- a/README.md
+++ b/README.md
@@ -52,6 +52,10 @@ More information can be found on the [homepage](https://commons.apache.org/prope
 The [JavaDoc](https://commons.apache.org/proper/commons-commons-build-plugin/javadocs/api-release) can be browsed.
 Questions related to the usage of Apache Commons Build Plugin Maven Mojo should be posted to the [user mailing list][ml].
 
+[![Build Status](https://travis-ci.org/apache/commons-build-plugin.svg?branch=master)](https://travis-ci.org/apache/commons-build-plugin)
+[![Maven Central](https://maven-badges.herokuapp.com/maven-central/org.apache.commons/commons-build-plugin/badge.svg)](https://maven-badges.herokuapp.com/maven-central/org.apache.commons/commons-build-plugin)
+[![License](http://img.shields.io/:license-apache-blue.svg)](http://www.apache.org/licenses/LICENSE-2.0.html)
+
 Where can I get the latest release?
 -----------------------------------
 You can download source and binaries from our [download page](https://commons.apache.org/proper/commons-commons-build-plugin/download_commons-build-plugin.cgi).


[09/50] commons-build-plugin git commit: Use full project name. Drop Ant suffix as the implementation mechanism is not relevant

Posted by ch...@apache.org.
Use full project name.
Drop Ant suffix as the implementation mechanism is not relevant

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/commons-build-plugin/trunk@1739610 13f79535-47bb-0310-9956-ffa450edef68


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

Branch: refs/heads/master
Commit: d353571ca644ecbd898cd6c2ef3ba56e0c483ba5
Parents: e761ec6
Author: Sebastian Bazley <se...@apache.org>
Authored: Sun Apr 17 13:41:32 2016 +0000
Committer: Sebastian Bazley <se...@apache.org>
Committed: Sun Apr 17 13:41:32 2016 +0000

----------------------------------------------------------------------
 src/site/xdoc/contributing-md-mojo.xml   | 2 +-
 src/site/xdoc/download-page-mojo.xml     | 2 +-
 src/site/xdoc/jira-page-mojo.xml         | 2 +-
 src/site/xdoc/mail-page-mojo.xml         | 2 +-
 src/site/xdoc/readme-md-mojo.xml         | 2 +-
 src/site/xdoc/sandbox-jira-page-mojo.xml | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/commons-build-plugin/blob/d353571c/src/site/xdoc/contributing-md-mojo.xml
----------------------------------------------------------------------
diff --git a/src/site/xdoc/contributing-md-mojo.xml b/src/site/xdoc/contributing-md-mojo.xml
index f261cb5..79c0883 100644
--- a/src/site/xdoc/contributing-md-mojo.xml
+++ b/src/site/xdoc/contributing-md-mojo.xml
@@ -28,7 +28,7 @@
       <p><strong>Full name</strong>:</p>
       <p>org.apache.commons:commons-build-plugin:1.5:contributing-md</p>
       <p><strong>Description</strong>:</p>
-      <div>Commons Build Ant Mojo: Generate CONTRIBUTING.md</div>
+      <div>Apache Commons Build Mojo: Generate CONTRIBUTING.md</div>
       <p><strong>Attributes</strong>:</p>
       <ul>
         <li>Requires a Maven 2.0 project to be executed.</li>

http://git-wip-us.apache.org/repos/asf/commons-build-plugin/blob/d353571c/src/site/xdoc/download-page-mojo.xml
----------------------------------------------------------------------
diff --git a/src/site/xdoc/download-page-mojo.xml b/src/site/xdoc/download-page-mojo.xml
index bc5dc5e..c349e51 100644
--- a/src/site/xdoc/download-page-mojo.xml
+++ b/src/site/xdoc/download-page-mojo.xml
@@ -28,7 +28,7 @@
       <p><strong>Full name</strong>:</p>
       <p>org.apache.commons:commons-build-plugin:1.3:download-page</p>
       <p><strong>Description</strong>:</p>
-      <div>Commons Build Ant Mojo: Generate Download page</div>
+      <div>Apache Apache Commons Build Mojo: Generate Download page</div>
       <p><strong>Attributes</strong>:</p>
       <ul>
         <li>Requires a Maven 2.0 project to be executed.</li>

http://git-wip-us.apache.org/repos/asf/commons-build-plugin/blob/d353571c/src/site/xdoc/jira-page-mojo.xml
----------------------------------------------------------------------
diff --git a/src/site/xdoc/jira-page-mojo.xml b/src/site/xdoc/jira-page-mojo.xml
index 5afb86f..e620c0e 100644
--- a/src/site/xdoc/jira-page-mojo.xml
+++ b/src/site/xdoc/jira-page-mojo.xml
@@ -28,7 +28,7 @@
       <p><strong>Full name</strong>:</p>
       <p>org.apache.commons:commons-build-plugin:1.3:jira-page</p>
       <p><strong>Description</strong>:</p>
-      <div>Commons Build Ant Mojo: Generate Issue Tracking page</div>
+      <div>Apache Commons Build Mojo: Generate Issue Tracking page</div>
       <p><strong>Attributes</strong>:</p>
       <ul>
         <li>Requires a Maven 2.0 project to be executed.</li>

http://git-wip-us.apache.org/repos/asf/commons-build-plugin/blob/d353571c/src/site/xdoc/mail-page-mojo.xml
----------------------------------------------------------------------
diff --git a/src/site/xdoc/mail-page-mojo.xml b/src/site/xdoc/mail-page-mojo.xml
index da67def..8ec87b9 100644
--- a/src/site/xdoc/mail-page-mojo.xml
+++ b/src/site/xdoc/mail-page-mojo.xml
@@ -28,7 +28,7 @@
       <p><strong>Full name</strong>:</p>
       <p>org.apache.commons:commons-build-plugin:1.3:mail-page</p>
       <p><strong>Description</strong>:</p>
-      <div>Commons Build Ant Mojo: Generate Mailing List page</div>
+      <div>Apache Commons Build Mojo: Generate Mailing List page</div>
       <p><strong>Attributes</strong>:</p>
       <ul>
         <li>Requires a Maven 2.0 project to be executed.</li>

http://git-wip-us.apache.org/repos/asf/commons-build-plugin/blob/d353571c/src/site/xdoc/readme-md-mojo.xml
----------------------------------------------------------------------
diff --git a/src/site/xdoc/readme-md-mojo.xml b/src/site/xdoc/readme-md-mojo.xml
index 2833847..3e8aeca 100644
--- a/src/site/xdoc/readme-md-mojo.xml
+++ b/src/site/xdoc/readme-md-mojo.xml
@@ -28,7 +28,7 @@
       <p><strong>Full name</strong>:</p>
       <p>org.apache.commons:commons-build-plugin:1.5:readme-md</p>
       <p><strong>Description</strong>:</p>
-      <div>Commons Build Ant Mojo: Generate README.md</div>
+      <div>Apache Commons Build Mojo: Generate README.md</div>
       <p><strong>Attributes</strong>:</p>
       <ul>
         <li>Requires a Maven 2.0 project to be executed.</li>

http://git-wip-us.apache.org/repos/asf/commons-build-plugin/blob/d353571c/src/site/xdoc/sandbox-jira-page-mojo.xml
----------------------------------------------------------------------
diff --git a/src/site/xdoc/sandbox-jira-page-mojo.xml b/src/site/xdoc/sandbox-jira-page-mojo.xml
index 1732dae..10d2d80 100644
--- a/src/site/xdoc/sandbox-jira-page-mojo.xml
+++ b/src/site/xdoc/sandbox-jira-page-mojo.xml
@@ -28,7 +28,7 @@
       <p><strong>Full name</strong>:</p>
       <p>org.apache.commons:commons-build-plugin:1.3:sandbox-jira-page</p>
       <p><strong>Description</strong>:</p>
-      <div>Commons Build Ant Mojo: Generate Sandbox Issue Tracking page</div>
+      <div>Apache Commons Build Mojo: Generate Sandbox Issue Tracking page</div>
       <p><strong>Attributes</strong>:</p>
       <ul>
         <li>Requires a Maven 2.0 project to be executed.</li>


[34/50] commons-build-plugin git commit: Prepare release 1.7.

Posted by ch...@apache.org.
Prepare release 1.7.

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/commons-build-plugin/trunk@1770452 13f79535-47bb-0310-9956-ffa450edef68


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

Branch: refs/heads/master
Commit: f85d793488f20f6566708fa27d71d3672cfc9ef8
Parents: 0d683cc
Author: Gary D. Gregory <gg...@apache.org>
Authored: Sat Nov 19 01:13:19 2016 +0000
Committer: Gary D. Gregory <gg...@apache.org>
Committed: Sat Nov 19 01:13:19 2016 +0000

----------------------------------------------------------------------
 RELEASE-NOTES.txt | 7 +++++++
 1 file changed, 7 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/commons-build-plugin/blob/f85d7934/RELEASE-NOTES.txt
----------------------------------------------------------------------
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index 02fceb7..09750b9 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -10,6 +10,13 @@ See:
    http://commons.apache.org/commons-build-plugin/
 
 
+VERSION 1.7 - 2016-11-18
+------------------------
+
+Changes since the last release
+1. Include badges in the README.md file.  Issue: COMMONSSITE-90. 
+2. Build plugin does not pass the JIRA_ID property when generating README.md.  Issue: COMMONSSITE-91. 
+
 VERSION 1.6 - 2016-04-24
 ------------------------
 


[30/50] commons-build-plugin git commit: [COMMONSSITE-91] Build plugin does not pass the JIRA_ID property when generating README.md.

Posted by ch...@apache.org.
[COMMONSSITE-91] Build plugin does not pass the JIRA_ID property when generating README.md.

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/commons-build-plugin/trunk@1770025 13f79535-47bb-0310-9956-ffa450edef68


Project: http://git-wip-us.apache.org/repos/asf/commons-build-plugin/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-build-plugin/commit/3852c319
Tree: http://git-wip-us.apache.org/repos/asf/commons-build-plugin/tree/3852c319
Diff: http://git-wip-us.apache.org/repos/asf/commons-build-plugin/diff/3852c319

Branch: refs/heads/master
Commit: 3852c31956e2d7424624dcdbdc2bdf3c7636ceb3
Parents: 351ed8c
Author: Gary D. Gregory <gg...@apache.org>
Authored: Wed Nov 16 18:11:17 2016 +0000
Committer: Gary D. Gregory <gg...@apache.org>
Committed: Wed Nov 16 18:11:17 2016 +0000

----------------------------------------------------------------------
 src/changes/changes.xml                   | 3 +++
 src/main/scripts/generate-xdocs.build.xml | 2 ++
 src/main/scripts/generate-xdocs.mojos.xml | 9 +++++++++
 3 files changed, 14 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/commons-build-plugin/blob/3852c319/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 5f5afae..c6d2aa7 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -33,6 +33,9 @@
       <action dev="ggregory" type="add" issue="COMMONSSITE-90">
         Include badges in the README.md file. 
       </action>
+      <action dev="ggregory" type="add" issue="COMMONSSITE-91">
+        Build plugin does not pass the JIRA_ID property when generating README.md.
+      </action>
     </release>
 
     <release version="1.5" date="2015-11-28" description="Feature and fix release">

http://git-wip-us.apache.org/repos/asf/commons-build-plugin/blob/3852c319/src/main/scripts/generate-xdocs.build.xml
----------------------------------------------------------------------
diff --git a/src/main/scripts/generate-xdocs.build.xml b/src/main/scripts/generate-xdocs.build.xml
index af82135..54622f5 100644
--- a/src/main/scripts/generate-xdocs.build.xml
+++ b/src/main/scripts/generate-xdocs.build.xml
@@ -336,6 +336,7 @@
         <echo level="${level}" message="project.name              : ${project.name}" />
         <echo level="${level}" message="project.artifactId        : ${project.artifactId}" />
         <echo level="${level}" message="project.groupId           : ${project.groupId}" />
+        <echo level="${level}" message="commons.jira.id           : ${commons.jira.id}" />
         <echo level="${level}" message="commons.release.version   : ${commons.release.version}" />
         <echo level="${level}" message="commons.componentid       : ${commons.componentid}" />
         <echo level="${level}" message="----- commons:readme-md - Parameters - END   -----" />
@@ -369,6 +370,7 @@
              <filter  token="ARTIFACTID"     value="${project.artifactId}"/>
              <filter  token="ARTIFACTCOREID" value="${tmp.artifactId}"/>
              <filter  token="GROUPID"        value="${project.groupId}"/>
+             <filter  token="JIRA_ID"        value="${commons.jira.id}"/>
              <filter  token="VERSION"        value="${commons.release.version}"/>
              <filter  token="DESCRIPTION"    value="${project.description}"/>
              <filter  token="ID"             value="${commons.componentid}"/>

http://git-wip-us.apache.org/repos/asf/commons-build-plugin/blob/3852c319/src/main/scripts/generate-xdocs.mojos.xml
----------------------------------------------------------------------
diff --git a/src/main/scripts/generate-xdocs.mojos.xml b/src/main/scripts/generate-xdocs.mojos.xml
index e58056c..f2a2917 100644
--- a/src/main/scripts/generate-xdocs.mojos.xml
+++ b/src/main/scripts/generate-xdocs.mojos.xml
@@ -326,6 +326,15 @@
                     <description>The groupId of the project currently being built.</description>
                 </parameter>
                 <parameter>
+                    <name>commons.jira.id</name> 
+                    <property>commons.jira.id</property>
+                    <required>true</required>
+                    <readonly>false</readonly>
+                    <defaultValue>${commons.jira.id}</defaultValue>
+                    <type>java.lang.String</type>
+                    <description>The external JIRA id for the project (alphabetic, upper case)</description>
+                </parameter>
+                <parameter>
                     <name>commons.release.version</name>
                     <property>commons.release.version</property>
                     <required>true</required>


[23/50] commons-build-plugin git commit: Clarify license and contributions

Posted by ch...@apache.org.
Clarify license and contributions


git-svn-id: https://svn.apache.org/repos/asf/commons/proper/commons-build-plugin/trunk@1750669 13f79535-47bb-0310-9956-ffa450edef68


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

Branch: refs/heads/master
Commit: b240367c669dc50c1e301947608bbd0093d94ac6
Parents: f546e06
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Wed Jun 29 16:43:26 2016 +0000
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Wed Jun 29 16:43:26 2016 +0000

----------------------------------------------------------------------
 .../commons-xdoc-templates/readme-md-template.md        | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/commons-build-plugin/blob/b240367c/src/main/resources/commons-xdoc-templates/readme-md-template.md
----------------------------------------------------------------------
diff --git a/src/main/resources/commons-xdoc-templates/readme-md-template.md b/src/main/resources/commons-xdoc-templates/readme-md-template.md
index 3c6fced..37af855 100644
--- a/src/main/resources/commons-xdoc-templates/readme-md-template.md
+++ b/src/main/resources/commons-xdoc-templates/readme-md-template.md
@@ -48,7 +48,7 @@
 Documentation
 -------------
 
-More information can be found on the [homepage](https://commons.apache.org/proper/commons-@ID@).
+More information can be found on the [@NAME@ homepage](https://commons.apache.org/proper/commons-@ID@).
 The [JavaDoc](https://commons.apache.org/proper/commons-@ID@/javadocs/api-release) can be browsed.
 Questions related to the usage of @NAME@ should be posted to the [user mailing list][ml].
 
@@ -69,7 +69,7 @@ Alternatively you can pull it from the central Maven repositories:
 Contributing
 ------------
 
-We accept PRs via github. The [developer mailing list][ml] is the main channel of communication for contributors.
+We accept Pull Requests via GitHub. The [developer mailing list][ml] is the main channel of communication for contributors.
 There are some guidelines which will make applying PRs easier for us:
 + No tabs! Please use spaces for indentation.
 + Respect the code style.
@@ -81,7 +81,9 @@ You can learn more about contributing via GitHub in our [contribution guidelines
 
 License
 -------
-Code is under the [Apache Licence v2](https://www.apache.org/licenses/LICENSE-2.0.txt).
+This code is under the [Apache Licence v2](https://www.apache.org/licenses/LICENSE-2.0).
+
+See the `NOTICE.txt` file for required notices and attributions.
 
 Donations
 ---------
@@ -91,8 +93,8 @@ Additional Resources
 --------------------
 
 + [Apache Commons Homepage](https://commons.apache.org/)
-+ [Apache Bugtracker (JIRA)](https://issues.apache.org/jira/)
++ [Apache Bugtracker (JIRA)](https://issues.apache.org/jira/browse/@JIRA_ID@)
 + [Apache Commons Twitter Account](https://twitter.com/ApacheCommons)
-+ #apachecommons IRC channel on freenode.org
++ `#apache-commons` IRC channel on `irc.freenode.org`
 
 [ml]:https://commons.apache.org/mail-lists.html


[03/50] commons-build-plugin git commit: Fix goal names

Posted by ch...@apache.org.
Fix goal names

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/commons-build-plugin/trunk@1716459 13f79535-47bb-0310-9956-ffa450edef68


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

Branch: refs/heads/master
Commit: d661f9985cecf338cd0bcc568a65c8b228edafd6
Parents: 1c90362
Author: Sebastian Bazley <se...@apache.org>
Authored: Wed Nov 25 16:11:31 2015 +0000
Committer: Sebastian Bazley <se...@apache.org>
Committed: Wed Nov 25 16:11:31 2015 +0000

----------------------------------------------------------------------
 RELEASE-NOTES.txt | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/commons-build-plugin/blob/d661f998/RELEASE-NOTES.txt
----------------------------------------------------------------------
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index e0991c9..990bd4f 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -1,5 +1,3 @@
-$Id$
-
 			 Commons Build Plugin
 			   Release Notes
 
@@ -7,6 +5,7 @@ $Id$
 INTRODUCTION:
 
 Commons Build Plugin is a Maven Ant Plugin which can be used by Apache Commons components.
+
 See:
    http://commons.apache.org/commons-build-plugin/
 
@@ -15,7 +14,7 @@ VERSION 1.5 - 2015-11-28
 ------------------------
 
 Changes since the last release
-1. Added CONTRIBUTING.md/README.md - New Goals to build Markdown formatted intro files for GitHub.
+1. Added new goals: contributing-md and readme-md - to build Markdown formatted intro files for GitHub.
 2. Download Page - Better describes KEYS file (and uses https links) 
 3. Use Apache Commons rather than just Commons
 


[27/50] commons-build-plugin git commit: Update commons-parent from 40 to 41.

Posted by ch...@apache.org.
Update commons-parent from 40 to 41.

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/commons-build-plugin/trunk@1769931 13f79535-47bb-0310-9956-ffa450edef68


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

Branch: refs/heads/master
Commit: e0d20b456e03beeca403a65b6c6f43027dc4fd22
Parents: b1e36ff
Author: Gary D. Gregory <gg...@apache.org>
Authored: Wed Nov 16 07:11:45 2016 +0000
Committer: Gary D. Gregory <gg...@apache.org>
Committed: Wed Nov 16 07:11:45 2016 +0000

----------------------------------------------------------------------
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/commons-build-plugin/blob/e0d20b45/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 1a7c6a9..a1435f2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.apache.commons</groupId>
         <artifactId>commons-parent</artifactId>
-        <version>40</version>
+        <version>41</version>
     </parent>
     <groupId>org.apache.commons</groupId>
     <artifactId>commons-build-plugin</artifactId>


[40/50] commons-build-plugin git commit: Fix typo in CONTRIBUTING.md template

Posted by ch...@apache.org.
Fix typo in CONTRIBUTING.md template


git-svn-id: https://svn.apache.org/repos/asf/commons/proper/commons-build-plugin/trunk@1780827 13f79535-47bb-0310-9956-ffa450edef68


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

Branch: refs/heads/master
Commit: e9c565fd8e91c590dedc1e81bb9633bafba4e820
Parents: 83c33fd
Author: Matt Sicker <ma...@apache.org>
Authored: Sun Jan 29 17:28:24 2017 +0000
Committer: Matt Sicker <ma...@apache.org>
Committed: Sun Jan 29 17:28:24 2017 +0000

----------------------------------------------------------------------
 .../resources/commons-xdoc-templates/contributing-md-template.md   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/commons-build-plugin/blob/e9c565fd/src/main/resources/commons-xdoc-templates/contributing-md-template.md
----------------------------------------------------------------------
diff --git a/src/main/resources/commons-xdoc-templates/contributing-md-template.md b/src/main/resources/commons-xdoc-templates/contributing-md-template.md
index cd23388..edc8c9f 100644
--- a/src/main/resources/commons-xdoc-templates/contributing-md-template.md
+++ b/src/main/resources/commons-xdoc-templates/contributing-md-template.md
@@ -50,7 +50,7 @@ Getting Started
 
 + Make sure you have a [JIRA account](https://issues.apache.org/jira/).
 + Make sure you have a [GitHub account](https://github.com/signup/free).
-+ If you're planning to implement a new feature it makes sense to discuss you're changes on the [dev list](https://commons.apache.org/mail-lists.html) first. This way you can make sure you're not wasting your time on something that isn't considered to be in @NAME@'s scope.
++ If you're planning to implement a new feature it makes sense to discuss your changes on the [dev list](https://commons.apache.org/mail-lists.html) first. This way you can make sure you're not wasting your time on something that isn't considered to be in @NAME@'s scope.
 + Submit a [Jira Ticket][jira] for your issue, assuming one does not already exist.
   + Clearly describe the issue including steps to reproduce when it is a bug.
   + Make sure you fill in the earliest version that you know has the issue.


[02/50] commons-build-plugin git commit: Prepare for version 1.5

Posted by ch...@apache.org.
Prepare for version 1.5

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/commons-build-plugin/trunk@1716457 13f79535-47bb-0310-9956-ffa450edef68


Project: http://git-wip-us.apache.org/repos/asf/commons-build-plugin/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-build-plugin/commit/1c903620
Tree: http://git-wip-us.apache.org/repos/asf/commons-build-plugin/tree/1c903620
Diff: http://git-wip-us.apache.org/repos/asf/commons-build-plugin/diff/1c903620

Branch: refs/heads/master
Commit: 1c903620f84390788e3133f97040dbe483e627c8
Parents: 020fa56
Author: Sebastian Bazley <se...@apache.org>
Authored: Wed Nov 25 16:07:39 2015 +0000
Committer: Sebastian Bazley <se...@apache.org>
Committed: Wed Nov 25 16:07:39 2015 +0000

----------------------------------------------------------------------
 src/site/xdoc/download_commons-build-plugin.xml | 26 ++++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/commons-build-plugin/blob/1c903620/src/site/xdoc/download_commons-build-plugin.xml
----------------------------------------------------------------------
diff --git a/src/site/xdoc/download_commons-build-plugin.xml b/src/site/xdoc/download_commons-build-plugin.xml
index 8ea3e75..62b0c6e 100644
--- a/src/site/xdoc/download_commons-build-plugin.xml
+++ b/src/site/xdoc/download_commons-build-plugin.xml
@@ -109,32 +109,32 @@ limitations under the License.
       </p>
     </subsection>
     </section>
-    <section name="Apache Commons Build Plugin Maven Mojo 1.4 ">
+    <section name="Apache Commons Build Plugin Maven Mojo 1.5 ">
       <subsection name="Binaries">
         <table>
           <tr>
-              <td><a href="[preferred]/commons/commons-build-plugin/binaries/commons-build-plugin-1.4-bin.tar.gz">commons-build-plugin-1.4-bin.tar.gz</a></td>
-              <td><a href="https://www.apache.org/dist/commons/commons-build-plugin/binaries/commons-build-plugin-1.4-bin.tar.gz.md5">md5</a></td>
-              <td><a href="https://www.apache.org/dist/commons/commons-build-plugin/binaries/commons-build-plugin-1.4-bin.tar.gz.asc">pgp</a></td>
+              <td><a href="[preferred]/commons/commons-build-plugin/binaries/commons-build-plugin-1.5-bin.tar.gz">commons-build-plugin-1.5-bin.tar.gz</a></td>
+              <td><a href="https://www.apache.org/dist/commons/commons-build-plugin/binaries/commons-build-plugin-1.5-bin.tar.gz.md5">md5</a></td>
+              <td><a href="https://www.apache.org/dist/commons/commons-build-plugin/binaries/commons-build-plugin-1.5-bin.tar.gz.asc">pgp</a></td>
           </tr>
           <tr>
-              <td><a href="[preferred]/commons/commons-build-plugin/binaries/commons-build-plugin-1.4-bin.zip">commons-build-plugin-1.4-bin.zip</a></td>
-              <td><a href="https://www.apache.org/dist/commons/commons-build-plugin/binaries/commons-build-plugin-1.4-bin.zip.md5">md5</a></td>
-              <td><a href="https://www.apache.org/dist/commons/commons-build-plugin/binaries/commons-build-plugin-1.4-bin.zip.asc">pgp</a></td>
+              <td><a href="[preferred]/commons/commons-build-plugin/binaries/commons-build-plugin-1.5-bin.zip">commons-build-plugin-1.5-bin.zip</a></td>
+              <td><a href="https://www.apache.org/dist/commons/commons-build-plugin/binaries/commons-build-plugin-1.5-bin.zip.md5">md5</a></td>
+              <td><a href="https://www.apache.org/dist/commons/commons-build-plugin/binaries/commons-build-plugin-1.5-bin.zip.asc">pgp</a></td>
           </tr>
         </table>
       </subsection>
       <subsection name="Source">
         <table>
           <tr>
-              <td><a href="[preferred]/commons/commons-build-plugin/source/commons-build-plugin-1.4-src.tar.gz">commons-build-plugin-1.4-src.tar.gz</a></td>
-              <td><a href="https://www.apache.org/dist/commons/commons-build-plugin/source/commons-build-plugin-1.4-src.tar.gz.md5">md5</a></td>
-              <td><a href="https://www.apache.org/dist/commons/commons-build-plugin/source/commons-build-plugin-1.4-src.tar.gz.asc">pgp</a></td>
+              <td><a href="[preferred]/commons/commons-build-plugin/source/commons-build-plugin-1.5-src.tar.gz">commons-build-plugin-1.5-src.tar.gz</a></td>
+              <td><a href="https://www.apache.org/dist/commons/commons-build-plugin/source/commons-build-plugin-1.5-src.tar.gz.md5">md5</a></td>
+              <td><a href="https://www.apache.org/dist/commons/commons-build-plugin/source/commons-build-plugin-1.5-src.tar.gz.asc">pgp</a></td>
           </tr>
           <tr>
-              <td><a href="[preferred]/commons/commons-build-plugin/source/commons-build-plugin-1.4-src.zip">commons-build-plugin-1.4-src.zip</a></td>
-              <td><a href="https://www.apache.org/dist/commons/commons-build-plugin/source/commons-build-plugin-1.4-src.zip.md5">md5</a></td>
-              <td><a href="https://www.apache.org/dist/commons/commons-build-plugin/source/commons-build-plugin-1.4-src.zip.asc">pgp</a></td>
+              <td><a href="[preferred]/commons/commons-build-plugin/source/commons-build-plugin-1.5-src.zip">commons-build-plugin-1.5-src.zip</a></td>
+              <td><a href="https://www.apache.org/dist/commons/commons-build-plugin/source/commons-build-plugin-1.5-src.zip.md5">md5</a></td>
+              <td><a href="https://www.apache.org/dist/commons/commons-build-plugin/source/commons-build-plugin-1.5-src.zip.asc">pgp</a></td>
           </tr>
         </table>
       </subsection>


[13/50] commons-build-plugin git commit: Don't rat-check download page templates

Posted by ch...@apache.org.
Don't rat-check download page templates

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/commons-build-plugin/trunk@1739755 13f79535-47bb-0310-9956-ffa450edef68


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

Branch: refs/heads/master
Commit: f778536b47e3270fe0dda882b7eb8219e5ff8fa3
Parents: 1feaa85
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Mon Apr 18 12:51:51 2016 +0000
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Mon Apr 18 12:51:51 2016 +0000

----------------------------------------------------------------------
 pom.xml | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/commons-build-plugin/blob/f778536b/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 0d78164..248aa84 100644
--- a/pom.xml
+++ b/pom.xml
@@ -121,7 +121,6 @@
                         </configuration>
                     </execution>
                 </executions>
-
             </plugin>
             <plugin>
                 <artifactId>maven-assembly-plugin</artifactId>
@@ -132,6 +131,18 @@
                     <tarLongFileMode>gnu</tarLongFileMode>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.rat</groupId>
+                <artifactId>apache-rat-plugin</artifactId>
+                <configuration>
+                    <useDefaultExcludes>true</useDefaultExcludes>
+                    <excludes>
+                        <!-- template files which will be inserted into the middle of resulting page -->
+                        <exclude>src/main/resources/commons-xdoc-templates/download-page-body.xml</exclude>
+                        <exclude>src/main/resources/commons-xdoc-templates/download-page-foot.xml</exclude>
+                    </excludes>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
     <reporting>


[36/50] commons-build-plugin git commit: Add README.md.

Posted by ch...@apache.org.
Add README.md.

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/commons-build-plugin/trunk@1770454 13f79535-47bb-0310-9956-ffa450edef68


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

Branch: refs/heads/master
Commit: a79d88b7457aeec6f5145670e36d9c54e5dc9fff
Parents: 11460fb
Author: Gary D. Gregory <gg...@apache.org>
Authored: Sat Nov 19 01:17:21 2016 +0000
Committer: Gary D. Gregory <gg...@apache.org>
Committed: Sat Nov 19 01:17:21 2016 +0000

----------------------------------------------------------------------
 README.md            | 98 +++++++++++++++++++++++++++++++++++++++++++++++
 src/assembly/src.xml |  1 +
 2 files changed, 99 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/commons-build-plugin/blob/a79d88b7/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..d5cd7ad
--- /dev/null
+++ b/README.md
@@ -0,0 +1,98 @@
+<!---
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<!---
+ +======================================================================+
+ |****                                                              ****|
+ |****      THIS FILE IS GENERATED BY THE COMMONS BUILD PLUGIN      ****|
+ |****                    DO NOT EDIT DIRECTLY                      ****|
+ |****                                                              ****|
+ +======================================================================+
+ | TEMPLATE FILE: readme-md-template.md                                 |
+ | commons-build-plugin/trunk/src/main/resources/commons-xdoc-templates |
+ +======================================================================+
+ |                                                                      |
+ | 1) Re-generate using: mvn commons:readme-md                          |
+ |                                                                      |
+ | 2) Set the following properties in the component's pom:              |
+ |    - commons.componentid (required, alphabetic, lower case)          |
+ |    - commons.release.version (required)                              |
+ |                                                                      |
+ | 3) Example Properties                                                |
+ |                                                                      |
+ |  <properties>                                                        |
+ |    <commons.componentid>math</commons.componentid>                   |
+ |    <commons.release.version>1.2</commons.release.version>            |
+ |  </properties>                                                       |
+ |                                                                      |
+ +======================================================================+
+--->
+Apache Commons Build Plugin Maven Mojo
+===================
+
+Apache Maven Mojo for Apache Commons Build tasks.
+
+Documentation
+-------------
+
+More information can be found on the [homepage](https://commons.apache.org/proper/commons-commons-build-plugin).
+The [JavaDoc](https://commons.apache.org/proper/commons-commons-build-plugin/javadocs/api-release) can be browsed.
+Questions related to the usage of Apache Commons Build Plugin Maven Mojo should be posted to the [user mailing list][ml].
+
+Where can I get the latest release?
+-----------------------------------
+You can download source and binaries from our [download page](https://commons.apache.org/proper/commons-commons-build-plugin/download_commons-build-plugin.cgi).
+
+Alternatively you can pull it from the central Maven repositories:
+
+```xml
+<dependency>
+  <groupId>org.apache.commons</groupId>
+  <artifactId>commons-build-plugin</artifactId>
+  <version>1.7</version>
+</dependency>
+```
+
+Contributing
+------------
+
+We accept PRs via github. The [developer mailing list][ml] is the main channel of communication for contributors.
+There are some guidelines which will make applying PRs easier for us:
++ No tabs! Please use spaces for indentation.
++ Respect the code style.
++ Create minimal diffs - disable on save actions like reformat source code or organize imports. If you feel the source code should be reformatted create a separate PR for this change.
++ Provide JUnit tests for your changes and make sure your changes don't break any existing tests by running ```mvn clean test```.
+
+If you plan to contribute on a regular basis, please consider filing a [contributor license agreement](https://www.apache.org/licenses/#clas).
+You can learn more about contributing via GitHub in our [contribution guidelines](CONTRIBUTING.md).
+
+License
+-------
+Code is under the [Apache Licence v2](https://www.apache.org/licenses/LICENSE-2.0.txt).
+
+Donations
+---------
+You like Apache Commons Build Plugin Maven Mojo? Then [donate back to the ASF](https://www.apache.org/foundation/contributing.html) to support the development.
+
+Additional Resources
+--------------------
+
++ [Apache Commons Homepage](https://commons.apache.org/)
++ [Apache Issue Tracker (JIRA)](https://issues.apache.org/jira/)
++ [Apache Commons Twitter Account](https://twitter.com/ApacheCommons)
++ #apachecommons IRC channel on freenode.org
+
+[ml]:https://commons.apache.org/mail-lists.html

http://git-wip-us.apache.org/repos/asf/commons-build-plugin/blob/a79d88b7/src/assembly/src.xml
----------------------------------------------------------------------
diff --git a/src/assembly/src.xml b/src/assembly/src.xml
index 019f95c..7a2b2ce 100644
--- a/src/assembly/src.xml
+++ b/src/assembly/src.xml
@@ -29,6 +29,7 @@
                 <include>NOTICE.txt</include>
                 <include>pom.xml</include>
                 <include>RELEASE-NOTES.txt</include>                
+                <include>README.md</include>                
             </includes>
         </fileSet>
         <fileSet>


[28/50] commons-build-plugin git commit: [COMMONSSITE-90] Include badges in the README.md file.

Posted by ch...@apache.org.
[COMMONSSITE-90] Include badges in the README.md file.

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/commons-build-plugin/trunk@1769938 13f79535-47bb-0310-9956-ffa450edef68


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

Branch: refs/heads/master
Commit: 053192318b598880f15186ccde4287103ccf44a2
Parents: e0d20b4
Author: Gary D. Gregory <gg...@apache.org>
Authored: Wed Nov 16 08:43:30 2016 +0000
Committer: Gary D. Gregory <gg...@apache.org>
Committed: Wed Nov 16 08:43:30 2016 +0000

----------------------------------------------------------------------
 src/changes/changes.xml                                         | 3 +++
 src/main/resources/commons-xdoc-templates/readme-md-template.md | 5 +++++
 2 files changed, 8 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/commons-build-plugin/blob/05319231/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 377d21d..5f5afae 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -30,6 +30,9 @@
       <action dev="sebb" type="add">
         Added new download-page subdir property: set this (e.g. to '1.2' or 'lang-1.2' etc) to override the default of binaries/source 
       </action>
+      <action dev="ggregory" type="add" issue="COMMONSSITE-90">
+        Include badges in the README.md file. 
+      </action>
     </release>
 
     <release version="1.5" date="2015-11-28" description="Feature and fix release">

http://git-wip-us.apache.org/repos/asf/commons-build-plugin/blob/05319231/src/main/resources/commons-xdoc-templates/readme-md-template.md
----------------------------------------------------------------------
diff --git a/src/main/resources/commons-xdoc-templates/readme-md-template.md b/src/main/resources/commons-xdoc-templates/readme-md-template.md
index 37af855..e39cb94 100644
--- a/src/main/resources/commons-xdoc-templates/readme-md-template.md
+++ b/src/main/resources/commons-xdoc-templates/readme-md-template.md
@@ -43,6 +43,11 @@
 @NAME@
 ===================
 
+[![Build Status](https://travis-ci.org/apache/@ARTIFACTCOREID@.svg?branch=master)](https://travis-ci.org/apache/@ARTIFACTCOREID@)
+[![Coverage Status](https://coveralls.io/repos/apache/@ARTIFACTCOREID@/badge.svg?branch=master)](https://coveralls.io/r/apache/@ARTIFACTCOREID@)
+[![Maven Central](https://maven-badges.herokuapp.com/maven-central/@GROUPID@/@ARTIFACTCOREID@/badge.svg)](https://maven-badges.herokuapp.com/maven-central/@GROUPID@/@ARTIFACTCOREID@/)
+[![License](http://img.shields.io/:license-apache-blue.svg)](http://www.apache.org/licenses/LICENSE-2.0.html)
+
 @DESCRIPTION@
 
 Documentation


[38/50] commons-build-plugin git commit: 1.7-SNAPSHOT -> 1.8-SNAPSHOT.

Posted by ch...@apache.org.
1.7-SNAPSHOT -> 1.8-SNAPSHOT.

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/commons-build-plugin/trunk@1770875 13f79535-47bb-0310-9956-ffa450edef68


Project: http://git-wip-us.apache.org/repos/asf/commons-build-plugin/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-build-plugin/commit/02cc0d45
Tree: http://git-wip-us.apache.org/repos/asf/commons-build-plugin/tree/02cc0d45
Diff: http://git-wip-us.apache.org/repos/asf/commons-build-plugin/diff/02cc0d45

Branch: refs/heads/master
Commit: 02cc0d45993822c553a46c55821d38024ff8234d
Parents: b6d87fc
Author: Gary D. Gregory <gg...@apache.org>
Authored: Tue Nov 22 19:15:59 2016 +0000
Committer: Gary D. Gregory <gg...@apache.org>
Committed: Tue Nov 22 19:15:59 2016 +0000

----------------------------------------------------------------------
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/commons-build-plugin/blob/02cc0d45/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 3c1c6bf..6795459 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
     </parent>
     <artifactId>commons-build-plugin</artifactId>
     <packaging>maven-plugin</packaging>
-    <version>1.7-SNAPSHOT</version>
+    <version>1.8-SNAPSHOT</version>
     <name>Apache Commons Build Plugin Maven Mojo</name>
     <description>
         Apache Maven Mojo for Apache Commons Build tasks.


[21/50] commons-build-plugin git commit: Fix up refs

Posted by ch...@apache.org.
Fix up refs

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/commons-build-plugin/trunk@1740697 13f79535-47bb-0310-9956-ffa450edef68


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

Branch: refs/heads/master
Commit: b73a600521bc996da3070427460b5fecca0fbbc2
Parents: 4b97617
Author: Sebastian Bazley <se...@apache.org>
Authored: Sun Apr 24 14:00:16 2016 +0000
Committer: Sebastian Bazley <se...@apache.org>
Committed: Sun Apr 24 14:00:16 2016 +0000

----------------------------------------------------------------------
 src/site/xdoc/download-page-mojo.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/commons-build-plugin/blob/b73a6005/src/site/xdoc/download-page-mojo.xml
----------------------------------------------------------------------
diff --git a/src/site/xdoc/download-page-mojo.xml b/src/site/xdoc/download-page-mojo.xml
index 5b8dadb..8967a43 100644
--- a/src/site/xdoc/download-page-mojo.xml
+++ b/src/site/xdoc/download-page-mojo.xml
@@ -120,7 +120,7 @@
             <td>The suffix for the alternative release binary distro.<br/><strong>Default value is</strong>: <code>${commons.release.2.binary.suffix}</code>.</td>
           </tr>
           <tr>
-            <td><strong><a href="#commons.release.subdir">commons.release.2.subdir</a></strong></td>
+            <td><strong><a href="#commons.release.2.subdir">commons.release.2.subdir</a></strong></td>
             <td><code>String</code></td>
             <td><code>-</code></td>
             <td>Subdirectory (if not source/binaries)<br/><strong>Default value is</strong>: <code>${commons.release.2.subdir}</code>.</td>
@@ -145,7 +145,7 @@
             <td>The suffix for the alternative release binary distro.<br/><strong>Default value is</strong>: <code>${commons.release.3.binary.suffix}</code>.</td>
           </tr>
           <tr>
-            <td><strong><a href="#commons.release.subdir">commons.release.3.subdir</a></strong></td>
+            <td><strong><a href="#commons.release.3.subdir">commons.release.3.subdir</a></strong></td>
             <td><code>String</code></td>
             <td><code>-</code></td>
             <td>Subdirectory (if not source/binaries)<br/><strong>Default value is</strong>: <code>${commons.release.3.subdir}</code>.</td>


[05/50] commons-build-plugin git commit: Tidy up

Posted by ch...@apache.org.
Tidy up

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/commons-build-plugin/trunk@1739372 13f79535-47bb-0310-9956-ffa450edef68


Project: http://git-wip-us.apache.org/repos/asf/commons-build-plugin/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-build-plugin/commit/656f3ff4
Tree: http://git-wip-us.apache.org/repos/asf/commons-build-plugin/tree/656f3ff4
Diff: http://git-wip-us.apache.org/repos/asf/commons-build-plugin/diff/656f3ff4

Branch: refs/heads/master
Commit: 656f3ff42ce18c88281811dbff79a52ab6a623ae
Parents: 5eb28b1
Author: Sebastian Bazley <se...@apache.org>
Authored: Fri Apr 15 21:23:50 2016 +0000
Committer: Sebastian Bazley <se...@apache.org>
Committed: Fri Apr 15 21:23:50 2016 +0000

----------------------------------------------------------------------
 src/site/site.xml | 40 +++++++++++++++++-----------------------
 1 file changed, 17 insertions(+), 23 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/commons-build-plugin/blob/656f3ff4/src/site/site.xml
----------------------------------------------------------------------
diff --git a/src/site/site.xml b/src/site/site.xml
index 45fa1ee..4a5be2f 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -24,31 +24,25 @@
     <body>
         <menu name="Build Plugin">
             <item name="Overview"                href="/index.html"/>
-            <item name="Download Page"           href="/download-page.html">
-                <item name="download-page"       href="/download-page.html"/>
-                <item name="properties"          href="/download-page-mojo.html"/>
-            </item>
-            <item name="JIRA Page"                  href="/jira-page.html">
-                <item name="Proper"                 href="/jira-page.html">
-                    <item name="jira-page"          href="/jira-page.html"/>
-                    <item name="properties"         href="/jira-page-mojo.html"/>
+            <item name="Goals">
+                <item name="download-page"       href="/download-page.html">
+                    <item name="properties"      href="/download-page-mojo.html"/>
                 </item>
-                <item name="Sandbox"                href="/sandbox-jira-page.html">
-                    <item name="sandbox-jira-page"  href="/sandbox-jira-page.html"/>
-                    <item name="properties"         href="/sandbox-jira-page-mojo.html"/>
+                <item name="jira-page"           href="/jira-page.html">
+                    <item name="properties"      href="/jira-page-mojo.html"/>
+                </item>
+                <item name="sandbox-jira-page"   href="/sandbox-jira-page.html">
+                    <item name="properties"      href="/sandbox-jira-page-mojo.html"/>
+                </item>
+                <item name="mail-page"           href="/mail-page.html">
+                    <item name="properties"      href="/mail-page-mojo.html"/>
+                </item>
+                <item name="readme-md"           href="/readme-md.html">
+                    <item name="properties"      href="/readme-md-mojo.html"/>
+                </item>
+                <item name="contributing-md"     href="/contributing-md.html">
+                    <item name="properties"      href="/contributing-md-mojo.html"/>
                 </item>
-            </item>
-            <item name="Mail Page"               href="/mail-page.html">
-                <item name="mail-page"           href="/mail-page.html"/>
-                <item name="properties"          href="/mail-page-mojo.html"/>
-            </item>
-            <item name="README.md"               href="/readme-md.html">
-                <item name="readme-md"           href="/readme-md.html"/>
-                <item name="properties"          href="/readme-md-mojo.html"/>
-            </item>
-            <item name="CONTRIBUTING.md"         href="/contributing-md.html">
-                <item name="contributing-md"     href="/contributing-md.html"/>
-                <item name="properties"          href="/contributing-md-mojo.html"/>
             </item>
             <item name="Help"                    href="/development.html">
                 <item name="Issue Tracking"      href="/issue-tracking.html"/>


[20/50] commons-build-plugin git commit: Missing parameters

Posted by ch...@apache.org.
Missing parameters

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/commons-build-plugin/trunk@1740696 13f79535-47bb-0310-9956-ffa450edef68


Project: http://git-wip-us.apache.org/repos/asf/commons-build-plugin/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-build-plugin/commit/4b976170
Tree: http://git-wip-us.apache.org/repos/asf/commons-build-plugin/tree/4b976170
Diff: http://git-wip-us.apache.org/repos/asf/commons-build-plugin/diff/4b976170

Branch: refs/heads/master
Commit: 4b97617091990c536396272aa56d9b834b0ac79a
Parents: b5a10b4
Author: Sebastian Bazley <se...@apache.org>
Authored: Sun Apr 24 13:58:54 2016 +0000
Committer: Sebastian Bazley <se...@apache.org>
Committed: Sun Apr 24 13:58:54 2016 +0000

----------------------------------------------------------------------
 src/site/xdoc/download-page.xml | 2 ++
 1 file changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/commons-build-plugin/blob/4b976170/src/site/xdoc/download-page.xml
----------------------------------------------------------------------
diff --git a/src/site/xdoc/download-page.xml b/src/site/xdoc/download-page.xml
index 87a5fcb..6cfa69d 100644
--- a/src/site/xdoc/download-page.xml
+++ b/src/site/xdoc/download-page.xml
@@ -98,6 +98,7 @@
                     <li><b>commons.release.2.desc</b> - (<i>optional</i>) Additional text to append to the section name of the alternative release</li>
                     <li><b>commons.release.2.binary.suffix</b> - (<i>optional - defaults to <code>-bin</code></i>) The suffix for the alternative 
                         binary release (some components use "-bin", others have no suffix)</li>
+                    <li><b>commons.release.2.subdir</b> - The subdirectory to use. This defaults to using separate source/binaries folders; it set it will be used as the dierctory for both.</li>
                 </ul>
                 </p>
                 <p>
@@ -108,6 +109,7 @@
                     <li><b>commons.release.3.desc</b> - (<i>optional</i>) Additional text to append to the section name of the alternative release</li>
                     <li><b>commons.release.3.binary.suffix</b> - (<i>optional - defaults to <code>-bin</code></i>) The suffix for the alternative 
                         binary release (some components use "-bin", others have no suffix)</li>
+                    <li><b>commons.release.3.subdir</b> - The subdirectory to use. This defaults to using separate source/binaries folders; it set it will be used as the dierctory for both.</li>
                 </ul>
                 </p>                
                 <p>


[50/50] commons-build-plugin git commit: readme-md-template.md: remove the branch parameters from travis ci and coverall urls, so that the badges also work if the components is using svn instead of git

Posted by ch...@apache.org.
readme-md-template.md: remove the branch parameters from travis ci and coverall urls, so that the badges also work if the components is using svn instead of git

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/commons-build-plugin/trunk@1812006 13f79535-47bb-0310-9956-ffa450edef68


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

Branch: refs/heads/master
Commit: bee0b6ec70e22b98b568d93b8277548f291b0334
Parents: 05827bc
Author: Pascal Schumacher <pa...@apache.org>
Authored: Thu Oct 12 19:47:28 2017 +0000
Committer: Pascal Schumacher <pa...@apache.org>
Committed: Thu Oct 12 19:47:28 2017 +0000

----------------------------------------------------------------------
 src/main/resources/commons-xdoc-templates/readme-md-template.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/commons-build-plugin/blob/bee0b6ec/src/main/resources/commons-xdoc-templates/readme-md-template.md
----------------------------------------------------------------------
diff --git a/src/main/resources/commons-xdoc-templates/readme-md-template.md b/src/main/resources/commons-xdoc-templates/readme-md-template.md
index c9ff71b..63d1d4c 100644
--- a/src/main/resources/commons-xdoc-templates/readme-md-template.md
+++ b/src/main/resources/commons-xdoc-templates/readme-md-template.md
@@ -43,8 +43,8 @@
 @NAME@
 ===================
 
-[![Build Status](https://travis-ci.org/apache/@ARTIFACTCOREID@.svg?branch=master)](https://travis-ci.org/apache/@ARTIFACTCOREID@)
-[![Coverage Status](https://coveralls.io/repos/apache/@ARTIFACTCOREID@/badge.svg?branch=master)](https://coveralls.io/r/apache/@ARTIFACTCOREID@)
+[![Build Status](https://travis-ci.org/apache/@ARTIFACTCOREID@.svg)](https://travis-ci.org/apache/@ARTIFACTCOREID@)
+[![Coverage Status](https://coveralls.io/repos/apache/@ARTIFACTCOREID@/badge.svg)](https://coveralls.io/r/apache/@ARTIFACTCOREID@)
 [![Maven Central](https://maven-badges.herokuapp.com/maven-central/@GROUPID@/@ARTIFACTCOREID@/badge.svg)](https://maven-badges.herokuapp.com/maven-central/@GROUPID@/@ARTIFACTCOREID@/)
 [![Javadocs](https://javadoc.io/badge/@GROUPID@/@ARTIFACTCOREID@/@VERSION@.svg)](https://javadoc.io/doc/@GROUPID@/@ARTIFACTCOREID@/@VERSION@)
 


[22/50] commons-build-plugin git commit: commons-parent 39 -> 40.

Posted by ch...@apache.org.
commons-parent 39 -> 40.

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/commons-build-plugin/trunk@1744863 13f79535-47bb-0310-9956-ffa450edef68


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

Branch: refs/heads/master
Commit: f546e069e8623b58144921eb8e5dbcd7a9d5e545
Parents: b73a600
Author: Gary D. Gregory <gg...@apache.org>
Authored: Sat May 21 07:21:59 2016 +0000
Committer: Gary D. Gregory <gg...@apache.org>
Committed: Sat May 21 07:21:59 2016 +0000

----------------------------------------------------------------------
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/commons-build-plugin/blob/f546e069/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 44caafc..1a7c6a9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.apache.commons</groupId>
         <artifactId>commons-parent</artifactId>
-        <version>39</version>
+        <version>40</version>
     </parent>
     <groupId>org.apache.commons</groupId>
     <artifactId>commons-build-plugin</artifactId>


[41/50] commons-build-plugin git commit: EOL needed to ensure generated files have the correct EOLs

Posted by ch...@apache.org.
EOL needed to ensure generated files have the correct EOLs

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/commons-build-plugin/trunk@1782637 13f79535-47bb-0310-9956-ffa450edef68


Project: http://git-wip-us.apache.org/repos/asf/commons-build-plugin/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-build-plugin/commit/2b815067
Tree: http://git-wip-us.apache.org/repos/asf/commons-build-plugin/tree/2b815067
Diff: http://git-wip-us.apache.org/repos/asf/commons-build-plugin/diff/2b815067

Branch: refs/heads/master
Commit: 2b81506715df90fa9f66c7f993a8a53188cc01ad
Parents: e9c565f
Author: Sebastian Bazley <se...@apache.org>
Authored: Sat Feb 11 22:05:34 2017 +0000
Committer: Sebastian Bazley <se...@apache.org>
Committed: Sat Feb 11 22:05:34 2017 +0000

----------------------------------------------------------------------

----------------------------------------------------------------------



[18/50] commons-build-plugin git commit: Try to sort out site url

Posted by ch...@apache.org.
Try to sort out site url

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/commons-build-plugin/trunk@1740013 13f79535-47bb-0310-9956-ffa450edef68


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

Branch: refs/heads/master
Commit: f24d4a0f7e2b2c692276821678e996ea09fdf163
Parents: e2f462a
Author: Sebastian Bazley <se...@apache.org>
Authored: Tue Apr 19 21:14:26 2016 +0000
Committer: Sebastian Bazley <se...@apache.org>
Committed: Tue Apr 19 21:14:26 2016 +0000

----------------------------------------------------------------------
 pom.xml | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/commons-build-plugin/blob/f24d4a0f/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 248aa84..dccdacb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -42,11 +42,11 @@
         <url>http://svn.apache.org/viewvc/commons/proper/commons-build-plugin/trunk/</url>
     </scm>
     <distributionManagement>
-        <site>
-            <id>apache.website</id>
-            <name>Apache Commons ${commons.componentid} Site</name>
-            <url>${commons.deployment.protocol}://people.apache.org/www/commons.apache.org/${commons.componentid}</url>
-        </site>
+      <site>
+        <id>commons.site</id>
+        <name>Apache Commons Site SVN</name>
+        <url>scm:svn:${commons.scmPubUrl}</url>
+      </site>
     </distributionManagement>
     <developers>
         <developer>
@@ -172,5 +172,7 @@
         <commons.jira.pid>12310466&amp;amp;component=12312401</commons.jira.pid>
         <commons.release.version>${project.version}</commons.release.version>
         <commons.rc.version>RC1</commons.rc.version>
+        <commons.site.path>commons-build-plugin</commons.site.path>
+        <commons.scmPubUrl>https://svn.apache.org/repos/infra/websites/production/commons/content/proper/${commons.site.path}</commons.scmPubUrl>
     </properties>
 </project>


[10/50] commons-build-plugin git commit: Prepare for next version

Posted by ch...@apache.org.
Prepare for next version

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/commons-build-plugin/trunk@1739611 13f79535-47bb-0310-9956-ffa450edef68


Project: http://git-wip-us.apache.org/repos/asf/commons-build-plugin/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-build-plugin/commit/070b5e54
Tree: http://git-wip-us.apache.org/repos/asf/commons-build-plugin/tree/070b5e54
Diff: http://git-wip-us.apache.org/repos/asf/commons-build-plugin/diff/070b5e54

Branch: refs/heads/master
Commit: 070b5e548da61708754eed3a4075a5a438d35b2b
Parents: d353571
Author: Sebastian Bazley <se...@apache.org>
Authored: Sun Apr 17 13:43:42 2016 +0000
Committer: Sebastian Bazley <se...@apache.org>
Committed: Sun Apr 17 13:43:42 2016 +0000

----------------------------------------------------------------------
 src/site/xdoc/contributing-md-mojo.xml    | 2 +-
 src/site/xdoc/copy-javadoc-files-mojo.xml | 2 +-
 src/site/xdoc/download-page-mojo.xml      | 2 +-
 src/site/xdoc/index.xml                   | 2 +-
 src/site/xdoc/jira-page-mojo.xml          | 2 +-
 src/site/xdoc/mail-page-mojo.xml          | 2 +-
 src/site/xdoc/readme-md-mojo.xml          | 2 +-
 src/site/xdoc/sandbox-jira-page-mojo.xml  | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/commons-build-plugin/blob/070b5e54/src/site/xdoc/contributing-md-mojo.xml
----------------------------------------------------------------------
diff --git a/src/site/xdoc/contributing-md-mojo.xml b/src/site/xdoc/contributing-md-mojo.xml
index 79c0883..cf6a47c 100644
--- a/src/site/xdoc/contributing-md-mojo.xml
+++ b/src/site/xdoc/contributing-md-mojo.xml
@@ -26,7 +26,7 @@
   <body>
     <section name="commons:contributing-md">
       <p><strong>Full name</strong>:</p>
-      <p>org.apache.commons:commons-build-plugin:1.5:contributing-md</p>
+      <p>org.apache.commons:commons-build-plugin:1.6:contributing-md</p>
       <p><strong>Description</strong>:</p>
       <div>Apache Commons Build Mojo: Generate CONTRIBUTING.md</div>
       <p><strong>Attributes</strong>:</p>

http://git-wip-us.apache.org/repos/asf/commons-build-plugin/blob/070b5e54/src/site/xdoc/copy-javadoc-files-mojo.xml
----------------------------------------------------------------------
diff --git a/src/site/xdoc/copy-javadoc-files-mojo.xml b/src/site/xdoc/copy-javadoc-files-mojo.xml
index 235f568..1777ed8 100644
--- a/src/site/xdoc/copy-javadoc-files-mojo.xml
+++ b/src/site/xdoc/copy-javadoc-files-mojo.xml
@@ -26,7 +26,7 @@
   <body>
     <section name="commons:copy-javadoc-files">
       <p><strong>Full name</strong>:</p>
-      <p>org.apache.commons:commons-build-plugin:1.3:copy-javadoc-files</p>
+      <p>org.apache.commons:commons-build-plugin:1.6:copy-javadoc-files</p>
       <p><strong>Description</strong>:</p>
       <div>Commons Build: Copy NOTICE and LICENSE files to -javadoc.jar</div>
       <p><strong>Attributes</strong>:</p>

http://git-wip-us.apache.org/repos/asf/commons-build-plugin/blob/070b5e54/src/site/xdoc/download-page-mojo.xml
----------------------------------------------------------------------
diff --git a/src/site/xdoc/download-page-mojo.xml b/src/site/xdoc/download-page-mojo.xml
index c349e51..b6074d3 100644
--- a/src/site/xdoc/download-page-mojo.xml
+++ b/src/site/xdoc/download-page-mojo.xml
@@ -26,7 +26,7 @@
   <body>
     <section name="commons:download-page">
       <p><strong>Full name</strong>:</p>
-      <p>org.apache.commons:commons-build-plugin:1.3:download-page</p>
+      <p>org.apache.commons:commons-build-plugin:1.6:download-page</p>
       <p><strong>Description</strong>:</p>
       <div>Apache Apache Commons Build Mojo: Generate Download page</div>
       <p><strong>Attributes</strong>:</p>

http://git-wip-us.apache.org/repos/asf/commons-build-plugin/blob/070b5e54/src/site/xdoc/index.xml
----------------------------------------------------------------------
diff --git a/src/site/xdoc/index.xml b/src/site/xdoc/index.xml
index c156569..4c6427b 100644
--- a/src/site/xdoc/index.xml
+++ b/src/site/xdoc/index.xml
@@ -62,7 +62,7 @@
 <plugin>
   <groupId>org.apache.commons</groupId>
   <artifactId>commons-build-plugin</artifactId>
-  <version>1.5</version>
+  <version>1.6</version>
 </plugin>
 ]]></source>
             </p>

http://git-wip-us.apache.org/repos/asf/commons-build-plugin/blob/070b5e54/src/site/xdoc/jira-page-mojo.xml
----------------------------------------------------------------------
diff --git a/src/site/xdoc/jira-page-mojo.xml b/src/site/xdoc/jira-page-mojo.xml
index e620c0e..ef2ad34 100644
--- a/src/site/xdoc/jira-page-mojo.xml
+++ b/src/site/xdoc/jira-page-mojo.xml
@@ -26,7 +26,7 @@
   <body>
     <section name="commons:jira-page">
       <p><strong>Full name</strong>:</p>
-      <p>org.apache.commons:commons-build-plugin:1.3:jira-page</p>
+      <p>org.apache.commons:commons-build-plugin:1.6:jira-page</p>
       <p><strong>Description</strong>:</p>
       <div>Apache Commons Build Mojo: Generate Issue Tracking page</div>
       <p><strong>Attributes</strong>:</p>

http://git-wip-us.apache.org/repos/asf/commons-build-plugin/blob/070b5e54/src/site/xdoc/mail-page-mojo.xml
----------------------------------------------------------------------
diff --git a/src/site/xdoc/mail-page-mojo.xml b/src/site/xdoc/mail-page-mojo.xml
index 8ec87b9..d26fb2d 100644
--- a/src/site/xdoc/mail-page-mojo.xml
+++ b/src/site/xdoc/mail-page-mojo.xml
@@ -26,7 +26,7 @@
   <body>
     <section name="commons:mail-page">
       <p><strong>Full name</strong>:</p>
-      <p>org.apache.commons:commons-build-plugin:1.3:mail-page</p>
+      <p>org.apache.commons:commons-build-plugin:1.6:mail-page</p>
       <p><strong>Description</strong>:</p>
       <div>Apache Commons Build Mojo: Generate Mailing List page</div>
       <p><strong>Attributes</strong>:</p>

http://git-wip-us.apache.org/repos/asf/commons-build-plugin/blob/070b5e54/src/site/xdoc/readme-md-mojo.xml
----------------------------------------------------------------------
diff --git a/src/site/xdoc/readme-md-mojo.xml b/src/site/xdoc/readme-md-mojo.xml
index 3e8aeca..1d486c0 100644
--- a/src/site/xdoc/readme-md-mojo.xml
+++ b/src/site/xdoc/readme-md-mojo.xml
@@ -26,7 +26,7 @@
   <body>
     <section name="commons:readme-md">
       <p><strong>Full name</strong>:</p>
-      <p>org.apache.commons:commons-build-plugin:1.5:readme-md</p>
+      <p>org.apache.commons:commons-build-plugin:1.6:readme-md</p>
       <p><strong>Description</strong>:</p>
       <div>Apache Commons Build Mojo: Generate README.md</div>
       <p><strong>Attributes</strong>:</p>

http://git-wip-us.apache.org/repos/asf/commons-build-plugin/blob/070b5e54/src/site/xdoc/sandbox-jira-page-mojo.xml
----------------------------------------------------------------------
diff --git a/src/site/xdoc/sandbox-jira-page-mojo.xml b/src/site/xdoc/sandbox-jira-page-mojo.xml
index 10d2d80..8cb60f1 100644
--- a/src/site/xdoc/sandbox-jira-page-mojo.xml
+++ b/src/site/xdoc/sandbox-jira-page-mojo.xml
@@ -26,7 +26,7 @@
   <body>
     <section name="commons:sandbox-jira-page">
       <p><strong>Full name</strong>:</p>
-      <p>org.apache.commons:commons-build-plugin:1.3:sandbox-jira-page</p>
+      <p>org.apache.commons:commons-build-plugin:1.6:sandbox-jira-page</p>
       <p><strong>Description</strong>:</p>
       <div>Apache Commons Build Mojo: Generate Sandbox Issue Tracking page</div>
       <p><strong>Attributes</strong>:</p>


[17/50] commons-build-plugin git commit: Update docs

Posted by ch...@apache.org.
Update docs

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/commons-build-plugin/trunk@1740004 13f79535-47bb-0310-9956-ffa450edef68


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

Branch: refs/heads/master
Commit: e2f462aed15486790ae50a6e32d667b9a539e318
Parents: 3ba2467
Author: Sebastian Bazley <se...@apache.org>
Authored: Tue Apr 19 21:01:40 2016 +0000
Committer: Sebastian Bazley <se...@apache.org>
Committed: Tue Apr 19 21:01:40 2016 +0000

----------------------------------------------------------------------
 RELEASE-NOTES.txt       | 2 +-
 src/changes/changes.xml | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/commons-build-plugin/blob/e2f462ae/RELEASE-NOTES.txt
----------------------------------------------------------------------
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index 0d94500..02fceb7 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -10,7 +10,7 @@ See:
    http://commons.apache.org/commons-build-plugin/
 
 
-VERSION 1.6 - 2016-04-21
+VERSION 1.6 - 2016-04-24
 ------------------------
 
 Changes since the last release

http://git-wip-us.apache.org/repos/asf/commons-build-plugin/blob/e2f462ae/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 21345e9..377d21d 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -26,6 +26,12 @@
 
   <body>
 
+    <release version="1.6" date="2016-04-24" description="Feature release">
+      <action dev="sebb" type="add">
+        Added new download-page subdir property: set this (e.g. to '1.2' or 'lang-1.2' etc) to override the default of binaries/source 
+      </action>
+    </release>
+
     <release version="1.5" date="2015-11-28" description="Feature and fix release">
       <action dev="ecki" type="update" issue="COMMONSSITE-81">
         commons-build-plugin README/CONTRIBUTING.md handle multi-modules


[32/50] commons-build-plugin git commit: GroupId is duplicate of parent groupId.

Posted by ch...@apache.org.
GroupId is duplicate of parent groupId.

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/commons-build-plugin/trunk@1770281 13f79535-47bb-0310-9956-ffa450edef68


Project: http://git-wip-us.apache.org/repos/asf/commons-build-plugin/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-build-plugin/commit/9a64f011
Tree: http://git-wip-us.apache.org/repos/asf/commons-build-plugin/tree/9a64f011
Diff: http://git-wip-us.apache.org/repos/asf/commons-build-plugin/diff/9a64f011

Branch: refs/heads/master
Commit: 9a64f0111411c1b261ae03e64c7cd722bb448f5d
Parents: 07d4c27
Author: Gary D. Gregory <gg...@apache.org>
Authored: Thu Nov 17 21:50:14 2016 +0000
Committer: Gary D. Gregory <gg...@apache.org>
Committed: Thu Nov 17 21:50:14 2016 +0000

----------------------------------------------------------------------
 pom.xml | 1 -
 1 file changed, 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/commons-build-plugin/blob/9a64f011/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index a1435f2..e1103ce 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,6 @@
         <artifactId>commons-parent</artifactId>
         <version>41</version>
     </parent>
-    <groupId>org.apache.commons</groupId>
     <artifactId>commons-build-plugin</artifactId>
     <packaging>maven-plugin</packaging>
     <version>1.7-SNAPSHOT</version>


[46/50] commons-build-plugin git commit: Move changes entry for COMMONSSITE-94 to version 1.8

Posted by ch...@apache.org.
Move changes entry for COMMONSSITE-94 to version 1.8

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/commons-build-plugin/trunk@1809656 13f79535-47bb-0310-9956-ffa450edef68


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

Branch: refs/heads/master
Commit: f63b2ab37868829a9c814105b67823098dc9c8cc
Parents: 9af4de0
Author: Benedikt Ritter <br...@apache.org>
Authored: Mon Sep 25 18:45:21 2017 +0000
Committer: Benedikt Ritter <br...@apache.org>
Committed: Mon Sep 25 18:45:21 2017 +0000

----------------------------------------------------------------------
 src/changes/changes.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/commons-build-plugin/blob/f63b2ab3/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 19a093b..71b6515 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -26,14 +26,14 @@
 
   <body>
     <release version="1.8" date="2017-MM-DD" description="Feature release">
+      <action dev="britter" type="add" issue="COMMONSSITE-94">
+        Include JavaDoc badge in READM.md file.
+      </action>
       <action dev="sebb" type="fix">
         Add eol-style:native otherwise generated files can cause commit errors
       </action>
     </release>
     <release version="1.7" date="2016-11-18" description="Feature release">
-      <action dev="britter" type="add" issue="COMMONSSITE-94">
-        Include JavaDoc badge in READM.md file.
-      </action>
       <action dev="ggregory" type="add" issue="COMMONSSITE-90">
         Include badges in the README.md file. 
       </action>