Skip to content
This repository was archived by the owner on Sep 26, 2025. It is now read-only.

Commit e8c6f06

Browse files
simonbaslesimonbasle
committed
Merge #161 into 1.5.3
Most files conflicted due to the versions on `main` already having been updated (but not aligned on the 2017-2021 range).
2 parents b2055b0 + 4a5ded8 commit e8c6f06

File tree

64 files changed

+130
-128
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+130
-128
lines changed

‎LICENSE‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@
186186
same "printed page" as the copyright notice for easier
187187
identification within third-party archives.
188188

189-
Copyright (c) 2017-2020 VMware, Inc. or its affiliates.
189+
Copyright (c) 2017-2021 VMware Inc. or its affiliates, All Rights Reserved.
190190

191191
Licensed under the Apache License, Version 2.0 (the "License");
192192
you may not use this file except in compliance with the License.

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,4 +174,4 @@ for the support timeline of this library.
174174

175175
Reactor RabbitMQ is [Apache 2.0 licensed](https://www.apache.org/licenses/LICENSE-2.0.html).
176176

177-
_Sponsored by [VMware](https://www.vmware.com/)_
177+
_Sponsored by [VMware](https://tanzu.vmware.com/)_

‎build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/*
2-
* Copyright (c) 2011-2020 VMware, Inc. or its affiliates.
2+
* Copyright (c) 2017-2021 VMware Inc. or its affiliates, All Rights Reserved.
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.
66
* You may obtain a copy of the License at
77
*
8-
* https://www.apache.org/licenses/LICENSE-2.0
8+
* https://www.apache.org/licenses/LICENSE-2.0
99
*
1010
* Unless required by applicable law or agreed to in writing, software
1111
* distributed under the License is distributed on an "AS IS" BASIS,

‎gradle/doc.gradle‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,19 @@
11
/*
2-
* Copyright (c) 2011-2020 VMware, Inc. or its affiliates.
2+
* Copyright (c) 2017-2021 VMware Inc. or its affiliates, All Rights Reserved.
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.
66
* You may obtain a copy of the License at
77
*
8-
* https://www.apache.org/licenses/LICENSE-2.0
8+
* https://www.apache.org/licenses/LICENSE-2.0
99
*
1010
* Unless required by applicable law or agreed to in writing, software
1111
* distributed under the License is distributed on an "AS IS" BASIS,
1212
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16+
1617
configure(rootProject) {
1718
apply plugin: "java"
1819
apply plugin: 'org.asciidoctor.convert'

‎gradle/releaser.gradle‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,11 @@
1-
import java.time.ZoneOffset
2-
import java.time.ZonedDateTime
3-
import java.time.temporal.ChronoField
4-
51
/*
6-
* Copyright (c) 2011-2020 VMware, Inc. or its affiliates.
2+
* Copyright (c) 2017-2021 VMware Inc. or its affiliates, All Rights Reserved.
73
*
84
* Licensed under the Apache License, Version 2.0 (the "License");
95
* you may not use this file except in compliance with the License.
106
* You may obtain a copy of the License at
117
*
12-
* https://www.apache.org/licenses/LICENSE-2.0
8+
* https://www.apache.org/licenses/LICENSE-2.0
139
*
1410
* Unless required by applicable law or agreed to in writing, software
1511
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -18,6 +14,10 @@ import java.time.temporal.ChronoField
1814
* limitations under the License.
1915
*/
2016

17+
import java.time.ZoneOffset
18+
import java.time.ZonedDateTime
19+
import java.time.temporal.ChronoField
20+
2121
if (rootProject.hasProperty("releaserDryRun") && rootProject.findProperty("releaserDryRun") != "false") {
2222
println "Adding MavenLocal() for benefit of releaser dry run"
2323
rootProject.repositories {

‎gradle/setup.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/*
2-
* Copyright (c) 2017-2020 VMware, Inc. or its affiliates.
2+
* Copyright (c) 2017-2021 VMware Inc. or its affiliates, All Rights Reserved.
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.
66
* You may obtain a copy of the License at
77
*
8-
* https://www.apache.org/licenses/LICENSE-2.0
8+
* https://www.apache.org/licenses/LICENSE-2.0
99
*
1010
* Unless required by applicable law or agreed to in writing, software
1111
* distributed under the License is distributed on an "AS IS" BASIS,

‎reactor-rabbitmq-samples/src/main/java/reactor/rabbitmq/samples/SampleReceiver.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/*
2-
* Copyright (c) 2017-2020 VMware, Inc. or its affiliates.
2+
* Copyright (c) 2017-2021 VMware Inc. or its affiliates, All Rights Reserved.
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.
66
* You may obtain a copy of the License at
77
*
8-
* https://www.apache.org/licenses/LICENSE-2.0
8+
* https://www.apache.org/licenses/LICENSE-2.0
99
*
1010
* Unless required by applicable law or agreed to in writing, software
1111
* distributed under the License is distributed on an "AS IS" BASIS,

‎reactor-rabbitmq-samples/src/main/java/reactor/rabbitmq/samples/SampleSender.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/*
2-
* Copyright (c) 2017-2020 VMware, Inc. or its affiliates.
2+
* Copyright (c) 2017-2021 VMware Inc. or its affiliates, All Rights Reserved.
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.
66
* You may obtain a copy of the License at
77
*
8-
* https://www.apache.org/licenses/LICENSE-2.0
8+
* https://www.apache.org/licenses/LICENSE-2.0
99
*
1010
* Unless required by applicable law or agreed to in writing, software
1111
* distributed under the License is distributed on an "AS IS" BASIS,

‎reactor-rabbitmq-samples/src/main/java/reactor/rabbitmq/samples/SpringBootSample.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/*
2-
* Copyright (c) 2019-2020 VMware, Inc. or its affiliates.
2+
* Copyright (c) 2017-2021 VMware Inc. or its affiliates, All Rights Reserved.
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.
66
* You may obtain a copy of the License at
77
*
8-
* https://www.apache.org/licenses/LICENSE-2.0
8+
* https://www.apache.org/licenses/LICENSE-2.0
99
*
1010
* Unless required by applicable law or agreed to in writing, software
1111
* distributed under the License is distributed on an "AS IS" BASIS,

‎reactor-rabbitmq-samples/src/main/resources/logback.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<!--
2-
~ Copyright (c) 2011-2020 VMware, Inc. or its affiliates.
2+
~ Copyright (c) 2017-2021 VMware Inc. or its affiliates, All Rights Reserved.
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.
66
~ You may obtain a copy of the License at
77
~
8-
~ https://www.apache.org/licenses/LICENSE-2.0
8+
~ https://www.apache.org/licenses/LICENSE-2.0
99
~
1010
~ Unless required by applicable law or agreed to in writing, software
1111
~ distributed under the License is distributed on an "AS IS" BASIS,

0 commit comments

Comments
 (0)