Browse Source

Merge branch '6.0.x'

pull/30531/head
Sam Brannen 3 years ago
parent
commit
02f152c6e1
  1. 2
      spring-core/src/main/java/org/springframework/core/SpringProperties.java
  2. 2
      spring-jdbc/src/main/java/org/springframework/jdbc/datasource/DriverManagerDataSource.java
  3. 2
      spring-test/src/main/java/org/springframework/test/context/CacheAwareContextLoaderDelegate.java
  4. 2
      spring-test/src/main/java/org/springframework/test/context/TestContextAnnotationUtils.java
  5. 2
      spring-test/src/main/java/org/springframework/test/context/support/AbstractTestContextBootstrapper.java
  6. 2
      spring-test/src/main/java/org/springframework/test/util/TestSocketUtils.java
  7. 2
      spring-test/src/main/java/org/springframework/test/web/client/AbstractRequestExpectationManager.java
  8. 2
      spring-test/src/test/java/org/springframework/mock/web/MockServletContextTests.java
  9. 2
      spring-tx/src/main/java/org/springframework/transaction/annotation/Isolation.java
  10. 2
      spring-web/src/main/java/org/springframework/http/client/support/HttpAccessor.java
  11. 2
      spring-web/src/main/java/org/springframework/web/client/RestOperations.java

2
spring-core/src/main/java/org/springframework/core/SpringProperties.java

@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
/*
* Copyright 2002-2021 the original author or authors.
* Copyright 2002-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.

2
spring-jdbc/src/main/java/org/springframework/jdbc/datasource/DriverManagerDataSource.java

@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
/*
* Copyright 2002-2020 the original author or authors.
* Copyright 2002-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.

2
spring-test/src/main/java/org/springframework/test/context/CacheAwareContextLoaderDelegate.java

@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
/*
* Copyright 2002-2022 the original author or authors.
* Copyright 2002-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.

2
spring-test/src/main/java/org/springframework/test/context/TestContextAnnotationUtils.java

@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
/*
* Copyright 2002-2022 the original author or authors.
* Copyright 2002-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.

2
spring-test/src/main/java/org/springframework/test/context/support/AbstractTestContextBootstrapper.java

@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
/*
* Copyright 2002-2022 the original author or authors.
* Copyright 2002-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.

2
spring-test/src/main/java/org/springframework/test/util/TestSocketUtils.java

@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
/*
* Copyright 2002-2022 the original author or authors.
* Copyright 2002-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.

2
spring-test/src/main/java/org/springframework/test/web/client/AbstractRequestExpectationManager.java

@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
/*
* Copyright 2002-2021 the original author or authors.
* Copyright 2002-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.

2
spring-test/src/test/java/org/springframework/mock/web/MockServletContextTests.java

@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
/*
* Copyright 2002-2022 the original author or authors.
* Copyright 2002-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.

2
spring-tx/src/main/java/org/springframework/transaction/annotation/Isolation.java

@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
/*
* Copyright 2002-2022 the original author or authors.
* Copyright 2002-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.

2
spring-web/src/main/java/org/springframework/http/client/support/HttpAccessor.java

@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
/*
* Copyright 2002-2019 the original author or authors.
* Copyright 2002-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.

2
spring-web/src/main/java/org/springframework/web/client/RestOperations.java

@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
/*
* Copyright 2002-2022 the original author or authors.
* Copyright 2002-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.

Loading…
Cancel
Save