buildr 1.5.7-x86-mswin32 → 1.5.8-x86-mswin32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8ad9515a8b555553ce6edb45e9536d86e34a70d9
-  data.tar.gz: f20de0c78b0a2e4fcda1fc1d2a513365d21a7895
+  metadata.gz: 0d87ccb02f875068b3421beffe328a66401177ec
+  data.tar.gz: c1fe218268c73b99fed3ec26e09ed359526a0e06
 SHA512:
-  metadata.gz: 378b2899a63bcc33aec6680501970a4406ed319a1ebb427a50e5d9a0c3d9826996f9c26ac64203d8eb051f3863543ce87684b4691f0fcae309d1a7042df1168f
-  data.tar.gz: db5169056e365f27cb4265dcddf87aa8302cd2c586da82d13ea8086006775258104f01c7405d02de3a523edd1d2782bc7c6cc04a797d27ee430b8c676818dddd
+  metadata.gz: 3d8b038a42a2bc8ba1691843e39af473ec2783841b613ccfbb085da214ac4448324fcc3dcefb41e9baf9a0ae2c74998e658f7ff7794991c3130f0a5b8acfa508
+  data.tar.gz: 88f387cced567da4561786180bd5635f85acc31eff47320965f6af6d94d20705a25f2f5df6637fd7fa0bc9169fc6e7a9706970d388a95004928104d46e7c9c9e

data/CHANGELOG

@@ -1,3 +1,19 @@
+1.5.8 (2019-07-14)
+* Fixed:  Changed references to `https://repo1.maven.org/maven2` to use https where possible.
+* Change: Use the `zapwhite` gem to manage file whitespace within repository.
+* Fixed:  Replace references to long removed `http://www.ibiblio.org/maven2/` repository with
+          `https://repo1.maven.org/maven2`.
+* Fixed:  Ensure pom files used in tests use https when referring to maven repositories.
+* Added:  Add support for downloading external annotations and attaching them to IntelliJ IDEA module dependencies.
+* 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.
+* Fixed:  Stop generating poms with the parent POM `org.sonatype.oss:oss-parent:8`. The las update was a long time
+          ago (i.e. 2012) and it is no longer maintained. It was also deprecated several years ago and is not
+          guaranteed to work in modern Maven deployments.
+
 1.5.7 (2019-02-16)
 * Fixed:  The fix that allowed special characters in usernames and passwords was only partially applied
           in the `1.5.6` release. The complete fix that correctly decoded usernames and passwords before

data/addon/buildr/jetty.rb

@@ -52,7 +52,7 @@ module Buildr
       "org.eclipse.jetty:jetty-security:jar:#{VERSION}",
       "org.eclipse.jetty:jetty-xml:jar:#{VERSION}",
       "org.slf4j:slf4j-api:jar:#{SLF4J_VERSION}",
-      "org.slf4j:slf4j-simple:jar:#{SLF4J_VERSION}", 
+      "org.slf4j:slf4j-simple:jar:#{SLF4J_VERSION}",
       "org.slf4j:jcl-over-slf4j:jar:#{SLF4J_VERSION}",
       'javax.servlet:javax.servlet-api:jar:3.1.0' ]
 

data/buildr.buildfile

@@ -19,7 +19,7 @@ require 'buildr/jetty6'
 require 'buildr/nailgun'
 require 'buildr/scala'
 require 'buildr/kotlin'
-repositories.remote << 'http://repo1.maven.org/maven2'
+repositories.remote << 'https://repo1.maven.org/maven2'
 
 repositories.remote << 'https://oss.sonatype.org/content/groups/scala-tools'
 
@@ -33,7 +33,7 @@ define 'buildr' do
   define 'scala' do
     compile.using(:javac).from(FileList['lib/buildr/scala/**/*.java']).into('lib/buildr/scala')
   end
-  
+
   define 'kotlin' do
     compile.using(:javac).from(FileList['lib/buildr/kotlin/**/*.java']).into('lib/buildr/kotlin').with(Buildr::Kotlin::Kotlinc.dependencies)
   end

data/buildr.gemspec

@@ -38,7 +38,6 @@ something that's simple and intuitive to use, so we only need to tell it what
 to do, and it takes care of the rest.  But also something we can easily extend
 for those one-off tasks, with a language that's a joy to use.
   TEXT
-  spec.rubyforge_project  = 'buildr'
 
   spec.platform       = $platform
 
@@ -97,4 +96,6 @@ for those one-off tasks, with a language that's a joy to use.
   spec.add_development_dependency 'pygmentize', '0.0.3'
   spec.add_development_dependency 'saikuro_treemap', '0.2.0'
   spec.add_development_dependency 'atoulme-Saikuro', '1.2.1'
+  # Used to manage whitespace of files within repository
+  spec.add_development_dependency 'zapwhite', '2.14.0'
 end

data/doc/artifacts.textile

@@ -99,7 +99,7 @@ Buildr can download artifacts for you, but only if you tell it where to find the
 When you call @repositories.remote@, you get an array of URLs for the various remote repositories.  Initially, it's an empty array, to which you can add new repositories.  For example:
 
 {% highlight ruby %}
-repositories.remote << 'http://www.ibiblio.org/maven2/'
+repositories.remote << 'https://repo1.maven.org/maven2'
 {% endhighlight %}
 
 If your repository requires HTTP authentication, you can write,
@@ -171,7 +171,7 @@ artifacts(OPENJPA).each(&:invoke)
 
 When you let Buildr download artifacts for you, or by invoking the artifact task yourself, it scans through the remote repositories assuming each repository follows the Maven 2 structure.  Starting from the root repository URL, it will look for each artifact using the path @group/id/version/id-version.type@ (or ...@/id-version-classifier.type@).  The group identifier becomes a path by turning periods (@.@) into slashes (@/@). So to find @org.apache.axis2:axis2:jar:1.2@, we're going to look for @org/apache/axis2/axis2/1.2/axis2-1.2.jar@.
 
-You'll find a lot of open source Java libraries in public repositories that support this structure (for example, the "Ibiblio Maven":http://www.ibiblio.org/maven2/ repository).  And, of course, every remote repository you setup for your projects.
+You'll find a lot of open source Java libraries in public repositories that support this structure (for example, the "Maven Central":https://repo1.maven.org/maven2 repository).  And, of course, every remote repository you setup for your projects.
 
 But there are exceptions to the rule.  Say we want to download the Dojo widget library and use it in our project.  It's available from the Dojo Web site, but that site doesn't follow the Maven repository conventions, so our feeble attempt to use existing remote repositories will fail.
 

data/doc/download.textile

@@ -18,16 +18,28 @@ The source code is included in both source and binary distribution, the Gem dist
 
 h2(#dist).  Binaries and Source Code
 
+h3. buildr 1.5.7 (2019-02-16)
+
+|_. Package |_. MD5 Checksum |_. PGP |
+| "buildr-1.5.7.gem":http://www.apache.org/dyn/closer.cgi/buildr/1.5.7/buildr-1.5.7.gem | "da7aef9f2f016871162a11eed21f9821":http://www.apache.org/dist/buildr/1.5.7/buildr-1.5.7.gem.md5 | "Sig":http://www.apache.org/dist/buildr/1.5.7/buildr-1.5.7.gem.asc |
+| "buildr-1.5.7-x86-mswin32.gem":http://www.apache.org/dyn/closer.cgi/buildr/1.5.7/buildr-1.5.7-x86-mswin32.gem | "a5ea3efca5f6e01ee56f014b1f71c002":http://www.apache.org/dist/buildr/1.5.7/buildr-1.5.7-x86-mswin32.gem.md5 | "Sig":http://www.apache.org/dist/buildr/1.5.7/buildr-1.5.7-x86-mswin32.gem.asc |
+| "buildr-1.5.7-java.gem":http://www.apache.org/dyn/closer.cgi/buildr/1.5.7/buildr-1.5.7-java.gem | "c61529d8d0afa922d93faddef1170b3c":http://www.apache.org/dist/buildr/1.5.7/buildr-1.5.7-java.gem.md5 | "Sig":http://www.apache.org/dist/buildr/1.5.7/buildr-1.5.7-java.gem.asc |
+| "buildr-1.5.7.tgz":http://www.apache.org/dyn/closer.cgi/buildr/1.5.7/buildr-1.5.7.tgz | "e779df6b46e25c1692b0a3f102ed6903":http://www.apache.org/dist/buildr/1.5.7/buildr-1.5.7.tgz.md5 | "Sig":http://www.apache.org/dist/buildr/1.5.7/buildr-1.5.7.tgz.asc |
+| "buildr-1.5.7.zip":http://www.apache.org/dyn/closer.cgi/buildr/1.5.7/buildr-1.5.7.zip | "2991f9e184c6ae2eb229a219ac692e4c":http://www.apache.org/dist/buildr/1.5.7/buildr-1.5.7.zip.md5 | "Sig":http://www.apache.org/dist/buildr/1.5.7/buildr-1.5.7.zip.asc |
+
+p>. ("Release signing keys":http://www.apache.org/dist/buildr/1.5.7/KEYS)
+
+
 h3. buildr 1.5.6 (2018-05-10)
 
 |_. Package |_. MD5 Checksum |_. PGP |
-| "buildr-1.5.6.gem":http://www.apache.org/dyn/closer.cgi/buildr/1.5.6/buildr-1.5.6.gem | "3836a2bb86692ca353ccc9ed6c4a618d":http://www.apache.org/dist/buildr/1.5.6/buildr-1.5.6.gem.md5 | "Sig":http://www.apache.org/dist/buildr/1.5.6/buildr-1.5.6.gem.asc |
-| "buildr-1.5.6-java.gem":http://www.apache.org/dyn/closer.cgi/buildr/1.5.6/buildr-1.5.6-java.gem | "68879b787705d8c3222b80cab5416e99":http://www.apache.org/dist/buildr/1.5.6/buildr-1.5.6-java.gem.md5 | "Sig":http://www.apache.org/dist/buildr/1.5.6/buildr-1.5.6-java.gem.asc |
-| "buildr-1.5.6-x86-mswin32.gem":http://www.apache.org/dyn/closer.cgi/buildr/1.5.6/buildr-1.5.6-x86-mswin32.gem | "c0c65b86f422e7bb8c8f3bba00af4ec2":http://www.apache.org/dist/buildr/1.5.6/buildr-1.5.6-x86-mswin32.gem.md5 | "Sig":http://www.apache.org/dist/buildr/1.5.6/buildr-1.5.6-x86-mswin32.gem.asc |
-| "buildr-1.5.6.tgz":http://www.apache.org/dyn/closer.cgi/buildr/1.5.6/buildr-1.5.6.tgz | "b17855a2f439c042bd6c94c85454ddce":http://www.apache.org/dist/buildr/1.5.6/buildr-1.5.6.tgz.md5 | "Sig":http://www.apache.org/dist/buildr/1.5.6/buildr-1.5.6.tgz.asc |
-| "buildr-1.5.6.zip":http://www.apache.org/dyn/closer.cgi/buildr/1.5.6/buildr-1.5.6.zip | "4fcd9603070374b93f7db69fdef1ed83":http://www.apache.org/dist/buildr/1.5.6/buildr-1.5.6.zip.md5 | "Sig":http://www.apache.org/dist/buildr/1.5.6/buildr-1.5.6.zip.asc |
+| "buildr-1.5.6.gem":http://archive.apache.org/dist/buildr/1.5.6/buildr-1.5.6.gem | "3836a2bb86692ca353ccc9ed6c4a618d":http://archive.apache.org/dist/buildr/1.5.6/buildr-1.5.6.gem.md5 | "Sig":http://archive.apache.org/dist/buildr/1.5.6/buildr-1.5.6.gem.asc |
+| "buildr-1.5.6-java.gem":http://archive.apache.org/dist/buildr/1.5.6/buildr-1.5.6-java.gem | "68879b787705d8c3222b80cab5416e99":http://archive.apache.org/dist/buildr/1.5.6/buildr-1.5.6-java.gem.md5 | "Sig":http://archive.apache.org/dist/buildr/1.5.6/buildr-1.5.6-java.gem.asc |
+| "buildr-1.5.6-x86-mswin32.gem":http://archive.apache.org/dist/buildr/1.5.6/buildr-1.5.6-x86-mswin32.gem | "c0c65b86f422e7bb8c8f3bba00af4ec2":http://archive.apache.org/dist/buildr/1.5.6/buildr-1.5.6-x86-mswin32.gem.md5 | "Sig":http://archive.apache.org/dist/buildr/1.5.6/buildr-1.5.6-x86-mswin32.gem.asc |
+| "buildr-1.5.6.tgz":http://archive.apache.org/dist/buildr/1.5.6/buildr-1.5.6.tgz | "b17855a2f439c042bd6c94c85454ddce":http://archive.apache.org/dist/buildr/1.5.6/buildr-1.5.6.tgz.md5 | "Sig":http://archive.apache.org/dist/buildr/1.5.6/buildr-1.5.6.tgz.asc |
+| "buildr-1.5.6.zip":http://archive.apache.org/dist/buildr/1.5.6/buildr-1.5.6.zip | "4fcd9603070374b93f7db69fdef1ed83":http://archive.apache.org/dist/buildr/1.5.6/buildr-1.5.6.zip.md5 | "Sig":http://archive.apache.org/dist/buildr/1.5.6/buildr-1.5.6.zip.asc |
 
-p>. ("Release signing keys":http://www.apache.org/dist/buildr/1.5.6/KEYS)
+p>. ("Release signing keys":http://archive.apache.org/dist/buildr/1.5.6/KEYS)
 
 
 h3. buildr 1.5.5 (2017-12-06)

data/doc/index.textile

@@ -46,6 +46,17 @@ So let's get started.  You can "read the documentation online":quick_start.html,
 
 h2(#news).  What's New
 
+Highlights from Buildr 1.5.8 (2019-07-14)
+* Fixed:  Add support for IntelliJ IDEAs external annotations.
+* 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.
+* Fixed:  Stop generating poms with the parent POM `org.sonatype.oss:oss-parent:8`. The las update was a long time
+          ago (i.e. 2012) and it is no longer maintained. It was also deprecated several years ago and is not
+          guaranteed to work in modern Maven deployments.
+
 Highlights from Buildr 1.5.7 (2019-02-16)
 * Fixed:  The fix that allowed special characters in usernames and passwords was only partially applied
           in the `1.5.6` release. The complete fix that correctly decoded usernames and passwords before
@@ -64,44 +75,6 @@ Highlights from Buildr 1.5.7 (2019-02-16)
 * Change: Use https protocol to access Gem metadata. Submitted by Olle Jonsson.
 * Change: Change RSpec shared_context usage to avoid warnings. Submitted by Olle Jonsson.
 
-Highlights from Buildr 1.5.6 (2018-05-10)
-* Fixed:  Ensure that the username and passwords declared for repositories are correctly url encoded for
-          the upload repositories when converted to a URL. (i.e. Ensure `Buildr.repositories.release_to`
-          and `Buildr.repositories.snapshot_to` settings can have usernames and passwords with special
-          characters).
-* Added:  Add support for allowing some dependencies to include transitive dependencies via the
-          `pom.include_transitive_dependencies` configuration setting.
-* Added:  Add support for adding dependencies to the pom via the `pom.additional_dependencies` configuration
-          setting. These dependencies are `compile` scope and are in addition to any derived from the normal
-          compile dependencies.
-* Fixed:  GWT Addon: Use version `1.0.2` of the `com.google.jsinterop:jsinterop-annotations:jar` artifact
-          when using GWT 2.8.2 to align with version shipped with GWT.
-* Fixed:  Dependencies added as `pom.provided_dependencies` or `pom.runtime_dependencies` and not included
-          as compile dependencies were incorrectly omitted from pom.
-* Fixed:  Dependencies added as `pom.provided_dependencies` and `pom.runtime_dependencies` were being
-          incorrectly duplicated within the pom dependencies section. Now provided dependency scope takes
-          precedence over runtime scoped dependency.
-* Fixed:  Dependencies added to POMs will specify the classifier unless it is the default value.
-* Added:  Add the `project.pom.dependency_filter` configuration property that can be set to a proc. The proc
-          accepts a dependency and returns a boolean that determines whether the dependency is included in
-          the generated pom or not.
-* Fixed:  POMs generated by Buildr use the parent pom `org.sonatype.oss:oss-parent:pom:7` but this
-          generates a warning in the latest version of Maven. Modern versions of Maven would thus
-          ignore transitive dependencies declared in the pom. The parent pom has now been upgraded
-          to `org.sonatype.oss:oss-parent:pom:8` which will result in modern Maven correctly picking
-          up transitive dependencies.
-* Change: JaCoCo Addon: Update JaCoCo version to 0.8.0 which in turns supports Java9.
-* Added:  GWT Addon: Added support for `:gwtc_args` parameter to supply arbitrary parameters to
-          the GWT compiler.
-* Added:  Add support for sha512 digests to be generated for files during the upload. This is typically
-          configured by adding `sha512` to the list of digests via a line such as:
-          `repositories.release_to[:options] = {:digests => [:md5, :sha1, :sha512]}`
-* Fixed:  The default upload tasks would often get a ReadTimeout when uploading using http to a remote
-          server that did not have `KeepAlive` socket option enabled and the upload took more than 60
-          seconds (the default socket read timeout). Some commercial maven repositories could trigger
-          this scenario during upload of even modest size artifacts. Default the read_timeout to 10 minutes
-          when during upload to work address this issue.
-
 This is a partial list -- see the "CHANGELOG":CHANGELOG for full details.
 
 h2(#notices).  Credits & Notices

data/doc/projects.textile

@@ -26,7 +26,7 @@ AXIS_OF_WS = [AXIOM, AXIS2]
 OPENJPA = ['org.apache.openjpa:openjpa:jar:1.2.0',
   'net.sourceforge.serp:serp:jar:1.12.0']
 
-repositories.remote << 'http://www.ibiblio.org/maven2/'
+repositories.remote << 'https://repo1.maven.org/maven2'
 
 desc 'Code. Build. ??? Profit!'
 define 'killer-app' do

data/doc/quick_start.textile

@@ -67,7 +67,7 @@ h2(#dependencies). Dependencies
 So far, we have seen how Buildr can automatically infer what amounts to dozens of lines of @build.xml@ contents, all based on a buildfile and a directory structure.  However, the best is yet to come.  Buildr also provides Maven-style dependency management (but without the long loading times!).  In other words, you specify each dependent library using a string descriptor and Buildr figures out how to download and configure your classpath (the library descriptors are just a Ruby array, therefore they are separated by commas (@,@)).  You must specify at least one remote repository so that Buildr knows from where to download these libraries.  For example, we can configure our project to reference the "Apache Commons CLI":http://commons.apache.org/cli/ library and download libraries from the Ibiblio repository:
 
 {% highlight ruby %}
-repositories.remote << 'http://www.ibiblio.org/maven2'
+repositories.remote << 'https://repo1.maven.org/maven2'
 
 define 'killer-app' do
   project.version = '0.1.0'
@@ -83,7 +83,7 @@ p(tip). You can search the global repository of artifacts at sites like "MvnBrow
 Unfortunately, not all libraries are quite as simple as Commons CLI.  Many libraries (such as Apache Wicket) have dependencies of their own.  While we may be able to _compile_ against Apache Wicket without these extra libraries on our classpath, we cannot actually _run_ our application without its transitive dependencies. To avoid tracking down each of these dependencies and adding them manually, we can simply use the @transitive@ directive (this is how Maven behaves by default):
 
 {% highlight ruby %}
-repositories.remote << 'http://www.ibiblio.org/maven2'
+repositories.remote << 'https://repo1.maven.org/maven2'
 
 define 'killer-app' do
   project.version = '0.1.0'
@@ -95,7 +95,7 @@ end
 The @compile.with@ property accepts a full array of comma-separated artifacts, making it possible to specify any number of dependencies as necessary.  Of course, such a long list of verbose string descriptors could get very tiresome and messy.  For this reason, it is conventional to assign each dependency to a constant (e.g. @WICKET@) which is declared just above the project in the buildfile and passed to @compile.with@ in a clean, easy-to-read style:
 
 {% highlight ruby %}
-repositories.remote << 'http://www.ibiblio.org/maven2'
+repositories.remote << 'https://repo1.maven.org/maven2'
 
 WICKET = transitive('org.apache.wicket:wicket:jar:1.4-rc6')
 SLF4J = 'org.slf4j:slf4j-jdk14:jar:1.5.8'

data/lib/buildr/core/generate.rb

@@ -81,7 +81,7 @@ GROUP = "#{name}"
 COPYRIGHT = ""
 
 # Specify Maven 2.0 remote repositories here, like this:
-repositories.remote << "http://repo1.maven.org/maven2"
+repositories.remote << "https://repo1.maven.org/maven2"
 
 desc "The #{name.capitalize} project"
 define "#{name}" do
@@ -267,7 +267,7 @@ EOF
             legacy = repository["layout"].to_s =~ /legacy/
             !legacy
           } rescue nil
-          repositories = [{"name" => "Standard maven2 repository", "url" => "http://repo1.maven.org/maven2"}] if repositories.nil? || repositories.empty?
+          repositories = [{"name" => "Standard maven2 repository", "url" => "https://repo1.maven.org/maven2"}] if repositories.nil? || repositories.empty?
           repositories.each do |repository|
             name, url = repository["name"], repository["url"]
             script << "# #{name}"

data/lib/buildr/ide/idea.rb

@@ -212,6 +212,10 @@ module Buildr #:nodoc:
         'iml'
       end
 
+      def annotation_paths
+        @annotation_paths ||= [buildr_project._(:source, :main, :annotations)].select {|p| File.exist?(p)}
+      end
+
       def main_source_directories
         @main_source_directories ||= [buildr_project.compile.sources].flatten.compact
       end
@@ -342,10 +346,7 @@ module Buildr #:nodoc:
         buildr_project.assets.paths.each {|p| default_webroots[p] = '/' }
         webroots = options[:webroots] || default_webroots
         default_deployment_descriptors = []
-        ['web.xml', 'sun-web.xml', 'glassfish-web.xml', 'jetty-web.xml', 'geronimo-web.xml',
-         'context.xml', 'weblogic.xml',
-         'jboss-deployment-structure.xml', 'jboss-web.xml',
-         'ibm-web-bnd.xml', 'ibm-web-ext.xml', 'ibm-web-ext-pme.xml'].
+        %w(web.xml sun-web.xml glassfish-web.xml jetty-web.xml geronimo-web.xml context.xml weblogic.xml jboss-deployment-structure.xml jboss-web.xml ibm-web-bnd.xml ibm-web-ext.xml ibm-web-ext-pme.xml).
           each do |descriptor|
           webroots.each_pair do |path, relative_url|
             next unless relative_url == '/'
@@ -446,9 +447,7 @@ module Buildr #:nodoc:
         ejb_roots = options[:ejb_roots] || default_ejb_roots
 
         default_deployment_descriptors = []
-        ['ejb-jar.xml', 'glassfish-ejb-jar.xml', 'ibm-ejb-jar-bnd.xml', 'ibm-ejb-jar-ext-pme.xml', 'ibm-ejb-jar-ext.xml',
-         'jboss.xml', 'jbosscmp-jdbc.xml', 'openejb-jar.xml', 'sun-cmp-mapping.xml', 'sun-ejb-jar.xml',
-         'weblogic-cmp-rdbms-jar.xml', 'weblogic-ejb-jar.xml'].
+        %w(ejb-jar.xml glassfish-ejb-jar.xml ibm-ejb-jar-bnd.xml ibm-ejb-jar-ext-pme.xml ibm-ejb-jar-ext.xml jboss.xml jbosscmp-jdbc.xml openejb-jar.xml sun-cmp-mapping.xml sun-ejb-jar.xml weblogic-cmp-rdbms-jar.xml weblogic-ejb-jar.xml).
           each do |descriptor|
           ejb_roots.each do |path|
             d = "#{path}/WEB-INF/#{descriptor}"
@@ -483,12 +482,18 @@ module Buildr #:nodoc:
           dependency_path = d.to_s
           export = true
           source_path = nil
+          annotations_path = nil
           if d.respond_to?(:to_spec_hash)
             source_spec = d.to_spec_hash.merge(:classifier => 'sources')
             source_path = Buildr.artifact(source_spec).to_s
             source_path = nil unless File.exist?(source_path)
           end
-          [dependency_path, export, source_path]
+          if d.respond_to?(:to_spec_hash)
+            annotations_spec = d.to_spec_hash.merge(:classifier => 'annotations')
+            annotations_path = Buildr.artifact(annotations_spec).to_s
+            annotations_path = nil unless File.exist?(annotations_path)
+          end
+          [dependency_path, export, source_path, annotations_path]
         end
       end
 
@@ -499,12 +504,18 @@ module Buildr #:nodoc:
           dependency_path = d.to_s
           export = main_dependencies_paths.include?(dependency_path)
           source_path = nil
+          annotations_path = nil
           if d.respond_to?(:to_spec_hash)
             source_spec = d.to_spec_hash.merge(:classifier => 'sources')
             source_path = Buildr.artifact(source_spec).to_s
             source_path = nil unless File.exist?(source_path)
           end
-          [dependency_path, export, source_path]
+          if d.respond_to?(:to_spec_hash)
+            annotations_spec = d.to_spec_hash.merge(:classifier => 'annotations')
+            annotations_path = Buildr.artifact(annotations_spec).to_s
+            annotations_path = nil unless File.exist?(annotations_path)
+          end
+          [dependency_path, export, source_path, annotations_path]
         end
       end
 
@@ -550,22 +561,22 @@ module Buildr #:nodoc:
           end
 
           main_project_dependencies = project_dependencies.dup
-          self.test_dependency_details.each do |dependency_path, export, source_path|
+          self.test_dependency_details.each do |dependency_path, export, source_path, annotations_path|
             next if export
-            generate_lib(xml, dependency_path, export, source_path, project_dependencies)
+            generate_lib(xml, dependency_path, export, source_path, annotations_path, project_dependencies)
           end
 
           test_project_dependencies = project_dependencies - main_project_dependencies
-          self.main_dependency_details.each do |dependency_path, export, source_path|
+          self.main_dependency_details.each do |dependency_path, export, source_path, annotations_path|
             next unless export
-            generate_lib(xml, dependency_path, export, source_path, test_project_dependencies)
+            generate_lib(xml, dependency_path, export, source_path, annotations_path, test_project_dependencies)
           end
 
           xml.orderEntryProperties
         end
       end
 
-      def generate_lib(xml, dependency_path, export, source_path, project_dependencies)
+      def generate_lib(xml, dependency_path, export, source_path, annotations_path, project_dependencies)
         project_for_dependency = Buildr.projects.detect do |project|
           [project.packages, project.compile.target, project.resources.target, project.test.compile.target, project.test.resources.target].flatten.
             detect { |artifact| artifact.to_s == dependency_path }
@@ -578,7 +589,7 @@ module Buildr #:nodoc:
           end
           project_dependencies << project_for_dependency
         else
-          generate_module_lib(xml, url_for_path(dependency_path), export, (source_path ? url_for_path(source_path) : nil), !export)
+          generate_module_lib(xml, url_for_path(dependency_path), export, (source_path ? url_for_path(source_path) : nil), (annotations_path ? url_for_path(annotations_path) : nil), !export)
         end
       end
 
@@ -602,6 +613,14 @@ module Buildr #:nodoc:
         xml.output(:url => file_path(self.main_output_dir.to_s))
         xml.tag!('output-test', :url => file_path(self.test_output_dir.to_s))
         xml.tag!('exclude-output')
+        paths = self.annotation_paths
+        unless paths.empty?
+          xml.tag!('annotation-paths') do |xml|
+            paths.each do |path|
+              xml.root(:url=> file_path(path))
+            end
+          end
+        end
       end
 
       def generate_content(xml)
@@ -654,12 +673,15 @@ module Buildr #:nodoc:
         xml.orderEntry attribs
       end
 
-      def generate_module_lib(xml, path, export, source_path, test = false)
+      def generate_module_lib(xml, path, export, source_path, annotations_path, test = false)
         attribs = {:type => 'module-library'}
         attribs[:exported] = '' if export
         attribs[:scope] = 'TEST' if test
         xml.orderEntry attribs do
           xml.library do
+            xml.ANNOTATIONS do
+              xml.root :url => annotations_path
+            end if annotations_path
             xml.CLASSES do
               xml.root :url => path
             end

data/lib/buildr/java/custom_pom.rb

@@ -170,11 +170,6 @@ module Buildr
                     'xmlns:xsi' => 'http://www.w3.org/2001/XMLSchema-instance',
                     'xsi:schemaLocation' => 'http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd') do
           xml.modelVersion '4.0.0'
-          xml.parent do
-            xml.groupId 'org.sonatype.oss'
-            xml.artifactId 'oss-parent'
-            xml.version '8'
-          end
           xml.groupId project.group
           xml.artifactId project.id
           xml.version project.version

data/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]
+          project.doc.sourcepath = project.compile.sources.dup if project.doc.sourcepath.empty?
         end
       end
     end

data/lib/buildr/kotlin/compiler.rb

@@ -140,15 +140,15 @@ module Buildr::Kotlin
         hash[option] = options[option]
         hash
       end
-      
+
       options[:debug] = Buildr.options.debug || trace?(:kotlinc) if options[:debug].nil?
       options[:warnings] = verbose if options[:warnings].nil?
       options[:optimize] = false if options[:optimize].nil?
       options[:noStdlib] = true if options[:noStdlib].nil?
       @java = Javac.new(project, options[:javac])
     end
-    
-    
+
+
 
     def compile(sources, target, dependencies) #:nodoc:
       check_options(options, OPTIONS)

data/lib/buildr/kotlin/org/apache/buildr/KotlinMessageCollector.java

@@ -23,7 +23,7 @@ import org.jetbrains.kotlin.cli.common.messages.CompilerMessageLocation;
 
 
 public class KotlinMessageCollector implements MessageCollector {
-    
+
     public void report(CompilerMessageSeverity severity, String message, CompilerMessageLocation location) {
         switch(severity) {
             case ERROR:
@@ -35,12 +35,12 @@ public class KotlinMessageCollector implements MessageCollector {
                 break;
         }
     }
-    
+
     public boolean hasErrors() {
         return false;
     }
-    
+
     public void clear() {
         // not implemented
     }
-}
+}

data/lib/buildr/packaging/archive.rb

@@ -267,12 +267,12 @@ module Buildr #:nodoc:
         @expanders.each { |expander| expander.exclude(*files) }
         self
       end
-      
+
       def concatenate(*files)
         @expanders.each { |expander| expander.concatenate(*files) }
         self
       end
-      
+
       def transform(*files, &block)
         @expanders.each { |expander| expander.transform(*files, &block) }
         self
@@ -301,12 +301,12 @@ module Buildr #:nodoc:
         @excludes |= files
         self
       end
-      
+
       def concatenate(*files)
         @concatenates |= files
         self
       end
-      
+
       def transform(*files, &block)
         @transforms[[files].flatten] = block
         self
@@ -325,7 +325,7 @@ module Buildr #:nodoc:
               elsif @transforms.each_pair.detect do |transform, transform_block|\
                   if transform.any? { |pattern| File.fnmatch(pattern, entry.name) }
                     file_map[dest] << ZipEntryData.new(source, entry)
-                    
+
                     transform_map[dest] = transform_block
                     true
                   end

data/lib/buildr/packaging/artifact.rb

@@ -21,6 +21,9 @@ module Buildr #:nodoc:
   desc "Download all artifacts' sources"
   task 'artifacts:sources'
 
+  desc "Download all artifacts' external annotations"
+  task 'artifacts:annotations'
+
   desc "Download all artifacts' javadoc"
   task 'artifacts:javadoc'
 
@@ -142,6 +145,18 @@ module Buildr #:nodoc:
       javadoc_task
     end
 
+    # :call-seq:
+    #   annotations_artifact => Artifact
+    #
+    # Convenience method that returns an annotations artifact. The annotations artifact is used by
+    # Intellij IDEA as a source of external annotations.
+    def annotations_artifact
+      annotations_spec = to_spec_hash.merge(:classifier=>'annotations')
+      annotations_task = OptionalArtifact.define_task(Buildr.repositories.locate(annotations_spec))
+      annotations_task.send :apply_spec, annotations_spec
+      annotations_task
+    end
+
     # :call-seq:
     #   pom_xml => string
     #
@@ -948,6 +963,7 @@ module Buildr #:nodoc:
       unless spec[:type] == :pom
         Rake::Task['artifacts:sources'].enhance [task.sources_artifact]
         Rake::Task['artifacts:javadoc'].enhance [task.javadoc_artifact]
+        Rake::Task['artifacts:annotations'].enhance [task.annotations_artifact]
       end
     end
     task.enhance &block

data/lib/buildr/packaging/artifact_namespace.rb

@@ -720,10 +720,10 @@ module Buildr #:nodoc:
           previous = get(unvers, false) || get(name, false)
           if previous # have previous on current namespace
             if previous.requirement # we must satisfy the requirement
-              unless unvers # we only have the version
-                satisfied = previous.requirement.satisfied_by?(artifact.version)
-              else
+              if unvers
                 satisfied = previous.satisfied_by?(artifact)
+              else # we only have the version
+                satisfied = previous.requirement.satisfied_by?(artifact.version)
               end
               raise "Unsatisfied dependency #{previous} " +
                 "not satisfied by #{artifact}" unless satisfied
@@ -961,6 +961,7 @@ module Buildr #:nodoc:
 
    private
     def get(name, include_parents = true, include_subs = true, include_self = true) #:nodoc:
+      artifact = nil
       if include_subs && name.to_s[/_/] # try sub namespaces first
         sub, parts = self, name.to_s.split('_')
         sub_name = parts.shift.to_sym
@@ -980,7 +981,7 @@ module Buildr #:nodoc:
           artifact = registry.parent.get(name, true)
         end
       end
-      artifact = artifact.call if artifact.respond_to?(:call)
+      artifact = artifact.call if artifact && artifact.respond_to?(:call)
       artifact
     end
 

data/lib/buildr/packaging/artifact_search.rb

@@ -96,7 +96,7 @@ module Buildr #:nodoc:
 
     def remote_versions(art, base, from = :metadata, fallback = true)
       path = (art[:group].split(/\./) + [art[:id]]).flatten.join('/')
-      base ||= "http://mirrors.ibiblio.org/pub/mirrors/maven2"
+      base ||= "https://repo1.maven.org/maven2"
       uris = {:metadata => "#{base}/#{path}/maven-metadata.xml"}
       uris[:listing] = "#{base}/#{path}/" if base =~ /^https?:/
         xml = nil

data/lib/buildr/packaging/tar.rb

@@ -99,7 +99,7 @@ module Buildr #:nodoc:
             tar.mkdir(path, options.merge(:mode=>stat.mode, :mtime=>stat.mtime, :uid=>stat.uid, :gid=>stat.gid))
           else
             contents = [contents].flatten
-            
+
             combined_options = options
             if File.exists?(contents.first.to_s)
               stat = File.stat(contents.first.to_s)
@@ -107,8 +107,8 @@ module Buildr #:nodoc:
             elsif contents.first.respond_to?(:mode)
               combined_options = combined_options.merge(:mode => contents.first.mode)
             end
-              
-            
+
+
             tar.add_file path, combined_options do |os, opts|
               [contents].flatten.each do |content|
                 if content.respond_to?(:call)
@@ -120,7 +120,7 @@ module Buildr #:nodoc:
                     content.call os
                   end
                 else
-                  File.open content.to_s, 'rb' do |is| 
+                  File.open content.to_s, 'rb' do |is|
                     if transform
                       output = StringIO.new
                       while data = is.read(4096)
@@ -140,7 +140,7 @@ module Buildr #:nodoc:
               end
             end
           end
-          
+
         end
       end
     end

data/lib/buildr/version.rb

@@ -14,5 +14,5 @@
 # the License.
 
 module Buildr #:nodoc:
-  VERSION = '1.5.7'.freeze
+  VERSION = '1.5.8'.freeze
 end

data/rakelib/release.rake

@@ -13,7 +13,7 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-RC_VERSION = ENV['RC_VERSION'] || ''
+RC_VERSION = ENV['RC_VERSION'] || '' unless defined?(RC_VERSION)
 
 desc 'Release the next version of buildr from existing staged repository'
 task 'release' do
@@ -132,7 +132,7 @@ DOAP
   lambda do
     changes = File.read("_release/#{spec.version}/CHANGES")[/.*?\n(.*)/m, 1]
     email = <<-EMAIL
-To: users@buildr.apache.org, announce@apache.org
+To: users@buildr.apache.org
 Subject: [ANNOUNCE] Apache Buildr #{spec.version} released
 
 #{spec.description}

data/rakelib/stage.rake

@@ -18,8 +18,8 @@ require 'digest/sha1'
 
 gpg_cmd = 'gpg2'
 
-STAGE_DATE = ENV['STAGE_DATE'] ||  Time.now.strftime('%Y-%m-%d')
-RC_VERSION = ENV['RC_VERSION'] || ''
+STAGE_DATE = ENV['STAGE_DATE'] ||  Time.now.strftime('%Y-%m-%d') unless defined?(STAGE_DATE)
+RC_VERSION = ENV['RC_VERSION'] || '' unless defined?(RC_VERSION)
 
 task 'prepare' do
   # Update source files to next release number.

data/spec/ide/idea_spec.rb

@@ -1419,7 +1419,7 @@ describe Buildr::IntellijIdea do
         touch 'foo/src/main/java/foo/Foo.java' # needed so that buildr will treat as a java project
         artifact('group:id:jar:1.0') { |t| write t.to_s }
         define "root" do
-          repositories.remote << 'http://mirrors.ibiblio.org/pub/mirrors/maven2/'
+          repositories.remote << 'https://repo1.maven.org/maven2'
           project.version = "2.5.2"
           define 'foo' do
             resources.from _(:source, :main, :resources)

data/spec/java/custom_pom_spec.rb

@@ -98,13 +98,6 @@ describe Buildr::CustomPom do
       #$stderr.puts @pom_xml.to_s
     end
 
-    it 'has correct static metadata' do
-      @pom_xml.should match_xpath('/project/modelVersion', '4.0.0')
-      @pom_xml.should match_xpath('/project/parent/groupId', 'org.sonatype.oss')
-      @pom_xml.should match_xpath('/project/parent/artifactId', 'oss-parent')
-      @pom_xml.should match_xpath('/project/parent/version', '8')
-    end
-
     it 'has correct project level metadata' do
       @pom_xml.should match_xpath('/project/groupId', 'org.myproject')
       @pom_xml.should match_xpath('/project/artifactId', 'foo')

data/spec/java/ecj_spec.rb

@@ -77,7 +77,7 @@ describe 'ecj compiler' do
   end
 
   it 'should include tools.jar dependency' do
-    repositories.remote << "http://repo1.maven.org/maven2/"
+    repositories.remote << "https://repo1.maven.org/maven2/"
     write 'src/main/java/UseJarSigner.java', <<-JAVA
     import sun.tools.jar.Manifest;
     public class UseJarSigner { }
@@ -229,7 +229,7 @@ describe 'ecj compiler options' do
   end
 
   it 'should complain about options it doesn\'t know' do
-    repositories.remote << "http://repo1.maven.org/maven2/"
+    repositories.remote << "https://repo1.maven.org/maven2/"
     write 'source/Test.java', 'class Test {}'
     compile_task.using(:unknown=>'option')
     lambda { compile_task.from('source').invoke }.should raise_error(ArgumentError, /no such option/i)

data/spec/kotlin/compiler_spec.rb

@@ -182,7 +182,7 @@ RSpec.shared_examples 'KotlincCompiler_CommonOptions' do
     compile_task.using(:optimize=>false)
     kotlinc_args.noOptimize.should be_true
   end
-  
+
   it 'should set noStdlib option to true by default' do
     compile_task.options.noStdlib.should be_true
     kotlinc_args.noStdlib.should be_true
@@ -200,7 +200,7 @@ RSpec.shared_examples 'KotlincCompiler_CommonOptions' do
 
   it 'should not set other option by default' do
     compile_task.options.other.should be_nil
-  end  
+  end
 
   it 'should complain about options it doesn\'t know' do
     write 'source/Test.kt', 'class Test {}'
@@ -235,7 +235,7 @@ if Java.java.lang.System.getProperty("java.runtime.version") >= "1.8"
       it 'requires present KOTLIN_HOME' do
         ENV['KOTLIN_HOME'].should_not be_nil
       end
-    
+
       def compile_task
         @compile_task ||= define('foo').compile.using(:kotlinc)
       end
@@ -255,11 +255,11 @@ if Java.java.lang.System.getProperty("java.runtime.version") >= "1.8"
     it 'requires absent KOTLIN_HOME' do
       ENV['KOTLIN_HOME'].should be_nil
     end
-  
+
     def compile_task
       @compile_task ||= define('foo').compile.using(:kotlinc)
     end
-  
+
     def kotlinc_args
       compile_task.instance_eval { @compiler }.send(:kotlinc_args)
     end

data/spec/packaging/archive_spec.rb

@@ -306,7 +306,7 @@ RSpec.shared_examples 'ArchiveTask' do
       inspect_archive.should be_empty
     end
   end
-  
+
   it 'should merge archives, concatenate file contents' do
     @files = %w{foo1 foo2}.map { |folder| File.join(@dir, folder) }.
       map do |dir|
@@ -320,7 +320,7 @@ RSpec.shared_examples 'ArchiveTask' do
       archive['test1.txt'].should eql(content_for('test1.txt') * @files.size)
     end
   end
-  
+
   it 'should merge archives, transforming file contents' do
     @files = %w{foo1 foo2}.map { |folder| File.join(@dir, folder) }.
       map do |dir|

data/spec/packaging/artifact_spec.rb

@@ -215,15 +215,15 @@ describe Repositories, 'remote_uri' do
       @local = @remote = @release_to = nil
     end
 
-    @repos = [ 'https://oss.sonatype.org/', 'http://www.ibiblio.org/maven2', { :url => 'http://repo1.maven.org/maven2', :username => 'user', :password => 'password' } ]
+    @repos = [ 'https://oss.sonatype.org/', { :url => 'https://repo1.maven.org/maven2', :username => 'user', :password => 'password' } ]
   end
 
   it 'should convert remote to array of uri' do
-      uri = URI.parse( 'http://repo1.maven.org/maven2' )
+      uri = URI.parse( 'https://repo1.maven.org/maven2' )
       uri.user = 'user'
       uri.password = 'password'
 
-      uris = [ URI.parse( 'https://oss.sonatype.org/'), URI.parse( 'http://www.ibiblio.org/maven2' ), uri ]
+      uris = [ URI.parse( 'https://oss.sonatype.org/'), uri ]
 
       repositories.remote = @repos
       repositories.remote_uri.should eql(uris)
@@ -236,7 +236,7 @@ describe Repositories, 'mirrors' do
       @local = @remote = @release_to = @mirrors = nil
     end
 
-    @repos = [ 'http://www.ibiblio.org/maven2', 'http://repo1.maven.org/maven2' ]
+    @repos = %w(http://www.ibiblio.org/maven2 https://repo1.maven.org/maven2)
   end
 
   it 'should be empty initially' do
@@ -310,7 +310,7 @@ describe Repositories, 'remote' do
       @local = @remote = @release_to = nil
     end
 
-    @repos = [ 'http://www.ibiblio.org/maven2', 'http://repo1.maven.org/maven2' ]
+    @repos = %w(http://www.ibiblio.org/maven2 https://repo1.maven.org/maven2)
   end
 
   it 'should be empty initially' do
@@ -1214,13 +1214,6 @@ end
 describe Buildr, '#transitive' do
   before do
     repositories.remote = 'http://buildr.apache.org/repository/noexist'
-    write artifact('org.sonatype.oss:oss-parent:pom:8').pom.to_s, <<-XML
-<project>
-  <artifactId>oss-parent</artifactId>
-  <groupId>org.sonatype.oss</groupId>
-  <version>8</version>
-</project>
-XML
 
     @simple = %w(saxon:saxon:jar:8.4 saxon:saxon-dom:jar:8.4 saxon:saxon-xpath:jar:8.4)
     @simple.map { |spec| artifact(spec).pom }.each { |task| write task.name, task.pom_xml.call }

data/spec/packaging/packaging_spec.rb

@@ -363,11 +363,6 @@ describe Project, '#package' do
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.sonatype.oss</groupId>
-    <artifactId>oss-parent</artifactId>
-    <version>8</version>
-  </parent>
   <groupId>bar</groupId>
   <artifactId>foo</artifactId>
   <version>1.0</version>

data/spec/sandbox.rb

@@ -18,7 +18,7 @@
 # that the code requires several artifacts. So we establish them first using the real local
 # repository and cache these across test cases.
 Buildr.application.instance_eval { @rakefile = File.expand_path('buildfile') }
-repositories.remote << 'http://repo1.maven.org/maven2'
+repositories.remote << 'https://repo1.maven.org/maven2'
 repositories.remote << 'https://oss.sonatype.org/content/groups/scala-tools'
 
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: buildr
 version: !ruby/object:Gem::Version
-  version: 1.5.7
+  version: 1.5.8
 platform: x86-mswin32
 authors:
 - Apache Buildr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-16 00:00:00.000000000 Z
+date: 2019-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -430,6 +430,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.2.1
+- !ruby/object:Gem::Dependency
+  name: zapwhite
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.14.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.14.0
 description: |
   Apache Buildr is a build system for Java-based applications, including support
   for Scala, Groovy and a growing number of JVM languages and tools.  We wanted
@@ -714,7 +728,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.8.6
 requirements: []
-rubyforge_project: buildr
+rubyforge_project: 
 rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4