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

Bump up Java version to 21 #2682

Merged
merged 22 commits into from
Oct 24, 2024
Merged

Bump up Java version to 21 #2682

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
6d81843
Prep for Java 21
iamsanjay Aug 22, 2024
1cd918b
merge conflicts
iamsanjay Oct 18, 2024
e357537
merge conflicts
iamsanjay Oct 18, 2024
e6859da
Changing Java version for workflows
iamsanjay Aug 30, 2024
1be027e
Adding suppress warning
iamsanjay Aug 30, 2024
a23be0d
Removed explicit cast of HttpClient to AutoClosable
iamsanjay Aug 30, 2024
e3af3ae
FloatingPointLiteralPrecision from errorProne task
iamsanjay Aug 30, 2024
e2a666d
merge conflicts
iamsanjay Oct 18, 2024
cc96a91
merge conflicts
iamsanjay Oct 18, 2024
fb26967
change java version for docker
iamsanjay Oct 10, 2024
24fb33c
gradle toolchain configured
iamsanjay Oct 11, 2024
58576c7
revert toolchain
iamsanjay Oct 11, 2024
4bb25de
set source and target at package level
iamsanjay Oct 15, 2024
46445cb
change documentation to reflect JDK 21
iamsanjay Oct 17, 2024
c2888ad
tidy
iamsanjay Oct 17, 2024
d95ce4d
suppress warnings
iamsanjay Oct 17, 2024
ea75378
remove old garbage collector ref
iamsanjay Oct 18, 2024
268a008
added changes.txt
iamsanjay Oct 18, 2024
c5a6ce7
Updated doc and removed vm arg UseBiasedLocking
iamsanjay Oct 21, 2024
eaeedad
Merge branch 'main' into Java_Solr21
iamsanjay Oct 21, 2024
6380a21
merge conflicts
iamsanjay Oct 24, 2024
33f694c
changes.txt
iamsanjay Oct 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions solr/bin/solr.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1015,6 +1015,12 @@ IF "%GC_TUNE%"=="" (
-XX:+ExplicitGCInvokesConcurrent
)

REM Workaround for JIT crash, see https://issues.apache.org/jira/browse/SOLR-16463
if !JAVA_MAJOR_VERSION! GEQ 17 (
set SCRIPT_SOLR_OPTS=%SCRIPT_SOLR_OPTS% -XX:CompileCommand=exclude,com.github.benmanes.caffeine.cache.BoundedLocalCache::put
echo Java %JAVA_MAJOR_VERSION% detected. Enabled workaround for SOLR-16463
)

REM Vector optimizations are only supported for Java 20 and 21 for now.
REM This will need to change as Lucene is upgraded and newer Java versions are released
if !JAVA_MAJOR_VERSION! GEQ 20 if !JAVA_MAJOR_VERSION! LEQ 21 (
Expand Down
7 changes: 0 additions & 7 deletions solr/bin/solr.in.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,15 +49,8 @@ REM set GC_TUNE=-XX:+ExplicitGCInvokesConcurrent
REM set GC_TUNE=-XX:SurvivorRatio=4
REM set GC_TUNE=%GC_TUNE% -XX:TargetSurvivorRatio=90
REM set GC_TUNE=%GC_TUNE% -XX:MaxTenuringThreshold=8
REM set GC_TUNE=%GC_TUNE% -XX:+UseConcMarkSweepGC
REM set GC_TUNE=%GC_TUNE% -XX:ConcGCThreads=4
REM set GC_TUNE=%GC_TUNE% -XX:ParallelGCThreads=4
REM set GC_TUNE=%GC_TUNE% -XX:+CMSScavengeBeforeRemark
REM set GC_TUNE=%GC_TUNE% -XX:PretenureSizeThreshold=64m
REM set GC_TUNE=%GC_TUNE% -XX:+UseCMSInitiatingOccupancyOnly
REM set GC_TUNE=%GC_TUNE% -XX:CMSInitiatingOccupancyFraction=50
REM set GC_TUNE=%GC_TUNE% -XX:CMSMaxAbortablePrecleanTime=6000
REM set GC_TUNE=%GC_TUNE% -XX:+CMSParallelRemarkEnabled
REM set GC_TUNE=%GC_TUNE% -XX:+ParallelRefProcEnabled etc.

REM Set the ZooKeeper connection string if using an external ZooKeeper ensemble
Expand Down
8 changes: 1 addition & 7 deletions solr/bin/solr.in.sh
View file
Open in desktop
iamsanjay marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -55,14 +55,8 @@
#-XX:SurvivorRatio=4 \
#-XX:TargetSurvivorRatio=90 \
#-XX:MaxTenuringThreshold=8 \
#-XX:+UseConcMarkSweepGC \
#-XX:ConcGCThreads=4 -XX:ParallelGCThreads=4 \
#-XX:+CMSScavengeBeforeRemark \
#-XX:ParallelGCThreads=4 \
#-XX:PretenureSizeThreshold=64m \
#-XX:+UseCMSInitiatingOccupancyOnly \
#-XX:CMSInitiatingOccupancyFraction=50 \
#-XX:CMSMaxAbortablePrecleanTime=6000 \
#-XX:+CMSParallelRemarkEnabled \
#-XX:+ParallelRefProcEnabled etc.

# Set the ZooKeeper connection string if using an external ZooKeeper ensemble
Expand Down
Loading