From 2f28d04eb1a4db027cc1518d65b548fa24af7708 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 14 Jan 2022 14:53:01 +0100 Subject: [PATCH] Polishing. Fix Java selection for generic build operations. Include envers as child artifact of JPA. See #194 --- .../springframework/data/release/build/BuildOperations.java | 4 +++- .../org/springframework/data/release/model/Projects.java | 5 ++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/release-tools/src/main/java/org/springframework/data/release/build/BuildOperations.java b/release-tools/src/main/java/org/springframework/data/release/build/BuildOperations.java index 9c03fea..c78a4bf 100644 --- a/release-tools/src/main/java/org/springframework/data/release/build/BuildOperations.java +++ b/release-tools/src/main/java/org/springframework/data/release/build/BuildOperations.java @@ -220,7 +220,9 @@ public class BuildOperations { Supplier exception = () -> new IllegalStateException( String.format("No build system plugin found for project %s!", module.getProject())); - return function.apply(buildSystems.getPluginFor(module.getProject(), exception), module); + BuildSystem buildSystem = buildSystems.getPluginFor(module.getProject(), exception); + + return function.apply(buildSystem.withJavaVersion(module.getJavaVersion()), module); } } diff --git a/release-tools/src/main/java/org/springframework/data/release/model/Projects.java b/release-tools/src/main/java/org/springframework/data/release/model/Projects.java index 9cfa973..a82cd93 100644 --- a/release-tools/src/main/java/org/springframework/data/release/model/Projects.java +++ b/release-tools/src/main/java/org/springframework/data/release/model/Projects.java @@ -54,7 +54,10 @@ public class Projects { COMMONS = new Project("DATACMNS", "Commons", Tracker.GITHUB).withDependencies(BUILD); - JPA = new Project("DATAJPA", "JPA", Tracker.GITHUB).withDependencies(COMMONS); + JPA = new Project("DATAJPA", "JPA", Tracker.GITHUB) // + .withDependencies(COMMONS) // + // TODO: This is only for Spring Data 3.0. + .withAdditionalArtifacts(ArtifactCoordinates.SPRING_DATA.artifacts("spring-data-envers")); MONGO_DB = new Project("DATAMONGO", "MongoDB", Tracker.GITHUB) // .withDependencies(COMMONS) //