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

[FEDE-7079] Upgrade siren netty to 4.1.104 #35

Open
wants to merge 11 commits into
base: branch-siren-4.1.104.x
Choose a base branch
from

Conversation

prateeknima77
Copy link

Motivation:

Explain here the context, and why you're making that change.
What is the problem you're trying to solve.

Modification:

Describe the modifications you've done.

Result:

Fixes #.

If there is no issue then describe the changes introduced by this PR.

torito and others added 9 commits February 19, 2024 17:29
* [FEDE-5622] Upgrade Siren Netty version from 4.1.68 to 4.1.78 (#29)

* [FEDE-5203] Upgrade Siren netty version to 4.1.68 (#25)

* [FEDE-4580] Upgrade Siren netty to 4.1.48.final (#17)

* Prefix the "io.netty.noUnsafe" and
"io.netty.buffer.bytebuf.checkAccessible" properties with the siren
keyword. The netty-common and netty-buffer packages are shaded so that
the classes are relocated to a path prefixed with siren.

* added instructions on how to build netty

* prefix version number with siren keyword

fixed dependency issue with our own artifactory

* disable netty's recycler

* debug for renaud

* bump to 4.1.27.Final

* set siren profile for dev-tools module

* Bump version to siren-4.1.27-2-SNAPSHOT

* If direct memory hasn't been specified by the deployer, set it to the value computed by the static initializer

* Try reflection by default on JDK < 14

* Removed redundant code

* Include JDK 14 in the list of JDKs where reflection is enabled by default

* Release siren-4.1.27-2

* Bump version to siren-4.1.27-3-SNAPSHOT

* Try reflection by default on JDK <= 15

* Release siren-4.1.27-3

* Bump to version siren-4.1.27-4-SNAPSHOT

* [FEDE-3917] netty direct memory counter deprecation (#10)

* Deprecate direct memory counter for Java version >= 9+

* Remove getDirectMemoryCounter()

* Extract io.netty.maxDirectMemory Java system property as a static constant

* Set the release version to siren-4.1.27-4

* Set the release version to siren-4.1.27-5-SNAPSHOT (#11)

* Add io.netty.maxDirectMemory to the list of custom Siren java system property

* Add capability to set the max direct memory from a static field and enforce it optionally

* Fix syntax

* Fix syntax

* Update common/src/main/java/io/netty/util/internal/PlatformDependent.java

Co-authored-by: Renaud <[email protected]>

* Update common/src/main/java/io/netty/util/internal/PlatformDependentCompanion.java

Co-authored-by: Renaud <[email protected]>

* Rename into MaxDirectMemorySetting class

Cleaned README file
Copied methods to compute the default max direct memory

* Simplify handling of the max direct memory

* Fix removal

* Refactoring of maxDirectMemory0() into MaxDirectMemorySetting

* Update common/src/main/java/io/netty/util/internal/MaxDirectMemorySetting.java

Co-authored-by: Stéphane Campinas <[email protected]>

* Expand the class description

* Move maxDirectMemory0() to original place

* move description of getting the max direct memory to a clearer spot

* ignore test until it can be run without problem with the rest

* removed ignored test

* release siren-4.1.27-5

* bump netty to siren-4.1.27-6-SNAPSHOT

* Prefix the "io.netty.noUnsafe" and
"io.netty.buffer.bytebuf.checkAccessible" properties with the siren
keyword. The netty-common and netty-buffer packages are shaded so that
the classes are relocated to a path prefixed with siren.

* prefix version number with siren keyword

fixed dependency issue with our own artifactory

* disable netty's recycler

* bump to 4.1.27.Final

* set siren profile for dev-tools module

* [FEDE-3917] netty direct memory counter deprecation (#10)

* Deprecate direct memory counter for Java version >= 9+

* Remove getDirectMemoryCounter()

* Extract io.netty.maxDirectMemory Java system property as a static constant

* Set the release version to siren-4.1.27-4

* Add capability to set the max direct memory from a static field and enforce it optionally

* Refactoring of maxDirectMemory0() into MaxDirectMemorySetting

* Move maxDirectMemory0() to original place

* Prefix the "io.netty.noUnsafe" and
"io.netty.buffer.bytebuf.checkAccessible" properties with the siren
keyword. The netty-common and netty-buffer packages are shaded so that
the classes are relocated to a path prefixed with siren.

* added instructions on how to build netty

* prefix version number with siren keyword

fixed dependency issue with our own artifactory

* disable netty's recycler

* debug for renaud

* bump to 4.1.27.Final

* set siren profile for dev-tools module

* Bump version to siren-4.1.27-2-SNAPSHOT

* If direct memory hasn't been specified by the deployer, set it to the value computed by the static initializer

* Try reflection by default on JDK < 14

* Removed redundant code

* Include JDK 14 in the list of JDKs where reflection is enabled by default

* Release siren-4.1.27-2

* Bump version to siren-4.1.27-3-SNAPSHOT

* Try reflection by default on JDK <= 15

* Release siren-4.1.27-3

* Bump to version siren-4.1.27-4-SNAPSHOT

* [FEDE-3917] netty direct memory counter deprecation (#10)

* Deprecate direct memory counter for Java version >= 9+

* Remove getDirectMemoryCounter()

* Extract io.netty.maxDirectMemory Java system property as a static constant

* Set the release version to siren-4.1.27-4

* Set the release version to siren-4.1.27-5-SNAPSHOT (#11)

* Add io.netty.maxDirectMemory to the list of custom Siren java system property

* Add capability to set the max direct memory from a static field and enforce it optionally

* Fix syntax

* Fix syntax

* Update common/src/main/java/io/netty/util/internal/PlatformDependent.java

Co-authored-by: Renaud <[email protected]>

* Update common/src/main/java/io/netty/util/internal/PlatformDependentCompanion.java

Co-authored-by: Renaud <[email protected]>

* Rename into MaxDirectMemorySetting class

Cleaned README file
Copied methods to compute the default max direct memory

* Simplify handling of the max direct memory

* Refactoring of maxDirectMemory0() into MaxDirectMemorySetting

* Update common/src/main/java/io/netty/util/internal/MaxDirectMemorySetting.java

Co-authored-by: Stéphane Campinas <[email protected]>

* Expand the class description

* Move maxDirectMemory0() to original place

* move description of getting the max direct memory to a clearer spot

* ignore test until it can be run without problem with the rest

* removed ignored test

* release siren-4.1.27-5

* bump netty to siren-4.1.27-6-SNAPSHOT

* Prefix the "io.netty.noUnsafe" and
"io.netty.buffer.bytebuf.checkAccessible" properties with the siren
keyword. The netty-common and netty-buffer packages are shaded so that
the classes are relocated to a path prefixed with siren.

* prefix version number with siren keyword

fixed dependency issue with our own artifactory

* disable netty's recycler

* bump to 4.1.27.Final

* set siren profile for dev-tools module

* [FEDE-3917] netty direct memory counter deprecation (#10)

* Deprecate direct memory counter for Java version >= 9+

* Remove getDirectMemoryCounter()

* Extract io.netty.maxDirectMemory Java system property as a static constant

* Set the release version to siren-4.1.27-4

* Add capability to set the max direct memory from a static field and enforce it optionally

* Refactoring of maxDirectMemory0() into MaxDirectMemorySetting

* Move maxDirectMemory0() to original place

* Fix rebase

* Fix MaxDirectMemorySetting and PlatformDependent

* Fix PlatformDependent

* Update readme

* Update as per peer review

* Fix rebase as per peer review

* Fix rebase as per peer review

* Fix as per peer review, remove PlatformDependentCompanion and PlatformDependentMaxDirectMemoryTest, prefix maxCapacity with siren

* Fix readme and checkstyle

* Fix checkstyle

* Update README to make checkBounds false by default

Co-authored-by: Stéphane Campinas <[email protected]>
Co-authored-by: Fabio Corneti <[email protected]>
Co-authored-by: Martin Anseaume <[email protected]>
Co-authored-by: Johnny Hujol <[email protected]>
Co-authored-by: Johnny Hujol <[email protected]>
Co-authored-by: Renaud <[email protected]>

* Update readme

* release siren-4.1.48

* Bumped version to siren-4.1.48-1-SNAPSHOT (#21)

* [FEDE-4580] Bumped version to siren-4.1.48-2-SNAPSHOT (#22)

* Bumped version to siren-4.1.48-1-SNAPSHOT

* Bumped version to siren-4.1.48-2-SNAPSHOT

* Bumped version to siren-4.1.48-2-SNAPSHOT

* Fix rebase

* Clean up

* Use japicmp version 0.14.3 instead of version 0.15.3 since maven install with the later fails with
"Failed to execute goal com.github.siom79.japicmp:japicmp-maven-plugin:0.15.3:cmp (default) on project netty-common: Could not find previous version for artifact: io.netty:netty-common"

Signed-off-by: George Apaaboah <[email protected]>

* Remove deprecated settings and update javadoc.
It is time to remove the JAVA_SYS_PROP_IO_NETTY_MAX_DIRECT_MEMORY settings after being deprecated.

Signed-off-by: George Apaaboah <[email protected]>

* Add a check to verify that max direct memory is not set by the system

Signed-off-by: George Apaaboah <[email protected]>

* Clean up

Signed-off-by: George Apaaboah <[email protected]>

* lazy load direct memory limit in class PlatformDependent

* Clean up after cherrypick of
ea1bcab

Signed-off-by: George Apaaboah <[email protected]>

* Fix cherry-pick

Signed-off-by: George Apaaboah <[email protected]>

* Remove check to verify that max direct memory is not set by the system

Signed-off-by: George Apaaboah <[email protected]>

Co-authored-by: Stéphane Campinas <[email protected]>
Co-authored-by: Fabio Corneti <[email protected]>
Co-authored-by: Martin Anseaume <[email protected]>
Co-authored-by: Johnny Hujol <[email protected]>
Co-authored-by: Johnny Hujol <[email protected]>
Co-authored-by: Renaud <[email protected]>

* release siren-4.1.68-1

Signed-off-by: George Apaaboah <[email protected]>

* Bump version to siren-4.1.68-2-SNAPSHOT (#27)

Signed-off-by: George Apaaboah <[email protected]>

* Fix rebase

* Add deploy to netty-bom pom

* Update readme with new version update information

* Update build and deploy commands

* Fix netty build version and netty-jni-util version

* Upgrade japicmp version to 0.15.7 since there is a mvn install issue with earlier versions, see: siom79/japicmp#281
Update readme

* Fix revapi maven plugin

* Revert the change 4a45f0c and remove 9871048 to keep netty's original behavior.
Rename class Data to DirectMemoryValues and add comment to why this change was made, see #26

* Keep original changes made to fix failure due to reflection, and either the JDK is 14 or siren.io.netty.tryReflectionSetAccessible is set explicitly to false.
See discussion: #1 (comment)

Signed-off-by: George Apaaboah <[email protected]>

* Removed outdated code and clean up as per review

Signed-off-by: George Apaaboah <[email protected]>

Signed-off-by: George Apaaboah <[email protected]>
Co-authored-by: Stéphane Campinas <[email protected]>
Co-authored-by: Fabio Corneti <[email protected]>
Co-authored-by: Martin Anseaume <[email protected]>
Co-authored-by: Johnny Hujol <[email protected]>
Co-authored-by: Johnny Hujol <[email protected]>
Co-authored-by: Renaud <[email protected]>

* Fix cherry-pick

* Chore: clean up

* Chore: update readme as per review

---------

Signed-off-by: George Apaaboah <[email protected]>
Co-authored-by: George Apaaboah <[email protected]>
Co-authored-by: Stéphane Campinas <[email protected]>
Co-authored-by: Fabio Corneti <[email protected]>
Co-authored-by: Martin Anseaume <[email protected]>
Co-authored-by: Johnny Hujol <[email protected]>
Co-authored-by: Johnny Hujol <[email protected]>
Co-authored-by: Renaud <[email protected]>
Co-authored-by: George Apaaboah <[email protected]>
Copy link

@GeorgeAp GeorgeAp left a comment

Choose a reason for hiding this comment

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

The version for the upgrade should be siren-4.1.104-1

bom/pom.xml Outdated Show resolved Hide resolved
@prateeknima77 prateeknima77 marked this pull request as ready for review February 26, 2024 09:36
@prateeknima77 prateeknima77 requested a review from scampi February 28, 2024 09:58
Copy link

@scampi scampi left a comment

Choose a reason for hiding this comment

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

checked with @prateeknima77 and @GeorgeAp, our custom netty is indeed accessed

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