Skip to content

Commit a8a44dc

Browse files
Build the project by JDK 21 as default
- Spotless is executed only on JDK 11+ - We have ITs executing on JDK 8
1 parent a0360b3 commit a8a44dc

File tree

3 files changed

+9
-8
lines changed

3 files changed

+9
-8
lines changed

.github/workflows/maven.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,13 @@ jobs:
4242

4343
- uses: actions/setup-java@v4
4444
with:
45-
java-version: 8
45+
java-version: 21
4646
distribution: 'zulu'
4747
cache: 'maven'
4848

4949
- name: Set up Maven
5050
run:
51-
mvn --errors --batch-mode --show-version org.apache.maven.plugins:maven-wrapper-plugin:3.3.2:wrapper "-Dmaven=3.9.9"
51+
mvn --errors --batch-mode --show-version org.apache.maven.plugins:maven-wrapper-plugin:3.3.2:wrapper "-Dmaven=3.9.10"
5252

5353
- name: Build with Maven
5454
run: ./mvnw verify -e -B -V -DdistributionFileName=apache-maven

Jenkinsfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
properties([buildDiscarder(logRotator(artifactNumToKeepStr: '5', numToKeepStr: env.BRANCH_NAME=='maven-3.9.x'?'5':'1'))])
2121

2222
def buildOs = 'linux'
23-
def buildJdk = '8'
23+
def buildJdk = '21'
2424
def buildMvn = '3.x.x'
2525
def runITsOses = ['linux']
2626
def runITsJdks = ['8', '11', '17']

maven-core/src/test/java/org/apache/maven/graph/DefaultProjectDependencyGraphTest.java

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,12 @@ public class DefaultProjectDependencyGraphTest extends TestCase {
4040
private final MavenProject cProject = createProject(Arrays.asList(toDependency(bProject)), "cProject");
4141

4242
private final MavenProject dProject = createProject(
43-
Arrays.asList(toDependency(aProject), toDependency(bProject), toDependency(cProject)), "dProject");
43+
Arrays.asList(toDependency(aProject), toDependency(bProject), toDependency(cProject)), "dProject");
4444

4545
private final MavenProject eProject = createProject(
46-
Arrays.asList(toDependency(aProject), toDependency(bProject), toDependency(cProject), toDependency(dProject)),
47-
"eProject");
46+
Arrays.asList(
47+
toDependency(aProject), toDependency(bProject), toDependency(cProject), toDependency(dProject)),
48+
"eProject");
4849

4950
private final MavenProject depender1 = createProject(Arrays.asList(toDependency(aProject)), "depender1");
5051

@@ -90,8 +91,8 @@ public void testNonTransitiveFiltering() throws DuplicateProjectException, Cycle
9091
// downstream projects. Which would result in dProject and eProject being returned twice, but now the results are
9192
// made unique.
9293
public void testGetDownstreamDoesNotDuplicateProjects() throws CycleDetectedException, DuplicateProjectException {
93-
ProjectDependencyGraph graph = new DefaultProjectDependencyGraph(
94-
Arrays.asList(aProject, bProject, cProject, dProject, eProject));
94+
ProjectDependencyGraph graph =
95+
new DefaultProjectDependencyGraph(Arrays.asList(aProject, bProject, cProject, dProject, eProject));
9596
graph = new FilteredProjectDependencyGraph(graph, Arrays.asList(aProject, dProject, eProject));
9697
final List<MavenProject> downstreamProjects = graph.getDownstreamProjects(aProject, false);
9798
assertEquals(2, downstreamProjects.size());

0 commit comments

Comments
 (0)