Skip to content

Commit bed8ff6

Browse files
snicollsnicoll
committed
Merge pull request #20020 from izeye
* pr/20020: Update copyright year of changed files Polish Closes gh-20020
2 parents 05e7cd6 + b5e23e7 commit bed8ff6

File tree

7 files changed

+23
-24
lines changed

7 files changed

+23
-24
lines changed

Diff for: ‎ci/images/releasescripts/src/test/java/io/spring/concourse/releasescripts/artifactory/ArtifactoryServiceTests.java

+10-10
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ void tearDown() {
7676
void promoteWhenSuccessful() {
7777
this.server
7878
.expect(requestTo(
79-
"https://repo.spring.io/api/build/promote/" + "example-build" + "/" + "example-build-1"))
79+
"https://repo.spring.io/api/build/promote/example-build/example-build-1"))
8080
.andExpect(method(HttpMethod.POST))
8181
.andExpect(content().json(
8282
"{\"status\": \"staged\", \"sourceRepo\": \"libs-staging-local\", \"targetRepo\": \"libs-milestone-local\"}"))
@@ -91,9 +91,9 @@ void promoteWhenSuccessful() {
9191
void promoteWhenArtifactsAlreadyPromoted() {
9292
this.server
9393
.expect(requestTo(
94-
"https://repo.spring.io/api/build/promote/" + "example-build" + "/" + "example-build-1"))
94+
"https://repo.spring.io/api/build/promote/example-build/example-build-1"))
9595
.andRespond(withStatus(HttpStatus.CONFLICT));
96-
this.server.expect(requestTo("https://repo.spring.io/api/build/" + "example-build" + "/" + "example-build-1"))
96+
this.server.expect(requestTo("https://repo.spring.io/api/build/example-build/example-build-1"))
9797
.andRespond(withJsonFrom("build-info-response.json"));
9898
this.service.promote("libs-release-local", getReleaseInfo());
9999
this.server.verify();
@@ -103,9 +103,9 @@ void promoteWhenArtifactsAlreadyPromoted() {
103103
void promoteWhenCheckForArtifactsAlreadyPromotedFails() {
104104
this.server
105105
.expect(requestTo(
106-
"https://repo.spring.io/api/build/promote/" + "example-build" + "/" + "example-build-1"))
106+
"https://repo.spring.io/api/build/promote/example-build/example-build-1"))
107107
.andRespond(withStatus(HttpStatus.CONFLICT));
108-
this.server.expect(requestTo("https://repo.spring.io/api/build/" + "example-build" + "/" + "example-build-1"))
108+
this.server.expect(requestTo("https://repo.spring.io/api/build/example-build/example-build-1"))
109109
.andRespond(withStatus(HttpStatus.FORBIDDEN));
110110
assertThatExceptionOfType(HttpClientErrorException.class)
111111
.isThrownBy(() -> this.service.promote("libs-release-local", getReleaseInfo()));
@@ -116,9 +116,9 @@ void promoteWhenCheckForArtifactsAlreadyPromotedFails() {
116116
void promoteWhenPromotionFails() {
117117
this.server
118118
.expect(requestTo(
119-
"https://repo.spring.io/api/build/promote/" + "example-build" + "/" + "example-build-1"))
119+
"https://repo.spring.io/api/build/promote/example-build/example-build-1"))
120120
.andRespond(withStatus(HttpStatus.CONFLICT));
121-
this.server.expect(requestTo("https://repo.spring.io/api/build/" + "example-build" + "/" + "example-build-1"))
121+
this.server.expect(requestTo("https://repo.spring.io/api/build/example-build/example-build-1"))
122122
.andRespond(withJsonFrom("staged-build-info-response.json"));
123123
assertThatExceptionOfType(HttpClientErrorException.class)
124124
.isThrownBy(() -> this.service.promote("libs-release-local", getReleaseInfo()));
@@ -131,7 +131,7 @@ void distributeWhenSuccessful() throws Exception {
131131
given(this.bintrayService.isDistributionComplete(releaseInfo)).willReturn(true);
132132
this.server
133133
.expect(requestTo(
134-
"https://repo.spring.io/api/build/distribute/" + "example-build" + "/" + "example-build-1"))
134+
"https://repo.spring.io/api/build/distribute/example-build/example-build-1"))
135135
.andExpect(method(HttpMethod.POST))
136136
.andExpect(content().json(
137137
"{\"sourceRepos\": [\"libs-release-local\"], \"targetRepo\" : \"spring-distributions\", \"async\":\"true\"}"))
@@ -148,7 +148,7 @@ void distributeWhenFailure() throws Exception {
148148
ReleaseInfo releaseInfo = getReleaseInfo();
149149
this.server
150150
.expect(requestTo(
151-
"https://repo.spring.io/api/build/distribute/" + "example-build" + "/" + "example-build-1"))
151+
"https://repo.spring.io/api/build/distribute/example-build/example-build-1"))
152152
.andExpect(method(HttpMethod.POST))
153153
.andExpect(content().json(
154154
"{\"sourceRepos\": [\"libs-release-local\"], \"targetRepo\" : \"spring-distributions\", \"async\":\"true\"}"))
@@ -168,7 +168,7 @@ void distributeWhenGettingPackagesTimesOut() throws Exception {
168168
given(this.bintrayService.isDistributionComplete(releaseInfo)).willReturn(false);
169169
this.server
170170
.expect(requestTo(
171-
"https://repo.spring.io/api/build/distribute/" + "example-build" + "/" + "example-build-1"))
171+
"https://repo.spring.io/api/build/distribute/example-build/example-build-1"))
172172
.andExpect(method(HttpMethod.POST))
173173
.andExpect(content().json(
174174
"{\"sourceRepos\": [\"libs-release-local\"], \"targetRepo\" : \"spring-distributions\", \"async\":\"true\"}"))

Diff for: ‎spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/health/CompositeHealthTests.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2019 the original author or authors.
2+
* Copyright 2012-2020 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -64,7 +64,7 @@ void serializeV3WithJacksonReturnsValidJson() throws Exception {
6464
CompositeHealth health = new CompositeHealth(ApiVersion.V3, Status.UP, components);
6565
ObjectMapper mapper = new ObjectMapper();
6666
String json = mapper.writeValueAsString(health);
67-
assertThat(json).isEqualTo("{\"status\":\"UP\",\"components\":{" + "\"db1\":{\"status\":\"UP\"},"
67+
assertThat(json).isEqualTo("{\"status\":\"UP\",\"components\":{\"db1\":{\"status\":\"UP\"},"
6868
+ "\"db2\":{\"status\":\"DOWN\",\"details\":{\"a\":\"b\"}}}}");
6969
}
7070

@@ -76,7 +76,7 @@ void serializeV2WithJacksonReturnsValidJson() throws Exception {
7676
CompositeHealth health = new CompositeHealth(ApiVersion.V2, Status.UP, components);
7777
ObjectMapper mapper = new ObjectMapper();
7878
String json = mapper.writeValueAsString(health);
79-
assertThat(json).isEqualTo("{\"status\":\"UP\",\"details\":{" + "\"db1\":{\"status\":\"UP\"},"
79+
assertThat(json).isEqualTo("{\"status\":\"UP\",\"details\":{\"db1\":{\"status\":\"UP\"},"
8080
+ "\"db2\":{\"status\":\"DOWN\",\"details\":{\"a\":\"b\"}}}}");
8181
}
8282

Diff for: ‎spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/health/SystemHealthTests.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2019 the original author or authors.
2+
* Copyright 2012-2020 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -45,7 +45,7 @@ void serializeWithJacksonReturnsValidJson() throws Exception {
4545
CompositeHealth health = new SystemHealth(ApiVersion.V3, Status.UP, components, groups);
4646
ObjectMapper mapper = new ObjectMapper();
4747
String json = mapper.writeValueAsString(health);
48-
assertThat(json).isEqualTo("{\"status\":\"UP\",\"components\":{" + "\"db1\":{\"status\":\"UP\"},"
48+
assertThat(json).isEqualTo("{\"status\":\"UP\",\"components\":{\"db1\":{\"status\":\"UP\"},"
4949
+ "\"db2\":{\"status\":\"DOWN\",\"details\":{\"a\":\"b\"}}},"
5050
+ "\"groups\":[\"liveness\",\"readiness\"]}");
5151
}

Diff for: ‎spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/CacheAutoConfiguration.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2019 the original author or authors.
2+
* Copyright 2012-2020 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -107,7 +107,7 @@ static class CacheManagerValidator implements InitializingBean {
107107
@Override
108108
public void afterPropertiesSet() {
109109
Assert.notNull(this.cacheManager.getIfAvailable(),
110-
() -> "No cache manager could be auto-configured, check your configuration (caching " + "type is '"
110+
() -> "No cache manager could be auto-configured, check your configuration (caching type is '"
111111
+ this.cacheProperties.getType() + "')");
112112
}
113113

Diff for: ‎spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/HibernateJpaConfiguration.java

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2019 the original author or authors.
2+
* Copyright 2012-2020 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -183,8 +183,7 @@ private void configureSpringJtaPlatform(Map<String, Object> vendorProperties,
183183
// containers (e.g. JBoss EAP 6) wrap it in the superclass LinkageError
184184
if (!isUsingJndi()) {
185185
throw new IllegalStateException(
186-
"Unable to set Hibernate JTA platform, are you using the correct " + "version of Hibernate?",
187-
ex);
186+
"Unable to set Hibernate JTA platform, are you using the correct version of Hibernate?", ex);
188187
}
189188
// Assume that Hibernate will use JNDI
190189
if (logger.isDebugEnabled()) {

Diff for: ‎spring-boot-project/spring-boot-cli/src/intTest/java/org/springframework/boot/cli/JarCommandIT.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ void noArguments() throws Exception {
5555
invocation.await();
5656
assertThat(invocation.getStandardOutput()).isEqualTo("");
5757
assertThat(invocation.getErrorOutput())
58-
.contains("The name of the " + "resulting jar and at least one source file must be specified");
58+
.contains("The name of the resulting jar and at least one source file must be specified");
5959
}
6060

6161
@Test
@@ -64,7 +64,7 @@ void noSources() throws Exception {
6464
invocation.await();
6565
assertThat(invocation.getStandardOutput()).isEqualTo("");
6666
assertThat(invocation.getErrorOutput())
67-
.contains("The name of the " + "resulting jar and at least one source file must be specified");
67+
.contains("The name of the resulting jar and at least one source file must be specified");
6868
}
6969

7070
@Test

Diff for: ‎spring-boot-project/spring-boot-tools/spring-boot-test-support/src/test/java/org/springframework/boot/testsupport/classpath/ModifiedClassPathExtensionExclusionsTests.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2019 the original author or authors.
2+
* Copyright 2012-2020 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -30,7 +30,7 @@
3030
@ClassPathExclusions("hibernate-validator-*.jar")
3131
class ModifiedClassPathExtensionExclusionsTests {
3232

33-
private static final String EXCLUDED_RESOURCE = "META-INF/services/" + "javax.validation.spi.ValidationProvider";
33+
private static final String EXCLUDED_RESOURCE = "META-INF/services/javax.validation.spi.ValidationProvider";
3434

3535
@Test
3636
void entriesAreFilteredFromTestClassClassLoader() {

0 commit comments

Comments
 (0)