[Git][java-team/jruby][experimental] 3 commits: d/patches: add patch to adjust default jruby.home
Jérôme Charaoui (@lavamind)
gitlab at salsa.debian.org
Sat Sep 19 02:41:48 BST 2026
Jérôme Charaoui pushed to branch experimental at Debian Java Maintainers / jruby
Commits:
1b0928d0 by Jérôme Charaoui at 2026-09-14T00:44:50-04:00
d/patches: add patch to adjust default jruby.home
- - - - -
84ea14d7 by Jérôme Charaoui at 2026-09-14T09:36:28-04:00
d/patches: merge maven plugin removal patches
- - - - -
729b0377 by Jérôme Charaoui at 2026-09-18T14:27:29-04:00
Update changelog for 10.1.1.0+ds-1~exp2 release
- - - - -
7 changed files:
- debian/changelog
- debian/patches/0003-disable-checksum-maven-plugin.patch → debian/patches/0002-Disable-unwanted-maven-plugins.patch
- − debian/patches/0002-disable-buildnumber-maven-plugin.patch
- − debian/patches/0004-disable-truezip-plugin.patch
- − debian/patches/0012-disable-central-publishing-maven-plugin.patch
- + debian/patches/0017-Default-jruby-home.patch
- debian/patches/series
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+jruby (10.1.1.0+ds-1~exp2) experimental; urgency=medium
+
+ * d/patches: add patch to adjust default jruby.home
+ * d/patches: merge maven plugin removal patches
+
+ -- Jérôme Charaoui <jerome at riseup.net> Fri, 18 Sep 2026 14:27:13 -0400
+
jruby (10.1.1.0+ds-1~exp1) experimental; urgency=medium
* New upstream version 10.1.1.0+ds (Closes: #1064786, #1130186)
=====================================
debian/patches/0003-disable-checksum-maven-plugin.patch → debian/patches/0002-Disable-unwanted-maven-plugins.patch
=====================================
@@ -1,19 +1,57 @@
-From: =?utf-8?b?SsOpcsO0bWUgQ2hhcmFvdWk=?= <jerome at riseup.net>
+From: Jérôme Charaoui <jerome at riseup.net>
Date: Tue, 24 Oct 2023 09:49:52 -0400
-Subject: Disable checksum-maven-plugin
-
+Subject: Disable unwanted maven plugins
Forwarded: not-needed
----
- maven/jruby-complete/pom.rb | 1 -
- maven/jruby-dist/pom.rb | 1 -
- maven/jruby/pom.rb | 1 -
- maven/pom.rb | 6 ------
- 4 files changed, 9 deletions(-)
+Index: jruby/pom.rb
+===================================================================
+--- jruby.orig/pom.rb
++++ jruby/pom.rb
+@@ -142,10 +142,6 @@ project 'JRuby', 'https://github.com/jru
+ plugin :'scm-publish', '3.1.0'
+ end
+
+- plugin('org.sonatype.central:central-publishing-maven-plugin:0.7.0',
+- extensions: true,
+- publishingServerId: 'central')
+-
+ plugin(:site,
+ port: '9000',
+ tempWebappDirectory: '${basedir}/target/site/tempdir') do
+Index: jruby/core/pom.rb
+===================================================================
+--- jruby.orig/core/pom.rb
++++ jruby/core/pom.rb
+@@ -133,12 +133,6 @@ project 'JRuby Base' do
+ })
+ end
+
+- plugin 'org.codehaus.mojo:buildnumber-maven-plugin:1.2' do
+- execute_goals('create',
+- id: 'jruby-revision',
+- phase: 'generate-sources',
+- buildNumberPropertyName: 'jruby.revision')
+- end
+
+ phase 'process-classes' do
+ plugin 'org.codehaus.mojo:build-helper-maven-plugin' do
Index: jruby/maven/jruby-complete/pom.rb
===================================================================
--- jruby.orig/maven/jruby-complete/pom.rb
+++ jruby/maven/jruby-complete/pom.rb
+@@ -75,12 +75,6 @@ project 'JRuby Complete' do
+ @current.extensions = true
+ end
+
+- plugin('org.codehaus.mojo:truezip-maven-plugin', '1.2') do
+- execute_goals(:remove,
+- phase: :package,
+- filesets: [{ directory: '${build.directory}/${project.artifactId}-${project.version}.jar',
+- includes: ['module-info.class'] }])
+- end
+
+ plugin(:invoker)
+
@@ -110,7 +110,6 @@ project 'JRuby Complete' do
failOnError: false)
end
=====================================
debian/patches/0002-disable-buildnumber-maven-plugin.patch deleted
=====================================
@@ -1,26 +0,0 @@
-From: =?utf-8?b?SsOpcsO0bWUgQ2hhcmFvdWk=?= <jerome at riseup.net>
-Date: Tue, 24 Oct 2023 09:49:52 -0400
-Subject: Disable buildnumber-maven-plugin
-
-Forwarded: not-needed
----
- core/pom.rb | 6 ------
- 1 file changed, 6 deletions(-)
-
-Index: jruby/core/pom.rb
-===================================================================
---- jruby.orig/core/pom.rb
-+++ jruby/core/pom.rb
-@@ -133,12 +133,6 @@ project 'JRuby Base' do
- })
- end
-
-- plugin 'org.codehaus.mojo:buildnumber-maven-plugin:1.2' do
-- execute_goals('create',
-- id: 'jruby-revision',
-- phase: 'generate-sources',
-- buildNumberPropertyName: 'jruby.revision')
-- end
-
- phase 'process-classes' do
- plugin 'org.codehaus.mojo:build-helper-maven-plugin' do
=====================================
debian/patches/0004-disable-truezip-plugin.patch deleted
=====================================
@@ -1,26 +0,0 @@
-From: =?utf-8?b?SsOpcsO0bWUgQ2hhcmFvdWk=?= <jerome at riseup.net>
-Date: Tue, 24 Oct 2023 09:49:52 -0400
-Subject: Disable truezip-maven-plugin
-
-Forwarded: not-needed
----
- maven/jruby-complete/pom.rb | 7 -------
- 1 file changed, 7 deletions(-)
-
-Index: jruby/maven/jruby-complete/pom.rb
-===================================================================
---- jruby.orig/maven/jruby-complete/pom.rb
-+++ jruby/maven/jruby-complete/pom.rb
-@@ -75,12 +75,6 @@ project 'JRuby Complete' do
- @current.extensions = true
- end
-
-- plugin('org.codehaus.mojo:truezip-maven-plugin', '1.2') do
-- execute_goals(:remove,
-- phase: :package,
-- filesets: [{ directory: '${build.directory}/${project.artifactId}-${project.version}.jar',
-- includes: ['module-info.class'] }])
-- end
-
- plugin(:invoker)
-
=====================================
debian/patches/0012-disable-central-publishing-maven-plugin.patch deleted
=====================================
@@ -1,20 +0,0 @@
-Description: disable central-publishing-maven-plugin
-Author: Jérôme Charaoui <jerome at riseup.net>
-
-Forwarded: not-needed
-
-Index: jruby/pom.rb
-===================================================================
---- jruby.orig/pom.rb
-+++ jruby/pom.rb
-@@ -142,10 +142,6 @@ project 'JRuby', 'https://github.com/jru
- plugin :'scm-publish', '3.1.0'
- end
-
-- plugin('org.sonatype.central:central-publishing-maven-plugin:0.7.0',
-- extensions: true,
-- publishingServerId: 'central')
--
- plugin(:site,
- port: '9000',
- tempWebappDirectory: '${basedir}/target/site/tempdir') do
=====================================
debian/patches/0017-Default-jruby-home.patch
=====================================
@@ -0,0 +1,24 @@
+Description: Default jruby.home
+Author: Jérôme Charaoui <jerome at riseup.net>
+Last-Update: 2025-09-14
+Forwarded: not-needed
+
+This modifies the default path used for jruby.home when none is provided.
+Without this, JRuby instances might fail to load bundled gems that are part of
+the JRuby stdlib, eg. when executed via means other than /usr/bin/jruby
+
+Index: jruby/core/src/main/java/org/jruby/RubyInstanceConfig.java
+===================================================================
+--- jruby.orig/core/src/main/java/org/jruby/RubyInstanceConfig.java
++++ jruby/core/src/main/java/org/jruby/RubyInstanceConfig.java
+@@ -306,8 +306,8 @@ public class RubyInstanceConfig {
+ newJRubyHome = SafePropertyAccessor.getProperty("jruby.home");
+ }
+
+- if (newJRubyHome == null && getLoader().getResource("META-INF/jruby.home/.jrubydir") != null) {
+- newJRubyHome = "uri:classloader://META-INF/jruby.home";
++ if (newJRubyHome == null) {
++ newJRubyHome = "/usr/share/jruby";
+ }
+ if (newJRubyHome != null) {
+ // verify it if it's there
=====================================
debian/patches/series
=====================================
@@ -1,7 +1,5 @@
0001-patch-ruby-poms.patch
-0002-disable-buildnumber-maven-plugin.patch
-0003-disable-checksum-maven-plugin.patch
-0004-disable-truezip-plugin.patch
+0002-Disable-unwanted-maven-plugins.patch
0005-disable-jnr-ffi-native-usage.patch
0006-Rework-bundled-gems.patch
0007-Disable-test-requiring-Awaitility.patch
@@ -9,8 +7,8 @@
0009-Fix-test-failures-related-to-Module-PTY.patch
0010-Work-around-JarResourceTest-failure.patch
0011-Drop-CRaC-support.patch
-0012-disable-central-publishing-maven-plugin.patch
0013-fix-default-appcds-cache-path.patch
0014-Reduce-test-memory.patch
0015-Drop-jruby-prism-requirement.patch
0016-Workaround-AppCDS-symlink-issue.patch
+0017-Default-jruby-home.patch
View it on GitLab: https://salsa.debian.org/java-team/jruby/-/compare/a5b1cbe3f4be37e71f3842ce16f5e95d70351674...729b0377c7d773437c4f74b6c4bb1e471e8f305f
--
View it on GitLab: https://salsa.debian.org/java-team/jruby/-/compare/a5b1cbe3f4be37e71f3842ce16f5e95d70351674...729b0377c7d773437c4f74b6c4bb1e471e8f305f
You're receiving this email because of your account on salsa.debian.org. Manage all notifications: https://salsa.debian.org/-/profile/notifications | Help: https://salsa.debian.org/help
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20260919/629442be/attachment.htm>
More information about the pkg-java-commits
mailing list