[Git][java-team/jruby][master] Deleted 42 commits: New upstream version 9.4.3.0+ds

Jérôme Charaoui (@lavamind) gitlab at salsa.debian.org
Sat Dec 2 03:09:26 GMT 2023



Jérôme Charaoui pushed to branch master at Debian Java Maintainers / jruby


WARNING: The push did not contain any new commits, but force pushed to delete the commits and changes below.


Deleted commits:
5a670e95 by Jérôme Charaoui at 2023-09-01T09:12:55-04:00
New upstream version 9.4.3.0+ds
- - - - -
d10ec652 by Jérôme Charaoui at 2023-09-01T09:13:19-04:00
Update upstream source from tag 'upstream/9.4.3.0+ds'

Update to upstream version '9.4.3.0+ds'
with Debian dir a82e3f911264e8b1d3dd9e518b0bc79331bcadf5
- - - - -
48c45096 by Jérôme Charaoui at 2023-10-20T21:17:24-04:00
d/patches: fix typo in dep-3 tag

- - - - -
e952d5a8 by Jérôme Charaoui at 2023-10-26T18:20:47-04:00
d/control: update changelog for new upstream version

- - - - -
2916ea70 by Jérôme Charaoui at 2023-10-26T18:20:52-04:00
d/patches: drop  mri test patch, merged upstream

- - - - -
9cca6629 by Jérôme Charaoui at 2023-10-26T18:20:52-04:00
d/patches: re-roll testRevision testcase patch

- - - - -
72b3d3ff by Jérôme Charaoui at 2023-10-26T18:20:53-04:00
d/patches: rebase pty.rb patch

- - - - -
d1811f78 by Jérôme Charaoui at 2023-11-07T09:31:18-05:00
d/control: add new libfixposix4 binary dependency

- - - - -
c7b433e9 by Jérôme Charaoui at 2023-11-07T09:31:19-05:00
d/rules: use jruby.dirs to create usj/jruby/lib/jni

- - - - -
6d4a006e by Jérôme Charaoui at 2023-11-07T09:31:19-05:00
d/rules: document surefire tests debugging

Gbp-Dch: ignore

- - - - -
111559e6 by Jérôme Charaoui at 2023-11-07T09:31:20-05:00
d/patches: forwarded patch fixing unit test

- - - - -
9adad212 by Jérôme Charaoui at 2023-11-07T09:31:20-05:00
d/control: add copy-rename-maven-plugin to build-deps

the maven plugin has been packaged in debian, so we can make use of it
from now on instead of substituting with janky d/rules bits

- - - - -
dd478591 by Jérôme Charaoui at 2023-11-26T21:52:46-05:00
build with polyglot-ruby

this drops the massive patch adding some pre-regenerated POMs to the
source tree, and instead makes use of the newly-packaged
io.takari.polyglot:polyglot-ruby maven extension to compile pom.rb files
into pom.xml at build-time

since debian-maven-helper doesn't know about pom.rb files, we need to
manually patch those to fix version numbers and ignore plugins that we
don't want or need in our build

also, mh_resolve_dependencies is noop because jruby.poms is removed, so
${maven:Depends} now needs to be replaced with a hard-coded list of
binary dependencies in d/control

- - - - -
546fd80b by Jérôme Charaoui at 2023-11-26T21:52:47-05:00
build with mavengem plugin

the mavengem plugin allows maven to install gems from the maven-repo,
which allows us to drop a lot of janky d/rules bits dealing with ruby
gems

this also add a new rubygems-download script to autogenerate the list of
gems required from lib/pom.rb, download them and create an extra orig
tarball

- - - - -
34f7c08b by Jérôme Charaoui at 2023-11-26T21:52:49-05:00
d/patches: add patch to omit bundled gems from build

- - - - -
5cd1c45d by Jérôme Charaoui at 2023-11-26T21:52:50-05:00
d/patches: re-enable JarResourceTest with workaround

- - - - -
cb65ddb3 by Jérôme Charaoui at 2023-11-26T21:52:50-05:00
d/rules: rework override_dh_prep stanza

this reimplements most of the cd && () code block with small adjustments

also now cleans up the bundled libfixposix cleanup, in addition to other
cleanup that was done before when handling the rubygems manually

- - - - -
0961c98a by Jérôme Charaoui at 2023-11-26T21:52:51-05:00
fix jzlib build dependency

org.jruby:jzlib was forked from com.jcraft:jzlib but the differences are
small, so the main missing patch was integrated into the existing jzlib
package in 1.1.3-3

- - - - -
ffa03bc1 by Jérôme Charaoui at 2023-11-26T21:52:51-05:00
d/copyright: update for new upstream release

- - - - -
639b65d0 by Jérôme Charaoui at 2023-11-26T21:52:52-05:00
switch to snakeyaml-engine for pysch 5.1

also removes the library from build-depends, its not needed there

see https://github.com/ruby/psych/commit/e93e44a627d781960847493a49405e014deb29b8

- - - - -
fcd99cbc by Jérôme Charaoui at 2023-11-26T21:52:52-05:00
d/patches: fix gems path in lib/pom.rb

- - - - -
e3a6db86 by Jérôme Charaoui at 2023-11-26T21:52:53-05:00
d/tests: fix jirb expect-based test

by default the multiline module is used, and this sends a bunch of
escape codes that seem to throw off expect, so test using the
singleline mode, and with the simple prompt (the default prompt has
changed since last version)

- - - - -
bc1bc602 by Jérôme Charaoui at 2023-11-26T21:52:53-05:00
cleanup obsolete script-not-executable lintian override

- - - - -
ee2bd689 by Jérôme Charaoui at 2023-11-26T21:52:54-05:00
d/tests: add rexml for new test in jruby set

- - - - -
6495bb95 by Jérôme Charaoui at 2023-11-26T21:52:54-05:00
d/tests: don't run chroot specs even if root

- - - - -
25249a38 by Jérôme Charaoui at 2023-11-26T21:52:55-05:00
d/rules: ship SourceCodePro font in package

They are not packaged in Debian, and some rdoc tests now rely on the
presence of these font files

- - - - -
30dcbfc6 by Jérôme Charaoui at 2023-11-26T21:52:55-05:00
debian/tests: add docs for running single tests

Gbp-Dch: ignore

- - - - -
97ca6365 by Jérôme Charaoui at 2023-11-26T21:52:56-05:00
d/salsa-ci.yml: enable autopkgtest in salsa

- - - - -
caa0a55d by Jérôme Charaoui at 2023-11-26T21:52:56-05:00
fix two libjffi library symlinks

Gbp-Dch: ignore

- - - - -
3c5e8db1 by Jérôme Charaoui at 2023-11-26T21:52:57-05:00
d/tests: fix test exclusion missing trailing newline

- - - - -
16352fad by Jérôme Charaoui at 2023-11-26T21:52:57-05:00
d/tests: skip some tests failing if ipv6 is absent

- - - - -
4d2c647f by Jérôme Charaoui at 2023-11-26T21:52:57-05:00
d/patches: patch stdlib gems to load jars from usj

Several stdlib gems are made to load bundled jars directly from stdlib,
such as jruby-openssl which needs to load bouncycastle libs. This
modifies the gems themselves to load the necessary jars from
/usr/share/java directly instead of relying on the libraries to already
exist on the classpath, which is how we dealt with this issue
previously. It turns out this method isn't really reliable as there are
many ways jruby is loaded, not limited to running the jruby binary or
executing it  via "java -jar".

- - - - -
c8387b20 by Jérôme Charaoui at 2023-11-26T21:52:58-05:00
d/patches: patch io-console to load on all platforms

- - - - -
bb014d18 by Jérôme Charaoui at 2023-11-26T21:52:58-05:00
don't ship jruby-stdlib and jruby-complete anymore

these two artifacts duplicate a lot of the contents of other jruby jars
and the files installed in /usr/share/jruby/lib/ruby/stdlib: removing them
cuts down the the package size by ~12MB

maven projects which depend on org.jruby:jruby-complete will need to
depend instead on org.jruby:jruby, eg. as a debian/maven.rules line:

org.jruby s/jruby-complete/jruby/ * * * *

- - - - -
a0951a61 by Jérôme Charaoui at 2023-11-26T22:06:32-05:00
d/control: run wrap-and-sort -bastk

- - - - -
240d9ead by Jérôme Charaoui at 2023-11-26T22:08:50-05:00
d/control: bump Standards-Version, no changes needed

- - - - -
ffd1b570 by Jérôme Charaoui at 2023-11-28T22:28:03-05:00
fix ruby-script-but-no-ruby-dep lintian warnings

these scripts don't need to be executable

- - - - -
f9211444 by Jérôme Charaoui at 2023-11-28T22:28:04-05:00
override codeless-jar lintian warning

- - - - -
dc28197b by Jérôme Charaoui at 2023-11-28T22:28:05-05:00
override superflous lintian warnings on sources

- - - - -
7878725a by Jérôme Charaoui at 2023-12-01T20:45:04-05:00
get jruby-mavengem from salsa aptly repo

- - - - -
ba1390a1 by Jérôme Charaoui at 2023-12-01T21:35:27-05:00
debian/gbp.conf: add rubygems component to export

- - - - -
5df6f3f1 by Jérôme Charaoui at 2023-12-01T22:05:40-05:00
extract rubygems in salsa extract-source job

- - - - -


25 changed files:

- .github/workflows/ci.yml
- + .github/workflows/nightly-snapshot-publish.yml
- .github/workflows/snapshot-publish.yml
- .gitignore
- .mvn/wrapper/maven-wrapper.jar
- .mvn/wrapper/maven-wrapper.properties
- BUILDING.md
- Gemfile
- README.md
- VERSION
- bin/jirb_swing
- − bin/jruby.bash
- bin/jruby.sh
- core/pom.rb
- core/pom.xml
- core/src/main/java/org/jruby/AbstractRubyMethod.java
- core/src/main/java/org/jruby/BasicObjectStub.java
- + core/src/main/java/org/jruby/DelegatedModule.java
- core/src/main/java/org/jruby/IncludedModule.java
- core/src/main/java/org/jruby/Main.java
- core/src/main/java/org/jruby/ObjectFlags.java
- core/src/main/java/org/jruby/PrependedModule.java
- core/src/main/java/org/jruby/Ruby.java
- core/src/main/java/org/jruby/RubyArgsFile.java
- core/src/main/java/org/jruby/RubyArithmeticSequence.java


The diff was not included because it is too large.


View it on GitLab: https://salsa.debian.org/java-team/jruby/-/compare/c48e28c2e9a5e73ba2237c8fcafe706c99573641...5df6f3f1ae1d1c98acbbc00d754af409d14b6dee

-- 
View it on GitLab: https://salsa.debian.org/java-team/jruby/-/compare/c48e28c2e9a5e73ba2237c8fcafe706c99573641...5df6f3f1ae1d1c98acbbc00d754af409d14b6dee
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20231202/54be6060/attachment.htm>


More information about the pkg-java-commits mailing list