buildr 1.5.6 → 1.5.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5793f6715926b79b32bc1180ee678793f5c74381
-  data.tar.gz: 8b9eeca272be9fbae824af95f337351fff00e918
+  metadata.gz: 886e7f2ba675b575d321d1d0e5b3f49939f0a83e
+  data.tar.gz: 47e2977e6163079c34e95bd13ca23b2c8211ffba
 SHA512:
-  metadata.gz: 920e4c8172dba2e8ffaf171ca9f0796f2f69922ebc8604537df9d608d8369f78df06fdf6354ede65c13dab29a8fa09360874e66b5f09da8e0d5da52dfc00d007
-  data.tar.gz: 84bab48c5276a0f9203b3748dab5ff3b144dc25deb33b2436fd99103767c7e5f5b77101c37305512c91bd838516487a6525799cad020343dc561307e7a2e4809
+  metadata.gz: f6540a5d9bcb9e4f3d0104f53713ddbb21407d544957793b61eabd660f0f4c52d6a9b682de005fc2ea752b6b2d6460600519ae7978bebfefff55c42128013cbb
+  data.tar.gz: 5b41be728f707e8d12814d51a0ac52febdd6ceda119762432eb4091c89d3d45fb45f135d961b76ea2288ea88fc052d3f7d54f746774accea79a1d868dc20ae7a

data/CHANGELOG

@@ -1,3 +1,39 @@
+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
+          passing them to HTTP library is now been applied.
+* Change: GWT Addon: Added support for `:skip_merge_gwt_dependencies` parameter that makes it possible to
+          avoid adding GWT dependencies to the project directly and thus the associated POM. This will be
+          required to support GWT3.x and GWT2.x simultaneously as well as making it easier to manage
+          dependencies in the POMs.
+* Change: Javadoc: If the user does not supply an explicit `:sourcepath` to the doc/javadoc tool then
+          default the value to `project.compile.sources`. This will stop javadoc from scanning the classpath
+          for `*.java` files which can cause issues with projects that include `sources` classifier artifacts
+          on the classpath. This is particularly relevant for GWT based projects that include artifacts with
+          source embedded in the artifacts. This change also made it possible to remove an ugly hack in the
+          GWT addon that removed the gwt artifacts from the javadoc path.
+* Change: Drop deprecated Gem::Specification#has_rdoc= (no replacement) method. Submitted by Olle Jonsson.
+* 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.
+* Change: Migrated source control to Apache GitBox which supports using either GitHub or GitBox as the
+          master repository.
+
 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`

data/README.rdoc

@@ -28,8 +28,8 @@ http://buildr.apache.org/
 === RTFM
 
 * Buildr documentation: http://buildr.apache.org
-* More about Rake: http://docs.rubyrake.org
-* Antwrap documentation: http://antwrap.rubyforge.org
+* More about Rake: https://github.com/ruby/rake
+* Antwrap documentation: https://rubygems.org/gems/Antwrap
 
 
 === Mailing list

data/Rakefile

@@ -30,7 +30,7 @@ end
 
 # Load the Gem specification for the current platform (Ruby or JRuby).
 def spec(platform = RUBY_PLATFORM[/java/] || 'ruby')
-  @specs ||= ['ruby', 'java', 'x86-mswin32'].inject({}) { |hash, spec_platform|
+  @specs ||= %w(ruby java x86-mswin32).inject({}) { |hash, spec_platform|
     ENV['BUILDR_PLATFORM'] = spec_platform
     hash.update(spec_platform=> Gem::Specification.load('buildr.gemspec'))
     Gem::Specification._clear_load_cache

data/addon/buildr/gwt.rb

@@ -236,11 +236,6 @@ module Buildr
     module ProjectExtension
       include Extension
 
-      after_define(:doc) do |project|
-        # Remove gwt artifacts when performing javadocs as the gwt jars have invalid source files
-        project.doc.classpath.delete_if { |f| f.to_s =~ /.*\/com\/google\/gwt\/gwt-.*/ }
-      end
-
       first_time do
         desc 'Run C22 to GSS converter. Set css files via environment variable CSS_FILES'
         task('css2gss') do
@@ -274,8 +269,10 @@ module Buildr
         Buildr::GWT.dependencies(version).each do |d|
           a = artifact(d)
           a.invoke if a.respond_to?(:invoke)
-          project.iml.main_dependencies << a unless !project.iml? || existing_deps.include?(a.to_s)
-          project.compile.dependencies << a unless existing_deps.include?(a.to_s)
+          unless options[:skip_merge_gwt_dependencies]
+            project.iml.main_dependencies << a unless !project.iml? || existing_deps.include?(a.to_s)
+            project.compile.dependencies << a unless existing_deps.include?(a.to_s)
+          end
           additional_gwt_deps << a
         end
 

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
@@ -48,7 +48,6 @@ define 'buildr' do
       spec.author             = 'Apache Buildr'
       spec.email              = 'users@buildr.apache.org'
       spec.homepage           = "http://buildr.apache.org"
-      spec.rubyforge_project  = 'buildr'
       spec.extra_rdoc_files   = legal
       spec.rdoc_options << '--webcvs' << 'https://github.com/apache/buildr'
       spec.add_dependency 'buildr', '~> 1.3'

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/_layouts/default.html

@@ -47,7 +47,7 @@
           <li>Reference
             <ol class="toc">
               <li><a href='rdoc/Buildr.html'>API</a></li>
-              <li><a href='http://docs.rubyrake.org'>Rake</a></li>
+              <li><a href='https://github.com/ruby/rake'>Rake</a></li>
               <li><a href='https://rubygems.org/gems/Antwrap'>Antwrap</a></li>
               <li><a href='http://cwiki.apache.org/confluence/display/BUILDR/Common+Problems+and+Solutions'>Troubleshooting</a></li>
             </ol>

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,40 @@ 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://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://archive.apache.org/dist/buildr/1.5.6/KEYS)
+
+
 h3. buildr 1.5.5 (2017-12-06)
 
 |_. Package |_. MD5 Checksum |_. PGP |
-| "buildr-1.5.5.gem":http://www.apache.org/dyn/closer.cgi/buildr/1.5.5/buildr-1.5.5.gem | "8bd720d1c4c96f5904c09b70c95aede3":http://www.apache.org/dist/buildr/1.5.5/buildr-1.5.5.gem.md5 | "Sig":http://www.apache.org/dist/buildr/1.5.5/buildr-1.5.5.gem.asc |
-| "buildr-1.5.5-java.gem":http://www.apache.org/dyn/closer.cgi/buildr/1.5.5/buildr-1.5.5-java.gem | "8c009622ed7c9b1bbc576c5df298d9df":http://www.apache.org/dist/buildr/1.5.5/buildr-1.5.5-java.gem.md5 | "Sig":http://www.apache.org/dist/buildr/1.5.5/buildr-1.5.5-java.gem.asc |
-| "buildr-1.5.5-x86-mswin32.gem":http://www.apache.org/dyn/closer.cgi/buildr/1.5.5/buildr-1.5.5-x86-mswin32.gem | "04f7af088b3ec99cdf72c58ea7c3ee67":http://www.apache.org/dist/buildr/1.5.5/buildr-1.5.5-x86-mswin32.gem.md5 | "Sig":http://www.apache.org/dist/buildr/1.5.5/buildr-1.5.5-x86-mswin32.gem.asc |
-| "buildr-1.5.5.tgz":http://www.apache.org/dyn/closer.cgi/buildr/1.5.5/buildr-1.5.5.tgz | "1aab23f1cd19bcbd3c8f48afb488e8ff":http://www.apache.org/dist/buildr/1.5.5/buildr-1.5.5.tgz.md5 | "Sig":http://www.apache.org/dist/buildr/1.5.5/buildr-1.5.5.tgz.asc |
-| "buildr-1.5.5.zip":http://www.apache.org/dyn/closer.cgi/buildr/1.5.5/buildr-1.5.5.zip | "9d1f076927cc2f565875c7f38e5afe69":http://www.apache.org/dist/buildr/1.5.5/buildr-1.5.5.zip.md5 | "Sig":http://www.apache.org/dist/buildr/1.5.5/buildr-1.5.5.zip.asc |
+| "buildr-1.5.5.gem":http://archive.apache.org/dist/buildr/1.5.5/buildr-1.5.5.gem | "8bd720d1c4c96f5904c09b70c95aede3":http://archive.apache.org/dist/buildr/1.5.5/buildr-1.5.5.gem.md5 | "Sig":http://archive.apache.org/dist/buildr/1.5.5/buildr-1.5.5.gem.asc |
+| "buildr-1.5.5-java.gem":http://archive.apache.org/dist/buildr/1.5.5/buildr-1.5.5-java.gem | "8c009622ed7c9b1bbc576c5df298d9df":http://archive.apache.org/dist/buildr/1.5.5/buildr-1.5.5-java.gem.md5 | "Sig":http://archive.apache.org/dist/buildr/1.5.5/buildr-1.5.5-java.gem.asc |
+| "buildr-1.5.5-x86-mswin32.gem":http://archive.apache.org/dist/buildr/1.5.5/buildr-1.5.5-x86-mswin32.gem | "04f7af088b3ec99cdf72c58ea7c3ee67":http://archive.apache.org/dist/buildr/1.5.5/buildr-1.5.5-x86-mswin32.gem.md5 | "Sig":http://archive.apache.org/dist/buildr/1.5.5/buildr-1.5.5-x86-mswin32.gem.asc |
+| "buildr-1.5.5.tgz":http://archive.apache.org/dist/buildr/1.5.5/buildr-1.5.5.tgz | "1aab23f1cd19bcbd3c8f48afb488e8ff":http://archive.apache.org/dist/buildr/1.5.5/buildr-1.5.5.tgz.md5 | "Sig":http://archive.apache.org/dist/buildr/1.5.5/buildr-1.5.5.tgz.asc |
+| "buildr-1.5.5.zip":http://archive.apache.org/dist/buildr/1.5.5/buildr-1.5.5.zip | "9d1f076927cc2f565875c7f38e5afe69":http://archive.apache.org/dist/buildr/1.5.5/buildr-1.5.5.zip.md5 | "Sig":http://archive.apache.org/dist/buildr/1.5.5/buildr-1.5.5.zip.asc |
 
-p>. ("Release signing keys":http://www.apache.org/dist/buildr/1.5.5/KEYS)
+p>. ("Release signing keys":http://archive.apache.org/dist/buildr/1.5.5/KEYS)
 
 
 h3. buildr 1.5.4 (2017-11-29)

data/doc/index.textile

@@ -46,43 +46,34 @@ So let's get started.  You can "read the documentation online":quick_start.html,
 
 h2(#news).  What's New
 
-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.
+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
+          passing them to HTTP library is now been applied.
+* Change: GWT Addon: Added support for `:skip_merge_gwt_dependencies` parameter that makes it possible to
+          avoid adding GWT dependencies to the project directly and thus the associated POM. This will be
+          required to support GWT3.x and GWT2.x simultaneously as well as making it easier to manage
+          dependencies in the POMs.
+* Change: Javadoc: If the user does not supply an explicit `:sourcepath` to the doc/javadoc tool then
+          default the value to `project.compile.sources`. This will stop javadoc from scanning the classpath
+          for `*.java` files which can cause issues with projects that include `sources` classifier artifacts
+          on the classpath. This is particularly relevant for GWT based projects that include artifacts with
+          source embedded in the artifacts. This change also made it possible to remove an ugly hack in the
+          GWT addon that removed the gwt artifacts from the javadoc path.
+* Change: Drop deprecated Gem::Specification#has_rdoc= (no replacement) method. Submitted by Olle Jonsson.
+* 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.
 
 This is a partial list -- see the "CHANGELOG":CHANGELOG for full details.
 

data/doc/installing.textile

@@ -27,7 +27,7 @@ If you are running behind a proxy server, make sure the environment variable @HT
 
 <br>
 
-*In details:* The @gem install@ and @gem update@ commands install Buildr from a binary distribution provided through "RubyForge":http://rubyforge.org/projects/buildr. This distribution is maintained by contributors to this project, but is *not* an official Apache distribution.  You can obtain the official Apache distribution files from the "download page":download.html.
+*In details:* The @gem install@ and @gem update@ commands install Buildr from a binary distribution provided through "RubyGems":https://rubygems.org/gems/buildr. This distribution is maintained by contributors to this project, but is *not* an official Apache distribution.  You can obtain the official Apache distribution files from the "download page":download.html.
 
 Older versions of RubyGems are all kind of fail.  You want to avoid these unless you have the patience to install each Buildr dependency manually.  Get RubyGems 1.3.1 or later, and when using Debian packages (e.g. Ubuntu), make sure to get the unmolested RubyGems straight form the source.
 
@@ -287,7 +287,7 @@ h2(#more). Learning More
 
 For a quicker read (and much more humor), "Why’s (Poignant) Guide to Ruby":http://poignantguide.net/ruby/ is available online.  More resources are listed on the "ruby-lang web site":http://www.ruby-lang.org/en/documentation/.
 
-*Rake* Buildr is based on Rake, a Ruby build system that handles tasks and dependencies.  Check out the "Rake documentation":http://docs.rubyrake.org/ for more information.
+*Rake* Buildr is based on Rake, a Ruby build system that handles tasks and dependencies.  Check out the "Rake documentation":https://github.com/ruby/rake for more information.
 
 *AntWrap* Buildr uses AntWrap, for configuring and running Ant tasks.  You can learn more from the "Antwrap documentation":https://rubygems.org/gems/Antwrap.
 

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/core/project.rb

@@ -127,7 +127,7 @@ module Buildr #:nodoc:
   #   buildr compile
   # from the command line, it will execute the compile task of the current project.
   #
-  # Projects and sub-projects follow a directory heirarchy. The Buildfile is assumed to
+  # Projects and sub-projects follow a directory hierarchy. The Buildfile is assumed to
   # reside in the same directory as the top-level project, and each sub-project is
   # contained in a sub-directory in the same name. For example:
   #   /home/foo
@@ -223,7 +223,7 @@ module Buildr #:nodoc:
           end
 
           # Top-level project? Invoke the project definition. Sub-project? We don't invoke
-          # the project definiton yet (allow project calls to establish order of evaluation),
+          # the project definition yet (allow project calls to establish order of evaluation),
           # but must do so before the parent project's definition is done.
           project.parent.enhance { project.invoke } if project.parent
         end

data/lib/buildr/core/transports.rb

@@ -335,7 +335,7 @@ module URI
         end
         headers = { 'Content-MD5'=>Digest::MD5.hexdigest(content.string), 'Content-Type'=>'application/octet-stream', 'User-Agent'=>"Buildr-#{Buildr::VERSION}" }
         request = Net::HTTP::Put.new(request_uri.empty? ? '/' : request_uri, headers)
-        request.basic_auth self.user, self.password if self.user
+        request.basic_auth URI.decode(self.user), URI.decode(self.password) if self.user
         response = nil
         with_progress_bar options[:progress], path.split('/').last, content.size do |progress|
           request.content_length = content.size

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
@@ -61,6 +62,7 @@ module Buildr #:nodoc:
           end
         [:sourcepath, :classpath].each do |option|
           Array(options[option]).flatten.tap do |paths|
+            paths = project.compile.sources if :sourcepath == option && options[option].nil?
             cmd_args << "-#{option}" << paths.flatten.map(&:to_s).join(File::PATH_SEPARATOR) unless paths.empty?
           end
         end