Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

SOLR-17089: Upgrade Jersey to 3.1.5 #2178

Merged
merged 12 commits into from
Jan 22, 2024
Merged

SOLR-17089: Upgrade Jersey to 3.1.5 #2178

merged 12 commits into from
Jan 22, 2024

Conversation

gerlowskija
Copy link
Contributor

@gerlowskija gerlowskija commented Jan 5, 2024 •
edited
Loading

https://issues.apache.org/jira/browse/SOLR-17089

Description

Brings in a number of bug fixes and improvements, as well as fixing some irritating stacktraces that Jersey 2.x was logging in certain startup scenarios.

Tests

Automated tests continue to pass, manual testing of our Jersey-based v2 APIs

Checklist

Please review the following and check all that apply:

  • I have reviewed the guidelines for How to Contribute and my code conforms to the standards described there to the best of my ability.
  • I have created a Jira issue and added the issue ID to my pull request title.
  • I have given Solr maintainers access to contribute to my PR branch. (optional but recommended)
  • I have developed this patch against the main branch.
  • I have run ./gradlew check.

@gerlowskija
SOLR-17089: Upgrade Jersey to 3.1.5
b62600a 
Brings in a number of bug fixes and improvements, as well as fixing some
irritating stacktraces that Jersey 2.x was logging in certain startup
scenarios.
@gerlowskija
Replace injection annotation
5a9584d
@gerlowskija
Fix check
3eaf757
@gerlowskija gerlowskija force-pushed the SOLR-17089-upgrade-jersey-to-latest-major branch from 7971922 to 3eaf757 Compare January 8, 2024 13:10
@gerlowskija
Test fixes, pt 1
2c2448e
@gerlowskija
Test fixes, pt 2
c954fbc 
Some S3 tests were continuing to fail after the Jersey upgrade due to
some severe misalignment in the version of jakarta.xml.bind that was
needed by various libraries, with the newer Jersey version relying on
xml.bind 4.0.0, with s3-mock relying on 2.3.3.  This was causing
(test-only) NoClassDefFoundErrors in the s3 tests.

The best solution I could find to this was to stop Jersey from
pulling in xml-bind.  We can always reverse course on this, but for now
Solr uses its own XML serialization/deserialization anyways, so we're
not using xml-bind.

The exclusion itself was pretty straightforward, but required dropping a
few Jersey test dependencies that we weren't making much use of anyways.
@gerlowskija
Update licenses following dep change
f80f489
@gerlowskija
Fix check
4b8f078
@gerlowskija
Remove unused licenses
0430733
@risdenk
Copy link
Contributor

risdenk commented Jan 8, 2024

So having the swagger-jaxrs2-jakarta is ok even though we are in theory on javax still with Jetty? I have a hard time wrapping my head around when javax vs jakarta matters :/

@gerlowskija
Copy link
Contributor Author

Yeah, I'm definitely with you - it's very confusing.

My intention with the swagger-jaxrs2-jakarta dep is that it's not a proper Solr dependency - it's something needed by one of the plugins our gradle build uses. Specifically it's used by 'swagger-gradle-plugin' so that it can pick up jakarta-packaged annotations in generating the OAS. See these swagger-gradle-plugin docs for a bit more context.

@gerlowskija gerlowskija merged commit 976ced1 into apache:main Jan 22, 2024
3 checks passed
@gerlowskija gerlowskija deleted the SOLR-17089-upgrade-jersey-to-latest-major branch January 22, 2024 14:30
gerlowskija added a commit that referenced this pull request Jan 25, 2024
@gerlowskija
SOLR-17089: Upgrade Jersey to 3.1.5 (#2178)
61fe5ae 
Brings in a number of bug fixes and improvements, as well as fixing some
irritating stacktraces that Jersey 2.x was logging in certain startup
scenarios.
gerlowskija added a commit that referenced this pull request Jan 25, 2024
@gerlowskija
SOLR-17089: Upgrade Jersey to 3.1.5 (#2178)
b0f5565 
Brings in a number of bug fixes and improvements, as well as fixing some
irritating stacktraces that Jersey 2.x was logging in certain startup
scenarios.
freedev added a commit to freedev/solr that referenced this pull request Jan 26, 2024
@freedev
Merge branch 'main' into jira/solr-17112
fa9bfc7 
* main: (27 commits)
  Update protected-branches to include branch_9_5 (apache#2211)
  SOLR-16397: Tweak v2 'REQUESTSTATUS' API to be more REST-ful  (apache#2144)
  SOLR-17120: handle null value when merging partials (apache#2214)
  SOLR-17119: Fix exception swallowing in /cluster/plugins (apache#2202)
  SOLR-15960 Cut over System.getProperty() to EnvUtils for modules (apache#2193)
  Final fix for node problems (apache#2208)
  SOLR-16397: Fix warning in merge-indices docs
  Fix nodeSetup, use node distBaseUrl instead of registry (apache#2208)
  Add next minor version 9.6.0
  SOLR-17089: Upgrade Jersey to 3.1.5 (apache#2178)
  solr-ref-guide: fix typo in result-clustering.adoc (apache#2210)
  SOLR-17074: Fixed not correctly escaped quote in bin/solr script (apache#2200)
  SOLR-15960: Rename getProp as getProperty (apache#2194)
  Add npmRegistry for nodeSetup as well (apache#2208)
  Give NPM registry option for downloading node tools (apache#2208)
  SOLR-17116: Fix INSTALLSHARDDATA async reporting (apache#2188)
  SOLR-17066: Replace 'data store' term in code and docs (apache#2201)
  SOLR-17121: Fix SchemaCodecFactory to get PostingsFormat and DocValues from field. (apache#2206)
  Sync CHANGES for 9.4.1
  Add bugfix version 9.4.1
  ...
@cpoerschke
Copy link
Contributor

Hmm, looks like https://github.com/apache/solr/actions/runs/7589025449/job/20672803641 here says

WARNING: there were unreferenced files under license folder:
  - /home/runner/work/solr/solr/solr/licenses/jakarta.inject-2.6.1.jar.sha1

but doesn't fail the precommit itself. Noticed via @rahulgoswami's #2233 including removal of the .sha1 file.

I'm able to reproduce the "unreferenced files under license folder" locally and strangely running precommit twice gives a different list of unreferenced files second time around, hmm.

(Probably dev mailing list thread or JIRA issue worthy but as a first step commenting here in case that helps.)

@risdenk
Copy link
Contributor

risdenk commented Jan 30, 2024

@cpoerschke see https://lists.apache.org/thread/hlh1bmtgnmp55q8knhjtltf8t57pbl5q about unlicensed. I don't specifically know about the jakarta.inject-2.6.1.jar.sha1 one but in general I know there is some weirdness with usage tracking of files without a clean.

@cpoerschke
Copy link
Contributor

... (Probably dev mailing list thread or JIRA issue worthy but as a first step commenting here in case that helps.)

https://issues.apache.org/jira/browse/SOLR-17142 created.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
api dependencies Dependency upgrades tool:build
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@gerlowskija @risdenk @cpoerschke