diff --git a/docs/pom.xml b/docs/pom.xml index 9f54d0db..913bf194 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -12,7 +12,7 @@ spring-cloud-release-tools ${basedir}/.. - 3.4 + 3.6.4 releaser.* diff --git a/pom.xml b/pom.xml index e4284fd3..91c51619 100644 --- a/pom.xml +++ b/pom.xml @@ -30,18 +30,18 @@ UTF-8 1.8 - 2021.0.0 + 2021.0.1 1.1.2 0.0.9 - 7.0.2.Final + 7.0.4.Final 5.12.0.202106070339-r - 3.8.4 - 2.7 + 3.8.5 + 2.10.0 4.3.0 0.12.0 - 4.1.1 + 4.2.0 1.0.0-SNAPSHOT 1.1.4 5.0.4 diff --git a/projects/reactor/pom.xml b/projects/reactor/pom.xml index f7641c75..d482ecff 100644 --- a/projects/reactor/pom.xml +++ b/projects/reactor/pom.xml @@ -17,7 +17,7 @@ UTF-8 1.8 - 4.12.0.RELEASE + 5.7.0.RELEASE diff --git a/releaser-core/src/main/java/releaser/internal/buildsystem/PomUpdater.java b/releaser-core/src/main/java/releaser/internal/buildsystem/PomUpdater.java index 41706f26..fe074233 100644 --- a/releaser-core/src/main/java/releaser/internal/buildsystem/PomUpdater.java +++ b/releaser-core/src/main/java/releaser/internal/buildsystem/PomUpdater.java @@ -328,7 +328,7 @@ class PomWriter { try { XMLInputFactory inputFactory = XMLInputFactory2.newInstance(); inputFactory.setProperty(XMLInputFactory2.P_PRESERVE_LOCATION, Boolean.TRUE); - newPom = new ModifiedPomXMLEventReader(input, inputFactory); + newPom = new ModifiedPomXMLEventReader(input, inputFactory, null); } catch (XMLStreamException e) { log.error("Exception occurred while trying to parse pom", e); diff --git a/releaser-core/src/test/java/releaser/internal/buildsystem/PomUpdaterTests.java b/releaser-core/src/test/java/releaser/internal/buildsystem/PomUpdaterTests.java index 0eccbb0a..1baaab14 100644 --- a/releaser-core/src/test/java/releaser/internal/buildsystem/PomUpdaterTests.java +++ b/releaser-core/src/test/java/releaser/internal/buildsystem/PomUpdaterTests.java @@ -20,10 +20,10 @@ import java.io.File; import java.io.IOException; import java.net.URISyntaxException; import java.nio.file.Files; +import java.util.Collections; import java.util.HashSet; import java.util.Set; -import edu.emory.mathcs.backport.java.util.Collections; import org.apache.maven.model.Model; import org.assertj.core.api.BDDAssertions; import org.junit.jupiter.api.BeforeEach; diff --git a/releaser-core/src/test/java/releaser/internal/buildsystem/PropertyVersionChangerTests.java b/releaser-core/src/test/java/releaser/internal/buildsystem/PropertyVersionChangerTests.java index fa644b1b..3f435720 100644 --- a/releaser-core/src/test/java/releaser/internal/buildsystem/PropertyVersionChangerTests.java +++ b/releaser-core/src/test/java/releaser/internal/buildsystem/PropertyVersionChangerTests.java @@ -16,11 +16,11 @@ package releaser.internal.buildsystem; +import java.util.Arrays; import java.util.HashSet; import java.util.Properties; import java.util.Set; -import edu.emory.mathcs.backport.java.util.Arrays; import org.apache.maven.model.Model; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -37,13 +37,13 @@ import static org.mockito.Mockito.never; * @author Marcin Grzejszczak */ @ExtendWith(MockitoExtension.class) -public class PropertyVersionChangerTests { +class PropertyVersionChangerTests { @Mock PropertyStorer propertyStorer; @Test - public void should_set_version_when_project_matches_property_name() { + void should_set_version_when_project_matches_property_name() { PropertyVersionChanger changer = new PropertyVersionChanger(model(), versions(), null, null, this.propertyStorer); @@ -54,7 +54,7 @@ public class PropertyVersionChangerTests { } @Test - public void should_not_set_version_when_project_doesnt_match_property_name() { + void should_not_set_version_when_project_doesnt_match_property_name() { PropertyVersionChanger changer = new PropertyVersionChanger(nonMatchingModel(), versions(), null, null, this.propertyStorer); @@ -64,7 +64,7 @@ public class PropertyVersionChangerTests { } @Test - public void should_not_set_version_when_project_matches_property_name_and_versions_are_the_same() { + void should_not_set_version_when_project_matches_property_name_and_versions_are_the_same() { PropertyVersionChanger changer = new PropertyVersionChanger(modelWithSameValues(), versions(), null, null, this.propertyStorer); @@ -80,8 +80,8 @@ public class PropertyVersionChangerTests { @SuppressWarnings("unchecked") private Set allProjects() { - return new HashSet<>(Arrays.asList(new Project[] { project("spring-cloud-aws", "1.2.0.BUILD-SNAPSHOT"), - project("spring-cloud-sleuth", "1.2.0.BUILD-SNAPSHOT") })); + return new HashSet<>(Arrays.asList(project("spring-cloud-aws", "1.2.0.BUILD-SNAPSHOT"), + project("spring-cloud-sleuth", "1.2.0.BUILD-SNAPSHOT"))); } Project project(String name, String value) { diff --git a/releaser-core/src/test/resources/projects/spring-cloud-core-tests/bootstrap/src/test/java/demo/BootstrapClientApplicationTests.java b/releaser-core/src/test/resources/projects/spring-cloud-core-tests/bootstrap/src/test/java/demo/BootstrapClientApplicationTests.java index 278ddbc1..f764b661 100644 --- a/releaser-core/src/test/resources/projects/spring-cloud-core-tests/bootstrap/src/test/java/demo/BootstrapClientApplicationTests.java +++ b/releaser-core/src/test/resources/projects/spring-cloud-core-tests/bootstrap/src/test/java/demo/BootstrapClientApplicationTests.java @@ -29,13 +29,13 @@ import org.springframework.test.context.junit4.SpringRunner; @RunWith(SpringRunner.class) @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT) @DirtiesContext -public class BootstrapClientApplicationTests { +class BootstrapClientApplicationTests { @Autowired private ServerProperties server; @Test - public void contextLoads() throws Exception { + void contextLoads() throws Exception { assertThat(2).isEqualTo(this.server.getTomcat().getMaxThreads()); // The application.yml is never read because spring.config.name=sample assertThat("application").isEqualTo(this.server.getServlet().getApplicationDisplayName()); diff --git a/releaser-core/src/test/resources/projects/spring-cloud-core-tests/bus/src/test/java/demo/StandaloneClientApplicationTests.java b/releaser-core/src/test/resources/projects/spring-cloud-core-tests/bus/src/test/java/demo/StandaloneClientApplicationTests.java index 40878f3c..9468e1b0 100644 --- a/releaser-core/src/test/resources/projects/spring-cloud-core-tests/bus/src/test/java/demo/StandaloneClientApplicationTests.java +++ b/releaser-core/src/test/resources/projects/spring-cloud-core-tests/bus/src/test/java/demo/StandaloneClientApplicationTests.java @@ -30,13 +30,13 @@ import static org.junit.Assert.assertNotNull; @RunWith(SpringRunner.class) @SpringBootTest @DirtiesContext -public class StandaloneClientApplicationTests { +class StandaloneClientApplicationTests { @Autowired private ConfigServicePropertySourceLocator locator; @Test - public void contextLoads() throws Exception { + void contextLoads() throws Exception { assertNotNull(this.locator); } diff --git a/releaser-core/src/test/resources/projects/spring-cloud-core-tests/config-client-decrypt/src/test/java/demo/BootstrapDecryptionClientApplicationTests.java b/releaser-core/src/test/resources/projects/spring-cloud-core-tests/config-client-decrypt/src/test/java/demo/BootstrapDecryptionClientApplicationTests.java index 923c512a..4480a461 100644 --- a/releaser-core/src/test/resources/projects/spring-cloud-core-tests/config-client-decrypt/src/test/java/demo/BootstrapDecryptionClientApplicationTests.java +++ b/releaser-core/src/test/resources/projects/spring-cloud-core-tests/config-client-decrypt/src/test/java/demo/BootstrapDecryptionClientApplicationTests.java @@ -29,7 +29,7 @@ import org.springframework.test.context.junit4.SpringRunner; @RunWith(SpringRunner.class) @SpringBootTest @DirtiesContext -public class BootstrapDecryptionClientApplicationTests { +class BootstrapDecryptionClientApplicationTests { @Autowired private ConfigClientProperties config; @@ -38,7 +38,7 @@ public class BootstrapDecryptionClientApplicationTests { private ConfigServicePropertySourceLocator locator; @Test - public void contextLoads() throws Exception { + void contextLoads() throws Exception { assertThat(new String[] { "http://localhost:8888" }).isEqualTo(this.config.getUri()); // The application.yml is never read because spring.config.name=sample assertThat(this.locator).isNotNull(); diff --git a/releaser-core/src/test/resources/projects/spring-cloud-core-tests/config-client/src/test/java/demo/StandaloneClientApplicationTests.java b/releaser-core/src/test/resources/projects/spring-cloud-core-tests/config-client/src/test/java/demo/StandaloneClientApplicationTests.java index 40878f3c..9468e1b0 100644 --- a/releaser-core/src/test/resources/projects/spring-cloud-core-tests/config-client/src/test/java/demo/StandaloneClientApplicationTests.java +++ b/releaser-core/src/test/resources/projects/spring-cloud-core-tests/config-client/src/test/java/demo/StandaloneClientApplicationTests.java @@ -30,13 +30,13 @@ import static org.junit.Assert.assertNotNull; @RunWith(SpringRunner.class) @SpringBootTest @DirtiesContext -public class StandaloneClientApplicationTests { +class StandaloneClientApplicationTests { @Autowired private ConfigServicePropertySourceLocator locator; @Test - public void contextLoads() throws Exception { + void contextLoads() throws Exception { assertNotNull(this.locator); } diff --git a/releaser-core/src/test/resources/projects/spring-cloud-core-tests/configserver-bootstrap/src/test/java/demo/ConfigServerEurekaApplicationTests.java b/releaser-core/src/test/resources/projects/spring-cloud-core-tests/configserver-bootstrap/src/test/java/demo/ConfigServerEurekaApplicationTests.java index b68e966e..10dcbbfb 100644 --- a/releaser-core/src/test/resources/projects/spring-cloud-core-tests/configserver-bootstrap/src/test/java/demo/ConfigServerEurekaApplicationTests.java +++ b/releaser-core/src/test/resources/projects/spring-cloud-core-tests/configserver-bootstrap/src/test/java/demo/ConfigServerEurekaApplicationTests.java @@ -17,16 +17,13 @@ package demo; import org.junit.jupiter.api.Test; -import org.junit.runner.RunWith; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.annotation.DirtiesContext; -import org.springframework.test.context.junit4.SpringRunner; -@RunWith(SpringRunner.class) @SpringBootTest @DirtiesContext -public class ConfigServerEurekaApplicationTests { +class ConfigServerEurekaApplicationTests { @Test public void contextLoads() { diff --git a/releaser-core/src/test/resources/projects/spring-cloud-core-tests/configserver/src/test/java/demo/ConfigServerApplicationTests.java b/releaser-core/src/test/resources/projects/spring-cloud-core-tests/configserver/src/test/java/demo/ConfigServerApplicationTests.java index 14ea1d0e..be3d14fa 100644 --- a/releaser-core/src/test/resources/projects/spring-cloud-core-tests/configserver/src/test/java/demo/ConfigServerApplicationTests.java +++ b/releaser-core/src/test/resources/projects/spring-cloud-core-tests/configserver/src/test/java/demo/ConfigServerApplicationTests.java @@ -26,10 +26,10 @@ import org.springframework.test.context.junit4.SpringRunner; @RunWith(SpringRunner.class) @SpringBootTest @DirtiesContext -public class ConfigServerApplicationTests { +class ConfigServerApplicationTests { @Test - public void contextLoads() { + void contextLoads() { } } diff --git a/releaser-spring/src/main/java/releaser/internal/spring/SpringBatchFlowRunner.java b/releaser-spring/src/main/java/releaser/internal/spring/SpringBatchFlowRunner.java index 72503b7c..20652de9 100644 --- a/releaser-spring/src/main/java/releaser/internal/spring/SpringBatchFlowRunner.java +++ b/releaser-spring/src/main/java/releaser/internal/spring/SpringBatchFlowRunner.java @@ -19,6 +19,7 @@ package releaser.internal.spring; import java.io.Closeable; import java.util.ArrayList; import java.util.Arrays; +import java.util.Collections; import java.util.Iterator; import java.util.LinkedList; import java.util.List; @@ -29,7 +30,6 @@ import java.util.concurrent.atomic.AtomicReference; import java.util.function.Supplier; import java.util.stream.Collectors; -import edu.emory.mathcs.backport.java.util.Collections; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import releaser.internal.ReleaserProperties; diff --git a/releaser-spring/src/test/java/releaser/internal/docs/TestDocumentationUpdater.java b/releaser-spring/src/test/java/releaser/internal/docs/TestDocumentationUpdater.java index 7afa4e0e..4f49abe0 100644 --- a/releaser-spring/src/test/java/releaser/internal/docs/TestDocumentationUpdater.java +++ b/releaser-spring/src/test/java/releaser/internal/docs/TestDocumentationUpdater.java @@ -16,7 +16,8 @@ package releaser.internal.docs; -import edu.emory.mathcs.backport.java.util.Collections; +import java.util.Collections; + import releaser.internal.ReleaserProperties; import releaser.internal.git.ProjectGitHandler; diff --git a/releaser-test/src/main/java/releaser/internal/buildsystem/MavenBomParserAccessor.java b/releaser-test/src/main/java/releaser/internal/buildsystem/MavenBomParserAccessor.java index 12f776ad..beb0a776 100644 --- a/releaser-test/src/main/java/releaser/internal/buildsystem/MavenBomParserAccessor.java +++ b/releaser-test/src/main/java/releaser/internal/buildsystem/MavenBomParserAccessor.java @@ -16,7 +16,8 @@ package releaser.internal.buildsystem; -import edu.emory.mathcs.backport.java.util.Collections; +import java.util.Collections; + import releaser.internal.ReleaserProperties; public class MavenBomParserAccessor { diff --git a/spring-cloud-info/pom.xml b/spring-cloud-info/pom.xml index 9024ef61..5dd41aa4 100644 --- a/spring-cloud-info/pom.xml +++ b/spring-cloud-info/pom.xml @@ -13,12 +13,12 @@ spring-cloud-info - 3.6.1 + 3.8.5 1.1.4 - 3.6.3 + 3.8.5 3.1.6.RELEASE 0.2.0-RELEASE - 2021.0.0 + 2021.0.1 2.0.6.RELEASE