buildr 1.4.22 → 1.4.23

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: c24f0f4f9ffc98f5cc51c62f3d1c2222664fe251
4
- data.tar.gz: 4e2f497dd9d822aefcb8d7cb91d117c8fbfc3ab7
3
+ metadata.gz: 24cea5e75140b45ce8d2e1585d18ea4c3c3f91fd
4
+ data.tar.gz: e29059e7bc254d207146cb02a7ff5deddc07d605
5
5
  SHA512:
6
- metadata.gz: ed55e814fff9b5d1d747b4738b1645729b0e4c9dc8850f9a4a4ba36ff909ad8f3aeccf2e43f1124b9f987d63addd1da11f4a2f613b2b9f747a66c143949c4d68
7
- data.tar.gz: d4d0a184e33a455fcf00d2d7d006ab7de4f86ecd5a1e2e24f961124a13c50041cb0514e5e6337fb6f1213e64d435b3f6d7f658ce428b6660910328049757b8be
6
+ metadata.gz: 7b9f79e5d063b52e113d111888a8e974e463aa7f1c068aa73adcc55f3993719c31892f00203c22c2d613911f2c058b9bf84ffbabb1a4d36286f8a1f508417ba1
7
+ data.tar.gz: c4be41e2dc2eee68b841797a539857bfc12ec4151f78c1e867e684dcf31ac7deb3d0fa40099159474064c666251fa4bf476cb5e63b560b88645f630901de338d
data/CHANGELOG CHANGED
@@ -1,3 +1,11 @@
1
+ 1.4.23 (2015-06-12)
2
+ * Change: BUILDR-706 - Update the checkstyle addon use checkstyle 6.6. Submitted
3
+ by Dieter Vrancken.
4
+ * Fixed: Fix Buildr.rspec_present? so that it works under jruby 1.6.7.2
5
+ * Change: BUILDR-705 - Avoid attempting to load rspec classes unless Buildr.rspec_present?
6
+ returns true. Reported By rbpandey.
7
+ * Fixed: Remove debug output left in ipr.sql_dialect_mappings.
8
+
1
9
  1.4.22 (2015-02-28)
2
10
  * Change: BUILDR-704 - Updated the Sonar addon to support the latest version of SonarQube
3
11
  Runner. Submitted by Ross Mahony.
@@ -23,10 +23,12 @@ module Buildr
23
23
  # The specs for requirements
24
24
  def dependencies
25
25
  [
26
- 'com.puppycrawl.tools:checkstyle:jar:6.1.1',
26
+ 'com.puppycrawl.tools:checkstyle:jar:6.6',
27
27
  'antlr:antlr:jar:2.7.7',
28
- 'org.antlr:antlr4-runtime:jar:4.3',
28
+ 'org.antlr:antlr4-runtime:jar:4.5',
29
29
  'com.google.guava:guava:jar:18.0',
30
+ 'org.apache.commons:commons-lang3:jar:3.4',
31
+ 'org.abego.treelayout:org.abego.treelayout.core:jar:1.0.1',
30
32
  'commons-cli:commons-cli:jar:1.2',
31
33
  'commons-beanutils:commons-beanutils-core:jar:1.8.3',
32
34
  'commons-logging:commons-logging:jar:1.1.1'
@@ -48,10 +50,7 @@ module Buildr
48
50
  args << format
49
51
  args << '-o'
50
52
  args << output_file
51
- source_paths.each do |source_path|
52
- args << '-r'
53
- args << source_path
54
- end
53
+ args += source_paths
55
54
 
56
55
  begin
57
56
  Java::Commands.java 'com.puppycrawl.tools.checkstyle.Main', *(args + [{:classpath => cp, :properties => options[:properties], :java_args => options[:java_args]}])
@@ -130,15 +130,7 @@ module Buildr
130
130
  project.test.setup do
131
131
  agent_jar = Buildr.artifacts(Buildr::JaCoCo.agent_spec).each(&:invoke).map(&:to_s).join('')
132
132
  options = []
133
- ["destfile",
134
- "append",
135
- "exclclassloader",
136
- "sessionid",
137
- "dumponexit",
138
- "output",
139
- "address",
140
- "port",
141
- "classdumpdir"].each do |option|
133
+ %w(destfile append exclclassloader sessionid dumponexit output address port classdumpdir).each do |option|
142
134
  value = project.jacoco.send(option.to_sym)
143
135
  options << "#{option}=#{value}" unless value.nil?
144
136
  end
@@ -150,10 +142,10 @@ module Buildr
150
142
  end
151
143
  namespace 'jacoco' do
152
144
  if project.jacoco.generate_xml?
153
- desc "Generate JaCoCo reports."
145
+ desc 'Generate JaCoCo reports.'
154
146
  task 'reports' do
155
- Buildr.ant "jacoco" do |ant|
156
- ant.taskdef(:resource => "org/jacoco/ant/antlib.xml") do |ant|
147
+ Buildr.ant 'jacoco' do |ant|
148
+ ant.taskdef(:resource => 'org/jacoco/ant/antlib.xml') do |ant|
157
149
  ant.classpath :path => Buildr.artifacts(Buildr::JaCoCo.ant_spec).each(&:invoke).map(&:to_s).join(File::PATH_SEPARATOR)
158
150
  end
159
151
  ant.report do |ant|
@@ -167,7 +159,7 @@ module Buildr
167
159
  ant.fileset :dir => project.compile.target
168
160
  end
169
161
  end
170
- ant.sourcefiles(:encoding => "UTF-8") do |ant|
162
+ ant.sourcefiles(:encoding => 'UTF-8') do |ant|
171
163
  project.compile.sources.each do |path|
172
164
  ant.fileset :dir => path.to_s
173
165
  end
@@ -184,10 +176,10 @@ module Buildr
184
176
  end
185
177
  end
186
178
  namespace 'jacoco' do
187
- desc "Generate JaCoCo reports."
179
+ desc 'Generate JaCoCo reports.'
188
180
  task 'report' do
189
- Buildr.ant "jacoco" do |ant|
190
- ant.taskdef(:resource => "org/jacoco/ant/antlib.xml") do |ant|
181
+ Buildr.ant 'jacoco' do |ant|
182
+ ant.taskdef(:resource => 'org/jacoco/ant/antlib.xml') do |ant|
191
183
  ant.classpath :path => Buildr.artifacts(Buildr::JaCoCo.ant_spec).each(&:invoke).map(&:to_s).join(File::PATH_SEPARATOR)
192
184
  end
193
185
  ant.report do |ant|
@@ -197,22 +189,22 @@ module Buildr
197
189
  end
198
190
  end
199
191
 
200
- ant.structure(:name => "Jacoco Report") do |ant|
192
+ ant.structure(:name => 'Jacoco Report') do |ant|
201
193
  ant.classfiles do |ant|
202
194
  Buildr.projects.map(&:compile).map(&:target).flatten.map(&:to_s).each do |src|
203
195
  ant.fileset :dir=>src.to_s if File.exist?(src)
204
196
  end
205
197
  end
206
- ant.sourcefiles(:encoding => "UTF-8") do |ant|
198
+ ant.sourcefiles(:encoding => 'UTF-8') do |ant|
207
199
  Buildr.projects.map(&:compile).map(&:sources).flatten.map(&:to_s).each do |src|
208
200
  ant.fileset :dir=>src.to_s if File.exist?(src)
209
201
  end
210
202
  end
211
203
  end
212
204
 
213
- ant.html :destdir => "reports/jacoco"
214
- ant.xml :destfile => "reports/jacoco/jacoco.xml"
215
- ant.csv :destfile => "reports/jacoco/jacoco.csv"
205
+ ant.html :destdir => 'reports/jacoco'
206
+ ant.xml :destfile => 'reports/jacoco/jacoco.xml'
207
+ ant.csv :destfile => 'reports/jacoco/jacoco.csv'
216
208
  end
217
209
  end
218
210
  end
@@ -30,7 +30,7 @@ Gem::Specification.new do |spec|
30
30
  spec.email = 'users@buildr.apache.org'
31
31
  spec.homepage = 'http://buildr.apache.org/'
32
32
  spec.summary = 'Build like you code'
33
- spec.licenses = ['Apache-2.0']
33
+ spec.licenses = %w(Apache-2.0)
34
34
  spec.description = <<-TEXT
35
35
  Apache Buildr is a build system for Java-based applications, including support
36
36
  for Scala, Groovy and a growing number of JVM languages and tools. We wanted
@@ -43,7 +43,7 @@ for those one-off tasks, with a language that's a joy to use.
43
43
  spec.platform = $platform
44
44
 
45
45
  spec.files = Dir['{addon,bin,doc,etc,lib,rakelib,spec}/**/*', '*.{gemspec,buildfile}'] +
46
- ['LICENSE', 'NOTICE', 'CHANGELOG', 'README.rdoc', 'Rakefile', '_buildr', '_jbuildr']
46
+ %w(LICENSE NOTICE CHANGELOG README.rdoc Rakefile _buildr _jbuildr)
47
47
  spec.require_paths = 'lib', 'addon'
48
48
  spec.bindir = 'bin' # Use these for applications.
49
49
  spec.executable = 'buildr'
@@ -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.22 (2015-02-28)
22
+
23
+ |_. 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 |
29
+
30
+ p>. ("Release signing keys":http://www.apache.org/dist/buildr/1.4.22/KEYS)
31
+
32
+
21
33
  h3. buildr 1.4.21 (2014-11-28)
22
34
 
23
35
  |_. Package |_. MD5 Checksum |_. PGP |
24
- | "buildr-1.4.21-java.gem":http://www.apache.org/dyn/closer.cgi/buildr/1.4.21/buildr-1.4.21-java.gem | "71dda93f4e3f093046342fd8b081ad3f":http://www.apache.org/dist/buildr/1.4.21/buildr-1.4.21-java.gem.md5 | "Sig":http://www.apache.org/dist/buildr/1.4.21/buildr-1.4.21-java.gem.asc |
25
- | "buildr-1.4.21-x86-mswin32.gem":http://www.apache.org/dyn/closer.cgi/buildr/1.4.21/buildr-1.4.21-x86-mswin32.gem | "7157a4bda149ccd408934bdce1c220bf":http://www.apache.org/dist/buildr/1.4.21/buildr-1.4.21-x86-mswin32.gem.md5 | "Sig":http://www.apache.org/dist/buildr/1.4.21/buildr-1.4.21-x86-mswin32.gem.asc |
26
- | "buildr-1.4.21.gem":http://www.apache.org/dyn/closer.cgi/buildr/1.4.21/buildr-1.4.21.gem | "52a7462fc521261f136c9cd8b6bfd89d":http://www.apache.org/dist/buildr/1.4.21/buildr-1.4.21.gem.md5 | "Sig":http://www.apache.org/dist/buildr/1.4.21/buildr-1.4.21.gem.asc |
27
- | "buildr-1.4.21.tgz":http://www.apache.org/dyn/closer.cgi/buildr/1.4.21/buildr-1.4.21.tgz | "a4bc7ce263eff547f40c752ecd2fa80c":http://www.apache.org/dist/buildr/1.4.21/buildr-1.4.21.tgz.md5 | "Sig":http://www.apache.org/dist/buildr/1.4.21/buildr-1.4.21.tgz.asc |
28
- | "buildr-1.4.21.zip":http://www.apache.org/dyn/closer.cgi/buildr/1.4.21/buildr-1.4.21.zip | "7e8ec75d426b39d5f93410286860cc19":http://www.apache.org/dist/buildr/1.4.21/buildr-1.4.21.zip.md5 | "Sig":http://www.apache.org/dist/buildr/1.4.21/buildr-1.4.21.zip.asc |
36
+ | "buildr-1.4.21-java.gem":http://archive.apache.org/dist/buildr/1.4.21/buildr-1.4.21-java.gem | "71dda93f4e3f093046342fd8b081ad3f":http://archive.apache.org/dist/buildr/1.4.21/buildr-1.4.21-java.gem.md5 | "Sig":http://archive.apache.org/dist/buildr/1.4.21/buildr-1.4.21-java.gem.asc |
37
+ | "buildr-1.4.21-x86-mswin32.gem":http://archive.apache.org/dist/buildr/1.4.21/buildr-1.4.21-x86-mswin32.gem | "7157a4bda149ccd408934bdce1c220bf":http://archive.apache.org/dist/buildr/1.4.21/buildr-1.4.21-x86-mswin32.gem.md5 | "Sig":http://archive.apache.org/dist/buildr/1.4.21/buildr-1.4.21-x86-mswin32.gem.asc |
38
+ | "buildr-1.4.21.gem":http://archive.apache.org/dist/buildr/1.4.21/buildr-1.4.21.gem | "52a7462fc521261f136c9cd8b6bfd89d":http://archive.apache.org/dist/buildr/1.4.21/buildr-1.4.21.gem.md5 | "Sig":http://archive.apache.org/dist/buildr/1.4.21/buildr-1.4.21.gem.asc |
39
+ | "buildr-1.4.21.tgz":http://archive.apache.org/dist/buildr/1.4.21/buildr-1.4.21.tgz | "a4bc7ce263eff547f40c752ecd2fa80c":http://archive.apache.org/dist/buildr/1.4.21/buildr-1.4.21.tgz.md5 | "Sig":http://archive.apache.org/dist/buildr/1.4.21/buildr-1.4.21.tgz.asc |
40
+ | "buildr-1.4.21.zip":http://archive.apache.org/dist/buildr/1.4.21/buildr-1.4.21.zip | "7e8ec75d426b39d5f93410286860cc19":http://archive.apache.org/dist/buildr/1.4.21/buildr-1.4.21.zip.md5 | "Sig":http://archive.apache.org/dist/buildr/1.4.21/buildr-1.4.21.zip.asc |
29
41
 
30
- p>. ("Release signing keys":http://www.apache.org/dist/buildr/1.4.21/KEYS)
42
+ p>. ("Release signing keys":http://archive.apache.org/dist/buildr/1.4.21/KEYS)
31
43
 
32
44
 
33
45
  h3. buildr 1.4.20 (2014-08-23)
@@ -46,6 +46,13 @@ 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
+
49
56
  Highlights from Buildr 1.4.22 (2015-02-28)
50
57
  * Change: BUILDR-704 - Updated the Sonar addon to support the latest version of SonarQube
51
58
  Runner. Submitted by Ross Mahony.
@@ -700,8 +700,6 @@ module Buildr #:nodoc:
700
700
  add_component('SqlDialectMappings') do |component|
701
701
  mappings.each_pair do |path, dialect|
702
702
  file_path = file_path(path).gsub(/\/.$/, '')
703
-
704
- puts "#{file_path} => #{dialect}"
705
703
  component.file :url => file_path, :dialect => dialect
706
704
  end
707
705
  end
@@ -194,7 +194,7 @@ module Buildr #:nodoc:
194
194
  runner.requires ||= []
195
195
  runner.requires.unshift File.join(File.dirname(__FILE__), 'test_result')
196
196
  runner.gems ||= {}
197
- runner.rspec ||= ['--format', 'progress', '--format', 'documentation']
197
+ runner.rspec ||= %w(--format progress --format documentation)
198
198
  runner.format.each { |format| runner.rspec << '--format' << format } if runner.format
199
199
  runner.rspec.push '--format', "Buildr::TestFramework::TestResult::YamlFormatter"
200
200
  runner.rspec.push '-o', runner.result
@@ -15,11 +15,6 @@
15
15
 
16
16
  # It is necessary to require these files here as the bdd plugin directly includes this file
17
17
  require 'yaml'
18
- begin
19
- require 'rspec/core/formatters/base_formatter'
20
- rescue LoadError
21
- # If Rspec is not present then assume we do no need Yaml formatter
22
- end
23
18
 
24
19
  module Buildr #:nodoc:
25
20
  module TestFramework #:nodoc:
@@ -245,7 +245,7 @@ module Buildr #:nodoc:
245
245
  taskdef.invoke
246
246
  ant.taskdef :name=>'junit', :classname=>'org.apache.tools.ant.taskdefs.optional.junit.JUnitTask', :classpath=>taskdef.to_s
247
247
 
248
- ant.junit forking.merge(:clonevm=>options[:clonevm] || false, :dir=>task.send(:project).path_to) do
248
+ ant.junit forking.merge(:clonevm=> !!options[:clonevm], :dir=>task.send(:project).path_to) do
249
249
  ant.classpath :path=>dependencies.join(File::PATH_SEPARATOR)
250
250
  (options[:properties] || []).each { |key, value| ant.sysproperty :key=>key, :value=>value }
251
251
  (options[:environment] || []).each { |key, value| ant.env :key=>key, :value=>value }
@@ -27,7 +27,8 @@ module Buildr #:nodoc:
27
27
  @@rspec_checked = true
28
28
  end
29
29
 
30
- $LOADED_FEATURES.any?{|f| f=~ /[\\\/]rspec\.rb$/ }
30
+ # Need to check 'rspec.rb' for jruby-1.6.7.2 and earlier
31
+ $LOADED_FEATURES.any?{|f| f == 'rspec.rb' || f =~ /[\\\/]rspec\.rb$/ }
31
32
  end
32
33
 
33
34
  def self.ensure_rspec(context)
@@ -14,5 +14,5 @@
14
14
  # the License.
15
15
 
16
16
  module Buildr #:nodoc:
17
- VERSION = '1.4.22'.freeze
17
+ VERSION = '1.4.23'.freeze
18
18
  end
@@ -0,0 +1,60 @@
1
+ # Licensed to the Apache Software Foundation (ASF) under one or more
2
+ # contributor license agreements. See the NOTICE file distributed with this
3
+ # work for additional information regarding copyright ownership. The ASF
4
+ # licenses this file to you under the Apache License, Version 2.0 (the
5
+ # "License"); you may not use this file except in compliance with the License.
6
+ # You may obtain a copy of the License at
7
+ #
8
+ # http://www.apache.org/licenses/LICENSE-2.0
9
+ #
10
+ # Unless required by applicable law or agreed to in writing, software
11
+ # distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
12
+ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
13
+ # License for the specific language governing permissions and limitations under
14
+ # the License.
15
+
16
+ require File.expand_path('../spec_helpers', File.dirname(__FILE__))
17
+ if Java.java.lang.System.getProperty('java.runtime.version') >= '1.7'
18
+
19
+ Sandbox.require_optional_extension 'buildr/checkstyle'
20
+ artifacts(Buildr::Checkstyle::dependencies).map(&:invoke)
21
+
22
+ CHECKS_CONTENT = <<CHECKS
23
+ <?xml version="1.0"?>
24
+ <!DOCTYPE module PUBLIC
25
+ "-//Puppy Crawl//DTD Check Configuration 1.2//EN"
26
+ "http://www.puppycrawl.com/dtds/configuration_1_2.dtd">
27
+ <module name="Checker">
28
+ </module>
29
+ CHECKS
30
+ GOOD_CONTENT = <<GOOD
31
+ public final class SomeClass {
32
+ }
33
+ GOOD
34
+
35
+ describe Buildr::Checkstyle do
36
+
37
+ before do
38
+ # Reloading the extension because the sandbox removes all its actions
39
+ Buildr.module_eval { remove_const :Checkstyle }
40
+ load File.expand_path('../addon/buildr/checkstyle.rb')
41
+ @tool_module = Buildr::Checkstyle
42
+
43
+ write 'src/main/java/SomeClass.java', GOOD_CONTENT
44
+ write 'src/main/etc/checkstyle/checks.xml', CHECKS_CONTENT
45
+ end
46
+
47
+ it 'should generate an XML report' do
48
+ define 'foo'
49
+ task('foo:checkstyle:xml').invoke
50
+ file(project('foo')._('reports/checkstyle/checkstyle.xml')).should exist
51
+ end
52
+
53
+ it 'should generate an HTML report' do
54
+ define 'foo'
55
+ task('foo:checkstyle:html').invoke
56
+ file(project('foo')._('reports/checkstyle/checkstyle.html')).should exist
57
+ end
58
+
59
+ end
60
+ end
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.4.22
4
+ version: 1.4.23
5
5
  platform: ruby
6
6
  authors:
7
7
  - Apache Buildr
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-03-06 00:00:00.000000000 Z
11
+ date: 2015-06-12 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rake
@@ -585,6 +585,7 @@ files:
585
585
  - rakelib/rspec.rake
586
586
  - rakelib/stage.rake
587
587
  - spec/addon/bnd_spec.rb
588
+ - spec/addon/checkstyle_spec.rb
588
589
  - spec/addon/custom_pom_spec.rb
589
590
  - spec/addon/drb_spec.rb
590
591
  - spec/addon/jaxb_xjc_spec.rb