Skip to content

Conversation

andsel
Copy link
Contributor

@andsel andsel commented May 20, 2025

Release notes

[rn:skip]

What does this PR do?

Avoid hard pins on gem versions in the Gemfile.template and remove some duplicated gems which are already vendored to an upper version

@andsel andsel self-assigned this May 20, 2025
@github-actions
Copy link
Contributor

🤖 GitHub comments

Expand to view the GitHub comments

Just comment with:

  • run docs-build : Re-trigger the docs validation. (use unformatted text in the comment!)

@mergify
Copy link
Contributor

mergify bot commented May 20, 2025

This pull request does not have a backport label. Could you fix it @andsel? 🙏
To fixup this pull request, you need to add the backport labels for the needed
branches, such as:

  • backport-8./d is the label to automatically backport to the 8./d branch. /d is the digit.
  • If no backport is necessary, please add the backport-skip label

…me duplicated gems which are already vendored to an upper version
@andsel andsel force-pushed the fix/avoid_hard_pins_and_clean_dup_jars branch from 843f070 to 3462446 Compare May 20, 2025 15:16
Comment on lines +108 to +109
@exclude_paths << 'vendor/jruby/lib/ruby/stdlib/cgi{,.rb}'
@exclude_paths << 'vendor/jruby/lib/ruby/stdlib/cgi/**/*'
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Review note:

  1. build a tarball:
    ./gradlew assembleTarDistribution
    
  2. Look for instances of the word cgi, and ensure that the stdlib entry present in vendor/jruby/lib/ruby/stdlib of source is not present in the tarbal:
    tar -tzf build/logstash-9.1.0-SNAPSHOT.tar.gz | egrep '\cgi\b'
    

@elastic-sonarqube
Copy link

Quality Gate passed Quality Gate passed

Issues
0 New issues
0 Fixed issues
0 Accepted issues

Measures
0 Security Hotspots
No data about Coverage
No data about Duplication

See analysis details on SonarQube

@elasticmachine
Copy link
Collaborator

💚 Build Succeeded

History

cc @andsel

Copy link
Member

@robbavey robbavey left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

@yaauie yaauie added backport-8.17 Automated backport with mergify backport-9.0 Automated backport to the 9.0 branch with mergify backport-8.18 Automated backport with mergify backport-8.19 Automated backport to the 8.19 branch labels May 20, 2025
@yaauie yaauie merged commit 06c877e into elastic:main May 20, 2025
9 checks passed
mergify bot pushed a commit that referenced this pull request May 20, 2025
* Avoid hard pins on gem versions in the Gemfile.template and remove some duplicated gems which are already vendored to an upper version

* exclude inactive net-imap-0.2.3 from artifacts

* artifacts: exclude "default" stdlib gems that are shadowed by pinned gems

---------

Co-authored-by: Ry Biesemeyer <[email protected]>
(cherry picked from commit 06c877e)
mergify bot pushed a commit that referenced this pull request May 20, 2025
* Avoid hard pins on gem versions in the Gemfile.template and remove some duplicated gems which are already vendored to an upper version

* exclude inactive net-imap-0.2.3 from artifacts

* artifacts: exclude "default" stdlib gems that are shadowed by pinned gems

---------

Co-authored-by: Ry Biesemeyer <[email protected]>
(cherry picked from commit 06c877e)

# Conflicts:
#	Gemfile.template
mergify bot pushed a commit that referenced this pull request May 20, 2025
* Avoid hard pins on gem versions in the Gemfile.template and remove some duplicated gems which are already vendored to an upper version

* exclude inactive net-imap-0.2.3 from artifacts

* artifacts: exclude "default" stdlib gems that are shadowed by pinned gems

---------

Co-authored-by: Ry Biesemeyer <[email protected]>
(cherry picked from commit 06c877e)

# Conflicts:
#	rakelib/artifacts.rake
mergify bot pushed a commit that referenced this pull request May 20, 2025
* Avoid hard pins on gem versions in the Gemfile.template and remove some duplicated gems which are already vendored to an upper version

* exclude inactive net-imap-0.2.3 from artifacts

* artifacts: exclude "default" stdlib gems that are shadowed by pinned gems

---------

Co-authored-by: Ry Biesemeyer <[email protected]>
(cherry picked from commit 06c877e)

# Conflicts:
#	Gemfile.template
yaauie added a commit that referenced this pull request May 20, 2025
* Avoid hard pins on gem versions in the Gemfile.template and remove some duplicated gems which are already vendored to an upper version

* exclude inactive net-imap-0.2.3 from artifacts

* artifacts: exclude "default" stdlib gems that are shadowed by pinned gems

---------


(cherry picked from commit 06c877e)

Co-authored-by: Andrea Selva <[email protected]>
Co-authored-by: Ry Biesemeyer <[email protected]>
yaauie added a commit that referenced this pull request May 20, 2025
…17664)

* Fixes to the bundles gems and jars versions (#17659)

* Avoid hard pins on gem versions in the Gemfile.template and remove some duplicated gems which are already vendored to an upper version

* exclude inactive net-imap-0.2.3 from artifacts

* artifacts: exclude "default" stdlib gems that are shadowed by pinned gems

---------

Co-authored-by: Ry Biesemeyer <[email protected]>
(cherry picked from commit 06c877e)

# Conflicts:
#	Gemfile.template

* fix merge conflict (line order)

---------

Co-authored-by: Andrea Selva <[email protected]>
Co-authored-by: Rye Biesemeyer <[email protected]>
yaauie added a commit that referenced this pull request May 20, 2025
…17662)

* Fixes to the bundles gems and jars versions (#17659)

* Avoid hard pins on gem versions in the Gemfile.template and remove some duplicated gems which are already vendored to an upper version

* exclude inactive net-imap-0.2.3 from artifacts

* artifacts: exclude "default" stdlib gems that are shadowed by pinned gems

---------

Co-authored-by: Ry Biesemeyer <[email protected]>
(cherry picked from commit 06c877e)

# Conflicts:
#	Gemfile.template

* fix conflict (line order)

---------

Co-authored-by: Andrea Selva <[email protected]>
Co-authored-by: Rye Biesemeyer <[email protected]>
andsel added a commit that referenced this pull request May 21, 2025
…17663)

Avoid hard pins on gem versions in the Gemfile.template and remove some duplicated gems which are already vendored to an upper version

---------

Co-authored-by: Andrea Selva <[email protected]>
Co-authored-by: Rye Biesemeyer <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport-8.17 Automated backport with mergify backport-8.18 Automated backport with mergify backport-8.19 Automated backport to the 8.19 branch backport-9.0 Automated backport to the 9.0 branch with mergify

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants