Skip to content

Commit 55afa20

Browse files
yachubyachub
authored
Merge pull request #110 from puppetlabs/fix-dns-class-load-bug
Bump jruby and all vmpooler gems
2 parents fcad67b + 3648ff0 commit 55afa20

File tree

3 files changed

+61
-55
lines changed

3 files changed

+61
-55
lines changed

‎docker/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
# RUN:
99
# docker run -e VMPOOLER_CONFIG -p 80:4567 -it vmpooler
1010

11-
FROM jruby:9.4.2.0-jdk11
11+
FROM jruby:9.4.3.0-jdk11
1212

1313
LABEL org.opencontainers.image.description "VMPooler plus all known providers"
1414

‎docker/Dockerfile.local‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
# Then change directory into vmpooler-projects and build with:
1010

1111

12-
FROM jruby:9.4.2.0-jdk11
12+
FROM jruby:9.4.3.0-jdk11
1313

1414
LABEL org.opencontainers.image.description "VMPooler plus all known providers"
1515

‎docker/Gemfile.lock‎

Lines changed: 59 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
addressable (2.8.4)
4+
addressable (2.8.5)
55
public_suffix (>= 2.0.2, < 6.0)
66
bindata (2.4.15)
77
builder (3.2.4)
88
concurrent-ruby (1.2.2)
9-
connection_pool (2.4.0)
9+
connection_pool (2.4.1)
1010
declarative (0.0.20)
1111
deep_merge (1.2.2)
12-
faraday (2.7.4)
12+
faraday (2.7.10)
1313
faraday-net_http (>= 2.0, < 3.1)
1414
ruby2_keywords (>= 0.0.4)
1515
faraday-net_http (3.0.2)
16-
google-apis-compute_v1 (0.66.0)
16+
google-apis-compute_v1 (0.75.0)
1717
google-apis-core (>= 0.11.0, < 2.a)
18-
google-apis-core (0.11.0)
18+
google-apis-core (0.11.1)
1919
addressable (~> 2.5, >= 2.5.1)
2020
googleauth (>= 0.16.2, < 2.a)
2121
httpclient (>= 2.8.1, < 3.a)
@@ -46,67 +46,73 @@ GEM
4646
signet (>= 0.16, < 2.a)
4747
httpclient (2.8.3)
4848
json (2.6.3-java)
49-
jwt (2.7.0)
49+
jwt (2.7.1)
5050
memoist (0.16.2)
51-
mini_mime (1.1.2)
51+
mini_mime (1.1.5)
5252
multi_json (1.15.0)
5353
mustermann (3.0.0)
5454
ruby2_keywords (~> 0.0.1)
5555
net-ldap (0.18.0)
5656
nio4r (2.5.9-java)
57-
nokogiri (1.14.3-java)
57+
nokogiri (1.15.3-java)
5858
racc (~> 1.4)
59-
opentelemetry-api (1.1.0)
60-
opentelemetry-common (0.19.6)
59+
opentelemetry-api (1.2.1)
60+
opentelemetry-common (0.20.0)
6161
opentelemetry-api (~> 1.0)
62-
opentelemetry-exporter-jaeger (0.22.0)
62+
opentelemetry-exporter-jaeger (0.23.0)
6363
opentelemetry-api (~> 1.1)
64-
opentelemetry-common (~> 0.19.6)
64+
opentelemetry-common (~> 0.20)
6565
opentelemetry-sdk (~> 1.2)
6666
opentelemetry-semantic_conventions
6767
thrift
68-
opentelemetry-instrumentation-base (0.19.0)
68+
opentelemetry-instrumentation-base (0.22.2)
6969
opentelemetry-api (~> 1.0)
70-
opentelemetry-instrumentation-concurrent_ruby (0.19.2)
70+
opentelemetry-registry (~> 0.1)
71+
opentelemetry-instrumentation-concurrent_ruby (0.21.1)
7172
opentelemetry-api (~> 1.0)
72-
opentelemetry-instrumentation-base (~> 0.19.0)
73-
opentelemetry-instrumentation-http_client (0.19.4)
73+
opentelemetry-instrumentation-base (~> 0.22.1)
74+
opentelemetry-instrumentation-http_client (0.22.2)
7475
opentelemetry-api (~> 1.0)
75-
opentelemetry-common (~> 0.19.3)
76-
opentelemetry-instrumentation-base (~> 0.19.0)
77-
opentelemetry-instrumentation-redis (0.21.3)
76+
opentelemetry-common (~> 0.20.0)
77+
opentelemetry-instrumentation-base (~> 0.22.1)
78+
opentelemetry-instrumentation-rack (0.23.4)
7879
opentelemetry-api (~> 1.0)
79-
opentelemetry-common (~> 0.19.3)
80-
opentelemetry-instrumentation-base (~> 0.19.0)
81-
opentelemetry-instrumentation-sinatra (0.19.3)
80+
opentelemetry-common (~> 0.20.0)
81+
opentelemetry-instrumentation-base (~> 0.22.1)
82+
opentelemetry-instrumentation-redis (0.25.3)
8283
opentelemetry-api (~> 1.0)
83-
opentelemetry-common (~> 0.19.3)
84-
opentelemetry-instrumentation-base (~> 0.19.0)
85-
opentelemetry-registry (0.2.0)
84+
opentelemetry-common (~> 0.20.0)
85+
opentelemetry-instrumentation-base (~> 0.22.1)
86+
opentelemetry-instrumentation-sinatra (0.23.2)
87+
opentelemetry-api (~> 1.0)
88+
opentelemetry-common (~> 0.20.0)
89+
opentelemetry-instrumentation-base (~> 0.22.1)
90+
opentelemetry-instrumentation-rack (~> 0.21)
91+
opentelemetry-registry (0.3.0)
8692
opentelemetry-api (~> 1.1)
87-
opentelemetry-resource_detectors (0.23.0)
93+
opentelemetry-resource_detectors (0.24.1)
8894
google-cloud-env
8995
opentelemetry-sdk (~> 1.0)
90-
opentelemetry-sdk (1.2.0)
96+
opentelemetry-sdk (1.3.0)
9197
opentelemetry-api (~> 1.1)
92-
opentelemetry-common (~> 0.19.3)
98+
opentelemetry-common (~> 0.20)
9399
opentelemetry-registry (~> 0.2)
94100
opentelemetry-semantic_conventions
95-
opentelemetry-semantic_conventions (1.8.0)
101+
opentelemetry-semantic_conventions (1.10.0)
96102
opentelemetry-api (~> 1.0)
97-
optimist (3.0.1)
103+
optimist (3.1.0)
98104
os (1.1.4)
99105
pickup (0.0.11)
100-
prometheus-client (4.1.0)
101-
public_suffix (5.0.1)
102-
puma (6.2.2-java)
106+
prometheus-client (4.2.1)
107+
public_suffix (5.0.3)
108+
puma (6.3.0-java)
103109
nio4r (~> 2.0)
104-
racc (1.6.2-java)
105-
rack (2.2.7)
106-
rack-protection (3.0.6)
107-
rack
110+
racc (1.7.1-java)
111+
rack (2.2.8)
112+
rack-protection (3.1.0)
113+
rack (~> 2.2, >= 2.2.4)
108114
rake (13.0.6)
109-
rbvmomi2 (3.6.0)
115+
rbvmomi2 (3.6.1)
110116
builder (~> 3.2)
111117
json (~> 2.3)
112118
nokogiri (~> 1.12, >= 1.12.5)
@@ -117,37 +123,37 @@ GEM
117123
trailblazer-option (>= 0.1.1, < 0.2.0)
118124
uber (< 0.2.0)
119125
retriable (3.1.2)
120-
rexml (3.2.5)
126+
rexml (3.2.6)
121127
ruby2_keywords (0.0.5)
122128
signet (0.17.0)
123129
addressable (~> 2.8)
124130
faraday (>= 0.17.5, < 3.a)
125131
jwt (>= 1.5, < 3.0)
126132
multi_json (~> 1.10)
127-
sinatra (3.0.6)
133+
sinatra (3.1.0)
128134
mustermann (~> 3.0)
129135
rack (~> 2.2, >= 2.2.4)
130-
rack-protection (= 3.0.6)
136+
rack-protection (= 3.1.0)
131137
tilt (~> 2.0)
132138
spicy-proton (2.1.15)
133139
bindata (~> 2.3)
134140
statsd-ruby (1.5.0)
135141
thrift (0.18.1)
136-
tilt (2.1.0)
142+
tilt (2.2.0)
137143
trailblazer-option (0.1.2)
138144
uber (0.1.0)
139-
vmpooler (3.1.0)
145+
vmpooler (3.2.0)
140146
concurrent-ruby (~> 1.1)
141147
connection_pool (~> 2.2)
142148
deep_merge (~> 1.2)
143149
net-ldap (~> 0.16)
144-
opentelemetry-exporter-jaeger (= 0.22.0)
145-
opentelemetry-instrumentation-concurrent_ruby (= 0.19.2)
146-
opentelemetry-instrumentation-http_client (= 0.19.4)
147-
opentelemetry-instrumentation-redis (= 0.21.3)
148-
opentelemetry-instrumentation-sinatra (= 0.19.3)
149-
opentelemetry-resource_detectors (= 0.23.0)
150-
opentelemetry-sdk (~> 1.0, >= 1.0.2)
150+
opentelemetry-exporter-jaeger (= 0.23.0)
151+
opentelemetry-instrumentation-concurrent_ruby (= 0.21.1)
152+
opentelemetry-instrumentation-http_client (= 0.22.2)
153+
opentelemetry-instrumentation-redis (= 0.25.3)
154+
opentelemetry-instrumentation-sinatra (= 0.23.2)
155+
opentelemetry-resource_detectors (= 0.24.1)
156+
opentelemetry-sdk (~> 1.3, >= 1.3.0)
151157
pickup (~> 0.0.11)
152158
prometheus-client (>= 2, < 5)
153159
puma (>= 5.0.4, < 7)
@@ -157,15 +163,15 @@ GEM
157163
sinatra (>= 2, < 4)
158164
spicy-proton (~> 2.1)
159165
statsd-ruby (~> 1.4)
160-
vmpooler-dns-gcp (1.1.0)
166+
vmpooler-dns-gcp (1.2.0)
161167
google-cloud-dns (~> 0.35.1)
162168
googleauth (>= 0.16.2, < 1.3.0)
163169
vmpooler (~> 3.0)
164-
vmpooler-provider-gce (1.1.0)
170+
vmpooler-provider-gce (1.2.0)
165171
google-apis-compute_v1 (~> 0.14)
166172
googleauth (>= 0.16.2, < 1.4.0)
167173
vmpooler (~> 3.0)
168-
vmpooler-provider-vsphere (3.1.0)
174+
vmpooler-provider-vsphere (3.2.0)
169175
rbvmomi2 (>= 3.1, < 4.0)
170176
vmpooler (~> 3.0)
171177
webrick (1.8.1)

0 commit comments

Comments
 (0)