Skip to content

Commit 57ffe53

Browse files
committed
Merge branch '5.0.x'
2 parents 0d2031c + 0ef015b commit 57ffe53

6 files changed

Lines changed: 26 additions & 6 deletions

File tree

.idea/copyright/default.xml

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/copyright/profiles_settings.xml

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/scopes/build_gradle.xml

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gradle/plugins/conventions-plugin/src/main/java/org/springframework/ws/gradle/conventions/toolchain/ToolchainExtension.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-present the original author or authors.
2+
* Copyright 2005-present 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.

gradle/plugins/conventions-plugin/src/main/java/org/springframework/ws/gradle/conventions/toolchain/ToolchainPlugin.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-present the original author or authors.
2+
* Copyright 2005-present 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.

spring-ws-security/src/test/java/org/springframework/ws/soap/security/x509/X509AuthenticationProviderTest.java

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,17 @@
11
/*
2-
* Copyright 2012 Broadcom Inc. and/or its subsidiaries. All Rights Reserved.
3-
* Copyright 2012-present the original author or authors.
2+
* Copyright 2005-present the original author or authors.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* https://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
415
*/
516

617
package org.springframework.ws.soap.security.x509;

0 commit comments

Comments
 (0)