Skip to content

Commit b5c84d2

Browse files
headiusheadius
committed
Temporarily move sylog to default gems
Because of the issue described in an fixed by jruby#9197, the fake-out of the syslog extension build fails. Because it was being installed as a bundled gem rather than a default gem, and RubyGems will not activate a gem whose extension has not been built, this prevented syslog from being loadable. The change here moves it to a default gem for now, so that it can still be loaded from stdlib as well as being upgraded by users. These changes should be reverted once the gem platform fix has been merged.
1 parent d8894b3 commit b5c84d2

File tree

3 files changed

+19
-17
lines changed

3 files changed

+19
-17
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,7 @@ lib/ruby/stdlib/stringio*
118118
lib/ruby/stdlib/strscan*
119119
lib/ruby/stdlib/subspawn*
120120
lib/ruby/stdlib/syntax_suggest*
121+
lib/ruby/stdlib/syslog*
121122
lib/ruby/stdlib/tempfile.rb
122123
lib/ruby/stdlib/time.rb
123124
lib/ruby/stdlib/timeout*

‎lib/pom.rb‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,8 @@ 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'],
8688
['ffi-binary-libfixposix', '0.5.1.1'],
8789
['ffi-bindings-libfixposix', '0.5.1.0'],
8890
['syntax_suggest', '2.0.2'],
@@ -141,7 +143,6 @@ def log(message = nil)
141143
['rexml', '3.4.4'],
142144
['rinda', '0.2.0'],
143145
['rss', '0.3.1'],
144-
['syslog', '0.4.0'],
145146
['test-unit', '3.6.7']
146147
# Depends on many CRuby internals
147148
# ['typeprof', '0.30.1'],

‎lib/pom.xml‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -642,6 +642,19 @@ 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>
645658
<dependency>
646659
<groupId>rubygems</groupId>
647660
<artifactId>ffi-binary-libfixposix</artifactId>
@@ -1097,19 +1110,6 @@ DO NOT MODIFY - GENERATED CODE
10971110
</exclusion>
10981111
</exclusions>
10991112
</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,6 +1191,7 @@ 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>
11941195
<include>specifications/ffi-binary-libfixposix-0.5.1.1*</include>
11951196
<include>specifications/ffi-bindings-libfixposix-0.5.1.0*</include>
11961197
<include>specifications/syntax_suggest-2.0.2*</include>
@@ -1226,7 +1227,6 @@ DO NOT MODIFY - GENERATED CODE
12261227
<include>specifications/rexml-3.4.4*</include>
12271228
<include>specifications/rinda-0.2.0*</include>
12281229
<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,6 +1275,7 @@ 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>
12781279
<include>gems/ffi-binary-libfixposix-0.5.1.1*/**/*</include>
12791280
<include>gems/ffi-bindings-libfixposix-0.5.1.0*/**/*</include>
12801281
<include>gems/syntax_suggest-2.0.2*/**/*</include>
@@ -1310,7 +1311,6 @@ DO NOT MODIFY - GENERATED CODE
13101311
<include>gems/rexml-3.4.4*/**/*</include>
13111312
<include>gems/rinda-0.2.0*/**/*</include>
13121313
<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,6 +1359,7 @@ 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>
13621363
<include>cache/ffi-binary-libfixposix-0.5.1.1*</include>
13631364
<include>cache/ffi-bindings-libfixposix-0.5.1.0*</include>
13641365
<include>cache/syntax_suggest-2.0.2*</include>
@@ -1394,7 +1395,6 @@ DO NOT MODIFY - GENERATED CODE
13941395
<include>cache/rexml-3.4.4*</include>
13951396
<include>cache/rinda-0.2.0*</include>
13961397
<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)