Skip to content

Commit 74681c8

Browse files
authored
Upgrade to Gradle 9.1.0 (#15236)
1 parent 46a43cd commit 74681c8

File tree

47 files changed

+14910
-14850
lines changed

Some content is hidden

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

47 files changed

+14910
-14850
lines changed

.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: "24"
10+
default: "25"
1111
description: "The default JDK version to set up."
1212

1313
java-distribution:

.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: [ '24' ]
32+
java: [ '25' ]
3333

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

@@ -63,7 +63,7 @@ jobs:
6363
matrix:
6464
# Operating systems to run on.
6565
os: [ ubuntu-latest, windows-latest, macos-latest ]
66-
java: [ '24' ]
66+
java: [ '25' ]
6767

6868
runs-on: ${{ matrix.os }}
6969

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
strategy:
3333
matrix:
3434
os: [ ubuntu-latest ]
35-
java-version: [ '24' ]
35+
java-version: [ '25' ]
3636
uses-alt-java: [ true, false ]
3737

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

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
strategy:
2323
matrix:
2424
os: [ ubuntu-latest ]
25-
java-version: [ '24' ]
25+
java-version: [ '25' ]
2626

2727
runs-on: ${{ matrix.os }}
2828

.github/workflows/run-special-checks-sandbox.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
strategy:
2121
matrix:
2222
os: [ ubuntu-latest ]
23-
java: [ '24' ]
23+
java: [ '25' ]
2424
faiss-version: [ '1.11.0' ]
2525

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

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ comprehensive documentation, visit:
4040

4141
### Basic steps:
4242

43-
1. Install [OpenJDK 24](https://jdk.java.net/archive/).
43+
1. Install [OpenJDK 25](https://jdk.java.net/archive/).
4444
2. Clone Lucene's git repository (or download the source distribution).
4545
3. Run gradle launcher script (`gradlew`).
4646

build-tools/build-infra-shadow/build.gradle

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ repositories {
2424
gradlePluginPortal()
2525
}
2626

27+
apply from: rootProject.file("build-tools/build-infra/ecj-source.gradle")
28+
2729
// Convert a plugin dependency to a regular dependency so that we can
2830
// use [plugins] section in the top-level toml but declare regular
2931
// project dependencies here.

build-tools/build-infra/build.gradle

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ repositories {
2727
gradlePluginPortal()
2828
}
2929

30+
apply from: file("ecj-source.gradle")
31+
3032
group = "org.apache"
3133

3234
java {
Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
/*
2+
* Licensed to the Apache Software Foundation (ASF) under one or more
3+
* contributor license agreements. See the NOTICE file distributed with
4+
* this work for additional information regarding copyright ownership.
5+
* The ASF licenses this file to You under the Apache License, Version 2.0
6+
* (the "License"); you may not use this file except in compliance with
7+
* the License. You may obtain a copy of the License at
8+
*
9+
* http://www.apache.org/licenses/LICENSE-2.0
10+
*
11+
* Unless required by applicable law or agreed to in writing, software
12+
* distributed under the License is distributed on an "AS IS" BASIS,
13+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
* See the License for the specific language governing permissions and
15+
* limitations under the License.
16+
*/
17+
18+
// We occasionally use versions of ecj that are not yet published in Maven Central
19+
// and are only available in Eclipse "drops" (interim builds) (ecj jar is uploaded
20+
// to maven central approximately every three months). If this is the case,
21+
// we redirect dependency resolution to our own s3-based "maven repository" just for
22+
// the ecj jar.
23+
24+
boolean useDropMirrorForEcj = true
25+
if (useDropMirrorForEcj) {
26+
repositories {
27+
exclusiveContent {
28+
forRepository {
29+
ivy {
30+
url = 'https://s3.amazonaws.com/lucene-testdata/temp-repo/ecj/'
31+
patternLayout {
32+
artifact "[artifact]-[revision](.[ext])"
33+
m2compatible = true
34+
}
35+
metadataSources {
36+
it.artifact()
37+
}
38+
}
39+
}
40+
filter {
41+
includeGroup "org.eclipse.jdt"
42+
}
43+
}
44+
}
45+
}

build-tools/build-infra/src/main/groovy/lucene.regenerate.icu.gradle

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -272,18 +272,18 @@ configure(project(":lucene:analysis:common")) {
272272
outputs.file outputFile
273273

274274
doFirst {
275-
def execOps = objects.newInstance(ExecOperationsProvider).execOperations
276-
execOps.javaexec {
277-
mainClass "groovy.lang.GroovyShell"
278-
classpath icuConfig, groovyConfig
275+
ExecOperations execOps = objects.newInstance(ExecOperationsProvider).execOperations
276+
execOps.javaexec({ JavaExecSpec spec ->
277+
spec.mainClass = "groovy.lang.GroovyShell"
278+
spec.classpath(icuConfig, groovyConfig)
279279

280-
args = [
280+
spec.args([
281281
"--encoding",
282282
"UTF-8",
283-
file("${resources}/GenerateUnicodeProps.groovy"),
284-
outputFile
285-
]
286-
}
283+
file("${resources}/GenerateUnicodeProps.groovy").toString(),
284+
outputFile.toString()
285+
])
286+
})
287287
}
288288
}
289289

@@ -313,8 +313,8 @@ configure(project(":lucene:core")) {
313313

314314
doFirst {
315315
def execOps = objects.newInstance(ExecOperationsProvider).execOperations
316-
execOps.javaexec {
317-
mainClass "groovy.lang.GroovyShell"
316+
execOps.javaexec({
317+
mainClass = "groovy.lang.GroovyShell"
318318
classpath icuConfig, groovyConfig
319319

320320
args = [
@@ -323,7 +323,7 @@ configure(project(":lucene:core")) {
323323
file("${resources}/GenerateCaseFolding.groovy"),
324324
outputFile
325325
]
326-
}
326+
})
327327
}
328328
}
329329

0 commit comments

Comments
 (0)