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

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