buildr 1.4.23-x86-mswin32 → 1.4.24-x86-mswin32

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -43,7 +43,7 @@ module Buildr
43
43
  project.task("java2wsdl").enhance([project.compile.target])
44
44
 
45
45
  base_wsdl_dir = File.expand_path(options[:output_dir] || project._(:target, :generated, :wsgen, :main, :wsdl))
46
- project.iml.main_source_directories << base_wsdl_dir if project.iml?
46
+ project.iml.main_generated_source_directories << base_wsdl_dir if project.iml?
47
47
  project.file(base_wsdl_dir)
48
48
  project.task("java2wsdl").enhance([base_wsdl_dir])
49
49
 
@@ -182,7 +182,7 @@ module Buildr
182
182
  end
183
183
 
184
184
  project.compile.from ws_dir
185
- project.iml.main_source_directories << ws_dir if project.iml?
185
+ project.iml.main_generated_source_directories << ws_dir if project.iml?
186
186
  project.compile.enhance(['wsdl2java'])
187
187
 
188
188
  ws_dir
data/doc/download.textile CHANGED
@@ -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.4.23 (2015-06-12)
22
+
23
+ |_. Package |_. MD5 Checksum |_. PGP |
24
+ | "buildr-1.4.23-java.gem":http://www.apache.org/dyn/closer.cgi/buildr/1.4.23/buildr-1.4.23-java.gem | "e2e437989933c8602ba0b41b9bcc4988":http://www.apache.org/dist/buildr/1.4.23/buildr-1.4.23-java.gem.md5 | "Sig":http://www.apache.org/dist/buildr/1.4.23/buildr-1.4.23-java.gem.asc |
25
+ | "buildr-1.4.23-x86-mswin32.gem":http://www.apache.org/dyn/closer.cgi/buildr/1.4.23/buildr-1.4.23-x86-mswin32.gem | "0977069ebdf6b902b86f9c0a757d70c9":http://www.apache.org/dist/buildr/1.4.23/buildr-1.4.23-x86-mswin32.gem.md5 | "Sig":http://www.apache.org/dist/buildr/1.4.23/buildr-1.4.23-x86-mswin32.gem.asc |
26
+ | "buildr-1.4.23.gem":http://www.apache.org/dyn/closer.cgi/buildr/1.4.23/buildr-1.4.23.gem | "012cc3319768f8fa37f5743284d5ad31":http://www.apache.org/dist/buildr/1.4.23/buildr-1.4.23.gem.md5 | "Sig":http://www.apache.org/dist/buildr/1.4.23/buildr-1.4.23.gem.asc |
27
+ | "buildr-1.4.23.tgz":http://www.apache.org/dyn/closer.cgi/buildr/1.4.23/buildr-1.4.23.tgz | "40acd29febb55bec063ec8a77bf40fc1":http://www.apache.org/dist/buildr/1.4.23/buildr-1.4.23.tgz.md5 | "Sig":http://www.apache.org/dist/buildr/1.4.23/buildr-1.4.23.tgz.asc |
28
+ | "buildr-1.4.23.zip":http://www.apache.org/dyn/closer.cgi/buildr/1.4.23/buildr-1.4.23.zip | "f3ad77a50e4c8c88b91994ff6b703bcd":http://www.apache.org/dist/buildr/1.4.23/buildr-1.4.23.zip.md5 | "Sig":http://www.apache.org/dist/buildr/1.4.23/buildr-1.4.23.zip.asc |
29
+
30
+ p>. ("Release signing keys":http://www.apache.org/dist/buildr/1.4.23/KEYS)
31
+
32
+
21
33
  h3. buildr 1.4.22 (2015-02-28)
22
34
 
23
35
  |_. Package |_. MD5 Checksum |_. PGP |
24
- | "buildr-1.4.22-java.gem":http://www.apache.org/dyn/closer.cgi/buildr/1.4.22/buildr-1.4.22-java.gem | "f439a733481169889ad8f240c067b363":http://www.apache.org/dist/buildr/1.4.22/buildr-1.4.22-java.gem.md5 | "Sig":http://www.apache.org/dist/buildr/1.4.22/buildr-1.4.22-java.gem.asc |
25
- | "buildr-1.4.22-x86-mswin32.gem":http://www.apache.org/dyn/closer.cgi/buildr/1.4.22/buildr-1.4.22-x86-mswin32.gem | "511966d49f3933f40f195eb03e158c7b":http://www.apache.org/dist/buildr/1.4.22/buildr-1.4.22-x86-mswin32.gem.md5 | "Sig":http://www.apache.org/dist/buildr/1.4.22/buildr-1.4.22-x86-mswin32.gem.asc |
26
- | "buildr-1.4.22.gem":http://www.apache.org/dyn/closer.cgi/buildr/1.4.22/buildr-1.4.22.gem | "678061023447005438cd2e8c9d50be3b":http://www.apache.org/dist/buildr/1.4.22/buildr-1.4.22.gem.md5 | "Sig":http://www.apache.org/dist/buildr/1.4.22/buildr-1.4.22.gem.asc |
27
- | "buildr-1.4.22.tgz":http://www.apache.org/dyn/closer.cgi/buildr/1.4.22/buildr-1.4.22.tgz | "c4b2eb1aa508a039da0f1679d7dc78d9":http://www.apache.org/dist/buildr/1.4.22/buildr-1.4.22.tgz.md5 | "Sig":http://www.apache.org/dist/buildr/1.4.22/buildr-1.4.22.tgz.asc |
28
- | "buildr-1.4.22.zip":http://www.apache.org/dyn/closer.cgi/buildr/1.4.22/buildr-1.4.22.zip | "2b2aca5092cccd916f6504745ec3ff4d":http://www.apache.org/dist/buildr/1.4.22/buildr-1.4.22.zip.md5 | "Sig":http://www.apache.org/dist/buildr/1.4.22/buildr-1.4.22.zip.asc |
36
+ | "buildr-1.4.22-java.gem":http://archive.apache.org/dist/buildr/1.4.22/buildr-1.4.22-java.gem | "f439a733481169889ad8f240c067b363":http://archive.apache.org/dist/buildr/1.4.22/buildr-1.4.22-java.gem.md5 | "Sig":http://archive.apache.org/dist/buildr/1.4.22/buildr-1.4.22-java.gem.asc |
37
+ | "buildr-1.4.22-x86-mswin32.gem":http://archive.apache.org/dist/buildr/1.4.22/buildr-1.4.22-x86-mswin32.gem | "511966d49f3933f40f195eb03e158c7b":http://archive.apache.org/dist/buildr/1.4.22/buildr-1.4.22-x86-mswin32.gem.md5 | "Sig":http://archive.apache.org/dist/buildr/1.4.22/buildr-1.4.22-x86-mswin32.gem.asc |
38
+ | "buildr-1.4.22.gem":http://archive.apache.org/dist/buildr/1.4.22/buildr-1.4.22.gem | "678061023447005438cd2e8c9d50be3b":http://archive.apache.org/dist/buildr/1.4.22/buildr-1.4.22.gem.md5 | "Sig":http://archive.apache.org/dist/buildr/1.4.22/buildr-1.4.22.gem.asc |
39
+ | "buildr-1.4.22.tgz":http://archive.apache.org/dist/buildr/1.4.22/buildr-1.4.22.tgz | "c4b2eb1aa508a039da0f1679d7dc78d9":http://archive.apache.org/dist/buildr/1.4.22/buildr-1.4.22.tgz.md5 | "Sig":http://archive.apache.org/dist/buildr/1.4.22/buildr-1.4.22.tgz.asc |
40
+ | "buildr-1.4.22.zip":http://archive.apache.org/dist/buildr/1.4.22/buildr-1.4.22.zip | "2b2aca5092cccd916f6504745ec3ff4d":http://archive.apache.org/dist/buildr/1.4.22/buildr-1.4.22.zip.md5 | "Sig":http://archive.apache.org/dist/buildr/1.4.22/buildr-1.4.22.zip.asc |
29
41
 
30
- p>. ("Release signing keys":http://www.apache.org/dist/buildr/1.4.22/KEYS)
42
+ p>. ("Release signing keys":http://archive.apache.org/dist/buildr/1.4.22/KEYS)
31
43
 
32
44
 
33
45
  h3. buildr 1.4.21 (2014-11-28)
data/doc/index.textile CHANGED
@@ -46,30 +46,22 @@ 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.4.23 (2015-06-12)
50
- * Change: BUILDR-706 - Update the checkstyle addon use checkstyle 6.6. Submitted
51
- by Dieter Vrancken.
52
- * Fixed: Fix Buildr.rspec_present? so that it works under jruby 1.6.7.2
53
- * Change: BUILDR-705 - Avoid attempting to load rspec classes unless Buildr.rspec_present?
54
- returns true. Reported By rbpandey.
55
-
56
- Highlights from Buildr 1.4.22 (2015-02-28)
57
- * Change: BUILDR-704 - Updated the Sonar addon to support the latest version of SonarQube
58
- Runner. Submitted by Ross Mahony.
59
- * Change: Update the buildr gemspec so that rspec is no longer a required dependency.
60
- This enables end-users to use a different version of rspec and buildr in
61
- the same project. The rspec version MUST be be compatible with the version
62
- used by Buildr if rspec features are used from within Buildr. Buildr also
63
- issues a warning if the `check` method is called and rspec has not been loaded.
64
- The warning includes directions on how to resolve the issue. Submitted by r6p.
65
- * Fixed: A long standing bug existed such that if tests failed to compile, and the
66
- option Buildr.options.test is set to :all then the compilation error would
67
- not result in a failed build. As many people set the Buildr.options.test to
68
- :all in their continuous delivery/integration tools, this has caused some
69
- problems. This has been fixed by ensuring all the problems associated with
70
- the resolving the prerequisites are not caught when Buildr.options.test is
71
- set to :all.
72
- * Change: Update checkstyle to 6.1.1. Submitted by neher.
49
+ Highlights from Buildr 1.4.24 (2016-03-19)
50
+ * Added: Support the :no_invoke parameter being passed to Buildr.project() and
51
+ Buildr.projects() to avoid attempting to call invoke when retrieving the projects.
52
+ * Added: Add `exclude_paths` setting to pmd addon to allow paths to be explicitly excluded.
53
+ * Fixed: Update jDepend addon to ensure target directories are invoked prior to attempting
54
+ to analyze directories.
55
+ * Added: Add jdepend.additional_project_names configuration to jDepend addon to
56
+ ease merging in the source paths from multiple projects into one jDepend task.
57
+ * Added: Add findbugs.additional_project_names configuration to Findbugs addon to
58
+ ease merging in the source paths from multiple projects into one Findbugs task.
59
+ * Added: Add checkstyle.additional_project_names configuration to Checkstyle addon to
60
+ ease merging in the source paths from multiple projects into one Checkstyle task.
61
+ * Added: Add pmd.additional_project_names configuration to PMD addon to ease merging in
62
+ the source paths from multiple projects into one PMD task.
63
+ * Change: Update the default GWT version used in the GWT addon to the latest release 2.7.0.
64
+ * Change: Update the checkstyle addon to use checkstyle 6.12.1.
73
65
 
74
66
  This is a partial list -- see the "CHANGELOG":CHANGELOG for full details.
75
67
 
data/etc/KEYS CHANGED
@@ -318,3 +318,39 @@ AbKC6d82L04esDIV38wV9HjEH2n3gIqbMLlS19GXtMHodV/vnrX3qP2u4VobApsA
318
318
  vNcZccHdEbAhg06FGA6u16Jc
319
319
  =Kl2l
320
320
  -----END PGP PUBLIC KEY BLOCK-----
321
+ pub 2048R/5E469BCB 2016-03-10
322
+ uid [ultimate] Antoine Toulme <toulmean@apache.org>
323
+ sig 3 5E469BCB 2016-03-10 Antoine Toulme <toulmean@apache.org>
324
+ sub 2048R/C380C925 2016-03-10
325
+ sig 5E469BCB 2016-03-10 Antoine Toulme <toulmean@apache.org>
326
+
327
+ -----BEGIN PGP PUBLIC KEY BLOCK-----
328
+ Comment: GPGTools - https://gpgtools.org
329
+
330
+ mQENBFbhCrABCADBZJYY7g949txfE5JLHdp7AUE6Dd0g2pnYUjUHwjhW/oswym4U
331
+ AA9QIWORZcJx9C3DnilUwVtJS5TGc/RrB7P0EDQ499kKP5gdd+aFNiiVta+CXT0u
332
+ ic7KKYDnIlWWB/cxZCHdeGoLsd3tzY1D+Zt+asUP1Vaf8zUP1DGERJdBZFEs8Lpq
333
+ 5A9rD2KInc3XYnEebJa3zcxNTN1EqHHnGAIf1oOZKeWvBQVeYUw9JyA1qvNBrbXW
334
+ uLjj4I3EJUzJ4BYjqbxDQmKlPVyxdaUfeuBAwZm6k9xrYRZLQkMNT2TfR4uWeVHY
335
+ VwKMZKkJs4ZLtb32K3SzR3zUN1dkwHcsSFkFABEBAAG0JEFudG9pbmUgVG91bG1l
336
+ IDx0b3VsbWVhbkBhcGFjaGUub3JnPokBNwQTAQoAIQUCVuEKsAIbAwULCQgHAwUV
337
+ CgkICwUWAgMBAAIeAQIXgAAKCRABO3qJXkaby1frB/97UCrhW1+t+pPQ4ZeAzsLO
338
+ DdFxEHUBKsh/08K7gXqGt+C8sMWUL84yzrXJYMT4U3AI+JndSruxuFKa/k3xTp03
339
+ UkWWu7wG1OBp5LX2GXOZrtcIqYSRj0OIoiMxQalW83ThCK1bXEhNYM8AWvIhYmE+
340
+ C07Aev40zg1QZoKzqzxYFNdt6eerjVU+DUz5JQY/h51bsDF3hGhr1ZTSImy2whgG
341
+ fD6V0sm8OeVlqkr2JLMpzK07w71HD4x/OxConRZO6HJiQH96JJvrJb7sgnEH+yTq
342
+ rxLUviNr17NI7Cz4yQ0UM2RQlOWRwNaiS2yyqEFldfSZL6iXHvWsLzsCTD4VPdZt
343
+ uQENBFbhCrABCADHlgW/e2Y+EkHrM4/HSr0gi9UZdnmhCrtk6hEDdU13BLAqoSpR
344
+ YhUEa24m9r3BA6KpiIUVe3SJqKOdKYMGsUi9nUX+x6I8qGCxy+9YaTxiJxEZq41r
345
+ go9z8meNJRfzPKOmCvN8htXIXMNsfk41j6FuHpAkVixjPquGWhbgGatjXcsejJKJ
346
+ +sYKmeVmOcW+OZ6dm+HKJAa63M5OAheJRn/MzvFHmlLU7GUT63nLJ3BypETT6s6G
347
+ kD7sB0hfuiP9rX3z0jYpoKCZ6NLe0kCUknIG/eGvKTAliQnTFGvgU8hXWyJtCCq0
348
+ 2TdX1pTY5RbfDjiR7uUwbsI+LHyALj+wqI69ABEBAAGJAR8EGAEKAAkFAlbhCrAC
349
+ GwwACgkQATt6iV5Gm8s0ZwgAiuBAkjWKlg5WXFc1NlVn4lS7+IjJRL0qOwgHVaFS
350
+ BF28XPN4NTC2yxDLWYi5A83/2lXeKpoS+mzyH2adWHf167w0jVul0Qy/SxS6YyEk
351
+ NIUCirFjt/TQujlB47/a3UxUe0txxYj3e4FADe0gs1XEbpKzv2mKJgNK/GyM1+GA
352
+ I7UuE4Y9W1PONDTweeUC9dYfVTQepmvatYsljmE5aAp7bCwdqp3tYYCgmHEQL5GM
353
+ HSqfJZu8rAo7mHRsd56Q3RQSXft6gWlclf2Fd4BX3lFVwJPQLJ2J+FoUWUN3Kvri
354
+ SytM5SUx7NT8IMCYqRKwKc3tNhYstquDgTe2VOgkhuxUAg==
355
+ =fVHy
356
+ -----END PGP PUBLIC KEY BLOCK-----
@@ -234,7 +234,9 @@ module Buildr #:nodoc:
234
234
  def project(*args, &block) #:nodoc:
235
235
  options = args.pop if Hash === args.last
236
236
  return define(args.first, options, &block) if block
237
- rake_check_options options, :scope if options
237
+ rake_check_options options, :scope, :no_invoke if options
238
+ no_invoke = options && options[:no_invoke]
239
+
238
240
  raise ArgumentError, 'Only one project name at a time' unless args.size == 1
239
241
  @projects ||= {}
240
242
  name = args.first.to_s
@@ -251,7 +253,7 @@ module Buildr #:nodoc:
251
253
  end
252
254
  project ||= @projects[name] # Not found in scope.
253
255
  raise "No such project #{name}" unless project
254
- project.invoke unless Buildr.application.current_scope.join(":").to_s == project.name.to_s
256
+ project.invoke unless no_invoke || Buildr.application.current_scope.join(":").to_s == project.name.to_s
255
257
  project
256
258
  end
257
259
 
@@ -261,26 +263,29 @@ module Buildr #:nodoc:
261
263
  # See Buildr#projects.
262
264
  def projects(*names) #:nodoc:
263
265
  options = names.pop if Hash === names.last
264
- rake_check_options options, :scope if options
266
+ rake_check_options options, :scope, :no_invoke if options
267
+
268
+ no_invoke = options && options[:no_invoke]
269
+
265
270
  @projects ||= {}
266
271
  names = names.flatten
267
272
  if options && options[:scope]
268
273
  # We assume parent project is evaluated.
269
274
  if names.empty?
270
275
  parent = @projects[options[:scope].to_s] or raise "No such project #{options[:scope]}"
271
- @projects.values.select { |project| project.parent == parent }.each { |project| project.invoke }.
272
- map { |project| [project] + projects(:scope=>project) }.flatten.sort_by(&:name)
276
+ @projects.values.select { |project| project.parent == parent }.each { |project| project.invoke unless no_invoke }.
277
+ map { |project| [project] + projects(:scope => project, :no_invoke => no_invoke) }.flatten.sort_by(&:name)
273
278
  else
274
- names.uniq.map { |name| project(name, :scope=>options[:scope]) }
279
+ names.uniq.map { |name| project(name, :scope => options[:scope], :no_invoke => no_invoke) }
275
280
  end
276
281
  elsif names.empty?
277
282
  # Parent project(s) not evaluated so we don't know all the projects yet.
278
- @projects.values.each(&:invoke)
279
- @projects.keys.map { |name| project(name) or raise "No such project #{name}" }.sort_by(&:name)
283
+ @projects.values.each { |project| project.invoke unless no_invoke }
284
+ @projects.keys.map { |name| project(name, :no_invoke => no_invoke) or raise "No such project #{name}" }.sort_by(&:name)
280
285
  else
281
286
  # Parent project(s) not evaluated, for the sub-projects we may need to find.
282
- names.map { |name| name.split(':') }.select { |name| name.size > 1 }.map(&:first).uniq.each { |name| project(name) }
283
- names.uniq.map { |name| project(name) or raise "No such project #{name}" }.sort_by(&:name)
287
+ names.map { |name| name.split(':') }.select { |name| name.size > 1 }.map(&:first).uniq.each { |name| project(name, :no_invoke => no_invoke) }
288
+ names.uniq.map { |name| project(name, :no_invoke => no_invoke) or raise "No such project #{name}" }.sort_by(&:name)
284
289
  end
285
290
  end
286
291
 
@@ -213,17 +213,35 @@ module Buildr #:nodoc:
213
213
  end
214
214
 
215
215
  def main_source_directories
216
- @main_source_directories ||= [
217
- buildr_project.compile.sources,
218
- buildr_project.resources.sources
219
- ].flatten.compact
216
+ @main_source_directories ||= [buildr_project.compile.sources].flatten.compact
217
+ end
218
+
219
+ def main_resource_directories
220
+ @main_resource_directories ||= [buildr_project.resources.sources].flatten.compact
221
+ end
222
+
223
+ def main_generated_source_directories
224
+ @main_generated_source_directories ||= []
225
+ end
226
+
227
+ def main_generated_resource_directories
228
+ @main_generated_resource_directories ||= []
220
229
  end
221
230
 
222
231
  def test_source_directories
223
- @test_source_directories ||= [
224
- buildr_project.test.compile.sources,
225
- buildr_project.test.resources.sources
226
- ].flatten.compact
232
+ @test_source_directories ||= [buildr_project.test.compile.sources].flatten.compact
233
+ end
234
+
235
+ def test_resource_directories
236
+ @test_resource_directories ||= [buildr_project.test.resources.sources].flatten.compact
237
+ end
238
+
239
+ def test_generated_source_directories
240
+ @test_generated_source_directories ||= []
241
+ end
242
+
243
+ def test_generated_resource_directories
244
+ @test_generated_resource_directories ||= []
227
245
  end
228
246
 
229
247
  def excluded_directories
@@ -249,11 +267,11 @@ module Buildr #:nodoc:
249
267
  end
250
268
 
251
269
  def main_dependencies
252
- @main_dependencies ||= buildr_project.compile.dependencies
270
+ @main_dependencies ||= buildr_project.compile.dependencies.dup
253
271
  end
254
272
 
255
273
  def test_dependencies
256
- @test_dependencies ||= buildr_project.test.compile.dependencies
274
+ @test_dependencies ||= buildr_project.test.compile.dependencies.dup
257
275
  end
258
276
 
259
277
  def add_facet(name, type)
@@ -467,6 +485,21 @@ module Buildr #:nodoc:
467
485
  p
468
486
  end
469
487
 
488
+ def main_dependency_details
489
+ target_dir = buildr_project.compile.target.to_s
490
+ main_dependencies.select { |d| d.to_s != target_dir }.collect do |d|
491
+ dependency_path = d.to_s
492
+ export = true
493
+ source_path = nil
494
+ if d.respond_to?(:to_spec_hash)
495
+ source_spec = d.to_spec_hash.merge(:classifier => 'sources')
496
+ source_path = Buildr.artifact(source_spec).to_s
497
+ source_path = nil unless File.exist?(source_path)
498
+ end
499
+ [dependency_path, export, source_path]
500
+ end
501
+ end
502
+
470
503
  def test_dependency_details
471
504
  main_dependencies_paths = main_dependencies.map(&:to_s)
472
505
  target_dir = buildr_project.compile.target.to_s
@@ -512,7 +545,7 @@ module Buildr #:nodoc:
512
545
  project_dependencies = []
513
546
 
514
547
 
515
- self.test_dependency_details.each do |dependency_path, export, source_path|
548
+ self.main_dependency_details.each do |dependency_path, export, source_path|
516
549
  next unless export
517
550
  generate_lib(xml, dependency_path, export, source_path, project_dependencies)
518
551
  end
@@ -568,12 +601,24 @@ module Buildr #:nodoc:
568
601
  def generate_content(xml)
569
602
  xml.content(:url => 'file://$MODULE_DIR$') do
570
603
  # Source folders
571
- {
572
- :main => self.main_source_directories,
573
- :test => self.test_source_directories
574
- }.each do |kind, directories|
575
- directories.map { |dir| dir.to_s }.compact.sort.uniq.each do |dir|
576
- xml.sourceFolder :url => file_path(dir), :isTestSource => (kind == :test ? 'true' : 'false')
604
+ [
605
+ {:dirs => (self.main_source_directories.dup - self.main_generated_source_directories)},
606
+ {:dirs => self.main_generated_source_directories, :generated => true},
607
+ {:type => 'resource', :dirs => (self.main_resource_directories.dup - self.main_generated_resource_directories)},
608
+ {:type => 'resource', :dirs => self.main_generated_resource_directories, :generated => true},
609
+ {:test => true, :dirs => (self.test_source_directories - self.test_generated_source_directories)},
610
+ {:test => true, :dirs => self.test_generated_source_directories, :generated => true},
611
+ {:test => true, :type => 'resource', :dirs => (self.test_resource_directories - self.test_generated_resource_directories)},
612
+ {:test => true, :type => 'resource', :dirs => self.test_generated_resource_directories, :generated => true},
613
+ ].each do |content|
614
+ content[:dirs].map { |dir| dir.to_s }.compact.sort.uniq.each do |dir|
615
+ options = {}
616
+ options[:url] = file_path(dir)
617
+ options[:isTestSource] = (content[:test] ? 'true' : 'false') if content[:type] != 'resource'
618
+ options[:type] = 'java-resource' if content[:type] == 'resource' && !content[:test]
619
+ options[:type] = 'java-test-resource' if content[:type] == 'resource' && content[:test]
620
+ options[:generated] = 'true' if content[:generated]
621
+ xml.sourceFolder options
577
622
  end
578
623
  end
579
624
 
@@ -96,9 +96,9 @@ module Buildr #:nodoc:
96
96
  Buildr.settings.build['jmock'] || VERSION
97
97
  end
98
98
 
99
- def dependencies(versions = {:hamcrest => "1.1"})
99
+ def dependencies(versions = {:hamcrest => '1.1'})
100
100
  two_or_later = version[0,1].to_i >= 2
101
- group = two_or_later ? "org.jmock" : "jmock"
101
+ group = two_or_later ? 'org.jmock' : 'jmock'
102
102
 
103
103
  @dependencies ||= ["#{group}:jmock:jar:#{version}"]
104
104
  if two_or_later
@@ -112,7 +112,7 @@ module Buildr #:nodoc:
112
112
  private
113
113
  def const_missing(const)
114
114
  return super unless const == :REQUIRES # TODO: remove in 1.5
115
- Buildr.application.deprecated "Please use JMock.dependencies/.version instead of JMock::REQUIRES/VERSION"
115
+ Buildr.application.deprecated 'Please use JMock.dependencies/.version instead of JMock::REQUIRES/VERSION'
116
116
  dependencies
117
117
  end
118
118
  end
@@ -198,7 +198,7 @@ module Buildr #:nodoc:
198
198
  end
199
199
 
200
200
  def dependencies
201
- four11_or_newer = version >= "4.11"
201
+ four11_or_newer = version >= '4.11'
202
202
  @dependencies ||= ["junit:junit:jar:#{version}"]+ (four11_or_newer ? JMock.dependencies({:hamcrest => '1.3'}) : JMock.dependencies)
203
203
  end
204
204
 
@@ -209,7 +209,7 @@ module Buildr #:nodoc:
209
209
  private
210
210
  def const_missing(const)
211
211
  return super unless const == :REQUIRES # TODO: remove in 1.5
212
- Buildr.application.deprecated "Please use JUnit.dependencies/.version instead of JUnit::REQUIRES/VERSION"
212
+ Buildr.application.deprecated 'Please use JUnit.dependencies/.version instead of JUnit::REQUIRES/VERSION'
213
213
  dependencies
214
214
  end
215
215
  end
@@ -312,7 +312,7 @@ module Buildr #:nodoc:
312
312
  private
313
313
  def const_missing(const)
314
314
  return super unless const == :REQUIRES # TODO: remove in 1.5
315
- Buildr.application.deprecated "Please use TestNG.dependencies/.version instead of TestNG::REQUIRES/VERSION"
315
+ Buildr.application.deprecated 'Please use TestNG.dependencies/.version instead of TestNG::REQUIRES/VERSION'
316
316
  dependencies
317
317
  end
318
318
  end
@@ -326,19 +326,19 @@ module Buildr #:nodoc:
326
326
  def run(tests, dependencies) #:nodoc:
327
327
  cmd_args = []
328
328
  cmd_args << '-suitename' << task.project.id
329
- cmd_args << '-sourcedir' << task.compile.sources.join(';') if TestNG.version < "6.0"
329
+ cmd_args << '-sourcedir' << task.compile.sources.join(';') if TestNG.version < '6.0'
330
330
  cmd_args << '-log' << '2'
331
331
  cmd_args << '-d' << task.report_to.to_s
332
332
  exclude_args = options[:excludegroups] || []
333
333
  if !exclude_args.empty?
334
- cmd_args << '-excludegroups' << exclude_args.join(",")
334
+ cmd_args << '-excludegroups' << exclude_args.join(',')
335
335
  end
336
336
  groups_args = options[:groups] || []
337
337
  if !groups_args.empty?
338
- cmd_args << '-groups' << groups_args.join(",")
338
+ cmd_args << '-groups' << groups_args.join(',')
339
339
  end
340
340
  # run all tests in the same suite
341
- cmd_args << '-testclass' << (TestNG.version < "6.0" ? test : tests.join(','))
341
+ cmd_args << '-testclass' << (TestNG.version < '6.0' ? test : tests.join(','))
342
342
 
343
343
  cmd_args += options[:args] if options[:args]
344
344
 
@@ -347,7 +347,7 @@ module Buildr #:nodoc:
347
347
 
348
348
  tmp = nil
349
349
  begin
350
- tmp = Tempfile.open("testNG")
350
+ tmp = Tempfile.open('testNG')
351
351
  tmp.write cmd_args.join("\n")
352
352
  tmp.close
353
353
  Java::Commands.java ['org.testng.TestNG', "@#{tmp.path}"], cmd_options
@@ -387,7 +387,7 @@ module Buildr #:nodoc:
387
387
 
388
388
  def initialize(task, options) #:nodoc:
389
389
  super
390
- fail "Missing :frameworks option" unless options[:frameworks]
390
+ fail 'Missing :frameworks option' unless options[:frameworks]
391
391
  @frameworks = options[:frameworks].map do |f|
392
392
  framework_options = (options[:options] || {})[f.to_sym] || {}
393
393
  f.new(task, framework_options)
@@ -14,5 +14,5 @@
14
14
  # the License.
15
15
 
16
16
  module Buildr #:nodoc:
17
- VERSION = '1.4.23'.freeze
17
+ VERSION = '1.4.24'.freeze
18
18
  end
data/rakelib/stage.rake CHANGED
@@ -22,6 +22,7 @@ STAGE_DATE = ENV['STAGE_DATE'] || Time.now.strftime('%Y-%m-%d')
22
22
 
23
23
  task 'prepare' do |task, args|
24
24
  gpg_arg = args.gpg || ENV['gpg']
25
+ user = args.user || ENV['user'] || `whoami`
25
26
 
26
27
  # Update source files to next release number.
27
28
  lambda do
@@ -84,6 +85,13 @@ task 'prepare' do |task, args|
84
85
  sh 'prince --version'
85
86
  puts '[X] We have prince available'
86
87
  end.call
88
+
89
+ # Need lftp to push the stage website to home.apache.org
90
+ lambda do
91
+ puts 'Checking that lftp is available...'
92
+ sh 'lftp --version'
93
+ puts '[X] We have lftp available'
94
+ end.call
87
95
 
88
96
  raise "Can not run stage process under jruby" if RUBY_PLATFORM[/java/]
89
97
  raise "Can not run staging process under older rubies" unless RUBY_VERSION >= '1.9'
@@ -91,6 +99,7 @@ end
91
99
 
92
100
  task 'stage' => %w(clobber prepare) do |task, args|
93
101
  gpg_arg = args.gpg || ENV['gpg']
102
+ user = args.user || ENV['user'] || `whoami`
94
103
  mkpath '_staged'
95
104
 
96
105
  lambda do
@@ -173,12 +182,11 @@ p>. ("Release signing keys":#{official}/KEYS)
173
182
  end.call
174
183
 
175
184
 
176
- # Move everything over to people.apache.org so we can vote on it.
185
+ # Move everything over to home.apache.org so we can vote on it.
177
186
  lambda do
178
- url = "people.apache.org:~/public_html/#{spec.name}/#{spec.version}"
179
- puts "Uploading _staged directory to #{url} ..."
180
- sh 'rsync', '--progress', '--recursive', '_staged/', url
181
- puts "[X] Uploaded _staged directory to #{url}"
187
+ puts "Uploading _staged directory ..."
188
+ sh "lftp -e \"mirror -R _staged public_html/buildr/#{spec.version}; bye\" -u #{user} sftp://home.apache.org"
189
+ puts "[X] Uploaded _staged directory"
182
190
  end.call
183
191
 
184
192
 
@@ -186,8 +194,7 @@ p>. ("Release signing keys":#{official}/KEYS)
186
194
  # email for you and vote on it.
187
195
  lambda do
188
196
  # Need to know who you are on Apache, local user may be different (see .ssh/config).
189
- whoami = `ssh people.apache.org whoami`.strip
190
- base_url = "http://people.apache.org/~#{whoami}/buildr/#{spec.version}"
197
+ base_url = "http://home.apache.org/~#{user}/buildr/#{spec.version}"
191
198
  # Need changes for this release only.
192
199
  changelog = File.read('CHANGELOG').scan(/(^(\d+\.\d+(?:\.\d+)?)\s+\(\d{4}-\d{2}-\d{2}\)\s*((:?^[^\n]+\n)*))/)
193
200
  changes = changelog[0][2]