diff --git a/.github/workflows/lein-test.yaml b/.github/workflows/lein-test.yaml index 82e752d7..8ec088da 100644 --- a/.github/workflows/lein-test.yaml +++ b/.github/workflows/lein-test.yaml @@ -24,7 +24,6 @@ jobs: java: - '25' - '21' - - '17' steps: - name: Check out repository code uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 diff --git a/src/clj/puppetlabs/services/jruby_pool_manager/impl/jruby_internal.clj b/src/clj/puppetlabs/services/jruby_pool_manager/impl/jruby_internal.clj index e080728b..d1e0b32d 100644 --- a/src/clj/puppetlabs/services/jruby_pool_manager/impl/jruby_internal.clj +++ b/src/clj/puppetlabs/services/jruby_pool_manager/impl/jruby_internal.clj @@ -15,7 +15,7 @@ ScriptingContainer) (java.io File) (java.util.concurrent TimeUnit Executors ExecutorService) - (org.jruby CompatVersion Main Ruby RubyInstanceConfig RubyInstanceConfig$CompileMode RubyInstanceConfig$ProfilingMode) + (org.jruby Main Ruby RubyInstanceConfig RubyInstanceConfig$CompileMode RubyInstanceConfig$ProfilingMode) (org.jruby.embed LocalContextScope) (org.jruby.runtime.profile.builtin ProfileOutput) (org.jruby.util KCode) diff --git a/src/clj/puppetlabs/services/jruby_pool_manager/jruby_core.clj b/src/clj/puppetlabs/services/jruby_pool_manager/jruby_core.clj index b32378b6..0aba10bc 100644 --- a/src/clj/puppetlabs/services/jruby_pool_manager/jruby_core.clj +++ b/src/clj/puppetlabs/services/jruby_pool_manager/jruby_core.clj @@ -16,7 +16,6 @@ (:import (puppetlabs.services.jruby_pool_manager.jruby_schemas JRubyInstance) (clojure.lang IFn) (java.util.concurrent TimeUnit) - (org.jruby CompatVersion) (org.jruby.util.cli OutputStrings))) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; diff --git a/test/integration/puppetlabs/services/jruby_pool_manager/jruby_internal_test.clj b/test/integration/puppetlabs/services/jruby_pool_manager/jruby_internal_test.clj index 10dc4b54..0276976c 100644 --- a/test/integration/puppetlabs/services/jruby_pool_manager/jruby_internal_test.clj +++ b/test/integration/puppetlabs/services/jruby_pool_manager/jruby_internal_test.clj @@ -9,7 +9,7 @@ [me.raynes.fs :as fs]) (:import (java.io StringReader) (com.puppetlabs.jruby_utils.pool JRubyPool) - (org.jruby RubyInstanceConfig$CompileMode CompatVersion RubyInstanceConfig$ProfilingMode) + (org.jruby RubyInstanceConfig$CompileMode RubyInstanceConfig$ProfilingMode) (org.jruby.util.cli Options) (clojure.lang ExceptionInfo))) diff --git a/test/unit/puppetlabs/services/jruby_pool_manager/jruby_core_test.clj b/test/unit/puppetlabs/services/jruby_pool_manager/jruby_core_test.clj index b4c84475..37602116 100644 --- a/test/unit/puppetlabs/services/jruby_pool_manager/jruby_core_test.clj +++ b/test/unit/puppetlabs/services/jruby_pool_manager/jruby_core_test.clj @@ -125,4 +125,4 @@ (is (re-find #"bar" out)))))) (deftest jruby-version-info-test - (is (re-find #"jruby 9." jruby-core/jruby-version-info))) + (is (re-find #"^jruby" jruby-core/jruby-version-info)))