maven-tools 1.0.0 → 1.0.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/Mavenfile +1 -2
- data/lib/maven/tools/dsl.rb +20 -9
- data/lib/maven/tools/version.rb +1 -1
- data/spec/gemfile_with_groups/Gemfile +8 -2
- data/spec/gemfile_with_groups/pom.xml +15 -1
- data/spec/pom_from_jarfile_with_repos/Jarfile +5 -0
- data/spec/pom_from_jarfile_with_repos/Mavenfile +1 -0
- data/spec/pom_from_jarfile_with_repos/pom.xml +55 -0
- metadata +8 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 2835f257ca8d7a4f674d3467b985f13b6cd904b4
|
|
4
|
+
data.tar.gz: 5b3214884d8abf05f1f95b748bcbdee22083f4ca
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 5e171ae444c08355dcdde8ba8b5c31396fbc8edebb8201544d26ab618b57e1c219c0e85df9cc60afdee9ce097a07bdc228d5de17b142496d78009dcef97d2310
|
|
7
|
+
data.tar.gz: 2b9919b02df3a24651df6f3400a87a03da53cadf6c482ba89ee97c499ea5217ff450dbeb3278dc614ed5e9cd4e5b06422e481412fd0c44984a5a066e310343a7
|
data/Mavenfile
CHANGED
data/lib/maven/tools/dsl.rb
CHANGED
|
@@ -98,7 +98,7 @@ module Maven
|
|
|
98
98
|
end
|
|
99
99
|
|
|
100
100
|
def group( *args )
|
|
101
|
-
@group = args
|
|
101
|
+
@group = args
|
|
102
102
|
yield
|
|
103
103
|
ensure
|
|
104
104
|
@group = nil
|
|
@@ -315,7 +315,7 @@ module Maven
|
|
|
315
315
|
|
|
316
316
|
if options[ :skip_locked ] or not file.exists_lock?
|
|
317
317
|
file.populate_unlocked do |dsl|
|
|
318
|
-
|
|
318
|
+
jarfile_dsl( dsl )
|
|
319
319
|
dsl.artifacts.each do |a|
|
|
320
320
|
_dependency a
|
|
321
321
|
end
|
|
@@ -325,7 +325,7 @@ module Maven
|
|
|
325
325
|
artifact( dep )
|
|
326
326
|
end
|
|
327
327
|
file.populate_unlocked do |dsl|
|
|
328
|
-
|
|
328
|
+
jarfile_dsl( dsl )
|
|
329
329
|
dsl.artifacts.each do |a|
|
|
330
330
|
if a[ :system_path ]
|
|
331
331
|
dependeny a
|
|
@@ -334,6 +334,17 @@ module Maven
|
|
|
334
334
|
end
|
|
335
335
|
end
|
|
336
336
|
end
|
|
337
|
+
|
|
338
|
+
def jarfile_dsl( dsl )
|
|
339
|
+
setup_jruby( dsl.jruby )
|
|
340
|
+
dsl.repositories.each do |r|
|
|
341
|
+
repository r.merge( {:id => r[:name] } )
|
|
342
|
+
end
|
|
343
|
+
dsl.snapshot_repositories.each do |r|
|
|
344
|
+
snapshot_repository r.merge( {:id => r[:name] } )
|
|
345
|
+
end
|
|
346
|
+
end
|
|
347
|
+
private :jarfile_dsl
|
|
337
348
|
|
|
338
349
|
def gemspec( name = nil, options = {} )
|
|
339
350
|
if @inside_gemfile == true
|
|
@@ -1269,12 +1280,12 @@ module Maven
|
|
|
1269
1280
|
platform = options.delete( :platform ) || options.delete( 'platform' )
|
|
1270
1281
|
group = options.delete( :group ) || options.delete( 'group' ) || @group
|
|
1271
1282
|
if group
|
|
1272
|
-
|
|
1273
|
-
|
|
1274
|
-
|
|
1275
|
-
|
|
1276
|
-
|
|
1277
|
-
|
|
1283
|
+
group = [ group ].flatten.each { |g| g.to_sym }
|
|
1284
|
+
if group.member? :development
|
|
1285
|
+
options[ :scope ] = :provided
|
|
1286
|
+
elsif group.member? :test
|
|
1287
|
+
options[ :scope ] = :test
|
|
1288
|
+
end
|
|
1278
1289
|
end
|
|
1279
1290
|
if platform.nil? || is_jruby_platform( platform )
|
|
1280
1291
|
options[ :version ] = '[0,)' if args.size == 2 && options[ :version ].nil? && options[ 'version' ].nil?
|
data/lib/maven/tools/version.rb
CHANGED
|
@@ -1,9 +1,15 @@
|
|
|
1
1
|
#-*- mode: ruby -*-
|
|
2
2
|
|
|
3
|
-
group :test do
|
|
3
|
+
group :test, :development do
|
|
4
4
|
gem 'rspec', '2.13.0'
|
|
5
5
|
end
|
|
6
6
|
|
|
7
|
-
|
|
7
|
+
group :test do
|
|
8
|
+
gem 'cucumber', '2.13.0'
|
|
9
|
+
end
|
|
10
|
+
|
|
11
|
+
gem 'copyright-header', '1.0.3', :group => [:development, :test]
|
|
12
|
+
|
|
13
|
+
gem 'minitest', '0.5.3', :group => :test
|
|
8
14
|
|
|
9
15
|
# vim: syntax=Ruby
|
|
@@ -25,15 +25,29 @@
|
|
|
25
25
|
<artifactId>rspec</artifactId>
|
|
26
26
|
<version>2.13.0</version>
|
|
27
27
|
<type>gem</type>
|
|
28
|
+
<scope>provided</scope>
|
|
29
|
+
</dependency>
|
|
30
|
+
<dependency>
|
|
31
|
+
<groupId>rubygems</groupId>
|
|
32
|
+
<artifactId>cucumber</artifactId>
|
|
33
|
+
<version>2.13.0</version>
|
|
34
|
+
<type>gem</type>
|
|
28
35
|
<scope>test</scope>
|
|
29
36
|
</dependency>
|
|
30
37
|
<dependency>
|
|
31
38
|
<groupId>rubygems</groupId>
|
|
32
|
-
<artifactId>copyright-
|
|
39
|
+
<artifactId>copyright-header</artifactId>
|
|
33
40
|
<version>1.0.3</version>
|
|
34
41
|
<type>gem</type>
|
|
35
42
|
<scope>provided</scope>
|
|
36
43
|
</dependency>
|
|
44
|
+
<dependency>
|
|
45
|
+
<groupId>rubygems</groupId>
|
|
46
|
+
<artifactId>minitest</artifactId>
|
|
47
|
+
<version>0.5.3</version>
|
|
48
|
+
<type>gem</type>
|
|
49
|
+
<scope>test</scope>
|
|
50
|
+
</dependency>
|
|
37
51
|
</dependencies>
|
|
38
52
|
<repositories>
|
|
39
53
|
<repository>
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
jarfile
|
|
@@ -0,0 +1,55 @@
|
|
|
1
|
+
<?xml version="1.0" encoding="UTF-8"?>
|
|
2
|
+
<!--
|
|
3
|
+
|
|
4
|
+
Copyright (c) 2012 to original author or authors
|
|
5
|
+
All rights reserved. This program and the accompanying materials
|
|
6
|
+
are made available under the terms of the Eclipse Public License v1.0
|
|
7
|
+
which accompanies this distribution, and is available at
|
|
8
|
+
http://www.eclipse.org/legal/epl-v10.html
|
|
9
|
+
|
|
10
|
+
-->
|
|
11
|
+
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
|
|
12
|
+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
|
|
13
|
+
<modelVersion>4.0.0</modelVersion>
|
|
14
|
+
<groupId>dummy</groupId>
|
|
15
|
+
<artifactId>pom_from_jarfile_with_repos</artifactId>
|
|
16
|
+
<version>0.0.0</version>
|
|
17
|
+
<name>pom_from_jarfile_with_repos</name>
|
|
18
|
+
<dependencies>
|
|
19
|
+
<dependency>
|
|
20
|
+
<groupId>org.jruby</groupId>
|
|
21
|
+
<artifactId>jruby</artifactId>
|
|
22
|
+
<version>1.7.13</version>
|
|
23
|
+
<type>pom</type>
|
|
24
|
+
<scope>provided</scope>
|
|
25
|
+
</dependency>
|
|
26
|
+
<dependency>
|
|
27
|
+
<groupId>junit</groupId>
|
|
28
|
+
<artifactId>junit</artifactId>
|
|
29
|
+
<version>4.11</version>
|
|
30
|
+
</dependency>
|
|
31
|
+
</dependencies>
|
|
32
|
+
<repositories>
|
|
33
|
+
<repository>
|
|
34
|
+
<id>http://1.2.3.4/artifactory/</id>
|
|
35
|
+
<name>http://1.2.3.4/artifactory/</name>
|
|
36
|
+
<url>http://1.2.3.4/artifactory/</url>
|
|
37
|
+
</repository>
|
|
38
|
+
<repository>
|
|
39
|
+
<id>takari</id>
|
|
40
|
+
<name>takari</name>
|
|
41
|
+
<url>http://otto.takari.io:8081/nexus/content/groups/public</url>
|
|
42
|
+
</repository>
|
|
43
|
+
<repository>
|
|
44
|
+
<releases>
|
|
45
|
+
<enabled>false</enabled>
|
|
46
|
+
</releases>
|
|
47
|
+
<snapshots>
|
|
48
|
+
<enabled>true</enabled>
|
|
49
|
+
</snapshots>
|
|
50
|
+
<id>tesla</id>
|
|
51
|
+
<name>tesla</name>
|
|
52
|
+
<url>http://repository.tesla.io:8081/nexus/content/groups/public</url>
|
|
53
|
+
</repository>
|
|
54
|
+
</repositories>
|
|
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.1
|
|
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-06-
|
|
11
|
+
date: 2014-06-30 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: virtus
|
|
@@ -102,6 +102,7 @@ files:
|
|
|
102
102
|
- spec/pom.xml
|
|
103
103
|
- spec/gemfile_with_source/pom.xml
|
|
104
104
|
- spec/gemspec_in_profile/pom.xml
|
|
105
|
+
- spec/pom_from_jarfile_with_repos/pom.xml
|
|
105
106
|
- spec/gemfile_with_lock/pom.xml
|
|
106
107
|
- spec/gemfile_with_test_group/pom.xml
|
|
107
108
|
- spec/gemspec_with_prereleased_dependency_and_no_repo/pom.xml
|
|
@@ -134,6 +135,8 @@ files:
|
|
|
134
135
|
- spec/gemfile_with_extras/pom.xml
|
|
135
136
|
- spec/gemfile_with_source/Mavenfile
|
|
136
137
|
- spec/gemspec_in_profile/Mavenfile
|
|
138
|
+
- spec/pom_from_jarfile_with_repos/Jarfile
|
|
139
|
+
- spec/pom_from_jarfile_with_repos/Mavenfile
|
|
137
140
|
- spec/gemfile_with_lock/Mavenfile
|
|
138
141
|
- spec/gemfile_with_lock/Gemfile
|
|
139
142
|
- spec/gemfile_with_test_group/Mavenfile
|
|
@@ -267,6 +270,7 @@ test_files:
|
|
|
267
270
|
- spec/pom.xml
|
|
268
271
|
- spec/gemfile_with_source/pom.xml
|
|
269
272
|
- spec/gemspec_in_profile/pom.xml
|
|
273
|
+
- spec/pom_from_jarfile_with_repos/pom.xml
|
|
270
274
|
- spec/gemfile_with_lock/pom.xml
|
|
271
275
|
- spec/gemfile_with_test_group/pom.xml
|
|
272
276
|
- spec/gemspec_with_prereleased_dependency_and_no_repo/pom.xml
|
|
@@ -299,6 +303,8 @@ test_files:
|
|
|
299
303
|
- spec/gemfile_with_extras/pom.xml
|
|
300
304
|
- spec/gemfile_with_source/Mavenfile
|
|
301
305
|
- spec/gemspec_in_profile/Mavenfile
|
|
306
|
+
- spec/pom_from_jarfile_with_repos/Jarfile
|
|
307
|
+
- spec/pom_from_jarfile_with_repos/Mavenfile
|
|
302
308
|
- spec/gemfile_with_lock/Mavenfile
|
|
303
309
|
- spec/gemfile_with_lock/Gemfile
|
|
304
310
|
- spec/gemfile_with_test_group/Mavenfile
|