Skip to content

Commit d6e63f7

Browse files
committed
Bump Gradle to v9
1 parent 707c917 commit d6e63f7

5 files changed

Lines changed: 249 additions & 160 deletions

File tree

build.gradle

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,18 @@ plugins {
44
}
55

66
description = "MYA web-based query tool"
7-
version new File("${projectDir}/VERSION").text.trim()
7+
version = new File("${projectDir}/VERSION").text.trim()
8+
ext.version = project.version
89
ext.releaseDate = new Date().format('MMM dd yyyy')
910

10-
tasks.withType(JavaCompile) {
11+
tasks.withType(JavaCompile).configureEach {
1112
options.release = 17
1213
options.encoding = 'UTF-8'
1314
options.compilerArgs << "-Xlint:unchecked" << "-Xlint:deprecation"
1415
}
15-
1616
repositories {
1717
mavenCentral()
1818
}
19-
2019
sourceSets {
2120
integration {
2221
java.srcDir "${projectDir}/src/integration/java"
@@ -25,20 +24,17 @@ sourceSets {
2524
runtimeClasspath += sourceSets.main.output
2625
}
2726
}
28-
2927
configurations {
3028
integrationImplementation.extendsFrom testImplementation
3129
integrationRuntimeOnly.extendsFrom runtimeOnly
3230
}
33-
3431
dependencies {
3532
implementation 'org.jlab:jmyapi:9.0.0',
3633
'org.eclipse.parsson:parsson:1.1.1'
3734
providedCompile 'jakarta.servlet:jakarta.servlet-api:6.0.0'
3835
testImplementation 'junit:junit:4.13.2'
3936
}
40-
41-
task integrationTest(type: Test) {
37+
tasks.register('integrationTest', Test) {
4238
description = 'Runs integration tests.'
4339
group = 'verification'
4440

@@ -51,12 +47,14 @@ task integrationTest(type: Test) {
5147
showStandardStreams = true
5248
}
5349
}
54-
50+
tasks.named('jar') {
51+
enabled = false
52+
}
5553
war {
5654
archiveFileName = 'myquery.war'
5755
filesMatching('WEB-INF/web.xml') {
5856
filter {
59-
String line -> line.replaceAll("@VERSION@", project.version)
57+
String line -> line.replaceAll("@VERSION@", version)
6058
}
6159
filter {
6260
String line -> line.replaceAll("@RELEASE_DATE@", releaseDate)

gradle/wrapper/gradle-wrapper.jar

-9.5 KB
Binary file not shown.
Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip
21
distributionBase=GRADLE_USER_HOME
32
distributionPath=wrapper/dists
4-
zipStorePath=wrapper/dists
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
4+
networkTimeout=10000
5+
validateDistributionUrl=true
56
zipStoreBase=GRADLE_USER_HOME
7+
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)