realityforge-buildr 1.5.21 → 1.5.22

Sign up to get free protection for your applications and to get access to all the features.
Files changed (10) hide show
  1. checksums.yaml +4 -4
  2. data/addon/buildr/checkstyle.rb +2 -2
  3. data/addon/buildr/gwt.rb +14 -161
  4. data/addon/buildr/pmd.rb +14 -15
  5. data/addon/buildr/release_tool.rb +1 -1
  6. data/addon/buildr/spotbugs.rb +18 -12
  7. data/addon/buildr/wsgen.rb +10 -1
  8. data/lib/buildr/java/annotation_processor.rb +1 -0
  9. data/lib/buildr/version.rb +1 -1
  10. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 3724f5f06c0b2405d5b662831bae438eb33f0e94eff458b152d0ab1ff614aa7e
4
- data.tar.gz: b1e8485771c961070ff6e6fbc98a0e3489faedfd6cce77c66db4ebc2a0574abd
3
+ metadata.gz: 8a0637c5fe262399626a0b41fbb0b78eab1028b7aa37e1aaa905f1b564d6fb66
4
+ data.tar.gz: c0eba687f7c98540bda12e300a2b6648e70913bdd6b815918c63d7abfb007e60
5
5
  SHA512:
6
- metadata.gz: 8209eab6d4c0281a92958098a5d5d6d37f08aa79535cb136ddb919e57bb39724fb22487deca33d55feebbf8bcfa0c6e01fada1d0ab40ea4309487df2db4b0d6a
7
- data.tar.gz: d29e0456bc500292b078f0282dd92c66257624a5273b899f1f176be43eba71fd4c786044428d4a7a1f07f56538634a9e1336a188d6c7b3c419842445cb49560f
6
+ metadata.gz: b82dfc10f4f1f1dcc88e0f7a6653d48b38c4a527be47dc534d5326e039ac96ed02cd2cfd016ffc5014eac4592076bab99454c6b668e5d598bef1abf3c08540d7
7
+ data.tar.gz: f56ef5eba45cf96fa082662b975682cde0a2505402113dc04f63880796eae5c58bcbbabd5d57b8e0f3d9202d656a3b134830a1095fac4d557e436aae0a6dc960
data/addon/buildr/checkstyle.rb CHANGED
@@ -22,7 +22,7 @@ module Buildr
22
22
 
23
23
  # The specs for requirements
24
24
  def dependencies
25
- version = '8.40'
25
+ version = '10.7.0'
26
26
  spec = "com.puppycrawl.tools:checkstyle-all:jar:#{version}"
27
27
  Buildr.download(Buildr.artifact(spec) => "https://github.com/checkstyle/checkstyle/releases/download/checkstyle-#{version}/checkstyle-#{version}-all.jar")
28
28
  [spec]
@@ -220,7 +220,7 @@ module Buildr
220
220
  project.task('checkstyle:xml') do
221
221
  puts 'Checkstyle: Analyzing source code...'
222
222
  mkdir_p File.dirname(project.checkstyle.xml_output_file)
223
- source_paths = project.checkstyle.complete_source_paths.select{|p| !p.start_with?(project._(:target, :generated).to_s)}
223
+ source_paths = project.checkstyle.complete_source_paths.select{|p| !p.to_s.start_with?(project._(:target, :generated).to_s)}
224
224
  source_paths = source_paths.collect{|p|::Buildr::Util.relative_path(File.expand_path(p.to_s), project.base_dir)}
225
225
  Buildr::Checkstyle.checkstyle(project.checkstyle.configuration_file,
226
226
  project.checkstyle.format,
data/addon/buildr/gwt.rb CHANGED
@@ -22,7 +22,7 @@ module Buildr
22
22
  end
23
23
 
24
24
  def version
25
- @version || Buildr.settings.build['gwt'] || '2.8.2'
25
+ @version || Buildr.settings.build['gwt'] || '2.10.0'
26
26
  end
27
27
 
28
28
  # The specs for requirements
@@ -31,175 +31,24 @@ module Buildr
31
31
  %w(javax.validation:validation-api:jar:1.0.0.GA javax.validation:validation-api:jar:sources:1.0.0.GA)
32
32
  v = version || self.version
33
33
  gwt_dev_jar = "com.google.gwt:gwt-dev:jar:#{v}"
34
- if v <= '2.6.1'
35
- [gwt_dev_jar] + validation_deps
36
- elsif v == '2.7.0'
37
- [
38
- gwt_dev_jar,
39
- 'org.ow2.asm:asm:jar:5.0.3'
40
- ] + validation_deps
41
- elsif v == '2.8.0'
42
- %w(
43
- com.google.jsinterop:jsinterop-annotations:jar:1.0.1
44
- com.google.jsinterop:jsinterop-annotations:jar:sources:1.0.1
45
- org.w3c.css:sac:jar:1.3
46
- com.google.gwt:gwt-dev:jar:2.8.0
47
- com.google.gwt:gwt-user:jar:2.8.0
48
- com.google.code.gson:gson:jar:2.6.2
49
- org.ow2.asm:asm:jar:5.0.3
50
- org.ow2.asm:asm-util:jar:5.0.3
51
- org.ow2.asm:asm-tree:jar:5.0.3
52
- org.ow2.asm:asm-commons:jar:5.0.3
53
- colt:colt:jar:1.2.0
54
- ant:ant:jar:1.6.5
55
- commons-collections:commons-collections:jar:3.2.2
56
- commons-io:commons-io:jar:2.4
57
- com.ibm.icu:icu4j:jar:50.1.1
58
- tapestry:tapestry:jar:4.0.2
59
-
60
- javax.annotation:javax.annotation-api:jar:1.2
61
- javax.servlet:javax.servlet-api:jar:3.1.0
62
- org.eclipse.jetty:jetty-annotations:jar:9.2.14.v20151106
63
- org.eclipse.jetty:jetty-continuation:jar:9.2.14.v20151106
64
- org.eclipse.jetty:jetty-http:jar:9.2.14.v20151106
65
- org.eclipse.jetty:jetty-io:jar:9.2.14.v20151106
66
- org.eclipse.jetty:jetty-jndi:jar:9.2.14.v20151106
67
- org.eclipse.jetty:jetty-plus:jar:9.2.14.v20151106
68
- org.eclipse.jetty:jetty-security:jar:9.2.14.v20151106
69
- org.eclipse.jetty:jetty-server:jar:9.2.14.v20151106
70
- org.eclipse.jetty:jetty-servlet:jar:9.2.14.v20151106
71
- org.eclipse.jetty:jetty-servlets:jar:9.2.14.v20151106
72
- org.eclipse.jetty:jetty-util:jar:9.2.14.v20151106
73
- org.eclipse.jetty:jetty-webapp:jar:9.2.14.v20151106
74
- org.eclipse.jetty:jetty-xml:jar:9.2.14.v20151106
75
- org.eclipse.jetty.toolchain:jetty-schemas:jar:3.1.M0
76
- ) + validation_deps
77
- elsif v == '2.8.1'
78
- %w(
79
- com.google.jsinterop:jsinterop-annotations:jar:1.0.1
80
- com.google.jsinterop:jsinterop-annotations:jar:sources:1.0.1
81
- org.w3c.css:sac:jar:1.3
82
- com.google.gwt:gwt-dev:jar:2.8.1
83
- com.google.gwt:gwt-user:jar:2.8.1
84
- com.google.code.gson:gson:jar:2.6.2
85
- org.ow2.asm:asm:jar:5.0.3
86
- org.ow2.asm:asm-util:jar:5.0.3
87
- org.ow2.asm:asm-tree:jar:5.0.3
88
- org.ow2.asm:asm-commons:jar:5.0.3
89
- colt:colt:jar:1.2.0
90
- ant:ant:jar:1.6.5
91
- commons-collections:commons-collections:jar:3.2.2
92
- commons-io:commons-io:jar:2.4
93
- com.ibm.icu:icu4j:jar:50.1.1
94
- tapestry:tapestry:jar:4.0.2
95
-
96
- javax.annotation:javax.annotation-api:jar:1.2
97
- javax.servlet:javax.servlet-api:jar:3.1.0
98
- org.eclipse.jetty:jetty-annotations:jar:9.2.14.v20151106
99
- org.eclipse.jetty:jetty-continuation:jar:9.2.14.v20151106
100
- org.eclipse.jetty:jetty-http:jar:9.2.14.v20151106
101
- org.eclipse.jetty:jetty-io:jar:9.2.14.v20151106
102
- org.eclipse.jetty:jetty-jndi:jar:9.2.14.v20151106
103
- org.eclipse.jetty:jetty-plus:jar:9.2.14.v20151106
104
- org.eclipse.jetty:jetty-security:jar:9.2.14.v20151106
105
- org.eclipse.jetty:jetty-server:jar:9.2.14.v20151106
106
- org.eclipse.jetty:jetty-servlet:jar:9.2.14.v20151106
107
- org.eclipse.jetty:jetty-servlets:jar:9.2.14.v20151106
108
- org.eclipse.jetty:jetty-util:jar:9.2.14.v20151106
109
- org.eclipse.jetty:jetty-webapp:jar:9.2.14.v20151106
110
- org.eclipse.jetty:jetty-xml:jar:9.2.14.v20151106
111
- org.eclipse.jetty.toolchain:jetty-schemas:jar:3.1.M0
112
- ) + validation_deps
113
- elsif v == '2.8.2'
114
- %w(
115
- com.google.jsinterop:jsinterop-annotations:jar:1.0.2
116
- com.google.jsinterop:jsinterop-annotations:jar:sources:1.0.2
117
- org.w3c.css:sac:jar:1.3
118
- com.google.gwt:gwt-dev:jar:2.8.2
119
- com.google.gwt:gwt-user:jar:2.8.2
120
- com.google.code.gson:gson:jar:2.6.2
121
- org.ow2.asm:asm:jar:5.0.3
122
- org.ow2.asm:asm-util:jar:5.0.3
123
- org.ow2.asm:asm-tree:jar:5.0.3
124
- org.ow2.asm:asm-commons:jar:5.0.3
125
- colt:colt:jar:1.2.0
126
- ant:ant:jar:1.6.5
127
- commons-collections:commons-collections:jar:3.2.2
128
- commons-io:commons-io:jar:2.4
129
- com.ibm.icu:icu4j:jar:50.1.1
130
- tapestry:tapestry:jar:4.0.2
131
-
132
- javax.annotation:javax.annotation-api:jar:1.2
133
- javax.servlet:javax.servlet-api:jar:3.1.0
134
- org.eclipse.jetty:jetty-annotations:jar:9.2.14.v20151106
135
- org.eclipse.jetty:jetty-continuation:jar:9.2.14.v20151106
136
- org.eclipse.jetty:jetty-http:jar:9.2.14.v20151106
137
- org.eclipse.jetty:jetty-io:jar:9.2.14.v20151106
138
- org.eclipse.jetty:jetty-jndi:jar:9.2.14.v20151106
139
- org.eclipse.jetty:jetty-plus:jar:9.2.14.v20151106
140
- org.eclipse.jetty:jetty-security:jar:9.2.14.v20151106
141
- org.eclipse.jetty:jetty-server:jar:9.2.14.v20151106
142
- org.eclipse.jetty:jetty-servlet:jar:9.2.14.v20151106
143
- org.eclipse.jetty:jetty-servlets:jar:9.2.14.v20151106
144
- org.eclipse.jetty:jetty-util:jar:9.2.14.v20151106
145
- org.eclipse.jetty:jetty-webapp:jar:9.2.14.v20151106
146
- org.eclipse.jetty:jetty-xml:jar:9.2.14.v20151106
147
- org.eclipse.jetty.toolchain:jetty-schemas:jar:3.1.M0
148
- ) + validation_deps
149
- elsif v == '2.8.2-v20191108'
150
- %w(
151
- org.realityforge.com.google.jsinterop:jsinterop-annotations:jar:2.8.2-v20191108
152
- org.realityforge.com.google.jsinterop:jsinterop-annotations:jar:sources:2.8.2-v20191108
153
- org.w3c.css:sac:jar:1.3
154
- org.realityforge.com.google.gwt:gwt-dev:jar:2.8.2-v20191108
155
- org.realityforge.com.google.gwt:gwt-user:jar:2.8.2-v20191108
156
- com.google.code.gson:gson:jar:2.6.2
157
-
158
- org.ow2.asm:asm:jar:7.1
159
- org.ow2.asm:asm-util:jar:7.1
160
- org.ow2.asm:asm-tree:jar:7.1
161
- org.ow2.asm:asm-commons:jar:7.1
162
-
163
- colt:colt:jar:1.2.0
164
- ant:ant:jar:1.6.5
165
- commons-collections:commons-collections:jar:3.2.2
166
- commons-io:commons-io:jar:2.4
167
- com.ibm.icu:icu4j:jar:63.1
168
- tapestry:tapestry:jar:4.0.2
169
-
170
- javax.annotation:javax.annotation-api:jar:1.2
171
- javax.servlet:javax.servlet-api:jar:3.1.0
172
- org.eclipse.jetty:jetty-annotations:jar:9.2.14.v20151106
173
- org.eclipse.jetty:jetty-continuation:jar:9.2.14.v20151106
174
- org.eclipse.jetty:jetty-http:jar:9.2.14.v20151106
175
- org.eclipse.jetty:jetty-io:jar:9.2.14.v20151106
176
- org.eclipse.jetty:jetty-jndi:jar:9.2.14.v20151106
177
- org.eclipse.jetty:jetty-plus:jar:9.2.14.v20151106
178
- org.eclipse.jetty:jetty-security:jar:9.2.14.v20151106
179
- org.eclipse.jetty:jetty-server:jar:9.2.14.v20151106
180
- org.eclipse.jetty:jetty-servlet:jar:9.2.14.v20151106
181
- org.eclipse.jetty:jetty-servlets:jar:9.2.14.v20151106
182
- org.eclipse.jetty:jetty-util:jar:9.2.14.v20151106
183
- org.eclipse.jetty:jetty-webapp:jar:9.2.14.v20151106
184
- org.eclipse.jetty:jetty-xml:jar:9.2.14.v20151106
185
- org.eclipse.jetty.toolchain:jetty-schemas:jar:3.1.M0
186
- ) + validation_deps
187
- elsif v == '2.9.0'
34
+ if v == '2.10.0'
188
35
  %w(
189
36
  com.google.jsinterop:jsinterop-annotations:jar:2.0.0
190
37
  com.google.jsinterop:jsinterop-annotations:jar:sources:2.0.0
191
38
  org.w3c.css:sac:jar:1.3
192
39
 
193
- com.google.gwt:gwt-dev:jar:2.9.0
194
- com.google.gwt:gwt-user:jar:2.9.0
40
+ org.gwtproject:gwt-dev:jar:2.10.0
41
+ org.gwtproject:gwt-user:jar:2.10.0
195
42
  com.google.code.gson:gson:jar:2.6.2
196
43
 
197
- org.ow2.asm:asm:jar:7.1
198
- org.ow2.asm:asm-util:jar:7.1
199
- org.ow2.asm:asm-tree:jar:7.1
200
- org.ow2.asm:asm-commons:jar:7.1
44
+ org.ow2.asm:asm:jar:9.2
45
+ org.ow2.asm:asm-util:jar:9.2
46
+ org.ow2.asm:asm-tree:jar:9.2
47
+ org.ow2.asm:asm-analysis:jar:9.2
48
+ org.ow2.asm:asm-commons:jar:9.2
201
49
 
202
50
  colt:colt:jar:1.2.0
51
+
203
52
  ant:ant:jar:1.6.5
204
53
  commons-collections:commons-collections:jar:3.2.2
205
54
  commons-io:commons-io:jar:2.4
@@ -317,6 +166,10 @@ module Buildr
317
166
  end
318
167
  end
319
168
 
169
+ before_define do |project|
170
+ project.clean { rm_rf project._(:target, :generated, :gwt) }
171
+ end
172
+
320
173
  def gwt(module_names, options = {})
321
174
  p = options[:target_project]
322
175
  target_project = p.nil? ? project : p.is_a?(String) ? project(p) : p
data/addon/buildr/pmd.rb CHANGED
@@ -24,18 +24,16 @@ module Buildr
24
24
  # The specs for requirements
25
25
  def dependencies
26
26
  %w(
27
- net.sourceforge.pmd:pmd-core:jar:6.11.0
28
- net.sourceforge.pmd:pmd-java:jar:6.11.0
29
- net.sourceforge.pmd:pmd-java8:jar:6.11.0
27
+ net.sourceforge.pmd:pmd-core:jar:6.54.0
28
+ net.sourceforge.pmd:pmd-java:jar:6.54.0
30
29
  jaxen:jaxen:jar:1.1.6
31
- commons-io:commons-io:jar:2.6
32
- com.beust:jcommander:jar:1.72
33
- org.ow2.asm:asm:jar:7.1
34
- com.google.code.gson:gson:jar:2.8.5
30
+ com.beust:jcommander:jar:1.48
31
+ org.ow2.asm:asm:jar:9.3
32
+ com.google.code.gson:gson:jar:2.8.9
35
33
  net.java.dev.javacc:javacc:jar:5.0
36
34
  net.sourceforge.saxon:saxon:jar:9.1.0.8
37
35
  org.apache.commons:commons-lang3:jar:3.8.1
38
- org.antlr:antlr4-runtime:jar:4.7
36
+ org.antlr:antlr4-runtime:jar:4.7.2
39
37
  )
40
38
  end
41
39
 
@@ -58,21 +56,22 @@ module Buildr
58
56
  mkdir_p File.dirname(output_file_prefix)
59
57
 
60
58
  args = []
61
- args << '-no-cache'
62
- args << '-shortnames'
63
- args << '-rulesets' << rule_sets.join(',')
64
- args << '-format' << format
65
- args << '-reportfile' << "#{output_file_prefix}.#{format}"
59
+ args << '--no-cache'
60
+ args << '--relativize-paths-with'
61
+ args << '--rulesets' << rule_sets.join(',')
62
+ args << '--format' << format
63
+ args << '--report-file' << "#{output_file_prefix}.#{format}"
64
+ #args << '--aux-classpath' << cp.join(':')
66
65
 
67
66
  files = []
68
67
  source_paths.each do |src|
69
- files += Dir["#{src}/**/*.java"] if File.directory?(src)
68
+ files += Dir["#{src}/**/*.java"] if File.directory?(src.to_s)
70
69
  end
71
70
  files = files.sort.uniq
72
71
 
73
72
  Tempfile.open('pmd') do |tmp|
74
73
  tmp.write files.join(',')
75
- args << '-filelist' << tmp.path.to_s
74
+ args << '--file-list' << tmp.path.to_s
76
75
  end
77
76
 
78
77
  begin
data/addon/buildr/release_tool.rb CHANGED
@@ -108,7 +108,7 @@ module Buildr
108
108
  changelog = IO.read('CHANGELOG.md')
109
109
  from = '0.00' == ENV['PREVIOUS_PRODUCT_VERSION'] ? `git rev-list --max-parents=0 HEAD`.strip : "v#{ENV['PREVIOUS_PRODUCT_VERSION']}"
110
110
 
111
- header = "### [v#{ENV['PRODUCT_VERSION']}](https://github.com/#{repository_name}/tree/v#{ENV['PRODUCT_VERSION']}) (#{ENV['RELEASE_DATE']}) · [Full Changelog](https://github.com/spritz/spritz/compare/#{from}...v#{ENV['PRODUCT_VERSION']})"
111
+ header = "### [v#{ENV['PRODUCT_VERSION']}](https://github.com/#{repository_name}/tree/v#{ENV['PRODUCT_VERSION']}) (#{ENV['RELEASE_DATE']}) · [Full Changelog](https://github.com/#{repository_name}/compare/#{from}...v#{ENV['PRODUCT_VERSION']})"
112
112
 
113
113
  sub_header_text = ''
114
114
 
data/addon/buildr/spotbugs.rb CHANGED
@@ -23,24 +23,30 @@ module Buildr
23
23
  # The specs for requirements
24
24
  def dependencies
25
25
  %w(
26
- com.github.spotbugs:spotbugs:jar:4.2.1
27
- com.github.spotbugs:spotbugs-annotations:jar:4.2.1
26
+ commons-codec:commons-codec:jar:1.15
27
+ com.github.spotbugs:spotbugs:jar:4.7.3
28
+ com.github.spotbugs:spotbugs-annotations:jar:4.7.3
28
29
  com.google.code.findbugs:jsr305:jar:3.0.2
30
+ com.google.code.gson:gson:jar:2.9.1
29
31
  net.jcip:jcip-annotations:jar:1.0
30
32
  org.apache.bcel:bcel:jar:6.5.0
31
- org.apache.commons:commons-lang3:jar:3.11
32
- org.apache.commons:commons-text:jar:1.9
33
+ org.apache.commons:commons-lang3:jar:3.12.0
34
+ org.apache.commons:commons-text:jar:1.10.0
35
+ org.apache.httpcomponents.client5:httpclient5:jar:5.1.3
36
+ org.apache.httpcomponents.core5:httpcore5:jar:5.1.3
37
+ org.apache.httpcomponents.core5:httpcore5-h2:jar:5.1.3
33
38
  org.dom4j:dom4j:jar:2.1.3
34
39
  org.json:json:jar:20201115
35
- org.ow2.asm:asm:jar:9.0
36
- org.ow2.asm:asm-analysis:jar:9.0
37
- org.ow2.asm:asm-tree:jar:9.0
38
- org.ow2.asm:asm-commons:jar:9.0
39
- org.ow2.asm:asm-util:jar:9.0
40
- org.slf4j:slf4j-api:jar:1.7.30
41
- org.slf4j:slf4j-jdk14:jar:1.7.30
40
+ org.ow2.asm:asm:jar:9.4
41
+ org.ow2.asm:asm-analysis:jar:9.4
42
+ org.ow2.asm:asm-tree:jar:9.4
43
+ org.ow2.asm:asm-commons:jar:9.4
44
+ org.ow2.asm:asm-util:jar:9.4
45
+ org.slf4j:slf4j-api:jar:2.0.0
46
+ org.xmlresolver:xmlresolver:jar:4.4.3
42
47
  jaxen:jaxen:jar:1.2.0
43
- net.sf.saxon:Saxon-HE:jar:10.3
48
+ net.sf.saxon:Saxon-HE:jar:11.4
49
+ xml-apis:xml-apis:jar:1.4.01
44
50
  )
45
51
  end
46
52
 
data/addon/buildr/wsgen.rb CHANGED
@@ -47,7 +47,7 @@ module Buildr
47
47
  project.file(base_wsdl_dir)
48
48
  project.task('java2wsdl').enhance([base_wsdl_dir])
49
49
 
50
- services = classnames.is_a?(Array) ? classnames.inject({}) {|result, element| result[element] = {}; result} : classnames
50
+ services = classnames.is_a?(Array) ? classnames.inject({}) { |result, element| result[element] = {}; result } : classnames
51
51
 
52
52
  services.each_pair do |classname, config|
53
53
 
@@ -188,5 +188,14 @@ module Buildr
188
188
  ws_dir
189
189
  end
190
190
  end
191
+
192
+ module ProjectExtension
193
+ include Extension
194
+
195
+ before_define do |project|
196
+ project.clean { rm_rf project._(:target, :generated, :ws) }
197
+ project.clean { rm_rf project._(:target, :generated, :wsgen) }
198
+ end
199
+ end
191
200
  end
192
201
  end
data/lib/buildr/java/annotation_processor.rb CHANGED
@@ -19,6 +19,7 @@ module Buildr
19
19
  if project.iml?
20
20
  project.iml.instance_variable_set('@main_generated_source_directories', [])
21
21
  project.iml.instance_variable_set('@test_generated_source_directories', [])
22
+ project.clean { rm_rf project._(:target, :generated, :processors) }
22
23
  end
23
24
  end
24
25
 
data/lib/buildr/version.rb CHANGED
@@ -14,5 +14,5 @@
14
14
  # the License.
15
15
 
16
16
  module Buildr #:nodoc:
17
- VERSION = '1.5.21'.freeze
17
+ VERSION = '1.5.22'.freeze
18
18
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: realityforge-buildr
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.5.21
4
+ version: 1.5.22
5
5
  platform: ruby
6
6
  authors:
7
7
  - Apache Buildr
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2022-04-20 00:00:00.000000000 Z
11
+ date: 2024-01-18 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rake