[buildr] branch master updated (00ed714 -> a8377d4)

[do...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

donaldp pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/buildr.git.


    from 00ed714  Merge pull request #43 from apache/SupportExternalAnnotationArtifacts
     new 073b149  Set file type of gitattributes
     new a8377d4  Explicitly specify the `:sourcepath` parameter for javadoc tool

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .gitattributes         | 1 +
 CHANGELOG              | 2 ++
 lib/buildr/java/doc.rb | 1 +
 3 files changed, 4 insertions(+)

[buildr] 02/02: Explicitly specify the `:sourcepath` parameter for javadoc tool

[do...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

donaldp pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/buildr.git

commit a8377d49dfa2c50e72a9159bc6d1c854c6a83e8d
Author: Peter Donald <pe...@realityforge.org>
AuthorDate: Sun Jul 14 13:58:28 2019 +1000

    Explicitly specify the `:sourcepath` parameter for javadoc tool
---
 CHANGELOG              | 2 ++
 lib/buildr/java/doc.rb | 1 +
 2 files changed, 3 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index f5a8f3e..96d7796 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -8,6 +8,8 @@
 * Added:  Detect external annotations in the local project and add them to the generated IntelliJ IDEA
           module when generating. The default location is `src/main/annotations` but other locations
           can be specified by modifying the `project.iml.annotation_paths` property.
+* Fixed:  Explicitly specify the `:sourcepath` parameter for javadoc tool. This enables additional parameters
+          such as `-packagenames` and `-subpackages` to be passed to the underling tool.
 
 1.5.7 (2019-02-16)
 * Fixed:  The fix that allowed special characters in usernames and passwords was only partially applied
diff --git a/lib/buildr/java/doc.rb b/lib/buildr/java/doc.rb
index 123e46a..3dfca28 100644
--- a/lib/buildr/java/doc.rb
+++ b/lib/buildr/java/doc.rb
@@ -24,6 +24,7 @@ module Buildr #:nodoc:
         if project.doc.engine? Javadoc
           options = project.doc.options
           options[:windowtitle] = (project.comment || project.name) unless options[:windowtitle]
+          options[:sourcepath] = project.compile.sources.join(File::PATH_SEPARATOR) unless options[:sourcepath]
         end
       end
     end

[buildr] 01/02: Set file type of gitattributes

[do...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

donaldp pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/buildr.git

commit 073b1494d2af99391ba8b17bee3ccc2b6545923c
Author: Peter Donald <pe...@realityforge.org>
AuthorDate: Sun Jul 14 13:40:18 2019 +1000

    Set file type of gitattributes
---
 .gitattributes | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitattributes b/.gitattributes
index 4c95e62..9ed2654 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -17,6 +17,7 @@
 *.xml text
 *.xsl text
 *.yml text
+.gitattributes text
 .gitignore text
 Buildfile text
 CHANGELOG text