Skip to content

Commit 5e0e1d6

Browse files
authored
Merge pull request #1100 from cloudfoundry/pr-by-releng-bot-1769608631
Updating version for jruby for 9.4.X
2 parents 5b7b477 + 2854661 commit 5e0e1d6

4 files changed

Lines changed: 11 additions & 11 deletions

File tree

fixtures/default/sinatra_jruby/Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
source 'https://rubygems.org'
22

3-
ruby '3.1.4', :engine => 'jruby', :engine_version => '9.4.8.0'
3+
ruby '3.1.7', :engine => 'jruby', :engine_version => '9.4.14.0'
44

55
gem 'rackup'
66
gem 'sinatra'

fixtures/default/sinatra_jruby/Gemfile.lock

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,16 +27,18 @@ GEM
2727
webrick (1.9.2)
2828

2929
PLATFORMS
30+
java
3031
universal-java-1.8
3132
universal-java-25
33+
universal-java-8
3234

3335
DEPENDENCIES
3436
rackup
3537
sinatra
3638
webrick
3739

3840
RUBY VERSION
39-
ruby 3.1.4p0 (jruby 9.4.8.0)
41+
ruby 3.1.7p0 (jruby 9.4.14.0)
4042

4143
BUNDLED WITH
42-
2.3.26
44+
2.6.3

manifest.yml

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ dependency_deprecation_dates:
1010
name: node
1111
date: 2025-04-30
1212
link: https://github.com/nodejs/Release
13-
1413
- version_line: 3.2.x
1514
name: ruby
1615
date: 2026-03-31
@@ -42,13 +41,13 @@ dependencies:
4241
source: https://s3.amazonaws.com/jruby.org/downloads/9.4.8.0/jruby-src-9.4.8.0.tar.gz
4342
source_sha256: d1a7abb31bd02335cf0e26e3de54e2f82232044c0b6e59bd336a00cab8e1e211
4443
- name: jruby
45-
version: 9.4.8.0
46-
uri: https://buildpacks.cloudfoundry.org/dependencies/jruby/jruby_9.4.8.0-ruby-3.1_linux_x64_cflinuxfs4_89442854.tgz
47-
sha256: 89442854db82ec0636e5f9c79a6c78a189222fbef8a68d7ce40c3afc82b99bd8
44+
version: 9.4.14.0
45+
uri: https://buildpacks.cloudfoundry.org/dependencies/jruby/jruby_9.4.14.0-ruby-3.1_linux_x64_cflinuxfs4_ab1682e2.tgz
46+
sha256: ab1682e2022ce30ac0f768890349b467458d3b3e096bb3ac6756f68bd9cdaaaf
4847
cf_stacks:
4948
- cflinuxfs4
50-
source: https://s3.amazonaws.com/jruby.org/downloads/9.4.8.0/jruby-src-9.4.8.0.tar.gz
51-
source_sha256: d1a7abb31bd02335cf0e26e3de54e2f82232044c0b6e59bd336a00cab8e1e211
49+
source: https://repo1.maven.org/maven2/org/jruby/jruby-dist/9.4.14.0/jruby-dist-9.4.14.0-src.zip
50+
source_sha256: 400086b33f701a47dc28c5965d5a408bc2740301a5fb3b545e37abaa002ccdf8
5251
- name: node
5352
version: 20.16.0
5453
uri: https://buildpacks.cloudfoundry.org/dependencies/node/node_20.16.0_linux_x64_cflinuxfs3_62df07a7.tgz
@@ -74,7 +73,6 @@ dependencies:
7473
- cflinuxfs4
7574
source: https://java-buildpack.cloudfoundry.org/openjdk-jdk/bionic/x86_64/openjdk-jdk-1.8.0_242-bionic.tar.gz
7675
source_sha256: dcb9fea2fc3a9b003031874ed17aa5d5a7ebbe397b276ecc8c814633003928fe
77-
7876
- name: ruby
7977
version: 3.2.8
8078
uri: https://buildpacks.cloudfoundry.org/dependencies/ruby/ruby_3.2.8_linux_x64_cflinuxfs3_f36a7c8d.tgz

src/ruby/integration/default_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ func testDefault(platform switchblade.Platform, fixtures string) func(*testing.T
118118
Expect(logs).To(ContainLines(MatchRegexp(`Installing jruby \d+\.\d+\.\d+\.\d+`)))
119119
// JRuby needs extra time to warm up after health check passes
120120
// Increase timeout to 3 minutes with 2-second intervals for CI environments
121-
Eventually(deployment, 3*time.Minute, 2*time.Second).Should(Serve(ContainSubstring("jruby 3.1.4")).WithEndpoint("/ruby"), logs.String())
121+
Eventually(deployment, 3*time.Minute, 2*time.Second).Should(Serve(ContainSubstring("jruby 3.1.7")).WithEndpoint("/ruby"), logs.String())
122122
})
123123
})
124124
}

0 commit comments

Comments
 (0)