jar-dependencies 0.3.11 → 0.3.12
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/Mavenfile +29 -33
- data/Rakefile +13 -13
- data/Readme.md +8 -8
- data/bin/lock_jars +11 -12
- data/jar-dependencies.gemspec +11 -11
- data/lib/jar_dependencies.rb +91 -97
- data/lib/jars/attach_jars_pom.rb +8 -8
- data/lib/jars/classpath.rb +31 -33
- data/lib/jars/gemspec_artifacts.rb +30 -38
- data/lib/jars/gemspec_pom.rb +2 -2
- data/lib/jars/installer.rb +85 -89
- data/lib/jars/lock.rb +16 -18
- data/lib/jars/lock_down.rb +38 -39
- data/lib/jars/lock_down_pom.rb +14 -11
- data/lib/jars/maven_exec.rb +31 -31
- data/lib/jars/maven_factory.rb +49 -56
- data/lib/jars/maven_settings.rb +13 -20
- data/lib/jars/output_jars_pom.rb +2 -2
- data/lib/jars/post_install_hook.rb +2 -2
- data/lib/jars/setup.rb +1 -1
- data/lib/jars/version.rb +1 -1
- metadata +26 -23
data/lib/jars/maven_settings.rb
CHANGED
@@ -1,19 +1,16 @@
|
|
1
|
+
require 'rubygems/uri_formatter'
|
1
2
|
module Jars
|
2
3
|
class MavenSettings
|
3
|
-
|
4
4
|
LINE_SEPARATOR = ENV_JAVA['line.separator']
|
5
5
|
|
6
6
|
class << self
|
7
|
-
|
8
7
|
def local_settings
|
9
8
|
unless instance_variable_defined?(:@_jars_maven_local_settings_)
|
10
9
|
@_jars_maven_local_settings_ = nil
|
11
10
|
end
|
12
11
|
if @_jars_maven_local_settings_.nil?
|
13
|
-
if settings = Jars.absolute(
|
14
|
-
if File.
|
15
|
-
@_jars_maven_local_settings_ = settings
|
16
|
-
end
|
12
|
+
if settings = Jars.absolute('settings.xml')
|
13
|
+
@_jars_maven_local_settings_ = settings if File.exist?(settings)
|
17
14
|
end
|
18
15
|
end
|
19
16
|
@_jars_maven_local_settings_ || nil
|
@@ -24,14 +21,14 @@ module Jars
|
|
24
21
|
@_jars_maven_user_settings_ = nil
|
25
22
|
end
|
26
23
|
if @_jars_maven_user_settings_.nil?
|
27
|
-
if settings = Jars.absolute(
|
28
|
-
unless File.
|
24
|
+
if settings = Jars.absolute(Jars.to_prop(MAVEN_SETTINGS))
|
25
|
+
unless File.exist?(settings)
|
29
26
|
Jars.warn { "configured ENV['#{MAVEN_SETTINGS}'] = '#{settings}' not found" }
|
30
27
|
settings = false
|
31
28
|
end
|
32
29
|
else # use maven default (user) settings
|
33
|
-
settings = File.join(
|
34
|
-
settings = false unless File.
|
30
|
+
settings = File.join(Jars.user_home, '.m2', 'settings.xml')
|
31
|
+
settings = false unless File.exist?(settings)
|
35
32
|
end
|
36
33
|
@_jars_maven_user_settings_ = settings
|
37
34
|
end
|
@@ -62,9 +59,7 @@ module Jars
|
|
62
59
|
end
|
63
60
|
|
64
61
|
def cleanup
|
65
|
-
if effective_settings != settings
|
66
|
-
File.unlink(effective_settings)
|
67
|
-
end
|
62
|
+
File.unlink(effective_settings) if effective_settings != settings
|
68
63
|
ensure
|
69
64
|
reset
|
70
65
|
end
|
@@ -77,9 +72,7 @@ module Jars
|
|
77
72
|
unless instance_variable_defined?(:@_jars_maven_settings_)
|
78
73
|
@_jars_maven_settings_ = nil
|
79
74
|
end
|
80
|
-
if @_jars_maven_settings_.nil?
|
81
|
-
local_settings || user_settings
|
82
|
-
end
|
75
|
+
local_settings || user_settings if @_jars_maven_settings_.nil?
|
83
76
|
end
|
84
77
|
|
85
78
|
def global_settings
|
@@ -87,9 +80,9 @@ module Jars
|
|
87
80
|
@_jars_maven_global_settings_ = nil
|
88
81
|
end
|
89
82
|
if @_jars_maven_global_settings_.nil?
|
90
|
-
if mvn_home = ENV[
|
91
|
-
settings = File.join(
|
92
|
-
settings = false unless File.
|
83
|
+
if mvn_home = ENV['M2_HOME'] || ENV['MAVEN_HOME']
|
84
|
+
settings = File.join(mvn_home, 'conf/settings.xml')
|
85
|
+
settings = false unless File.exist?(settings)
|
93
86
|
else
|
94
87
|
settings = false
|
95
88
|
end
|
@@ -110,7 +103,7 @@ module Jars
|
|
110
103
|
Jars.warn("can not interpolated proxy info for #{settings}")
|
111
104
|
return
|
112
105
|
else
|
113
|
-
raw.sub!(
|
106
|
+
raw.sub!('<settings>', "<settings>#{LINE_SEPARATOR}#{proxy}")
|
114
107
|
end
|
115
108
|
end
|
116
109
|
tempfile = java.io.File.create_temp_file('settings', '.xml')
|
data/lib/jars/output_jars_pom.rb
CHANGED
@@ -2,7 +2,7 @@
|
|
2
2
|
|
3
3
|
if ENV_JAVA['jars.quiet'] != 'true'
|
4
4
|
model.dependencies.each do |d|
|
5
|
-
puts
|
6
|
-
puts
|
5
|
+
puts ' ' + d.group_id + ':' + d.artifact_id + (d.classifier ? ':' + d.classifier : '') + ':' + d.version + ':' + (d.scope || 'compile')
|
6
|
+
puts ' exclusions: ' + d.exclusions.collect { |e| e.group_id + ':' + e.artifact_id }.join unless d.exclusions.empty?
|
7
7
|
end
|
8
8
|
end
|
@@ -19,11 +19,11 @@
|
|
19
19
|
# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
20
20
|
#
|
21
21
|
|
22
|
-
if defined?(
|
22
|
+
if defined?(JRUBY_VERSION) && Gem.post_install_hooks.empty?
|
23
23
|
Gem.post_install do |gem_installer|
|
24
24
|
unless (ENV['JARS_SKIP'] || ENV_JAVA['jars.skip']) == 'true'
|
25
25
|
require 'jars/installer'
|
26
|
-
jars = Jars::Installer.new(
|
26
|
+
jars = Jars::Installer.new(gem_installer.spec)
|
27
27
|
jars.ruby_maven_install_options = gem_installer.options || {}
|
28
28
|
jars.vendor_jars
|
29
29
|
end
|
data/lib/jars/setup.rb
CHANGED
data/lib/jars/version.rb
CHANGED
metadata
CHANGED
@@ -1,61 +1,58 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: jar-dependencies
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.3.
|
4
|
+
version: 0.3.12
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- christian meier
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2017-
|
11
|
+
date: 2017-12-26 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
|
+
name: minitest
|
15
|
+
version_requirements: !ruby/object:Gem::Requirement
|
16
|
+
requirements:
|
17
|
+
- - "~>"
|
18
|
+
- !ruby/object:Gem::Version
|
19
|
+
version: '5.3'
|
14
20
|
requirement: !ruby/object:Gem::Requirement
|
15
21
|
requirements:
|
16
22
|
- - "~>"
|
17
23
|
- !ruby/object:Gem::Version
|
18
24
|
version: '5.3'
|
19
|
-
name: minitest
|
20
25
|
prerelease: false
|
21
26
|
type: :development
|
27
|
+
- !ruby/object:Gem::Dependency
|
28
|
+
name: rake
|
22
29
|
version_requirements: !ruby/object:Gem::Requirement
|
23
30
|
requirements:
|
24
31
|
- - "~>"
|
25
32
|
- !ruby/object:Gem::Version
|
26
|
-
version: '
|
27
|
-
- !ruby/object:Gem::Dependency
|
33
|
+
version: '10.2'
|
28
34
|
requirement: !ruby/object:Gem::Requirement
|
29
35
|
requirements:
|
30
36
|
- - "~>"
|
31
37
|
- !ruby/object:Gem::Version
|
32
38
|
version: '10.2'
|
33
|
-
name: rake
|
34
39
|
prerelease: false
|
35
40
|
type: :development
|
41
|
+
- !ruby/object:Gem::Dependency
|
42
|
+
name: ruby-maven
|
36
43
|
version_requirements: !ruby/object:Gem::Requirement
|
37
44
|
requirements:
|
38
45
|
- - "~>"
|
39
46
|
- !ruby/object:Gem::Version
|
40
|
-
version:
|
41
|
-
- !ruby/object:Gem::Dependency
|
47
|
+
version: 3.3.11
|
42
48
|
requirement: !ruby/object:Gem::Requirement
|
43
49
|
requirements:
|
44
50
|
- - "~>"
|
45
51
|
- !ruby/object:Gem::Version
|
46
52
|
version: 3.3.11
|
47
|
-
name: ruby-maven
|
48
53
|
prerelease: false
|
49
54
|
type: :development
|
50
|
-
|
51
|
-
requirements:
|
52
|
-
- - "~>"
|
53
|
-
- !ruby/object:Gem::Version
|
54
|
-
version: 3.3.11
|
55
|
-
description: manage jar dependencies for gems and keep track which jar was already
|
56
|
-
loaded using maven artifact coordinates. it warns on version conflicts and loads
|
57
|
-
only ONE jar assuming the first one is compatible to the second one otherwise your
|
58
|
-
project needs to lock down the right version by providing a Jars.lock file.
|
55
|
+
description: manage jar dependencies for gems and keep track which jar was already loaded using maven artifact coordinates. it warns on version conflicts and loads only ONE jar assuming the first one is compatible to the second one otherwise your project needs to lock down the right version by providing a Jars.lock file.
|
59
56
|
email:
|
60
57
|
- mkristian@web.de
|
61
58
|
executables:
|
@@ -94,10 +91,16 @@ homepage: https://github.com/mkristian/jar-dependencies
|
|
94
91
|
licenses:
|
95
92
|
- MIT
|
96
93
|
metadata: {}
|
97
|
-
post_install_message:
|
98
|
-
|
99
|
-
|
100
|
-
|
94
|
+
post_install_message: |2+
|
95
|
+
|
96
|
+
if you want to use the executable lock_jars then install ruby-maven gem before using lock_jars
|
97
|
+
|
98
|
+
$ gem install ruby-maven -v '~> 3.3.11'
|
99
|
+
|
100
|
+
or add it as a development dependency to your Gemfile
|
101
|
+
|
102
|
+
gem 'ruby-maven', '~> 3.3.11'
|
103
|
+
|
101
104
|
rdoc_options: []
|
102
105
|
require_paths:
|
103
106
|
- lib
|
@@ -113,7 +116,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
113
116
|
version: '0'
|
114
117
|
requirements: []
|
115
118
|
rubyforge_project:
|
116
|
-
rubygems_version: 2.
|
119
|
+
rubygems_version: 2.4.8
|
117
120
|
signing_key:
|
118
121
|
specification_version: 4
|
119
122
|
summary: manage jar dependencies for gems
|