buildr 1.5.6-java → 1.5.7-java

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 2ee490802cd6a7da37971c0674a68408a489c5bb
4
- data.tar.gz: 0c500b68a529bbe266bc05e0850f8d767c63f250
3
+ metadata.gz: 4979576a237201f0c96f2b946838d12322760aef
4
+ data.tar.gz: 7c479a1ff3e57cc4ddb8b60634d1e86aded682f2
5
5
  SHA512:
6
- metadata.gz: 8d4379518b3d33cc0fce4ec4628be3b5bad1c7b3a0131d67b275cdb87b6d69aa1a01488d73b1fbb027b4daeb17ca2663f2df5d05e703d3de9b3258f6ca2bbfb6
7
- data.tar.gz: 498eeeef59c7bcd1d9f6e1a0a093186cb7e929341dc622467b9f46bc959008801bee9637ca0dbc26c09b6ff434985d0c426a78b2cced717c14bf4ebc4502a9d6
6
+ metadata.gz: ab8f9ccaf8ffc62d25d1932f628a47fc5700bc535342495945c39762f510000701e3987b0c84dfd9359a9dffa4d8fe54be7d3d210e5674ffe7e8ac330075d3a6
7
+ data.tar.gz: 6c665174fcf1f71031275d9893791c372333639f1869e3f12505b0e0bb32c60c24f5d9545d67679fe627000414578c719d61a4a0e43e7232d185c52732d236dd
data/CHANGELOG CHANGED
@@ -1,3 +1,23 @@
1
+ 1.5.7 (2019-02-16)
2
+ * Fixed: The fix that allowed special characters in usernames and passwords was only partially applied
3
+ in the `1.5.6` release. The complete fix that correctly decoded usernames and passwords before
4
+ passing them to HTTP library is now been applied.
5
+ * Change: GWT Addon: Added support for `:skip_merge_gwt_dependencies` parameter that makes it possible to
6
+ avoid adding GWT dependencies to the project directly and thus the associated POM. This will be
7
+ required to support GWT3.x and GWT2.x simultaneously as well as making it easier to manage
8
+ dependencies in the POMs.
9
+ * Change: Javadoc: If the user does not supply an explicit `:sourcepath` to the doc/javadoc tool then
10
+ default the value to `project.compile.sources`. This will stop javadoc from scanning the classpath
11
+ for `*.java` files which can cause issues with projects that include `sources` classifier artifacts
12
+ on the classpath. This is particularly relevant for GWT based projects that include artifacts with
13
+ source embedded in the artifacts. This change also made it possible to remove an ugly hack in the
14
+ GWT addon that removed the gwt artifacts from the javadoc path.
15
+ * Change: Drop deprecated Gem::Specification#has_rdoc= (no replacement) method. Submitted by Olle Jonsson.
16
+ * Change: Use https protocol to access Gem metadata. Submitted by Olle Jonsson.
17
+ * Change: Change RSpec shared_context usage to avoid warnings. Submitted by Olle Jonsson.
18
+ * Change: Migrated source control to Apache GitBox which supports using either GitHub or GitBox as the
19
+ master repository.
20
+
1
21
  1.5.6 (2018-05-10)
2
22
  * Fixed: Ensure that the username and passwords declared for repositories are correctly url encoded for
3
23
  the upload repositories when converted to a URL. (i.e. Ensure `Buildr.repositories.release_to`
@@ -28,8 +28,8 @@ http://buildr.apache.org/
28
28
  === RTFM
29
29
 
30
30
  * Buildr documentation: http://buildr.apache.org
31
- * More about Rake: http://docs.rubyrake.org
32
- * Antwrap documentation: http://antwrap.rubyforge.org
31
+ * More about Rake: https://github.com/ruby/rake
32
+ * Antwrap documentation: https://rubygems.org/gems/Antwrap
33
33
 
34
34
 
35
35
  === Mailing list
data/Rakefile CHANGED
@@ -30,7 +30,7 @@ end
30
30
 
31
31
  # Load the Gem specification for the current platform (Ruby or JRuby).
32
32
  def spec(platform = RUBY_PLATFORM[/java/] || 'ruby')
33
- @specs ||= ['ruby', 'java', 'x86-mswin32'].inject({}) { |hash, spec_platform|
33
+ @specs ||= %w(ruby java x86-mswin32).inject({}) { |hash, spec_platform|
34
34
  ENV['BUILDR_PLATFORM'] = spec_platform
35
35
  hash.update(spec_platform=> Gem::Specification.load('buildr.gemspec'))
36
36
  Gem::Specification._clear_load_cache
@@ -236,11 +236,6 @@ module Buildr
236
236
  module ProjectExtension
237
237
  include Extension
238
238
 
239
- after_define(:doc) do |project|
240
- # Remove gwt artifacts when performing javadocs as the gwt jars have invalid source files
241
- project.doc.classpath.delete_if { |f| f.to_s =~ /.*\/com\/google\/gwt\/gwt-.*/ }
242
- end
243
-
244
239
  first_time do
245
240
  desc 'Run C22 to GSS converter. Set css files via environment variable CSS_FILES'
246
241
  task('css2gss') do
@@ -274,8 +269,10 @@ module Buildr
274
269
  Buildr::GWT.dependencies(version).each do |d|
275
270
  a = artifact(d)
276
271
  a.invoke if a.respond_to?(:invoke)
277
- project.iml.main_dependencies << a unless !project.iml? || existing_deps.include?(a.to_s)
278
- project.compile.dependencies << a unless existing_deps.include?(a.to_s)
272
+ unless options[:skip_merge_gwt_dependencies]
273
+ project.iml.main_dependencies << a unless !project.iml? || existing_deps.include?(a.to_s)
274
+ project.compile.dependencies << a unless existing_deps.include?(a.to_s)
275
+ end
279
276
  additional_gwt_deps << a
280
277
  end
281
278
 
@@ -48,7 +48,6 @@ define 'buildr' do
48
48
  spec.author = 'Apache Buildr'
49
49
  spec.email = 'users@buildr.apache.org'
50
50
  spec.homepage = "http://buildr.apache.org"
51
- spec.rubyforge_project = 'buildr'
52
51
  spec.extra_rdoc_files = legal
53
52
  spec.rdoc_options << '--webcvs' << 'https://github.com/apache/buildr'
54
53
  spec.add_dependency 'buildr', '~> 1.3'
@@ -47,7 +47,7 @@
47
47
  <li>Reference
48
48
  <ol class="toc">
49
49
  <li><a href='rdoc/Buildr.html'>API</a></li>
50
- <li><a href='http://docs.rubyrake.org'>Rake</a></li>
50
+ <li><a href='https://github.com/ruby/rake'>Rake</a></li>
51
51
  <li><a href='https://rubygems.org/gems/Antwrap'>Antwrap</a></li>
52
52
  <li><a href='http://cwiki.apache.org/confluence/display/BUILDR/Common+Problems+and+Solutions'>Troubleshooting</a></li>
53
53
  </ol>
@@ -18,16 +18,28 @@ The source code is included in both source and binary distribution, the Gem dist
18
18
 
19
19
  h2(#dist). Binaries and Source Code
20
20
 
21
+ h3. buildr 1.5.6 (2018-05-10)
22
+
23
+ |_. Package |_. MD5 Checksum |_. PGP |
24
+ | "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 |
25
+ | "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 |
26
+ | "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 |
27
+ | "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 |
28
+ | "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 |
29
+
30
+ p>. ("Release signing keys":http://www.apache.org/dist/buildr/1.5.6/KEYS)
31
+
32
+
21
33
  h3. buildr 1.5.5 (2017-12-06)
22
34
 
23
35
  |_. Package |_. MD5 Checksum |_. PGP |
24
- | "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 |
25
- | "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 |
26
- | "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 |
27
- | "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 |
28
- | "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 |
36
+ | "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 |
37
+ | "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 |
38
+ | "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 |
39
+ | "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 |
40
+ | "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 |
29
41
 
30
- p>. ("Release signing keys":http://www.apache.org/dist/buildr/1.5.5/KEYS)
42
+ p>. ("Release signing keys":http://archive.apache.org/dist/buildr/1.5.5/KEYS)
31
43
 
32
44
 
33
45
  h3. buildr 1.5.4 (2017-11-29)
@@ -46,6 +46,24 @@ So let's get started. You can "read the documentation online":quick_start.html,
46
46
 
47
47
  h2(#news). What's New
48
48
 
49
+ Highlights from Buildr 1.5.7 (2019-02-16)
50
+ * Fixed: The fix that allowed special characters in usernames and passwords was only partially applied
51
+ in the `1.5.6` release. The complete fix that correctly decoded usernames and passwords before
52
+ passing them to HTTP library is now been applied.
53
+ * Change: GWT Addon: Added support for `:skip_merge_gwt_dependencies` parameter that makes it possible to
54
+ avoid adding GWT dependencies to the project directly and thus the associated POM. This will be
55
+ required to support GWT3.x and GWT2.x simultaneously as well as making it easier to manage
56
+ dependencies in the POMs.
57
+ * Change: Javadoc: If the user does not supply an explicit `:sourcepath` to the doc/javadoc tool then
58
+ default the value to `project.compile.sources`. This will stop javadoc from scanning the classpath
59
+ for `*.java` files which can cause issues with projects that include `sources` classifier artifacts
60
+ on the classpath. This is particularly relevant for GWT based projects that include artifacts with
61
+ source embedded in the artifacts. This change also made it possible to remove an ugly hack in the
62
+ GWT addon that removed the gwt artifacts from the javadoc path.
63
+ * Change: Drop deprecated Gem::Specification#has_rdoc= (no replacement) method. Submitted by Olle Jonsson.
64
+ * Change: Use https protocol to access Gem metadata. Submitted by Olle Jonsson.
65
+ * Change: Change RSpec shared_context usage to avoid warnings. Submitted by Olle Jonsson.
66
+
49
67
  Highlights from Buildr 1.5.6 (2018-05-10)
50
68
  * Fixed: Ensure that the username and passwords declared for repositories are correctly url encoded for
51
69
  the upload repositories when converted to a URL. (i.e. Ensure `Buildr.repositories.release_to`
@@ -27,7 +27,7 @@ If you are running behind a proxy server, make sure the environment variable @HT
27
27
 
28
28
  <br>
29
29
 
30
- *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.
30
+ *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.
31
31
 
32
32
  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.
33
33
 
@@ -287,7 +287,7 @@ h2(#more). Learning More
287
287
 
288
288
  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/.
289
289
 
290
- *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.
290
+ *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.
291
291
 
292
292
  *AntWrap* Buildr uses AntWrap, for configuring and running Ant tasks. You can learn more from the "Antwrap documentation":https://rubygems.org/gems/Antwrap.
293
293
 
@@ -127,7 +127,7 @@ module Buildr #:nodoc:
127
127
  # buildr compile
128
128
  # from the command line, it will execute the compile task of the current project.
129
129
  #
130
- # Projects and sub-projects follow a directory heirarchy. The Buildfile is assumed to
130
+ # Projects and sub-projects follow a directory hierarchy. The Buildfile is assumed to
131
131
  # reside in the same directory as the top-level project, and each sub-project is
132
132
  # contained in a sub-directory in the same name. For example:
133
133
  # /home/foo
@@ -223,7 +223,7 @@ module Buildr #:nodoc:
223
223
  end
224
224
 
225
225
  # Top-level project? Invoke the project definition. Sub-project? We don't invoke
226
- # the project definiton yet (allow project calls to establish order of evaluation),
226
+ # the project definition yet (allow project calls to establish order of evaluation),
227
227
  # but must do so before the parent project's definition is done.
228
228
  project.parent.enhance { project.invoke } if project.parent
229
229
  end
@@ -335,7 +335,7 @@ module URI
335
335
  end
336
336
  headers = { 'Content-MD5'=>Digest::MD5.hexdigest(content.string), 'Content-Type'=>'application/octet-stream', 'User-Agent'=>"Buildr-#{Buildr::VERSION}" }
337
337
  request = Net::HTTP::Put.new(request_uri.empty? ? '/' : request_uri, headers)
338
- request.basic_auth self.user, self.password if self.user
338
+ request.basic_auth URI.decode(self.user), URI.decode(self.password) if self.user
339
339
  response = nil
340
340
  with_progress_bar options[:progress], path.split('/').last, content.size do |progress|
341
341
  request.content_length = content.size
@@ -61,6 +61,7 @@ module Buildr #:nodoc:
61
61
  end
62
62
  [:sourcepath, :classpath].each do |option|
63
63
  Array(options[option]).flatten.tap do |paths|
64
+ paths = project.compile.sources if :sourcepath == option && options[option].nil?
64
65
  cmd_args << "-#{option}" << paths.flatten.map(&:to_s).join(File::PATH_SEPARATOR) unless paths.empty?
65
66
  end
66
67
  end
@@ -292,7 +292,7 @@ module Buildr #:nodoc:
292
292
 
293
293
  def dependencies
294
294
  return ["org.testng:testng:jar:jdk15:#{version}"] + JMock.dependencies if version < '6.0'
295
- ["org.testng:testng:jar:#{version}",'com.beust:jcommander:jar:1.27'] + JMock.dependencies
295
+ %W(org.testng:testng:jar:#{version} com.beust:jcommander:jar:1.27) + JMock.dependencies
296
296
  end
297
297
  end
298
298
 
@@ -309,11 +309,11 @@ module Buildr #:nodoc:
309
309
  cmd_args << '-log' << '2'
310
310
  cmd_args << '-d' << task.report_to.to_s
311
311
  exclude_args = options[:excludegroups] || []
312
- if !exclude_args.empty?
312
+ unless exclude_args.empty?
313
313
  cmd_args << '-excludegroups' << exclude_args.join(',')
314
314
  end
315
315
  groups_args = options[:groups] || []
316
- if !groups_args.empty?
316
+ unless groups_args.empty?
317
317
  cmd_args << '-groups' << groups_args.join(',')
318
318
  end
319
319
  # run all tests in the same suite
@@ -376,7 +376,7 @@ module Buildr #:nodoc:
376
376
  def dependencies #:nodoc:
377
377
  unless @dependencies
378
378
  @dependencies = TestFramework::Java.dependencies
379
- @dependencies += @frameworks.map { |f| f.dependencies }.flatten
379
+ @dependencies += @frameworks.map(&:dependencies).flatten
380
380
  end
381
381
  @dependencies
382
382
  end
@@ -130,7 +130,7 @@ module Buildr #:nodoc:
130
130
  # Sometimes users would need to change the default artifact versions used by some
131
131
  # module, for example, the XMLBeans compiler needs this, because of compatibility
132
132
  # issues. Another example would be to select the groovy version to use on all our
133
- # projects so that Buildr modules requiring groovy jars can use user prefered versions.
133
+ # projects so that Buildr modules requiring groovy jars can use user preferred versions.
134
134
  #
135
135
  # To meet this goal, an ArtifactNamespace allows to specify ArtifactRequirement objects.
136
136
  # In fact the only difference with the examples you have already seen is that requirements
@@ -194,7 +194,7 @@ module Buildr #:nodoc:
194
194
  #
195
195
  # A more advanced example using ArtifactRequirement listeners is included
196
196
  # in the artifact_namespace_spec.rb description for 'Extension using ArtifactNamespace'
197
- # That's it for addon writers, now, users can select their prefered version with
197
+ # That's it for addon writers, now, users can select their preferred version with
198
198
  # something like:
199
199
  #
200
200
  # require 'buildr/xmlbeans'
@@ -413,7 +413,7 @@ module Buildr #:nodoc:
413
413
  # The last part consist of a VersionRequirement.
414
414
  # -> ( >2 & <4)
415
415
  #
416
- # VersionRequirement supports RubyGem's comparision operators
416
+ # VersionRequirement supports RubyGem's comparison operators
417
417
  # in adition to parens, logical and, logical or and negation.
418
418
  # See the docs for VersionRequirement for more info on operators.
419
419
  def initialize(spec)
@@ -65,7 +65,6 @@ module Buildr #:nodoc:
65
65
  spec.name = id
66
66
  spec.version = version.gsub('-','.') # RubyGems doesn't like '-' in version numbers
67
67
  spec.summary = full_comment
68
- spec.has_rdoc = true
69
68
  spec.rdoc_options << '--title' << comment
70
69
  spec.require_path = 'lib'
71
70
  end
@@ -14,5 +14,5 @@
14
14
  # the License.
15
15
 
16
16
  module Buildr #:nodoc:
17
- VERSION = '1.5.6'.freeze
17
+ VERSION = '1.5.7'.freeze
18
18
  end
@@ -36,6 +36,7 @@ RSpec::Core::RakeTask.new :spec => ['_reports', :compile] do |task|
36
36
  ENV['USE_FSC'] = 'no'
37
37
  files = FileList['spec/**/*_spec.rb']
38
38
  files = files.delete_if {|f| f =~ /^spec\/groovy\//} if RUBY_PLATFORM[/java/]
39
+ task.rspec_path = 'bundle exec rspec'
39
40
  task.rspec_files = files
40
41
  task.rspec_opts = %w{--order random:123 --format html --out _reports/specs.html --backtrace}
41
42
  end
@@ -16,7 +16,7 @@
16
16
 
17
17
  require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helpers'))
18
18
 
19
- shared_examples_for 'local task' do
19
+ RSpec.shared_examples 'local task' do
20
20
  it "should execute task for project in current directory" do
21
21
  define 'foobar'
22
22
  lambda { @task.invoke }.should run_task("foobar:#{@task.name}")
@@ -387,7 +387,7 @@ describe Release do
387
387
  end
388
388
 
389
389
 
390
- shared_examples_for 'a release process' do
390
+ RSpec.shared_examples 'a release process' do
391
391
 
392
392
  describe '#make' do
393
393
  before do
@@ -343,7 +343,7 @@ end
343
343
 
344
344
  describe Buildr::Checks::Expectation do
345
345
 
346
- shared_examples_for 'all archive types' do
346
+ RSpec.shared_examples 'all archive types' do
347
347
 
348
348
  before do
349
349
  archive = @archive
@@ -141,7 +141,7 @@ describe Buildr::CompileTask, '#compiler' do
141
141
  end
142
142
  end
143
143
 
144
- it 'should allow supressing compilation' do
144
+ it 'should allow suppressing compilation' do
145
145
  write 'src/main/java/package/Test.java', 'class Test {}'
146
146
  define 'foo' do
147
147
  compile.sources.clear
@@ -428,7 +428,7 @@ describe Buildr::CompileTask, '#invoke' do
428
428
  end
429
429
 
430
430
 
431
- shared_examples_for 'accessor task' do
431
+ RSpec.shared_examples 'accessor task' do
432
432
  it 'should return a task' do
433
433
  define('foo').send(@task_name).should be_kind_of(Rake::Task)
434
434
  end
@@ -102,7 +102,7 @@ describe Project, '.shell' do
102
102
  end
103
103
  end
104
104
 
105
- shared_examples_for "shell provider" do
105
+ RSpec.shared_examples "shell provider" do
106
106
 
107
107
  it 'should have launch method accepting shell task' do
108
108
  @instance.method(:launch).should_not be_nil
@@ -375,6 +375,7 @@ describe URI::HTTP, '#write' do
375
375
  @uri = URI('http://john:secret@host.domain/foo/bar/baz.jar')
376
376
  @http = double('Net::HTTP')
377
377
  @http.stub(:request).and_return(Net::HTTPOK.new(nil, nil, nil))
378
+ @http.should_receive(:read_timeout=).with(500)
378
379
  Net::HTTP.stub(:new).and_return(@http)
379
380
  end
380
381
 
@@ -382,7 +382,7 @@ MANIFEST
382
382
  write 'src/test/java/Test.java'
383
383
  end
384
384
 
385
- shared_examples_for 'source' do
385
+ RSpec.shared_examples 'source' do
386
386
  it 'should ignore CVS and SVN files' do
387
387
  define('foo')
388
388
  classpath_sources('excluding').each do |excluding_attribute|
@@ -53,7 +53,7 @@ describe Project, '#manifest' do
53
53
  end
54
54
 
55
55
 
56
- shared_examples_for 'package with manifest' do
56
+ RSpec.shared_examples 'package with manifest' do
57
57
  before do
58
58
  @long_line = 'No line may be longer than 72 bytes (not characters), in its UTF8-encoded form. If a value would make the initial line longer than this, it should be continued on extra lines (each starting with a single SPACE).'
59
59
  end
@@ -347,7 +347,7 @@ describe Project, '#meta_inf' do
347
347
  end
348
348
 
349
349
 
350
- shared_examples_for 'package with meta_inf' do
350
+ RSpec.shared_examples 'package with meta_inf' do
351
351
 
352
352
  def package_with_meta_inf(meta_inf = nil)
353
353
  packaging = @packaging
@@ -1258,7 +1258,7 @@ describe Packaging, 'test_jar' do
1258
1258
  end
1259
1259
  end
1260
1260
 
1261
- shared_examples_for 'package_with_' do
1261
+ RSpec.shared_examples 'package_with_' do
1262
1262
 
1263
1263
  def prepare(options = {})
1264
1264
  packager = "package_with_#{@packaging}"
@@ -53,7 +53,7 @@ module TestCoverageHelper
53
53
  end
54
54
  end
55
55
 
56
- shared_examples_for 'test coverage tool' do
56
+ RSpec.shared_examples 'test coverage tool' do
57
57
  include TestCoverageHelper
58
58
 
59
59
  def toolname
@@ -17,7 +17,7 @@
17
17
  require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helpers'))
18
18
 
19
19
  # need to test both with and without KOTLIN_HOME
20
- share_as :KotlincCompiler do
20
+ RSpec.shared_examples 'KotlincCompiler' do
21
21
 
22
22
  it 'should identify itself from source directories' do
23
23
  write 'src/main/kotlin/com/example/Test.kt', "package com.example\n class Test { }"
@@ -110,7 +110,7 @@ share_as :KotlincCompiler do
110
110
  end
111
111
  end
112
112
 
113
- share_as :KotlincCompiler_CommonOptions do
113
+ RSpec.shared_examples 'KotlincCompiler_CommonOptions' do
114
114
 
115
115
  it 'should set warnings option to false by default' do
116
116
  compile_task.options.warnings.should be_false
@@ -240,8 +240,8 @@ if Java.java.lang.System.getProperty("java.runtime.version") >= "1.8"
240
240
  @compile_task ||= define('foo').compile.using(:kotlinc)
241
241
  end
242
242
 
243
- it_should_behave_like KotlincCompiler
244
- it_should_behave_like KotlincCompiler_CommonOptions
243
+ it_should_behave_like 'KotlincCompiler'
244
+ it_should_behave_like 'KotlincCompiler_CommonOptions'
245
245
  end
246
246
  end
247
247
 
@@ -264,11 +264,11 @@ if Java.java.lang.System.getProperty("java.runtime.version") >= "1.8"
264
264
  compile_task.instance_eval { @compiler }.send(:kotlinc_args)
265
265
  end
266
266
 
267
- it_should_behave_like KotlincCompiler
268
- it_should_behave_like KotlincCompiler_CommonOptions
267
+ it_should_behave_like 'KotlincCompiler'
268
+ it_should_behave_like 'KotlincCompiler_CommonOptions'
269
269
 
270
270
  after :all do
271
271
  ENV['KOTLIN_HOME'] = old_home
272
272
  end
273
273
  end
274
- end
274
+ end
@@ -60,7 +60,7 @@ module ArchiveTaskHelpers
60
60
  end
61
61
  end
62
62
 
63
- shared_examples_for 'ArchiveTask' do
63
+ RSpec.shared_examples 'ArchiveTask' do
64
64
  include ArchiveTaskHelpers
65
65
 
66
66
  before(:each) do
@@ -14,7 +14,7 @@
14
14
  # the License.
15
15
 
16
16
 
17
- shared_examples_for 'packaging' do
17
+ RSpec.shared_examples 'packaging' do
18
18
  it 'should create artifact of proper type' do
19
19
  packaging = @packaging
20
20
  package_type = @package_type || @packaging
@@ -17,7 +17,7 @@
17
17
  require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helpers'))
18
18
 
19
19
  # need to test both with and without SCALA_HOME
20
- share_as :ScalacCompiler do
20
+ RSpec.shared_examples 'ScalacCompiler' do
21
21
 
22
22
  it 'should identify itself from source directories' do
23
23
  write 'src/main/scala/com/example/Test.scala', 'package com.example; class Test { val i = 1 }'
@@ -118,7 +118,7 @@ if ENV['SCALA_HOME']
118
118
  ENV['SCALA_HOME'].should_not be_nil
119
119
  end
120
120
 
121
- it_should_behave_like ScalacCompiler
121
+ it_should_behave_like 'ScalacCompiler'
122
122
  end
123
123
  end
124
124
 
@@ -133,14 +133,14 @@ describe 'scala compiler (downloaded from repository)' do
133
133
  ENV['SCALA_HOME'].should be_nil
134
134
  end
135
135
 
136
- it_should_behave_like ScalacCompiler
136
+ it_should_behave_like 'ScalacCompiler'
137
137
 
138
138
  after :all do
139
139
  ENV['SCALA_HOME'] = old_home
140
140
  end
141
141
  end
142
142
 
143
- share_as :ScalacCompiler_CommonOptions do
143
+ RSpec.shared_examples 'ScalacCompiler_CommonOptions' do
144
144
 
145
145
  it 'should set warnings option to false by default' do
146
146
  compile_task.options.warnings.should be_false
@@ -275,7 +275,7 @@ end
275
275
 
276
276
  describe 'scala compiler 2.8 options' do
277
277
 
278
- it_should_behave_like ScalacCompiler_CommonOptions
278
+ it_should_behave_like 'ScalacCompiler_CommonOptions'
279
279
 
280
280
  def compile_task
281
281
  @compile_task ||= define('foo').compile.using(:scalac)
@@ -298,7 +298,7 @@ end if Buildr::Scala.version?(2.8)
298
298
 
299
299
  describe 'scala compiler 2.9 options' do
300
300
 
301
- it_should_behave_like ScalacCompiler_CommonOptions
301
+ it_should_behave_like 'ScalacCompiler_CommonOptions'
302
302
 
303
303
  def compile_task
304
304
  @compile_task ||= define('foo').compile.using(:scalac)
@@ -345,7 +345,7 @@ describe 'zinc compiler (enabled through Buildr.settings)' do
345
345
  compile_task.invoke
346
346
  end
347
347
 
348
- it_should_behave_like ScalacCompiler
348
+ it_should_behave_like 'ScalacCompiler'
349
349
 
350
350
  after :each do
351
351
  Buildr.settings.build['scalac.incremental'] = nil
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: buildr
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.5.6
4
+ version: 1.5.7
5
5
  platform: java
6
6
  authors:
7
7
  - Apache Buildr
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2018-05-09 00:00:00.000000000 Z
11
+ date: 2019-02-16 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rake