MONGOID-5311 add support for JRuby 9.3 in 7.5 (#5363)

mongodb · Jul 11, 2022 · 2962c64 · 2962c64
1 parent 1f0059d
commit 2962c64
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 6 deletions.
diff --git a/.evergreen/config.yml b/.evergreen/config.yml
@@ -443,6 +443,10 @@ axes:
         display_name: jruby-9.2
         variables:
            RVM_RUBY: "jruby-9.2"
+      - id: "jruby-9.3"
+        display_name: jruby-9.3
+        variables:
+           RVM_RUBY: "jruby-9.3"
   - id: "os"
     display_name: OS
     values:
@@ -590,7 +594,7 @@ buildvariants:
 
 - matrix_name: "jruby"
   matrix_spec:
-    jruby: "jruby-9.2"
+    jruby: ["jruby-9.2", "jruby-9.3"]
     driver: ["current"]
     topology: ['replica-set', 'sharded-cluster']
     mongodb-version: '5.0'
@@ -769,7 +773,7 @@ buildvariants:
 
 - matrix_name: app-tests-jruby
   matrix_spec:
-    jruby: jruby-9.2
+    jruby: ["jruby-9.2", "jruby-9.3"]
     driver: ["current"]
     mongodb-version: '5.0'
     topology: standalone

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -58,6 +58,16 @@ jobs:
           i18n:
           gemfile: Gemfile
           experimental: false
+        - mongodb: '5.0'
+          ruby: jruby-9.3
+          topology: replica_set
+          os: ubuntu-20.04
+          task: test
+          driver: current
+          rails:
+          i18n:
+          gemfile: Gemfile
+          experimental: false
         - mongodb: '5.0'
           ruby: jruby-9.2
           topology: replica_set
@@ -298,6 +308,16 @@ jobs:
           i18n:
           gemfile: gemfiles/rails-5.2.gemfile
           experimental: false
+        - mongodb: '5.0'
+          ruby: jruby-9.3
+          topology: server
+          os: ubuntu-20.04
+          task: test
+          driver: current
+          rails: '6.0'
+          i18n:
+          gemfile: gemfiles/rails-6.0.gemfile
+          experimental: false
         - mongodb: '5.0'
           ruby: jruby-9.2
           topology: server

diff --git a/docs/reference/compatibility.txt b/docs/reference/compatibility.txt
@@ -84,6 +84,7 @@ is deprecated.
      - Ruby 2.3
      - Ruby 2.2
      - JRuby 9.2
+     - JRuby 9.3
 
    * - 7.5
      - |checkmark|
@@ -95,6 +96,7 @@ is deprecated.
      -
      -
      - D
+     - |checkmark|
 
    * - 7.4
      - |checkmark|
@@ -105,7 +107,8 @@ is deprecated.
      -
      -
      -
-     - D
+     - |checkmark|
+     -
 
    * - 7.3
      - |checkmark| [#mongoid-7.3-ruby-3.0]_
@@ -117,6 +120,7 @@ is deprecated.
      - D
      -
      - |checkmark|
+     -
 
    * - 7.2
      - |checkmark| [#mongoid-7.2-ruby-3.0]_
@@ -128,6 +132,7 @@ is deprecated.
      - D
      -
      - |checkmark|
+     -
 
    * - 7.1
      - |checkmark| [#mongoid-7.1-ruby-3.0]_
@@ -139,6 +144,7 @@ is deprecated.
      - |checkmark|
      -
      - |checkmark|
+     -
 
    * - 7.0
      -
@@ -150,6 +156,7 @@ is deprecated.
      - |checkmark|
      - |checkmark| [#ruby-2.2]_
      - |checkmark|
+     -
 
    * - 6.4
      -
@@ -161,6 +168,7 @@ is deprecated.
      - |checkmark|
      - |checkmark| [#ruby-2.2]_
      - |checkmark|
+     -
 
 .. [#mongoid-7.3-ruby-3.0] Mongoid version 7.3.2 or higher is required.
 

diff --git a/docs/release-notes/mongoid-7.4.txt b/docs/release-notes/mongoid-7.4.txt
@@ -28,9 +28,6 @@ Ruby Version Support
 As of version 7.4, Mongoid supports Ruby 2.5+.
 Support for Ruby 2.4 and earlier has been dropped.
 
-As of Mongoid 7.4, JRuby support is deprecated. Mongoid 8 will not support
-JRuby.
-
 
 Support for MongoDB 3.4 and Earlier Servers Deprecated
 ------------------------------------------------------