Spring/spring-data-release
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Upgrade dependencies.

Browse Source
This commit is contained in:
Mark Paluch
2022-08-29 11:56:46 +02:00
parent 6f5494c1ca
commit 8acc42f658
8 changed files with 30 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
pom.xml
View File

@@ -9,7 +9,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.3.4.RELEASE</version>
<version>2.7.2</version>
</parent>
<properties>
@@ -64,7 +64,7 @@
<dependency>
<groupId>org.xmlbeam</groupId>
<artifactId>xmlprojector</artifactId>
<version>1.4.7</version>
<version>1.4.23</version>
</dependency>
<dependency>
@@ -104,7 +104,13 @@
<dependency>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit</artifactId>
<version>5.6.0.201912101111-r</version>
<version>5.13.1.202206130422-r</version>
</dependency>
<dependency>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit.gpg.bc</artifactId>
<version>5.13.1.202206130422-r</version>
</dependency>
<dependency>
@@ -116,7 +122,7 @@
<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-invoker</artifactId>
<version>3.0.1</version>
<version>3.2.0</version>
</dependency>
<dependency>
@@ -128,14 +134,14 @@
<dependency>
<groupId>com.github.tomakehurst</groupId>
<artifactId>wiremock</artifactId>
<version>2.26.3</version>
<version>2.27.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>29.0-jre</version>
<version>31.1-jre</version>
<scope>test</scope>
</dependency>

2
src/main/java/org/springframework/data/release/git/BackportTargets.java
View File

@@ -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;

10
src/main/java/org/springframework/data/release/infra/DependencyOperations.java
View File

@@ -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<String, LocalDateTime> 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 <T extends Pom, R> R doWithPom(File file, Class<T> type, Function<T, R> callback) {
XBFileIO io = projectionFactory.io().file(file);
FileIO io = projectionFactory.io().file(file);
try {
@@ -570,7 +570,7 @@ public class DependencyOperations {
private <T extends Pom> void update(File file, Class<T> type, Consumer<T> callback) {
XBFileIO io = projectionFactory.io().file(file);
FileIO io = projectionFactory.io().file(file);
try {

4
src/main/java/org/springframework/data/release/infra/InfrastructureCommands.java
View File

@@ -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<JavaRuntimes.JdkInstallation> 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));

11
src/test/java/org/springframework/data/release/build/MavenIntegrationTests.java
View File

@@ -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);

4
src/test/java/org/springframework/data/release/cli/ReleaseCommandsIntegrationTests.java
View File

@@ -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();
}
}

4
src/test/java/org/springframework/data/release/git/GitOperationsIntegrationTests.java
View File

@@ -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();
}
}

4
src/test/java/org/springframework/data/release/infra/DependencyOperationsIntegrationTests.java
View File

@@ -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();
}
}