maven-tools 1.1.4 → 1.1.6

Sign up to get free protection for your applications and to get access to all the features.
Files changed (69) hide show
  1. checksums.yaml +4 -4
  2. data/Mavenfile +2 -2
  3. data/lib/maven/tools/dsl.rb +34 -15
  4. data/lib/maven/tools/model.rb +4 -4
  5. data/lib/maven/tools/version.rb +1 -1
  6. data/lib/maven/tools/versions.rb +4 -4
  7. data/lib/maven/tools/visitor.rb +1 -1
  8. data/spec/dsl/gemspec_spec/jars_and_poms.xml +2 -2
  9. data/spec/dsl/gemspec_spec/jars_and_poms_include_jars.xml +2 -2
  10. data/spec/dsl/gemspec_spec/maven-tools.xml +2 -2
  11. data/spec/dsl/jarfile_lock_spec/Jarfile.legacy.lock +1 -1
  12. data/spec/dsl/jarfile_lock_spec/Jarfile.lock +3 -3
  13. data/spec/dsl/profile_gemspec_spec/jars_and_poms.xml +2 -2
  14. data/spec/dsl/profile_gemspec_spec/jars_and_poms_include_jars.xml +2 -2
  15. data/spec/dsl/profile_gemspec_spec/maven-tools.xml +2 -2
  16. data/spec/dsl/profile_gemspec_spec/no_gems.xml +2 -2
  17. data/spec/dsl/profile_gemspec_spec/snapshot.xml +2 -2
  18. data/spec/dsl/profile_gemspec_spec/unknown_license.xml +2 -2
  19. data/spec/dsl/project_gemspec_spec/extended.xml +2 -2
  20. data/spec/dsl/project_gemspec_spec/jars_and_poms.xml +2 -2
  21. data/spec/dsl/project_gemspec_spec/jars_and_poms_include_jars.xml +2 -2
  22. data/spec/dsl/project_gemspec_spec/maven-tools.xml +2 -2
  23. data/spec/dsl/project_gemspec_spec/no_gems.xml +2 -2
  24. data/spec/dsl/project_gemspec_spec/profile.xml +2 -2
  25. data/spec/dsl/project_gemspec_spec/snapshot.xml +2 -2
  26. data/spec/dsl/project_gemspec_spec/unknown_license.xml +2 -2
  27. data/spec/gemfile/pom.xml +2 -2
  28. data/spec/gemfile_include_jars/pom.xml +2 -2
  29. data/spec/gemfile_with_access_to_model/pom.xml +2 -2
  30. data/spec/gemfile_with_custom_source/pom.xml +2 -2
  31. data/spec/gemfile_with_custom_source_and_custom_jarname/pom.xml +2 -2
  32. data/spec/gemfile_with_extras/pom.xml +2 -2
  33. data/spec/gemfile_with_groups/pom.xml +2 -2
  34. data/spec/gemfile_with_groups_and_lockfile/pom.xml +2 -2
  35. data/spec/gemfile_with_jars_lock/pom.xml +2 -2
  36. data/spec/gemfile_with_lock/pom.xml +2 -2
  37. data/spec/gemfile_with_path/pom.xml +2 -2
  38. data/spec/gemfile_with_platforms/pom.xml +2 -2
  39. data/spec/gemfile_with_source/Gemfile +4 -0
  40. data/spec/gemfile_with_source/pom.xml +12 -2
  41. data/spec/gemfile_with_source_and_custom_jarname/pom.xml +2 -2
  42. data/spec/gemfile_with_source_and_no_jar/pom.xml +2 -2
  43. data/spec/gemfile_with_test_group/pom.xml +2 -2
  44. data/spec/gemfile_with_two_sources/pom.xml +2 -2
  45. data/spec/gemfile_without_gemspec/pom.xml +2 -2
  46. data/spec/gemspec/pom.xml +2 -2
  47. data/spec/gemspec_in_profile/pom.xml +2 -2
  48. data/spec/gemspec_include_jars/pom.xml +2 -2
  49. data/spec/gemspec_no_rubygems_repo/pom.xml +2 -2
  50. data/spec/gemspec_prerelease/pom.xml +2 -2
  51. data/spec/gemspec_prerelease_snapshot/pom.xml +2 -2
  52. data/spec/gemspec_with_access_to_model/pom.xml +2 -2
  53. data/spec/gemspec_with_custom_source/pom.xml +2 -2
  54. data/spec/gemspec_with_custom_source_and_custom_jarname/pom.xml +2 -2
  55. data/spec/gemspec_with_extras/pom.xml +2 -2
  56. data/spec/gemspec_with_jar_dependencies/pom.xml +2 -2
  57. data/spec/gemspec_with_jars_lock/pom.xml +2 -2
  58. data/spec/gemspec_with_prereleased_dependency/pom.xml +2 -2
  59. data/spec/gemspec_with_prereleased_dependency_and_no_repo/pom.xml +2 -2
  60. data/spec/gemspec_with_source/pom.xml +2 -2
  61. data/spec/gemspec_with_source_and_custom_jarname/pom.xml +2 -2
  62. data/spec/gemspec_with_source_and_no_jar/pom.xml +2 -2
  63. data/spec/mavenfile/Mavenfile +15 -0
  64. data/spec/pom.xml +35 -0
  65. data/spec/pom_maven_alternative_style/pom.rb +14 -0
  66. data/spec/pom_maven_hash_style/pom.rb +20 -8
  67. data/spec/pom_maven_style/pom.rb +78 -162
  68. data/spec/pom_with_execute/pom.xml +2 -2
  69. metadata +3 -3
@@ -207,6 +207,11 @@ project 'my name', 'example.com' do
207
207
  end
208
208
 
209
209
  overrides do
210
+ jruby_plugin( :gem, '1.1.5', :scope => :compile,
211
+ :gems => {
212
+ 'thread_safe' => '0.3.3',
213
+ 'jdbc-mysql' => '5.1.30'
214
+ } )
210
215
  plugin( "org.mortbay.jetty:jetty-maven-plugin:8.1",
211
216
  :path => '/',
212
217
  :connectors => [ { :@implementation => "org.eclipse.jetty.server.nio.SelectChannelConnector",
@@ -220,6 +225,15 @@ project 'my name', 'example.com' do
220
225
  end
221
226
 
222
227
  end
228
+ profile :id => 'one' do
229
+ activation do
230
+ active_by_default false
231
+ jdk '1.7'
232
+ os :family => 'nix', :version => '2.7', :arch => 'x86_64', :name => 'linux'
233
+ file :missing => 'required_file', :exists => 'optional'
234
+ property :name => 'test', :value => 'extended'
235
+ end
236
+ end
223
237
  end
224
238
 
225
239
  # <build>
@@ -216,17 +216,22 @@ project :name => 'my name', :url => 'example.com' do
216
216
  plugin 'org.codehaus.mojo:exec-maven-plugin' do
217
217
  execute_goal( 'exec',
218
218
  :id => 'invoker-generator',
219
- 'arguments' => [ '-Djruby.bytecode.version=${base.java.version}',
219
+ :arguments => [ '-Djruby.bytecode.version=${base.java.version}',
220
220
  '-classpath',
221
221
  xml( '<classpath/>' ),
222
222
  'org.jruby.anno.InvokerGenerator',
223
223
  '${anno.sources}/annotated_classes.txt',
224
224
  '${project.build.outputDirectory}' ],
225
- 'executable' => 'java',
226
- 'classpathScope' => 'compile' )
225
+ :executable => 'java',
226
+ :classpath_scope => 'compile' )
227
227
  end
228
228
 
229
229
  plugin_management do
230
+ jruby_plugin( :gem, '1.1.5', :scope => :compile,
231
+ :gems => {
232
+ 'thread_safe' => '0.3.3',
233
+ 'jdbc-mysql' => '5.1.30'
234
+ } )
230
235
  plugin( "org.mortbay.jetty:jetty-maven-plugin:8.1",
231
236
  :path => '/',
232
237
  :connectors => [ { :@implementation => "org.eclipse.jetty.server.nio.SelectChannelConnector",
@@ -234,15 +239,22 @@ project :name => 'my name', :url => 'example.com' do
234
239
  { :@implementation => "org.eclipse.jetty.server.ssl.SslSelectChannelConnector",
235
240
  :port => '${run.sslport}',
236
241
  :keystore => '${run.keystore}',
237
- :keyPassword => '${run.keystore.pass}',
238
- :trustPassword => '${run.truststore.pass}' } ],
239
- :httpConnector => { :port => '${run.port}' } )
242
+ :key_password => '${run.keystore.pass}',
243
+ :trust_password => '${run.truststore.pass}' } ],
244
+ :http_connector => { :port => '${run.port}' } )
245
+ end
246
+ end
247
+ profile :id => 'one' do
248
+ activation do
249
+ active_by_default false
250
+ jdk '1.7'
251
+ os :family => 'nix', :version => '2.7', :arch => 'x86_64', :name => 'linux'
252
+ file :missing => 'required_file', :exists => 'optional'
253
+ property :name => 'test', :value => 'extended'
240
254
  end
241
255
  end
242
256
  end
243
257
 
244
- # <directory/>
245
- # <finalName/>
246
258
  # <filters/>
247
259
  # </build>
248
260
 
@@ -248,184 +248,100 @@ project do
248
248
  excludes [ '*~' ]
249
249
  end
250
250
 
251
- plugin :jar, '1.0' do
252
- inherited false
253
- extensions 'true'
254
- configuration :finalName => :testing
255
- end
251
+ plugins do
252
+ plugin :jar, '1.0' do
253
+ inherited false
254
+ extensions 'true'
255
+ configuration :finalName => :testing
256
+ end
256
257
 
257
- jruby_plugin :gem, '1.0.0' do
258
- extensions false
259
- dependency do
260
- group_id 'rubygems'
261
- artifact_id 'bundler'
262
- version '1.7.13'
263
- type :gem
258
+ jruby_plugin :gem, '1.0.0' do
259
+ extensions false
260
+ dependency do
261
+ group_id 'rubygems'
262
+ artifact_id 'bundler'
263
+ version '1.7.13'
264
+ type :gem
265
+ end
264
266
  end
265
- end
266
267
 
267
- plugin :antrun do
268
- execute_goals( 'run' ) do
269
- configuration( 'tasks' => {
270
- 'exec' => {
271
- '@executable' => '/bin/sh',
272
- '@osfamily' => 'unix',
273
- 'arg' => {
274
- '@line' => '-c \'cp "${jruby.basedir}/bin/jruby.bash" "${jruby.basedir}/bin/jruby"\''
268
+ plugin :antrun do
269
+ execute_goals( 'run' ) do
270
+ configuration( 'tasks' => {
271
+ 'exec' => {
272
+ '@executable' => '/bin/sh',
273
+ '@osfamily' => 'unix',
274
+ 'arg' => {
275
+ '@line' => '-c \'cp "${jruby.basedir}/bin/jruby.bash" "${jruby.basedir}/bin/jruby"\''
276
+ }
277
+ },
278
+ 'chmod' => {
279
+ '@file' => '${jruby.basedir}/bin/jruby',
280
+ '@perm' => '755'
275
281
  }
276
- },
277
- 'chmod' => {
278
- '@file' => '${jruby.basedir}/bin/jruby',
279
- '@perm' => '755'
280
- }
281
- } )
282
- id 'copy'
283
- phase 'package'
282
+ } )
283
+ id 'copy'
284
+ phase 'package'
285
+ end
286
+ dependency do
287
+ group_id 'org.super.duper'
288
+ artifact_id 'executor'
289
+ version '1.0.0'
290
+ end
284
291
  end
285
- dependency do
286
- group_id 'org.super.duper'
287
- artifact_id 'executor'
288
- version '1.0.0'
289
- end
290
- end
291
292
 
292
- plugin 'org.codehaus.mojo:exec-maven-plugin' do
293
- execute_goal( 'exec' ) do
294
- id 'invoker-generator'
295
- configuration( 'arguments' => [ '-Djruby.bytecode.version=${base.java.version}',
296
- '-classpath',
297
- xml( '<classpath/>' ),
298
- 'org.jruby.anno.InvokerGenerator',
299
- '${anno.sources}/annotated_classes.txt',
300
- '${project.build.outputDirectory}' ],
301
- 'executable' => 'java',
302
- 'classpathScope' => 'compile' )
293
+ plugin 'org.codehaus.mojo:exec-maven-plugin' do
294
+ execute_goal( 'exec' ) do
295
+ id 'invoker-generator'
296
+ configuration( 'arguments' => [ '-Djruby.bytecode.version=${base.java.version}',
297
+ '-classpath',
298
+ xml( '<classpath/>' ),
299
+ 'org.jruby.anno.InvokerGenerator',
300
+ '${anno.sources}/annotated_classes.txt',
301
+ '${project.build.outputDirectory}' ],
302
+ 'executable' => 'java',
303
+ 'classpathScope' => 'compile' )
304
+ end
303
305
  end
304
306
  end
305
307
 
306
308
  plugin_management do
307
- plugin( "org.mortbay.jetty:jetty-maven-plugin:8.1" ) do
308
- configuration( :path => '/',
309
- :connectors => [ { :@implementation => "org.eclipse.jetty.server.nio.SelectChannelConnector",
310
- :port => '${run.port}' },
311
- { :@implementation => "org.eclipse.jetty.server.ssl.SslSelectChannelConnector",
312
- :port => '${run.sslport}',
313
- :keystore => '${run.keystore}',
314
- :keyPassword => '${run.keystore.pass}',
315
- :trustPassword => '${run.truststore.pass}' } ],
316
- :httpConnector => { :port => '${run.port}' } )
309
+ plugins do
310
+ jruby_plugin( :gem, '1.1.5') do
311
+ configuration( :scope => :compile,
312
+ :gems => {
313
+ 'thread_safe' => '0.3.3',
314
+ 'jdbc-mysql' => '5.1.30'
315
+ } )
316
+ end
317
+ plugin( "org.mortbay.jetty:jetty-maven-plugin:8.1" ) do
318
+ configuration( :path => '/',
319
+ :connectors => [ { :@implementation => "org.eclipse.jetty.server.nio.SelectChannelConnector",
320
+ :port => '${run.port}' },
321
+ { :@implementation => "org.eclipse.jetty.server.ssl.SslSelectChannelConnector",
322
+ :port => '${run.sslport}',
323
+ :keystore => '${run.keystore}',
324
+ :keyPassword => '${run.keystore.pass}',
325
+ :trustPassword => '${run.truststore.pass}' } ],
326
+ :httpConnector => { :port => '${run.port}' } )
327
+ end
328
+ end
329
+ end
330
+ end
331
+ profiles do
332
+ profile :id => 'one' do
333
+ activation do
334
+ active_by_default false
335
+ jdk '1.7'
336
+ os :family => 'nix', :version => '2.7', :arch => 'x86_64', :name => 'linux'
337
+ file :missing => 'required_file', :exists => 'optional'
338
+ property :name => 'test', :value => 'extended'
317
339
  end
318
340
  end
319
341
  end
320
342
  end
321
343
  # <build>
322
- # <extensions>
323
- # <extension>
324
- # <groupId/>
325
- # <artifactId/>
326
- # <version/>
327
- # </extension>
328
- # </extensions>
329
- # <defaultGoal/>
330
- # <resources>
331
- # <resource>
332
- # <targetPath/>
333
- # <filtering/>
334
- # <directory/>
335
- # <includes/>
336
- # <excludes/>
337
- # </resource>
338
- # </resources>
339
- # <testResources>
340
- # <testResource>
341
- # <targetPath/>
342
- # <filtering/>
343
- # <directory/>
344
- # <includes/>
345
- # <excludes/>
346
- # </testResource>
347
- # </testResources>
348
- # <directory/>
349
- # <finalName/>
350
344
  # <filters/>
351
- # <pluginManagement>
352
- # <plugins>
353
- # <plugin>
354
- # <groupId/>
355
- # <artifactId/>
356
- # <version/>
357
- # <extensions/>
358
- # <executions>
359
- # <execution>
360
- # <id/>
361
- # <phase/>
362
- # <goals/>
363
- # <inherited/>
364
- # <configuration/>
365
- # </execution>
366
- # </executions>
367
- # <dependencies>
368
- # <dependency>
369
- # <groupId/>
370
- # <artifactId/>
371
- # <version/>
372
- # <type/>
373
- # <classifier/>
374
- # <scope/>
375
- # <systemPath/>
376
- # <exclusions>
377
- # <exclusion>
378
- # <artifactId/>
379
- # <groupId/>
380
- # </exclusion>
381
- # </exclusions>
382
- # <optional/>
383
- # </dependency>
384
- # </dependencies>
385
- # <goals/>
386
- # <inherited/>
387
- # <configuration/>
388
- # </plugin>
389
- # </plugins>
390
- # </pluginManagement>
391
- # <plugins>
392
- # <plugin>
393
- # <groupId/>
394
- # <artifactId/>
395
- # <version/>
396
- # <extensions/>
397
- # <executions>
398
- # <execution>
399
- # <id/>
400
- # <phase/>
401
- # <goals/>
402
- # <inherited/>
403
- # <configuration/>
404
- # </execution>
405
- # </executions>
406
- # <dependencies>
407
- # <dependency>
408
- # <groupId/>
409
- # <artifactId/>
410
- # <version/>
411
- # <type/>
412
- # <classifier/>
413
- # <scope/>
414
- # <systemPath/>
415
- # <exclusions>
416
- # <exclusion>
417
- # <artifactId/>
418
- # <groupId/>
419
- # </exclusion>
420
- # </exclusions>
421
- # <optional/>
422
- # </dependency>
423
- # </dependencies>
424
- # <goals/>
425
- # <inherited/>
426
- # <configuration/>
427
- # </plugin>
428
- # </plugins>
429
345
  # </build>
430
346
 
431
347
  # <reports/>
@@ -20,7 +20,7 @@
20
20
  <plugin>
21
21
  <groupId>io.takari.polyglot</groupId>
22
22
  <artifactId>polyglot-maven-plugin</artifactId>
23
- <version>0.1.15</version>
23
+ <version>0.1.18</version>
24
24
  <executions>
25
25
  <execution>
26
26
  <phase>validate</phase>
@@ -80,7 +80,7 @@
80
80
  <dependency>
81
81
  <groupId>io.takari.polyglot</groupId>
82
82
  <artifactId>polyglot-ruby</artifactId>
83
- <version>0.1.15</version>
83
+ <version>0.1.18</version>
84
84
  </dependency>
85
85
  </dependencies>
86
86
  </plugin>
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: maven-tools
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.1.4
4
+ version: 1.1.6
5
5
  platform: ruby
6
6
  authors:
7
7
  - Christian Meier
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2016-04-22 00:00:00.000000000 Z
11
+ date: 2016-06-14 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  requirement: !ruby/object:Gem::Requirement
@@ -333,7 +333,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
333
333
  version: '0'
334
334
  requirements: []
335
335
  rubyforge_project:
336
- rubygems_version: 2.4.8
336
+ rubygems_version: 2.6.4
337
337
  signing_key:
338
338
  specification_version: 4
339
339
  summary: helpers for maven related tasks