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.

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

OAK-11286: blob-cloud, segment: update netty version to 4.1.115 #1879

Merged
merged 3 commits into from
Jan 29, 2025

Conversation

reschke
Copy link
Contributor

@reschke reschke commented Nov 27, 2024

No description provided.

@reschke reschke requested a review from amit-jain November 27, 2024 12:03
@reschke reschke marked this pull request as draft November 28, 2024 09:43
@reschke
Copy link
Contributor Author

reschke commented Jan 6, 2025

ping @amit-jain ?

@reschke reschke marked this pull request as ready for review January 6, 2025 07:14
@reschke reschke marked this pull request as draft January 6, 2025 07:16
@ahanikel
Copy link
Contributor

ahanikel commented Jan 6, 2025

@reschke I couldn't figure out how to prevent the bundle plugin from exporting the io.netty.* packages in oak-segment-tar. However, we can get the thing to build by using

-                            org.apache.jackrabbit.oak.segment.spi.persistence.split,
-                            org.apache.jackrabbit.oak.segment.spi.persistence.persistentcache
+                            org.apache.jackrabbit.oak.segment.spi.persistence.split;version=1.0.0,
+                            org.apache.jackrabbit.oak.segment.spi.persistence.persistentcache;version=4.1.0

and

--- a/oak-parent/pom.xml
+++ b/oak-parent/pom.xml
@@ -221,6 +221,7 @@
                   <filter>!org.apache.jackrabbit.oak.plugins.index.solr.util</filter>
                   <filter>!org.apache.jackrabbit.oak.segment.spi.monitor</filter>
                   <filter>!org.apache.jackrabbit.oak.segment.spi.persistence</filter>
+                  <filter>!io.netty*</filter>
                   <!-- OAK-10838: we can't control the package version for the EOLd copy of lucene-core -->
                   <filter>!org.apache.lucene.*</filter>
                   <filter>*</filter>

Copy link

github-actions bot commented Jan 7, 2025

Commit-Check ✔️

@t-rana
Copy link
Contributor

t-rana commented Jan 7, 2025

@reschke ,
We can also prevent the packages from being exported by marking them as private.

<Private-Package>
    io.netty.util.internal.shaded.org.jctools.queues.atomic.unpadded,
    io.netty.util.internal.shaded.org.jctools.queues.unpadded
</Private-Package>

@mbaedke mbaedke marked this pull request as ready for review January 28, 2025 13:06
@t-rana
Copy link
Contributor

t-rana commented Jan 29, 2025

Looks good to me!

@reschke reschke merged commit 781d486 into trunk Jan 29, 2025
5 of 6 checks passed
@reschke reschke deleted the OAK-11286 branch January 29, 2025 09:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants