Skip to content

Commit b0b4164

Browse files
committed
Merge branch 'main' into reduce-NeighborArray-memory
* main: (51 commits) Fix ECJ compiler config for Java 24 (also affects Eclipse IDE) Correct shebang in gradlew. apache#14592 Overwrite gradlew scripts with up-to-date ones and apply Lucene customizations. (apache#14592) Remove abstractions of MMapDirectory and its "fake" MR-JAR support and move it to main sourceSet (vectors untouched) (apache#14564) deps(java): bump org.gradle.toolchains.foojay-resolver-convention (apache#14573) deps(java): bump com.gradle.develocity from 3.18.2 to 4.0.1 (apache#14585) deps(java): bump nl.littlerobots.version-catalog-update (apache#14568) Bump expected base Java version to 24. apache#14533 Create file open hints on IOContext to replace ReadAdvice (apache#14482) deps(java): bump com.github.ben-manes.versions from 0.51.0 to 0.52.0 (apache#14574) deps(java): bump org.owasp.dependencycheck from 7.2.0 to 12.1.1 (apache#14584) deps(java): bump org.eclipse.jgit:org.eclipse.jgit (apache#14579) deps(java): bump com.diffplug.spotless from 6.9.1 to 7.0.3 (apache#14588) deps(java): bump com.gradle.common-custom-user-data-gradle-plugin (apache#14587) deps(java): bump net.ltgt.errorprone from 4.1.0 to 4.2.0 (apache#14567) deps(java): bump org.locationtech.jts:jts-core from 1.17.0 to 1.20.0 (apache#14586) deps(java): bump org.apache.opennlp:opennlp-tools from 2.5.3 to 2.5.4 (apache#14580) deps(java): bump asm from 9.6 to 9.8 (apache#14578) deps(java): bump commons-codec:commons-codec from 1.17.2 to 1.18.0 (apache#14581) deps(java): bump net.java.dev.javacc:javacc from 7.0.12 to 7.0.13 (apache#14576) ... # Conflicts: # lucene/CHANGES.txt
2 parents f036ad4 + 0550cc6 commit b0b4164

142 files changed

Lines changed: 22819 additions & 21829 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/actions/prepare-for-build/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ description: Creates a shared setup for other workflows
77
inputs:
88
java-version:
99
required: false
10-
default: "23"
10+
default: "24"
1111
description: "The default JDK version to set up."
1212

1313
java-distribution:

.github/dependabot.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,26 @@ version: 2
22
updates:
33
- package-ecosystem: github-actions
44
directory: /
5+
open-pull-requests-limit: 25
56
schedule:
6-
interval: weekly
7-
day: tuesday
7+
interval: monthly
88
commit-message:
99
prefix: ci
1010
labels: [dependencies]
1111

1212
# python dependencies in /dev-tools/scripts
1313
- package-ecosystem: pip
1414
directory: /dev-tools/scripts/
15+
open-pull-requests-limit: 25
1516
schedule:
16-
interval: weekly
17-
day: tuesday
17+
interval: monthly
1818
commit-message:
1919
prefix: build(deps)
2020
labels: [dependencies]
2121

2222
- package-ecosystem: gradle
2323
directory: /
24+
open-pull-requests-limit: 25
2425
schedule:
2526
interval: weekly
2627
day: tuesday

.github/workflows/mark-stale-PRs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
pull-requests: write
1919

2020
steps:
21-
- uses: actions/stale@99b6c709598e2b0d0841cd037aaf1ba07a4410bd # v5.2.0
21+
- uses: actions/stale@5bef64f19d7facfb25b37b414482c7164d639639 # v9.1.0
2222
with:
2323
repo-token: ${{ secrets.GITHUB_TOKEN }}
2424

.github/workflows/run-checks-all.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
strategy:
3030
matrix:
3131
os: [ ubuntu-latest ]
32-
java: [ '23' ]
32+
java: [ '24' ]
3333

3434
runs-on: ${{ matrix.os }}
3535

@@ -53,7 +53,7 @@ jobs:
5353
matrix:
5454
# Operating systems to run on.
5555
os: [ ubuntu-latest, windows-latest, macos-latest ]
56-
java: [ '23' ]
56+
java: [ '24' ]
5757

5858
runs-on: ${{ matrix.os }}
5959

.github/workflows/run-checks-gradle-upgrade.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
strategy:
3131
matrix:
3232
os: [ ubuntu-latest ]
33-
java-version: [ '23-ea' ]
33+
java-version: [ '24' ]
3434
uses-alt-java: [ true, false ]
3535

3636
runs-on: ${{ matrix.os }}

.github/workflows/run-checks-python.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
2929

3030
- name: Setup Python
31-
uses: actions/setup-python@8d9ed9ac5c53483de85588cdf95a591a75ab9f55 # v5.5.0
31+
uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
3232
with:
3333
python-version: "3.12.6"
3434

.github/workflows/run-nightly-smoketester.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
strategy:
1919
matrix:
2020
os: [ ubuntu-latest ]
21-
java-version: [ '23', '24' ]
21+
java-version: [ '24' ]
2222

2323
runs-on: ${{ matrix.os }}
2424

@@ -37,7 +37,7 @@ jobs:
3737
# This intentionally lists two versions, the last one is used as the system default (for running gradle).
3838
java-version: |
3939
${{ matrix.java-version }}
40-
23
40+
24
4141
4242
- name: Echo diagnostic paths and locations
4343
run: |

build-tools/build-infra/src/main/java/org/apache/lucene/gradle/WrapperDownloader.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@ public static void main(String[] args) {
6060

6161
public static void checkVersion() {
6262
int major = Runtime.version().feature();
63-
if (major != 23) {
64-
throw new IllegalStateException("java version must be 23, your version: " + major);
63+
if (major != 24) {
64+
throw new IllegalStateException("java version must be 24, your version: " + major);
6565
}
6666
}
6767

dev-tools/scripts/requirements.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
Jinja2==3.1.6
22
PyYAML==6.0.2
3-
holidays==0.70
3+
holidays==0.71
44
ics==0.7.2
55
console-menu==0.8.0
66
PyGithub==2.6.1
77
jira==3.8.0
8-
basedpyright==1.28.5
9-
ruff==0.11.5
8+
basedpyright==1.29.1
9+
ruff==0.11.7

dev-tools/scripts/smokeTestRelease.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939

4040
import scriptutil
4141

42-
BASE_JAVA_VERSION = "23"
42+
BASE_JAVA_VERSION = "24"
4343

4444
# This tool expects to find /lucene off the base URL. You
4545
# must have a working gpg, tar, unzip in your path. This has been

0 commit comments

Comments
 (0)