PSARC/2025/002 EOF Ruby 3.1

37496981 EOF Ruby 3.1: Move to legacy state
oracle · Jan 29, 2025 · c8649b1 · c8649b1
1 parent 1a3d390
commit c8649b1
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 11 deletions.
diff --git a/components/ruby/ruby-31/generate/ruby-31.static b/components/ruby/ruby-31/generate/ruby-31.static
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2018, 2022, Oracle and/or its affiliates.
+# Copyright (c) 2018, 2025, Oracle and/or its affiliates.
 #
 
 link path=usr/ruby/$(RUBY_VER)/lib/64 target=$(MACH64)
@@ -52,3 +52,9 @@ link path=usr/share/man/man1/rake.1 \
     mediator-version=$(RUBY_VER)
 
 file path=usr/ruby/$(RUBY_VER)/lib/$(MACH64)/libruby-static.a
+
+file release-notes/runtime-ruby-31.txt \
+    path=usr/share/doc/release-notes/runtime-ruby-31.txt mode=0444 \
+    must-display=true \
+    release-note=feature/pkg/self@$(IPS_COMPONENT_VERSION)-AUTO_FMRI \
+    release-note=feature/pkg/self@0
diff --git a/components/ruby/ruby-31/release-notes/runtime-ruby-31.txt b/components/ruby/ruby-31/release-notes/runtime-ruby-31.txt
@@ -0,0 +1,2 @@
+Ruby 3.1 will be removed from a future release of Oracle Solaris. Customers
+using Ruby 3.1 should migrate to newer Ruby runtime.
diff --git a/components/ruby/ruby-31/ruby-31.p5m b/components/ruby/ruby-31/ruby-31.p5m
@@ -20,19 +20,20 @@
 #
 
 #
-# Copyright (c) 2015, 2024, Oracle and/or its affiliates.
+# Copyright (c) 2015, 2025, Oracle and/or its affiliates.
 #
 
-<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
+<transform file path=usr.*/man/.+ -> default mangler.man.stability "obsolete uncommitted">
 set name=pkg.fmri \
     value=pkg:/runtime/ruby-$(RUBY_VER_NO_DOT)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Ruby, RubyGems, and Rake"
+set name=pkg.legacy value=true
 set name=com.oracle.info.description value="Ruby, including RubyGems and Rake"
 set name=info.classification \
     value=org.opensolaris.category.2008:Development/Ruby
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
-set name=org.opensolaris.arc-caseid value=PSARC/2022/046
+set name=org.opensolaris.arc-caseid value=PSARC/2022/046 value=PSARC/2025/002
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 #
 link path=usr/bin/bundle target=./bundle$(RUBY_VER_NO_DOT) mediator=ruby \
@@ -14203,6 +14204,11 @@ file path=usr/ruby/$(RUBY_VER)/share/ri/$(RUBY_LIB_VER)/system/syntax/page-modul
 file path=usr/ruby/$(RUBY_VER)/share/ri/$(RUBY_LIB_VER)/system/syntax/page-pattern_matching_rdoc.ri
 file path=usr/ruby/$(RUBY_VER)/share/ri/$(RUBY_LIB_VER)/system/syntax/page-precedence_rdoc.ri
 file path=usr/ruby/$(RUBY_VER)/share/ri/$(RUBY_LIB_VER)/system/syntax/page-refinements_rdoc.ri
+file release-notes/runtime-ruby-31.txt \
+    path=usr/share/doc/release-notes/runtime-ruby-31.txt mode=0444 \
+    must-display=true \
+    release-note=feature/pkg/self@$(IPS_COMPONENT_VERSION)-AUTO_FMRI \
+    release-note=feature/pkg/self@0
 
 
 link path=usr/share/man/man1/erb$(RUBY_VER_NO_DOT).1 \

diff --git a/components/ruby/ruby-common/Makefile b/components/ruby/ruby-common/Makefile
@@ -20,13 +20,13 @@
 #
 
 #
-# Copyright (c) 2014, 2023, Oracle and/or its affiliates.
+# Copyright (c) 2014, 2025, Oracle and/or its affiliates.
 #
 include ../../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		ruby-meta
 # the latest version of Ruby
-COMPONENT_VERSION=	3.1
+COMPONENT_VERSION=	3.3
 COMPONENT_SRC=
 COMPONENT_ARCHIVE_SRC=	none
 COMPONENT_PROJECT_URL=	http://www.ruby-lang.org/

diff --git a/components/ruby/ruby-common/ruby.p5m b/components/ruby/ruby-common/ruby.p5m
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2015, 2023, Oracle and/or its affiliates.
+# Copyright (c) 2015, 2025, Oracle and/or its affiliates.
 #
 
 set name=pkg.fmri value=pkg:/runtime/ruby@$(COMPONENT_VERSION),$(BUILD_VERSION)
@@ -29,9 +29,10 @@ set name=info.classification \
     value=org.opensolaris.category.2008:Development/Ruby
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid value=PSARC/2013/269 value=PSARC/2015/113 \
-    value=PSARC/2018/119 value=PSARC/2019/018 value=PSARC/PSARC/2022/046
+    value=PSARC/2018/119 value=PSARC/2019/018 value=PSARC/2022/046 \
+    value=PSARC/2024/142
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 license ruby.license license=Oracle
 
 # Any version of Ruby currently available
-depend type=require-any fmri=runtime/ruby-31
+depend type=require-any fmri=runtime/ruby-31 fmri=runtime/ruby-33
diff --git a/transforms/defaults b/transforms/defaults
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2010, 2024, Oracle and/or its affiliates.
+# Copyright (c) 2010, 2025, Oracle and/or its affiliates.
 #
 
 #
@@ -77,7 +77,7 @@ set name=com.oracle.info.consolidation.repository-url \
 #
 # Set the default Ruby for mediated links
 #
-<transform link mediator=ruby mediator-version=3.1 -> default mediator-priority vendor>
+<transform link mediator=ruby mediator-version=3.3 -> default mediator-priority vendor>
 
 #
 # Set the default Perl for mediated links
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		Ruby 3.1 will be removed from a future release of Oracle Solaris. Customers
		using Ruby 3.1 should migrate to newer Ruby runtime.