Merge pull request #45 from justinstoller/SERVER-3167-3

(SERVER-3167) Take up JRuby 9.4.1

Author: justinstoller

project.clj

@@ -1,6 +1,6 @@
-(def jruby-version "9.4.0.0")
+(def jruby-version "9.4.1.0")
 
-(defproject puppetlabs/jruby-deps "9.4.0.0-3-SNAPSHOT"
+(defproject puppetlabs/jruby-deps "9.4.1.0-1-SNAPSHOT"
   :description "JRuby dependencies"
   :url "https://github.com/puppetlabs/jruby-deps"
   :license {:name "Apache License, Version 2.0"
@@ -15,9 +15,11 @@
                  [com.github.jnr/jnr-posix "3.1.15"]
                  [com.github.jnr/jnr-constants "0.10.3"]
                  [com.github.jnr/jnr-ffi "2.2.11"]
-                 [org.jruby/jruby-core ~jruby-version
-                  :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]]
-                 [org.jruby/jruby-stdlib ~jruby-version]]
+                 [org.jruby/jruby-base ~jruby-version
+                  :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 joda-time]]
+                 [org.jruby/jruby-stdlib ~jruby-version]
+                 [org.snakeyaml/snakeyaml-engine "2.6"]
+                 [joda-time "2.10.10"]]
 
   :deploy-repositories [["releases" {:url "https://clojars.org/repo"
                                      :username :env/clojars_jenkins_username
@@ -34,23 +36,4 @@
   ;; only project that relies on that right now, it's simpler to just add it here.
   :resource-paths ["project.clj"]
 
-  ;; For the jruby-deps uberjar builds, we want to exclude a few "common"
-  ;; dependencies which we expect to be provided by other jars in the Java
-  ;; classpath. We do this in order to make the dependency resolution
-  ;; predictable regardless of the order in which the jars are referenced on the
-  ;; classpath. Dependencies in the uberjar profile replace those from the base
-  ;; project definition in order to exclude the unwanted dependencies from the
-  ;; jruby-deps uberjar.
-  :profiles {:uberjar {:dependencies
-                       [[org.jruby/jruby-core ~jruby-version
-                         :exclusions [joda-time]]]}}
-
-  :uberjar-name "jruby-9k.jar"
-
-  ;; NOTE: jruby-stdlib packages some unexpected things inside
-  ;; of its jar.  e.g., it puts a pre-built copy of the bouncycastle
-  ;; and snakeyaml jars into its META-INF directory.  This is highly
-  ;; undesirable for projects that already have dependencies on different
-  ;; versions of these jars.  Items below are excluded from the uberjar.
-  :uberjar-exclusions  [#"META-INF/jruby.home/lib/ruby/stdlib/org/bouncycastle"
-                        #"META-INF/jruby.home/lib/ruby/stdlib/org/yaml/snakeyaml"])
+  :uberjar-name "jruby-9k.jar")