Skip to content

Commit 051c2fc

Browse files
committed
Revert "Temporarily move sylog to default gems"
This reverts commit b5c84d2.
1 parent 98b0108 commit 051c2fc

3 files changed

Lines changed: 17 additions & 19 deletions

File tree

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,6 @@ lib/ruby/stdlib/stringio*
117117
lib/ruby/stdlib/strscan*
118118
lib/ruby/stdlib/subspawn*
119119
lib/ruby/stdlib/syntax_suggest*
120-
lib/ruby/stdlib/syslog*
121120
lib/ruby/stdlib/tempfile.rb
122121
lib/ruby/stdlib/time.rb
123122
lib/ruby/stdlib/timeout*

lib/pom.rb

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,6 @@ def log(message = nil)
8383
['strscan', '3.1.7'],
8484
['subspawn', '0.1.1'], # has 3 transitive deps:
8585
['subspawn-posix', '0.1.1'],
86-
# temporarily a default gem until https://github.com/jruby/jruby/pull/9197
87-
['syslog', '0.4.0'],
8886
['ffi-binary-libfixposix', '0.5.1.1'],
8987
['ffi-bindings-libfixposix', '0.5.1.0'],
9088
['syntax_suggest', '2.0.2'],
@@ -143,6 +141,7 @@ def log(message = nil)
143141
['rexml', '3.4.4'],
144142
['rinda', '0.2.0'],
145143
['rss', '0.3.1'],
144+
['syslog', '0.4.0'],
146145
['test-unit', '3.6.7']
147146
# Depends on many CRuby internals
148147
# ['typeprof', '0.30.1'],

lib/pom.xml

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -642,19 +642,6 @@ DO NOT MODIFY - GENERATED CODE
642642
</exclusion>
643643
</exclusions>
644644
</dependency>
645-
<dependency>
646-
<groupId>rubygems</groupId>
647-
<artifactId>syslog</artifactId>
648-
<version>0.4.0</version>
649-
<type>gem</type>
650-
<scope>provided</scope>
651-
<exclusions>
652-
<exclusion>
653-
<groupId>rubygems</groupId>
654-
<artifactId>jar-dependencies</artifactId>
655-
</exclusion>
656-
</exclusions>
657-
</dependency>
658645
<dependency>
659646
<groupId>rubygems</groupId>
660647
<artifactId>ffi-binary-libfixposix</artifactId>
@@ -1110,6 +1097,19 @@ DO NOT MODIFY - GENERATED CODE
11101097
</exclusion>
11111098
</exclusions>
11121099
</dependency>
1100+
<dependency>
1101+
<groupId>rubygems</groupId>
1102+
<artifactId>syslog</artifactId>
1103+
<version>0.4.0</version>
1104+
<type>gem</type>
1105+
<scope>provided</scope>
1106+
<exclusions>
1107+
<exclusion>
1108+
<groupId>rubygems</groupId>
1109+
<artifactId>jar-dependencies</artifactId>
1110+
</exclusion>
1111+
</exclusions>
1112+
</dependency>
11131113
<dependency>
11141114
<groupId>rubygems</groupId>
11151115
<artifactId>test-unit</artifactId>
@@ -1191,7 +1191,6 @@ DO NOT MODIFY - GENERATED CODE
11911191
<include>specifications/strscan-3.1.7*</include>
11921192
<include>specifications/subspawn-0.1.1*</include>
11931193
<include>specifications/subspawn-posix-0.1.1*</include>
1194-
<include>specifications/syslog-0.4.0*</include>
11951194
<include>specifications/ffi-binary-libfixposix-0.5.1.1*</include>
11961195
<include>specifications/ffi-bindings-libfixposix-0.5.1.0*</include>
11971196
<include>specifications/syntax_suggest-2.0.2*</include>
@@ -1227,6 +1226,7 @@ DO NOT MODIFY - GENERATED CODE
12271226
<include>specifications/rexml-3.4.4*</include>
12281227
<include>specifications/rinda-0.2.0*</include>
12291228
<include>specifications/rss-0.3.1*</include>
1229+
<include>specifications/syslog-0.4.0*</include>
12301230
<include>specifications/test-unit-3.6.7*</include>
12311231
<include>gems/rubygems-update-3.7.2*/**/*</include>
12321232
<include>gems/benchmark-0.4.0*/**/*</include>
@@ -1275,7 +1275,6 @@ DO NOT MODIFY - GENERATED CODE
12751275
<include>gems/strscan-3.1.7*/**/*</include>
12761276
<include>gems/subspawn-0.1.1*/**/*</include>
12771277
<include>gems/subspawn-posix-0.1.1*/**/*</include>
1278-
<include>gems/syslog-0.4.0*/**/*</include>
12791278
<include>gems/ffi-binary-libfixposix-0.5.1.1*/**/*</include>
12801279
<include>gems/ffi-bindings-libfixposix-0.5.1.0*/**/*</include>
12811280
<include>gems/syntax_suggest-2.0.2*/**/*</include>
@@ -1311,6 +1310,7 @@ DO NOT MODIFY - GENERATED CODE
13111310
<include>gems/rexml-3.4.4*/**/*</include>
13121311
<include>gems/rinda-0.2.0*/**/*</include>
13131312
<include>gems/rss-0.3.1*/**/*</include>
1313+
<include>gems/syslog-0.4.0*/**/*</include>
13141314
<include>gems/test-unit-3.6.7*/**/*</include>
13151315
<include>cache/rubygems-update-3.7.2*</include>
13161316
<include>cache/benchmark-0.4.0*</include>
@@ -1359,7 +1359,6 @@ DO NOT MODIFY - GENERATED CODE
13591359
<include>cache/strscan-3.1.7*</include>
13601360
<include>cache/subspawn-0.1.1*</include>
13611361
<include>cache/subspawn-posix-0.1.1*</include>
1362-
<include>cache/syslog-0.4.0*</include>
13631362
<include>cache/ffi-binary-libfixposix-0.5.1.1*</include>
13641363
<include>cache/ffi-bindings-libfixposix-0.5.1.0*</include>
13651364
<include>cache/syntax_suggest-2.0.2*</include>
@@ -1395,6 +1394,7 @@ DO NOT MODIFY - GENERATED CODE
13951394
<include>cache/rexml-3.4.4*</include>
13961395
<include>cache/rinda-0.2.0*</include>
13971396
<include>cache/rss-0.3.1*</include>
1397+
<include>cache/syslog-0.4.0*</include>
13981398
<include>cache/test-unit-3.6.7*</include>
13991399
</includes>
14001400
</resource>

0 commit comments

Comments
 (0)