Skip to content

Commit 2f04e1d

Browse files
committed
(SERVER-3167) Take up JRuby 9.4.1.0
This brings in JRuby 9.4.1.0. It also moves us to JRuby's "base" jar rather than its "core" jar as the core jar is deprecated and superseded by the base jar. Puppet Server/jruby-util's appears to interfere with the loading of jars from within jars installed by gems. This convoluted setup is required for gems with jar dependencies and with the Ruby standard library being "gemified" is how JRuby expects Psych/YAML support to load its SnakeYAML dependency. We did not require this to work before because consumers of the project already pull in SnakeYAML. In Psych 5.1, on JRuby, it now depends on SnakeYAML-Engine, which is the successor to SnakeYAML. Puppet Server and others do not currently pull this in and so we must pull in SnakeYAML-Engine here. When Puppet Enterprise takes up this version of JRuby we should evaluate moving project to use clj-parent and to place SnakeYAML-Engine in clj-parent.
1 parent 32221ff commit 2f04e1d

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

project.clj

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
(def jruby-version "9.4.0.0")
1+
(def jruby-version "9.4.1.0")
22

3-
(defproject puppetlabs/jruby-deps "9.4.0.0-3-SNAPSHOT"
3+
(defproject puppetlabs/jruby-deps "9.4.1.0-1-SNAPSHOT"
44
:description "JRuby dependencies"
55
:url "https://github.com/puppetlabs/jruby-deps"
66
:license {:name "Apache License, Version 2.0"
@@ -15,9 +15,10 @@
1515
[com.github.jnr/jnr-posix "3.1.15"]
1616
[com.github.jnr/jnr-constants "0.10.3"]
1717
[com.github.jnr/jnr-ffi "2.2.11"]
18-
[org.jruby/jruby-core ~jruby-version
19-
:exclusions [com.github.jnr/jnr-enxio com.github.jnr/jnr-unixsocket com.github.jnr/jnr-posix com.github.jnr/jnr-constants com.github.jnr/jnr-ffi]]
20-
[org.jruby/jruby-stdlib ~jruby-version]]
18+
[org.jruby/jruby-base ~jruby-version
19+
:exclusions [com.github.jnr/jffi com.github.jnr/jnr-enxio com.github.jnr/jnr-unixsocket com.github.jnr/jnr-posix com.github.jnr/jnr-constants com.github.jnr/jnr-ffi]]
20+
[org.jruby/jruby-stdlib ~jruby-version]
21+
[org.snakeyaml/snakeyaml-engine "2.6"]
2122

2223
:deploy-repositories [["releases" {:url "https://clojars.org/repo"
2324
:username :env/clojars_jenkins_username

0 commit comments

Comments
 (0)