Skip to content

Commit a068c25

Browse files
committed
Test using JDK 21
1 parent e9515ed commit a068c25

File tree

4 files changed

+10
-7
lines changed

4 files changed

+10
-7
lines changed

.github/workflows/nebula.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
strategy:
2323
matrix:
2424
# test against latest update of some major Java version(s), as well as specific LTS version(s)
25-
java: [ 8, 17, 20]
25+
java: [ 8, 17, 21]
2626
name: Gradle Build without Publish
2727
steps:
2828
- uses: actions/checkout@v1

src/test/groovy/com/netflix/nebula/lint/plugin/Gradle8LintReportTaskSpec.groovy

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import spock.lang.Issue
55

66
class Gradle8LintReportTaskSpec extends IntegrationTestKitSpec {
77
def setup() {
8-
gradleVersion = '8.1.1'
8+
gradleVersion = '8.4-rc-2'
99
debug = true
1010
}
1111

src/test/groovy/com/netflix/nebula/lint/rule/dependency/BypassedForcesWithResolutionRulesSpec.groovy

+2-2
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,7 @@ test.nebula:a:1.2.0\n""")
264264
coreAlignment << [true]
265265
}
266266

267-
@IgnoreIf({ jvm.isJava20() })
267+
@IgnoreIf({ jvm.isJava21() })
268268
def 'handles dependencies and forces defined per project | core alignment #coreAlignment'() {
269269
definePluginOutsideOfPluginBlock = true
270270
//Necessary as 8.x does not have force support
@@ -868,7 +868,7 @@ test.nebula:a:1.3.0\n""")
868868
}
869869

870870
@Unroll
871-
@IgnoreIf({ jvm.isJava20() })
871+
@IgnoreIf({ jvm.isJava21() })
872872
def 'ignores buildscript dependencies for #type'() {
873873
//Necessary as 8.x does not have force support
874874
gradleVersion = '7.6'

src/test/groovy/com/netflix/nebula/lint/rule/dependency/UndeclaredDependencyRuleSpec.groovy

+6-3
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ package com.netflix.nebula.lint.rule.dependency
1818
import nebula.test.IntegrationTestKitSpec
1919
import nebula.test.dependencies.Coordinate
2020
import nebula.test.dependencies.maven.Pom
21+
import spock.lang.IgnoreIf
2122
import spock.lang.Subject
2223
import spock.lang.Unroll
2324

@@ -26,7 +27,7 @@ class UndeclaredDependencyRuleSpec extends IntegrationTestKitSpec {
2627
private static final def sample = new Coordinate('sample', 'alpha', '1.0')
2728
private static final def commonsLogging = new Coordinate('commons-logging', 'commons-logging', '1.2')
2829
private static final def commonsLang = new Coordinate('commons-lang', 'commons-lang', '2.6')
29-
private static final def lombok = new Coordinate('org.projectlombok', 'lombok', '1.18.22')
30+
private static final def lombok = new Coordinate('org.projectlombok', 'lombok', '1.18.30')
3031
private static final def junit = new Coordinate('junit', 'junit', '4.12')
3132

3233
def main = '''
@@ -134,6 +135,7 @@ class UndeclaredDependencyRuleSpec extends IntegrationTestKitSpec {
134135
}
135136

136137
@Unroll
138+
@IgnoreIf({ jvm.isJava21() })
137139
def 'adds dependencies alphabetically for #configuration configuration'() {
138140
given:
139141
def repo = new File(projectDir, 'repo')
@@ -157,7 +159,7 @@ class UndeclaredDependencyRuleSpec extends IntegrationTestKitSpec {
157159
}
158160
}
159161
dependencies {
160-
classpath "io.freefair.gradle:lombok-plugin:6.6.1"
162+
classpath "io.freefair.gradle:lombok-plugin:8.3"
161163
}
162164
}
163165
@@ -645,6 +647,7 @@ class UndeclaredDependencyRuleSpec extends IntegrationTestKitSpec {
645647
sample | 'compile'
646648
}
647649

650+
@IgnoreIf({ jvm.isJava21() })
648651
def 'when using compileOnly configuration, transitives are resolved before linting so no changes are made'() {
649652
given:
650653
def repo = new File(projectDir, 'repo')
@@ -665,7 +668,7 @@ class UndeclaredDependencyRuleSpec extends IntegrationTestKitSpec {
665668
}
666669
}
667670
dependencies {
668-
classpath "io.freefair.gradle:lombok-plugin:6.6.1"
671+
classpath "io.freefair.gradle:lombok-plugin:8.3"
669672
}
670673
}
671674

0 commit comments

Comments
 (0)