Skip to content

Commit ef0307e

Browse files
headiusheadius
authored
Merge pull request jruby#9108 from headius/gem_cleanup
Tidy up default gems
2 parents ae45c26 + 35a143b commit ef0307e

23 files changed

Lines changed: 1336 additions & 3669 deletions

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,7 @@ lib/ruby/stdlib/rake*
106106
lib/ruby/stdlib/rdoc*
107107
lib/ruby/stdlib/readline*
108108
lib/ruby/stdlib/reline*
109+
lib/ruby/stdlib/resolv.rb
109110
lib/ruby/stdlib/ripper.jar
110111
lib/ruby/stdlib/ruby2_keywords*
111112
lib/ruby/stdlib/rubygems*

‎lib/pom.rb‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -47,13 +47,13 @@ def log(message = nil)
4747
['io-console', '0.8.1'],
4848
# https://github.com/ruby/io-nonblock/issues/4
4949
# ['io-nonblock', '0.3.1'],
50-
['io-wait', '0.3.1'],
50+
['io-wait', '0.3.2'],
5151
['ipaddr', '1.2.7'],
5252
['irb', '1.14.3'],
5353
['jar-dependencies', '0.5.4'],
5454
['jruby-readline', '1.3.7'],
5555
['jruby-openssl', '0.15.5'],
56-
['json', '2.9.1'],
56+
['json', '2.16.0'],
5757
['logger', '1.6.4'],
5858
['net-http', '0.6.0'],
5959
['net-protocol', '0.2.2'],
@@ -74,15 +74,12 @@ def log(message = nil)
7474
['rake-ant', '1.0.6'],
7575
['rdoc', '6.14.0'],
7676
['reline', '0.6.0'],
77-
# https://github.com/ruby/resolv/issues/19
78-
# ['resolv', '0.6.0'],
77+
['resolv', '0.6.3'],
7978
['ruby2_keywords', '0.0.5'],
8079
['securerandom', '0.4.1'],
81-
# https://github.com/ruby/set/issues/21
82-
# ['set', '1.1.1'],
8380
['shellwords', '0.2.2'],
8481
['singleton', '0.3.0'],
85-
['stringio', '3.1.5'],
82+
['stringio', '3.1.9'],
8683
['strscan', '3.1.7'],
8784
['subspawn', '0.1.1'], # has 3 transitive deps:
8885
['subspawn-posix', '0.1.1'],

‎lib/pom.xml‎

Lines changed: 28 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ DO NOT MODIFY - GENERATED CODE
255255
<dependency>
256256
<groupId>rubygems</groupId>
257257
<artifactId>io-wait</artifactId>
258-
<version>0.3.1</version>
258+
<version>0.3.2</version>
259259
<type>gem</type>
260260
<scope>provided</scope>
261261
<exclusions>
@@ -333,7 +333,7 @@ DO NOT MODIFY - GENERATED CODE
333333
<dependency>
334334
<groupId>rubygems</groupId>
335335
<artifactId>json</artifactId>
336-
<version>2.9.1</version>
336+
<version>2.16.0</version>
337337
<type>gem</type>
338338
<scope>provided</scope>
339339
<exclusions>
@@ -525,6 +525,19 @@ DO NOT MODIFY - GENERATED CODE
525525
</exclusion>
526526
</exclusions>
527527
</dependency>
528+
<dependency>
529+
<groupId>rubygems</groupId>
530+
<artifactId>resolv</artifactId>
531+
<version>0.6.3</version>
532+
<type>gem</type>
533+
<scope>provided</scope>
534+
<exclusions>
535+
<exclusion>
536+
<groupId>rubygems</groupId>
537+
<artifactId>jar-dependencies</artifactId>
538+
</exclusion>
539+
</exclusions>
540+
</dependency>
528541
<dependency>
529542
<groupId>rubygems</groupId>
530543
<artifactId>ruby2_keywords</artifactId>
@@ -580,7 +593,7 @@ DO NOT MODIFY - GENERATED CODE
580593
<dependency>
581594
<groupId>rubygems</groupId>
582595
<artifactId>stringio</artifactId>
583-
<version>3.1.5</version>
596+
<version>3.1.9</version>
584597
<type>gem</type>
585598
<scope>provided</scope>
586599
<exclusions>
@@ -1135,13 +1148,13 @@ DO NOT MODIFY - GENERATED CODE
11351148
<include>specifications/find-0.2.0*</include>
11361149
<include>specifications/forwardable-1.3.3*</include>
11371150
<include>specifications/io-console-0.8.1*</include>
1138-
<include>specifications/io-wait-0.3.1*</include>
1151+
<include>specifications/io-wait-0.3.2*</include>
11391152
<include>specifications/ipaddr-1.2.7*</include>
11401153
<include>specifications/irb-1.14.3*</include>
11411154
<include>specifications/jar-dependencies-0.5.4*</include>
11421155
<include>specifications/jruby-readline-1.3.7*</include>
11431156
<include>specifications/jruby-openssl-0.15.5*</include>
1144-
<include>specifications/json-2.9.1*</include>
1157+
<include>specifications/json-2.16.0*</include>
11451158
<include>specifications/logger-1.6.4*</include>
11461159
<include>specifications/net-http-0.6.0*</include>
11471160
<include>specifications/net-protocol-0.2.2*</include>
@@ -1156,11 +1169,12 @@ DO NOT MODIFY - GENERATED CODE
11561169
<include>specifications/rake-ant-1.0.6*</include>
11571170
<include>specifications/rdoc-6.14.0*</include>
11581171
<include>specifications/reline-0.6.0*</include>
1172+
<include>specifications/resolv-0.6.3*</include>
11591173
<include>specifications/ruby2_keywords-0.0.5*</include>
11601174
<include>specifications/securerandom-0.4.1*</include>
11611175
<include>specifications/shellwords-0.2.2*</include>
11621176
<include>specifications/singleton-0.3.0*</include>
1163-
<include>specifications/stringio-3.1.5*</include>
1177+
<include>specifications/stringio-3.1.9*</include>
11641178
<include>specifications/strscan-3.1.7*</include>
11651179
<include>specifications/subspawn-0.1.1*</include>
11661180
<include>specifications/subspawn-posix-0.1.1*</include>
@@ -1217,13 +1231,13 @@ DO NOT MODIFY - GENERATED CODE
12171231
<include>gems/find-0.2.0*/**/*</include>
12181232
<include>gems/forwardable-1.3.3*/**/*</include>
12191233
<include>gems/io-console-0.8.1*/**/*</include>
1220-
<include>gems/io-wait-0.3.1*/**/*</include>
1234+
<include>gems/io-wait-0.3.2*/**/*</include>
12211235
<include>gems/ipaddr-1.2.7*/**/*</include>
12221236
<include>gems/irb-1.14.3*/**/*</include>
12231237
<include>gems/jar-dependencies-0.5.4*/**/*</include>
12241238
<include>gems/jruby-readline-1.3.7*/**/*</include>
12251239
<include>gems/jruby-openssl-0.15.5*/**/*</include>
1226-
<include>gems/json-2.9.1*/**/*</include>
1240+
<include>gems/json-2.16.0*/**/*</include>
12271241
<include>gems/logger-1.6.4*/**/*</include>
12281242
<include>gems/net-http-0.6.0*/**/*</include>
12291243
<include>gems/net-protocol-0.2.2*/**/*</include>
@@ -1238,11 +1252,12 @@ DO NOT MODIFY - GENERATED CODE
12381252
<include>gems/rake-ant-1.0.6*/**/*</include>
12391253
<include>gems/rdoc-6.14.0*/**/*</include>
12401254
<include>gems/reline-0.6.0*/**/*</include>
1255+
<include>gems/resolv-0.6.3*/**/*</include>
12411256
<include>gems/ruby2_keywords-0.0.5*/**/*</include>
12421257
<include>gems/securerandom-0.4.1*/**/*</include>
12431258
<include>gems/shellwords-0.2.2*/**/*</include>
12441259
<include>gems/singleton-0.3.0*/**/*</include>
1245-
<include>gems/stringio-3.1.5*/**/*</include>
1260+
<include>gems/stringio-3.1.9*/**/*</include>
12461261
<include>gems/strscan-3.1.7*/**/*</include>
12471262
<include>gems/subspawn-0.1.1*/**/*</include>
12481263
<include>gems/subspawn-posix-0.1.1*/**/*</include>
@@ -1299,13 +1314,13 @@ DO NOT MODIFY - GENERATED CODE
12991314
<include>cache/find-0.2.0*</include>
13001315
<include>cache/forwardable-1.3.3*</include>
13011316
<include>cache/io-console-0.8.1*</include>
1302-
<include>cache/io-wait-0.3.1*</include>
1317+
<include>cache/io-wait-0.3.2*</include>
13031318
<include>cache/ipaddr-1.2.7*</include>
13041319
<include>cache/irb-1.14.3*</include>
13051320
<include>cache/jar-dependencies-0.5.4*</include>
13061321
<include>cache/jruby-readline-1.3.7*</include>
13071322
<include>cache/jruby-openssl-0.15.5*</include>
1308-
<include>cache/json-2.9.1*</include>
1323+
<include>cache/json-2.16.0*</include>
13091324
<include>cache/logger-1.6.4*</include>
13101325
<include>cache/net-http-0.6.0*</include>
13111326
<include>cache/net-protocol-0.2.2*</include>
@@ -1320,11 +1335,12 @@ DO NOT MODIFY - GENERATED CODE
13201335
<include>cache/rake-ant-1.0.6*</include>
13211336
<include>cache/rdoc-6.14.0*</include>
13221337
<include>cache/reline-0.6.0*</include>
1338+
<include>cache/resolv-0.6.3*</include>
13231339
<include>cache/ruby2_keywords-0.0.5*</include>
13241340
<include>cache/securerandom-0.4.1*</include>
13251341
<include>cache/shellwords-0.2.2*</include>
13261342
<include>cache/singleton-0.3.0*</include>
1327-
<include>cache/stringio-3.1.5*</include>
1343+
<include>cache/stringio-3.1.9*</include>
13281344
<include>cache/strscan-3.1.7*</include>
13291345
<include>cache/subspawn-0.1.1*</include>
13301346
<include>cache/subspawn-posix-0.1.1*</include>

0 commit comments

Comments
 (0)