maven-tools 1.0.6 → 1.0.7
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/Mavenfile +2 -2
- data/lib/maven/tools/dsl/project_gemspec.rb +8 -4
- data/lib/maven/tools/gemspec_dependencies.rb +3 -3
- data/lib/maven/tools/version.rb +1 -1
- data/spec/dsl/profile_gemspec_spec.rb +7 -0
- data/spec/dsl/profile_gemspec_spec/unknown_license.gemspec +17 -0
- data/spec/dsl/profile_gemspec_spec/unknown_license.xml +29 -0
- data/spec/dsl/project_gemspec_spec.rb +7 -0
- data/spec/dsl/project_gemspec_spec/unknown_license.gemspec +17 -0
- data/spec/dsl/project_gemspec_spec/unknown_license.xml +55 -0
- metadata +10 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: be3cb4f48bdee6c87cd4633838e5471325452196
|
|
4
|
+
data.tar.gz: 8797da7932dbf47a435d91cb2560cc8335bb7f4f
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 73bb0dbf88f20d9ecfffbbae1f6a75d3e1240bb29c2bf6a1a6e18d1bd3dcea18856fd7dd30171d27d05e51b0d01805571af5dfa1ba60feba3ba2aaeb83be8a26
|
|
7
|
+
data.tar.gz: ce80dae968a9795014bc8aef7bedbd1496890bdda93dc39111f0d0499ecbf7fc18eaf3370cdc22fcb7a731369a3885059ceee0350e28f8fc8519298eae4ab8a7
|
data/Mavenfile
CHANGED
|
@@ -9,8 +9,8 @@ end
|
|
|
9
9
|
#snapshot_repository :jruby, 'http://ci.jruby.org/snapshots/maven'
|
|
10
10
|
|
|
11
11
|
# (jruby-1.6.7 produces a lot of yaml errors parsing gemspecs)
|
|
12
|
-
properties( #'jruby.versions' => ['1.7.16.1','9.0.0.0-SNAPSHOT'].join(','),
|
|
13
|
-
'jruby.versions' => ['1.7.16.1'].join(','),
|
|
12
|
+
properties( #'jruby.versions' => ['1.7.12', '1.7.16.1','9.0.0.0-SNAPSHOT'].join(','),
|
|
13
|
+
'jruby.versions' => ['1.7.12', '1.7.16.1'].join(','),
|
|
14
14
|
'jruby.modes' => ['1.9', '2.0','2.1'].join(','),
|
|
15
15
|
# just lock the versions
|
|
16
16
|
'jruby.version' => '1.7.16.1',
|
|
@@ -44,10 +44,14 @@ module Maven
|
|
|
44
44
|
end
|
|
45
45
|
|
|
46
46
|
spec.licenses.each do |l|
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
47
|
+
if Maven::Tools::LICENSES.include?(l.downcase)
|
|
48
|
+
lic = Maven::Tools::LICENSES[ l.downcase ]
|
|
49
|
+
@parent.license( :name => lic.short,
|
|
50
|
+
:url => lic.url,
|
|
51
|
+
:comments => lic.name )
|
|
52
|
+
else
|
|
53
|
+
@parent.license( l )
|
|
54
|
+
end
|
|
51
55
|
end
|
|
52
56
|
authors = [ spec.authors || [] ].flatten
|
|
53
57
|
emails = [ spec.email || [] ].flatten
|
|
@@ -5,11 +5,11 @@ module Maven
|
|
|
5
5
|
class GemspecDependencies
|
|
6
6
|
|
|
7
7
|
def initialize( gemspec )
|
|
8
|
-
if gemspec.is_a?
|
|
9
|
-
@spec = gemspec
|
|
10
|
-
else
|
|
8
|
+
if gemspec.is_a? String
|
|
11
9
|
warn 'DEPRECATED use Maven::Tools::DSL::Gemspec instead'
|
|
12
10
|
@spec = Gem::Specification.load( gemspec )
|
|
11
|
+
else
|
|
12
|
+
@spec = gemspec
|
|
13
13
|
end
|
|
14
14
|
_setup
|
|
15
15
|
end
|
data/lib/maven/tools/version.rb
CHANGED
|
@@ -74,4 +74,11 @@ describe Maven::Tools::DSL::ProfileGemspec do
|
|
|
74
74
|
xml.must_equal( ProfileGemspecFile.read( 'jars_and_poms_include_jars.xml',
|
|
75
75
|
'gemspec_spec' ) )
|
|
76
76
|
end
|
|
77
|
+
|
|
78
|
+
it 'evals gemspec without previously known license' do
|
|
79
|
+
subject.new parent, 'unknown_license.gemspec'
|
|
80
|
+
xml = ""
|
|
81
|
+
Maven::Tools::Visitor.new( xml ).accept_project( parent.model )
|
|
82
|
+
xml.must_equal( ProfileGemspecFile.read( 'unknown_license.xml', 'gemspec_spec' ) )
|
|
83
|
+
end
|
|
77
84
|
end
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
# -*- mode:ruby -*-
|
|
2
|
+
# -*- coding: utf-8 -*-
|
|
3
|
+
Gem::Specification.new do |s|
|
|
4
|
+
s.name = 'maven-tools'
|
|
5
|
+
s.version = '123'
|
|
6
|
+
|
|
7
|
+
s.summary = 'helpers for maven related tasks'
|
|
8
|
+
s.description = 'adds versions conversion from rubygems to maven and vice versa, ruby DSL for POM (Project Object Model from maven), pom generators, etc'
|
|
9
|
+
s.homepage = 'http://github.com/torquebox/maven-tools'
|
|
10
|
+
|
|
11
|
+
s.authors = ['Christian Meier']
|
|
12
|
+
s.email = ['m.kristian@web.de']
|
|
13
|
+
|
|
14
|
+
s.license = 'unknown'
|
|
15
|
+
end
|
|
16
|
+
|
|
17
|
+
# vim: syntax=Ruby
|
|
@@ -0,0 +1,29 @@
|
|
|
1
|
+
<project>
|
|
2
|
+
<modelVersion>4.0.0</modelVersion>
|
|
3
|
+
<groupId>no_group_id_given</groupId>
|
|
4
|
+
<artifactId>profile_gemspec_spec</artifactId>
|
|
5
|
+
<version>0.0.0</version>
|
|
6
|
+
<name>profile_gemspec_spec</name>
|
|
7
|
+
<properties>
|
|
8
|
+
<project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
|
|
9
|
+
<jruby.plugins.version>1.0.7</jruby.plugins.version>
|
|
10
|
+
</properties>
|
|
11
|
+
<repositories>
|
|
12
|
+
<repository>
|
|
13
|
+
<id>rubygems-releases</id>
|
|
14
|
+
<url>http://rubygems-proxy.torquebox.org/releases</url>
|
|
15
|
+
</repository>
|
|
16
|
+
</repositories>
|
|
17
|
+
<build>
|
|
18
|
+
<plugins>
|
|
19
|
+
<plugin>
|
|
20
|
+
<groupId>de.saumya.mojo</groupId>
|
|
21
|
+
<artifactId>gem-maven-plugin</artifactId>
|
|
22
|
+
<version>${jruby.plugins.version}</version>
|
|
23
|
+
<configuration>
|
|
24
|
+
<gemspec>unknown_license.gemspec</gemspec>
|
|
25
|
+
</configuration>
|
|
26
|
+
</plugin>
|
|
27
|
+
</plugins>
|
|
28
|
+
</build>
|
|
29
|
+
</project>
|
|
@@ -94,4 +94,11 @@ describe Maven::Tools::DSL::ProjectGemspec do
|
|
|
94
94
|
xml.must_equal( XmlFile.read( 'extended.xml',
|
|
95
95
|
'gemspec_spec' ) )
|
|
96
96
|
end
|
|
97
|
+
|
|
98
|
+
it 'evals gemspec with unknown license' do
|
|
99
|
+
subject.new parent, :name => 'unknown_license.gemspec'
|
|
100
|
+
xml = ""
|
|
101
|
+
Maven::Tools::Visitor.new( xml ).accept_project( parent.model )
|
|
102
|
+
xml.must_equal( XmlFile.read( 'unknown_license.xml', 'gemspec_spec') )
|
|
103
|
+
end
|
|
97
104
|
end
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
# -*- mode:ruby -*-
|
|
2
|
+
# -*- coding: utf-8 -*-
|
|
3
|
+
Gem::Specification.new do |s|
|
|
4
|
+
s.name = 'maven-tools'
|
|
5
|
+
s.version = '123'
|
|
6
|
+
|
|
7
|
+
s.summary = 'helpers for maven related tasks'
|
|
8
|
+
s.description = 'adds versions conversion from rubygems to maven and vice versa, ruby DSL for POM (Project Object Model from maven), pom generators, etc'
|
|
9
|
+
s.homepage = 'http://github.com/torquebox/maven-tools'
|
|
10
|
+
|
|
11
|
+
s.authors = ['Christian Meier']
|
|
12
|
+
s.email = ['m.kristian@web.de']
|
|
13
|
+
|
|
14
|
+
s.license = 'unknown'
|
|
15
|
+
end
|
|
16
|
+
|
|
17
|
+
# vim: syntax=Ruby
|
|
@@ -0,0 +1,55 @@
|
|
|
1
|
+
<project>
|
|
2
|
+
<modelVersion>4.0.0</modelVersion>
|
|
3
|
+
<groupId>rubygems</groupId>
|
|
4
|
+
<artifactId>maven-tools</artifactId>
|
|
5
|
+
<version>123</version>
|
|
6
|
+
<packaging>gem</packaging>
|
|
7
|
+
<name>helpers for maven related tasks</name>
|
|
8
|
+
<url>http://github.com/torquebox/maven-tools</url>
|
|
9
|
+
<description>adds versions conversion from rubygems to maven and vice versa, ruby DSL for POM (Project Object Model from maven), pom generators, etc</description>
|
|
10
|
+
<licenses>
|
|
11
|
+
<license>
|
|
12
|
+
<name>unknown</name>
|
|
13
|
+
</license>
|
|
14
|
+
</licenses>
|
|
15
|
+
<developers>
|
|
16
|
+
<developer>
|
|
17
|
+
<name>Christian Meier</name>
|
|
18
|
+
<email>m.kristian@web.de</email>
|
|
19
|
+
</developer>
|
|
20
|
+
</developers>
|
|
21
|
+
<scm>
|
|
22
|
+
<connection>https://github.com/torquebox/maven-tools.git</connection>
|
|
23
|
+
<url>http://github.com/torquebox/maven-tools</url>
|
|
24
|
+
</scm>
|
|
25
|
+
<properties>
|
|
26
|
+
<project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
|
|
27
|
+
<jruby.plugins.version>1.0.7</jruby.plugins.version>
|
|
28
|
+
</properties>
|
|
29
|
+
<repositories>
|
|
30
|
+
<repository>
|
|
31
|
+
<id>rubygems-releases</id>
|
|
32
|
+
<url>http://rubygems-proxy.torquebox.org/releases</url>
|
|
33
|
+
</repository>
|
|
34
|
+
</repositories>
|
|
35
|
+
<build>
|
|
36
|
+
<extensions>
|
|
37
|
+
<extension>
|
|
38
|
+
<groupId>de.saumya.mojo</groupId>
|
|
39
|
+
<artifactId>gem-extension</artifactId>
|
|
40
|
+
<version>${jruby.plugins.version}</version>
|
|
41
|
+
</extension>
|
|
42
|
+
</extensions>
|
|
43
|
+
<directory>${basedir}/pkg</directory>
|
|
44
|
+
<plugins>
|
|
45
|
+
<plugin>
|
|
46
|
+
<groupId>de.saumya.mojo</groupId>
|
|
47
|
+
<artifactId>gem-maven-plugin</artifactId>
|
|
48
|
+
<version>${jruby.plugins.version}</version>
|
|
49
|
+
<configuration>
|
|
50
|
+
<gemspec>unknown_license.gemspec</gemspec>
|
|
51
|
+
</configuration>
|
|
52
|
+
</plugin>
|
|
53
|
+
</plugins>
|
|
54
|
+
</build>
|
|
55
|
+
</project>
|
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.0.
|
|
4
|
+
version: 1.0.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: 2014-
|
|
11
|
+
date: 2014-12-04 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: virtus
|
|
@@ -157,6 +157,7 @@ files:
|
|
|
157
157
|
- spec/dsl/profile_gemspec_spec/maven-tools.xml
|
|
158
158
|
- spec/dsl/profile_gemspec_spec/jars_and_poms_include_jars.xml
|
|
159
159
|
- spec/dsl/profile_gemspec_spec/snapshot.xml
|
|
160
|
+
- spec/dsl/profile_gemspec_spec/unknown_license.xml
|
|
160
161
|
- spec/dsl/profile_gemspec_spec/jars_and_poms.xml
|
|
161
162
|
- spec/dsl/gemspec_spec/maven-tools.xml
|
|
162
163
|
- spec/dsl/gemspec_spec/jars_and_poms_include_jars.xml
|
|
@@ -167,6 +168,7 @@ files:
|
|
|
167
168
|
- spec/dsl/project_gemspec_spec/profile.xml
|
|
168
169
|
- spec/dsl/project_gemspec_spec/snapshot.xml
|
|
169
170
|
- spec/dsl/project_gemspec_spec/extended.xml
|
|
171
|
+
- spec/dsl/project_gemspec_spec/unknown_license.xml
|
|
170
172
|
- spec/dsl/project_gemspec_spec/jars_and_poms.xml
|
|
171
173
|
- spec/gemspec_with_prereleased_dependency/pom.xml
|
|
172
174
|
- spec/pom_from_jarfile_and_skip_lock/pom.xml
|
|
@@ -266,12 +268,14 @@ files:
|
|
|
266
268
|
- spec/gemspec_prerelease/bouncy-castle-java.gemspec
|
|
267
269
|
- spec/gemfile_with_custom_source/bouncy-castle-java.gemspec
|
|
268
270
|
- spec/dsl/profile_gemspec_spec/snapshot.gemspec
|
|
271
|
+
- spec/dsl/profile_gemspec_spec/unknown_license.gemspec
|
|
269
272
|
- spec/dsl/profile_gemspec_spec/jars_and_poms.gemspec
|
|
270
273
|
- spec/dsl/profile_gemspec_spec/maven-tools.gemspec
|
|
271
274
|
- spec/dsl/gemspec_spec/jars_and_poms.gemspec
|
|
272
275
|
- spec/dsl/gemspec_spec/maven-tools.gemspec
|
|
273
276
|
- spec/dsl/project_gemspec_spec/snapshot.gemspec
|
|
274
277
|
- spec/dsl/project_gemspec_spec/extended.gemspec
|
|
278
|
+
- spec/dsl/project_gemspec_spec/unknown_license.gemspec
|
|
275
279
|
- spec/dsl/project_gemspec_spec/jars_and_poms.gemspec
|
|
276
280
|
- spec/dsl/project_gemspec_spec/maven-tools.gemspec
|
|
277
281
|
- spec/gemspec_with_prereleased_dependency/bouncy-castle-java.gemspec
|
|
@@ -371,6 +375,7 @@ test_files:
|
|
|
371
375
|
- spec/dsl/profile_gemspec_spec/maven-tools.xml
|
|
372
376
|
- spec/dsl/profile_gemspec_spec/jars_and_poms_include_jars.xml
|
|
373
377
|
- spec/dsl/profile_gemspec_spec/snapshot.xml
|
|
378
|
+
- spec/dsl/profile_gemspec_spec/unknown_license.xml
|
|
374
379
|
- spec/dsl/profile_gemspec_spec/jars_and_poms.xml
|
|
375
380
|
- spec/dsl/gemspec_spec/maven-tools.xml
|
|
376
381
|
- spec/dsl/gemspec_spec/jars_and_poms_include_jars.xml
|
|
@@ -381,6 +386,7 @@ test_files:
|
|
|
381
386
|
- spec/dsl/project_gemspec_spec/profile.xml
|
|
382
387
|
- spec/dsl/project_gemspec_spec/snapshot.xml
|
|
383
388
|
- spec/dsl/project_gemspec_spec/extended.xml
|
|
389
|
+
- spec/dsl/project_gemspec_spec/unknown_license.xml
|
|
384
390
|
- spec/dsl/project_gemspec_spec/jars_and_poms.xml
|
|
385
391
|
- spec/gemspec_with_prereleased_dependency/pom.xml
|
|
386
392
|
- spec/pom_from_jarfile_and_skip_lock/pom.xml
|
|
@@ -480,12 +486,14 @@ test_files:
|
|
|
480
486
|
- spec/gemspec_prerelease/bouncy-castle-java.gemspec
|
|
481
487
|
- spec/gemfile_with_custom_source/bouncy-castle-java.gemspec
|
|
482
488
|
- spec/dsl/profile_gemspec_spec/snapshot.gemspec
|
|
489
|
+
- spec/dsl/profile_gemspec_spec/unknown_license.gemspec
|
|
483
490
|
- spec/dsl/profile_gemspec_spec/jars_and_poms.gemspec
|
|
484
491
|
- spec/dsl/profile_gemspec_spec/maven-tools.gemspec
|
|
485
492
|
- spec/dsl/gemspec_spec/jars_and_poms.gemspec
|
|
486
493
|
- spec/dsl/gemspec_spec/maven-tools.gemspec
|
|
487
494
|
- spec/dsl/project_gemspec_spec/snapshot.gemspec
|
|
488
495
|
- spec/dsl/project_gemspec_spec/extended.gemspec
|
|
496
|
+
- spec/dsl/project_gemspec_spec/unknown_license.gemspec
|
|
489
497
|
- spec/dsl/project_gemspec_spec/jars_and_poms.gemspec
|
|
490
498
|
- spec/dsl/project_gemspec_spec/maven-tools.gemspec
|
|
491
499
|
- spec/gemspec_with_prereleased_dependency/bouncy-castle-java.gemspec
|