maven-tools 1.1.2 → 1.1.7

Sign up to get free protection for your applications and to get access to all the features.
Files changed (70) hide show
  1. checksums.yaml +5 -5
  2. data/README.md +1 -1
  3. data/lib/maven/tools/dsl.rb +57 -22
  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 +17 -2
  64. data/spec/pom.xml +38 -1
  65. data/spec/pom_maven_alternative_style/pom.rb +16 -2
  66. data/spec/pom_maven_hash_style/pom.rb +23 -10
  67. data/spec/pom_maven_style/pom.rb +78 -160
  68. data/spec/pom_with_execute/pom.xml +2 -2
  69. metadata +16 -17
  70. data/Mavenfile +0 -39
@@ -248,182 +248,100 @@ project do
248
248
  excludes [ '*~' ]
249
249
  end
250
250
 
251
- plugin :jar, '1.0' do
252
- inherited true
253
- configuration :finalName => :testing
254
- end
251
+ plugins do
252
+ plugin :jar, '1.0' do
253
+ inherited false
254
+ extensions 'true'
255
+ configuration :finalName => :testing
256
+ end
255
257
 
256
- jruby_plugin :gem, '1.0.0' do
257
- dependency do
258
- group_id 'rubygems'
259
- artifact_id 'bundler'
260
- version '1.7.13'
261
- 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
262
266
  end
263
- end
264
267
 
265
- plugin :antrun do
266
- execute_goals( 'run' ) do
267
- configuration( 'tasks' => {
268
- 'exec' => {
269
- '@executable' => '/bin/sh',
270
- '@osfamily' => 'unix',
271
- 'arg' => {
272
- '@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'
273
281
  }
274
- },
275
- 'chmod' => {
276
- '@file' => '${jruby.basedir}/bin/jruby',
277
- '@perm' => '755'
278
- }
279
- } )
280
- id 'copy'
281
- 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
282
291
  end
283
- dependency do
284
- group_id 'org.super.duper'
285
- artifact_id 'executor'
286
- version '1.0.0'
287
- end
288
- end
289
292
 
290
- plugin 'org.codehaus.mojo:exec-maven-plugin' do
291
- execute_goal( 'exec' ) do
292
- id 'invoker-generator'
293
- configuration( 'arguments' => [ '-Djruby.bytecode.version=${base.java.version}',
294
- '-classpath',
295
- xml( '<classpath/>' ),
296
- 'org.jruby.anno.InvokerGenerator',
297
- '${anno.sources}/annotated_classes.txt',
298
- '${project.build.outputDirectory}' ],
299
- 'executable' => 'java',
300
- '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
301
305
  end
302
306
  end
303
307
 
304
308
  plugin_management do
305
- plugin( "org.mortbay.jetty:jetty-maven-plugin:8.1" ) do
306
- configuration( :path => '/',
307
- :connectors => [ { :@implementation => "org.eclipse.jetty.server.nio.SelectChannelConnector",
308
- :port => '${run.port}' },
309
- { :@implementation => "org.eclipse.jetty.server.ssl.SslSelectChannelConnector",
310
- :port => '${run.sslport}',
311
- :keystore => '${run.keystore}',
312
- :keyPassword => '${run.keystore.pass}',
313
- :trustPassword => '${run.truststore.pass}' } ],
314
- :httpConnector => { :port => '${run.port}' } )
309
+ plugins do
310
+ jruby_plugin( :gem, '2.0.1') 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'
315
339
  end
316
340
  end
317
341
  end
318
342
  end
319
343
  # <build>
320
- # <extensions>
321
- # <extension>
322
- # <groupId/>
323
- # <artifactId/>
324
- # <version/>
325
- # </extension>
326
- # </extensions>
327
- # <defaultGoal/>
328
- # <resources>
329
- # <resource>
330
- # <targetPath/>
331
- # <filtering/>
332
- # <directory/>
333
- # <includes/>
334
- # <excludes/>
335
- # </resource>
336
- # </resources>
337
- # <testResources>
338
- # <testResource>
339
- # <targetPath/>
340
- # <filtering/>
341
- # <directory/>
342
- # <includes/>
343
- # <excludes/>
344
- # </testResource>
345
- # </testResources>
346
- # <directory/>
347
- # <finalName/>
348
344
  # <filters/>
349
- # <pluginManagement>
350
- # <plugins>
351
- # <plugin>
352
- # <groupId/>
353
- # <artifactId/>
354
- # <version/>
355
- # <extensions/>
356
- # <executions>
357
- # <execution>
358
- # <id/>
359
- # <phase/>
360
- # <goals/>
361
- # <inherited/>
362
- # <configuration/>
363
- # </execution>
364
- # </executions>
365
- # <dependencies>
366
- # <dependency>
367
- # <groupId/>
368
- # <artifactId/>
369
- # <version/>
370
- # <type/>
371
- # <classifier/>
372
- # <scope/>
373
- # <systemPath/>
374
- # <exclusions>
375
- # <exclusion>
376
- # <artifactId/>
377
- # <groupId/>
378
- # </exclusion>
379
- # </exclusions>
380
- # <optional/>
381
- # </dependency>
382
- # </dependencies>
383
- # <goals/>
384
- # <inherited/>
385
- # <configuration/>
386
- # </plugin>
387
- # </plugins>
388
- # </pluginManagement>
389
- # <plugins>
390
- # <plugin>
391
- # <groupId/>
392
- # <artifactId/>
393
- # <version/>
394
- # <extensions/>
395
- # <executions>
396
- # <execution>
397
- # <id/>
398
- # <phase/>
399
- # <goals/>
400
- # <inherited/>
401
- # <configuration/>
402
- # </execution>
403
- # </executions>
404
- # <dependencies>
405
- # <dependency>
406
- # <groupId/>
407
- # <artifactId/>
408
- # <version/>
409
- # <type/>
410
- # <classifier/>
411
- # <scope/>
412
- # <systemPath/>
413
- # <exclusions>
414
- # <exclusion>
415
- # <artifactId/>
416
- # <groupId/>
417
- # </exclusion>
418
- # </exclusions>
419
- # <optional/>
420
- # </dependency>
421
- # </dependencies>
422
- # <goals/>
423
- # <inherited/>
424
- # <configuration/>
425
- # </plugin>
426
- # </plugins>
427
345
  # </build>
428
346
 
429
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,58 +1,59 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: maven-tools
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.1.2
4
+ version: 1.1.7
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-14 00:00:00.000000000 Z
11
+ date: 2021-11-06 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
+ name: virtus
14
15
  requirement: !ruby/object:Gem::Requirement
15
16
  requirements:
16
17
  - - "~>"
17
18
  - !ruby/object:Gem::Version
18
19
  version: '1.0'
19
- name: virtus
20
- prerelease: false
21
20
  type: :runtime
21
+ prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
24
  - - "~>"
25
25
  - !ruby/object:Gem::Version
26
26
  version: '1.0'
27
27
  - !ruby/object:Gem::Dependency
28
+ name: rake
28
29
  requirement: !ruby/object:Gem::Requirement
29
30
  requirements:
30
31
  - - "~>"
31
32
  - !ruby/object:Gem::Version
32
33
  version: '10.0'
33
- name: rake
34
- prerelease: false
35
34
  type: :development
35
+ prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
38
  - - "~>"
39
39
  - !ruby/object:Gem::Version
40
40
  version: '10.0'
41
41
  - !ruby/object:Gem::Dependency
42
+ name: minitest
42
43
  requirement: !ruby/object:Gem::Requirement
43
44
  requirements:
44
45
  - - "~>"
45
46
  - !ruby/object:Gem::Version
46
47
  version: '5.3'
47
- name: minitest
48
- prerelease: false
49
48
  type: :development
49
+ prerelease: false
50
50
  version_requirements: !ruby/object:Gem::Requirement
51
51
  requirements:
52
52
  - - "~>"
53
53
  - !ruby/object:Gem::Version
54
54
  version: '5.3'
55
- description: adds versions conversion from rubygems to maven and vice versa, ruby DSL for POM (Project Object Model from maven), pom generators, etc
55
+ description: adds versions conversion from rubygems to maven and vice versa, ruby
56
+ DSL for POM (Project Object Model from maven), pom generators, etc
56
57
  email:
57
58
  - m.kristian@web.de
58
59
  executables: []
@@ -61,7 +62,6 @@ extra_rdoc_files: []
61
62
  files:
62
63
  - Gemfile
63
64
  - MIT-LICENSE
64
- - Mavenfile
65
65
  - README.md
66
66
  - Rakefile
67
67
  - lib/maven-tools.rb
@@ -332,18 +332,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
332
332
  - !ruby/object:Gem::Version
333
333
  version: '0'
334
334
  requirements: []
335
- rubyforge_project:
336
- rubygems_version: 2.4.8
335
+ rubygems_version: 3.2.22
337
336
  signing_key:
338
337
  specification_version: 4
339
338
  summary: helpers for maven related tasks
340
339
  test_files:
341
340
  - spec/artifact_spec.rb
342
341
  - spec/coordinate_spec.rb
343
- - spec/gemspec_dependencies_spec.rb
344
- - spec/jarfile_spec.rb
345
- - spec/pom_spec.rb
346
- - spec/spec_helper.rb
347
342
  - spec/dsl/gemspec_spec.rb
348
343
  - spec/dsl/jarfile_lock_spec.rb
349
344
  - spec/dsl/profile_gemspec_spec.rb
@@ -354,11 +349,13 @@ test_files:
354
349
  - spec/gemfile_with_lock/bouncy-castle-version.rb
355
350
  - spec/gemfile_with_source/bouncy-castle-version.rb
356
351
  - spec/gemspec/bouncy-castle-version.rb
352
+ - spec/gemspec_dependencies_spec.rb
357
353
  - spec/gemspec_in_profile/bouncy-castle-version.rb
358
354
  - spec/gemspec_include_jars/bouncy-castle-version.rb
359
355
  - spec/gemspec_with_extras/bouncy-castle-version.rb
360
356
  - spec/gemspec_with_jars_lock/bouncy-castle-version.rb
361
357
  - spec/gemspec_with_source/bouncy-castle-version.rb
358
+ - spec/jarfile_spec.rb
362
359
  - spec/pom_from_jarfile/pom.rb
363
360
  - spec/pom_from_jarfile_and_empty_lock/pom.rb
364
361
  - spec/pom_from_jarfile_and_lock/pom.rb
@@ -370,8 +367,9 @@ test_files:
370
367
  - spec/pom_maven_alternative_style/pom.rb
371
368
  - spec/pom_maven_hash_style/pom.rb
372
369
  - spec/pom_maven_style/pom.rb
370
+ - spec/pom_spec.rb
373
371
  - spec/pom_with_execute/pom.rb
374
- - spec/pom.xml
372
+ - spec/spec_helper.rb
375
373
  - spec/dsl/gemspec_spec/jars_and_poms.xml
376
374
  - spec/dsl/gemspec_spec/jars_and_poms_include_jars.xml
377
375
  - spec/dsl/gemspec_spec/maven-tools.xml
@@ -426,6 +424,7 @@ test_files:
426
424
  - spec/gemspec_with_source_and_no_jar/pom.xml
427
425
  - spec/mavenfile_jrubyJar/pom.xml
428
426
  - spec/mavenfile_jrubyWar/pom.xml
427
+ - spec/pom.xml
429
428
  - spec/pom_from_jarfile/pom.xml
430
429
  - spec/pom_from_jarfile_and_empty_lock/pom.xml
431
430
  - spec/pom_from_jarfile_and_lock/pom.xml
data/Mavenfile DELETED
@@ -1,39 +0,0 @@
1
- #-*- mode: ruby -*-
2
-
3
- gemspec
4
-
5
- jruby_plugin( :minitest, :minispecDirectory =>"spec/*spec.rb" ) do
6
- execute_goals(:spec)
7
- end
8
-
9
- #snapshot_repository :jruby, 'http://ci.jruby.org/snapshots/maven'
10
-
11
- # (jruby-1.6.7 produces a lot of yaml errors parsing gemspecs)
12
- properties( 'jruby.plugins.version' => '1.1.4',
13
- 'jruby.versions' => ['1.7.12', '${jruby.version}', '9.0.5.0'].join(','),
14
- 'jruby.modes' => ['1.9', '2.0', '2.2'].join(','),
15
- # just lock the versions
16
- 'jruby.version' => '1.7.24',
17
- 'push.skip' => true )
18
-
19
-
20
- profile :id => :release do
21
- properties 'maven.test.skip' => true, 'invoker.skip' => true, 'push.skip' => false
22
-
23
- # distribution_management do
24
- # repository :id => :ossrh, :url => 'https://oss.sonatype.org/service/local/staging/deploy/maven2/'
25
- # end
26
-
27
- build do
28
- default_goal :deploy
29
- end
30
-
31
- # plugin :gpg, '1.5' do
32
- # execute_goal :sign, :id => 'sign artifacts', :phase => :verify
33
- # end
34
- # plugin :deploy, '2.8.2' do
35
- # execute_goal :deploy, :phase => :deploy, :id => 'deploy gem to maven central'
36
- # end
37
- end
38
-
39
- # vim: syntax=Ruby