diff --git a/pom.xml b/pom.xml index 206722d..a7a0372 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ org.springframework.boot spring-boot-starter-parent - 2.3.4.RELEASE + 2.7.2 @@ -64,7 +64,7 @@ org.xmlbeam xmlprojector - 1.4.7 + 1.4.23 @@ -104,7 +104,13 @@ org.eclipse.jgit org.eclipse.jgit - 5.6.0.201912101111-r + 5.13.1.202206130422-r + + + + org.eclipse.jgit + org.eclipse.jgit.gpg.bc + 5.13.1.202206130422-r @@ -116,7 +122,7 @@ org.apache.maven.shared maven-invoker - 3.0.1 + 3.2.0 @@ -128,14 +134,14 @@ com.github.tomakehurst wiremock - 2.26.3 + 2.27.2 test com.google.guava guava - 29.0-jre + 31.1-jre test diff --git a/src/main/java/org/springframework/data/release/git/BackportTargets.java b/src/main/java/org/springframework/data/release/git/BackportTargets.java index 54af987..a4b6b3e 100644 --- a/src/main/java/org/springframework/data/release/git/BackportTargets.java +++ b/src/main/java/org/springframework/data/release/git/BackportTargets.java @@ -23,8 +23,6 @@ import java.util.Set; import java.util.stream.Collectors; import java.util.stream.Stream; -import org.bouncycastle.util.Iterable; - import org.springframework.data.release.model.ModuleIteration; import org.springframework.data.release.model.Train; import org.springframework.util.Assert; diff --git a/src/main/java/org/springframework/data/release/infra/DependencyOperations.java b/src/main/java/org/springframework/data/release/infra/DependencyOperations.java index 2268149..0d341b7 100644 --- a/src/main/java/org/springframework/data/release/infra/DependencyOperations.java +++ b/src/main/java/org/springframework/data/release/infra/DependencyOperations.java @@ -68,8 +68,8 @@ import org.springframework.web.client.RestOperations; import org.xmlbeam.ProjectionFactory; import org.xmlbeam.annotation.XBRead; -import org.xmlbeam.io.XBFileIO; -import org.xmlbeam.io.XBStreamInput; +import org.xmlbeam.io.FileIO; +import org.xmlbeam.io.StreamInput; /** * Operations for dependency management. @@ -505,7 +505,7 @@ public class DependencyOperations { Map creationDates = parseCreationDates(directoryListing.getBody()); - XBStreamInput io = projectionFactory.io().stream(new ByteArrayInputStream(mavenMetadata.getBody())); + StreamInput io = projectionFactory.io().stream(new ByteArrayInputStream(mavenMetadata.getBody())); MavenMetadata metadata = io.read(MavenMetadata.class); @@ -556,7 +556,7 @@ public class DependencyOperations { private R doWithPom(File file, Class type, Function callback) { - XBFileIO io = projectionFactory.io().file(file); + FileIO io = projectionFactory.io().file(file); try { @@ -570,7 +570,7 @@ public class DependencyOperations { private void update(File file, Class type, Consumer callback) { - XBFileIO io = projectionFactory.io().file(file); + FileIO io = projectionFactory.io().file(file); try { diff --git a/src/main/java/org/springframework/data/release/infra/InfrastructureCommands.java b/src/main/java/org/springframework/data/release/infra/InfrastructureCommands.java index d07c0dc..9de2f73 100644 --- a/src/main/java/org/springframework/data/release/infra/InfrastructureCommands.java +++ b/src/main/java/org/springframework/data/release/infra/InfrastructureCommands.java @@ -24,7 +24,7 @@ import java.nio.file.Files; import java.nio.file.Paths; import java.util.List; -import org.bouncycastle.util.Strings; +import org.apache.commons.io.IOUtils; import org.springframework.data.release.CliComponent; import org.springframework.data.release.TimedCommand; @@ -57,7 +57,7 @@ public class InfrastructureCommands extends TimedCommand { public Table listJdkVersions() { List jdks = JavaRuntimes.getJdks(); - StringBuilder builder = new StringBuilder("Available Java versions" + Strings.lineSeparator()); + StringBuilder builder = new StringBuilder("Available Java versions" + IOUtils.LINE_SEPARATOR); Table table = new Table(); table.addHeader(1, new TableHeader("Version", 15)); diff --git a/src/test/java/org/springframework/data/release/build/MavenIntegrationTests.java b/src/test/java/org/springframework/data/release/build/MavenIntegrationTests.java index 9a0a612..65a2627 100644 --- a/src/test/java/org/springframework/data/release/build/MavenIntegrationTests.java +++ b/src/test/java/org/springframework/data/release/build/MavenIntegrationTests.java @@ -16,8 +16,7 @@ package org.springframework.data.release.build; import static org.assertj.core.api.Assertions.*; -import static org.assertj.core.api.Assumptions.assumeThat; -import static org.junit.Assume.*; +import static org.assertj.core.api.Assumptions.*; import java.io.ByteArrayInputStream; import java.io.File; @@ -38,7 +37,7 @@ import org.springframework.data.release.model.Projects; import org.xmlbeam.ProjectionFactory; import org.xmlbeam.evaluation.XPathEvaluator; -import org.xmlbeam.io.XBFileIO; +import org.xmlbeam.io.FileIO; /** * @author Oliver Gierke @@ -60,14 +59,14 @@ class MavenIntegrationTests extends AbstractIntegrationTests { urlConnection.connect(); urlConnection.getInputStream().close(); } catch (IOException e) { - assumeTrue("Test requires connectivity to GitHub:" + e.toString(), false); + assumeThat(false).as("Test requires connectivity to GitHub:" + e.toString()).isTrue(); } } @Test void modifiesParentPomCorrectly() throws IOException { - XBFileIO io = projection.io().file(new ClassPathResource("parent-pom.xml").getFile()); + FileIO io = projection.io().file(new ClassPathResource("parent-pom.xml").getFile()); ParentPom pom = io.read(ParentPom.class); pom.setSharedResourcesVersion(ArtifactVersion.of("1.2.0.RELEASE")); @@ -82,7 +81,7 @@ class MavenIntegrationTests extends AbstractIntegrationTests { @Test void updatesRepositoriesCorrectly() throws Exception { - XBFileIO io = projection.io().file(new ClassPathResource("sample-pom.xml").getFile()); + FileIO io = projection.io().file(new ClassPathResource("sample-pom.xml").getFile()); Pom pom = io.read(Pom.class); diff --git a/src/test/java/org/springframework/data/release/cli/ReleaseCommandsIntegrationTests.java b/src/test/java/org/springframework/data/release/cli/ReleaseCommandsIntegrationTests.java index d7f60a9..ceac1e8 100644 --- a/src/test/java/org/springframework/data/release/cli/ReleaseCommandsIntegrationTests.java +++ b/src/test/java/org/springframework/data/release/cli/ReleaseCommandsIntegrationTests.java @@ -16,7 +16,7 @@ package org.springframework.data.release.cli; import static org.assertj.core.api.Assertions.*; -import static org.junit.Assume.*; +import static org.assertj.core.api.Assumptions.*; import java.io.IOException; import java.net.URL; @@ -49,7 +49,7 @@ class ReleaseCommandsIntegrationTests extends AbstractIntegrationTests { urlConnection.connect(); urlConnection.getInputStream().close(); } catch (IOException e) { - assumeTrue("Test requires connectivity to GitHub:" + e.toString(), false); + assumeThat(false).as("Test requires connectivity to GitHub:" + e.toString()).isTrue(); } } diff --git a/src/test/java/org/springframework/data/release/git/GitOperationsIntegrationTests.java b/src/test/java/org/springframework/data/release/git/GitOperationsIntegrationTests.java index f0a9170..535304f 100644 --- a/src/test/java/org/springframework/data/release/git/GitOperationsIntegrationTests.java +++ b/src/test/java/org/springframework/data/release/git/GitOperationsIntegrationTests.java @@ -16,7 +16,7 @@ package org.springframework.data.release.git; import static org.assertj.core.api.Assertions.*; -import static org.junit.Assume.*; +import static org.assertj.core.api.Assumptions.*; import static org.springframework.data.release.model.Projects.*; import java.io.IOException; @@ -52,7 +52,7 @@ class GitOperationsIntegrationTests extends AbstractIntegrationTests { urlConnection.connect(); urlConnection.getInputStream().close(); } catch (IOException e) { - assumeTrue("Test requires connectivity to GitHub:" + e.toString(), false); + assumeThat(false).as("Test requires connectivity to GitHub:" + e.toString()).isTrue(); } } diff --git a/src/test/java/org/springframework/data/release/infra/DependencyOperationsIntegrationTests.java b/src/test/java/org/springframework/data/release/infra/DependencyOperationsIntegrationTests.java index 3f165d4..9b467db 100644 --- a/src/test/java/org/springframework/data/release/infra/DependencyOperationsIntegrationTests.java +++ b/src/test/java/org/springframework/data/release/infra/DependencyOperationsIntegrationTests.java @@ -16,7 +16,7 @@ package org.springframework.data.release.infra; import static org.assertj.core.api.Assertions.*; -import static org.junit.Assume.*; +import static org.assertj.core.api.Assumptions.*; import java.io.IOException; import java.net.URL; @@ -53,7 +53,7 @@ class DependencyOperationsIntegrationTests extends AbstractIntegrationTests { urlConnection.connect(); urlConnection.getInputStream().close(); } catch (IOException e) { - assumeTrue("Test requires connectivity to Maven: " + e.toString(), false); + assumeThat(false).as("Test requires connectivity to Maven: " + e.toString()).isTrue(); } }