(c) bump

michaelklishin · acogoluegnes · commit 88a93a7df5cb · 2020-01-06T11:00:38.000+01:00
(cherry picked from commit 24400f9) Conflicts: src/main/java/com/rabbitmq/client/impl/AMQConnection.java src/main/java/com/rabbitmq/client/impl/CredentialsProvider.java src/main/java/com/rabbitmq/client/impl/DefaultCredentialsProvider.java src/test/java/com/rabbitmq/client/test/TestUtils.java
diff --git a/src/main/java/com/rabbitmq/client/impl/AMQConnection.java b/src/main/java/com/rabbitmq/client/impl/AMQConnection.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2007-Present Pivotal Software, Inc.  All rights reserved.
+// Copyright (c) 2007-2020 Pivotal Software, Inc.  All rights reserved.
 //
 // This software, the RabbitMQ Java client library, is triple-licensed under the
 // Mozilla Public License 1.1 ("MPL"), the GNU General Public License version 2
@@ -35,7 +35,7 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 
 final class Copyright {
-    final static String COPYRIGHT="Copyright (c) 2007-2019 Pivotal Software, Inc.";
+    final static String COPYRIGHT="Copyright (c) 2007-2020 Pivotal Software, Inc.";
     final static String LICENSE="Licensed under the MPL. See https://www.rabbitmq.com/";
 }
 
diff --git a/src/main/java/com/rabbitmq/client/impl/CredentialsProvider.java b/src/main/java/com/rabbitmq/client/impl/CredentialsProvider.java
@@ -1,3 +1,18 @@
+// Copyright (c) 2018-2020 Pivotal Software, Inc.  All rights reserved.
+//
+// This software, the RabbitMQ Java client library, is triple-licensed under the
+// Mozilla Public License 1.1 ("MPL"), the GNU General Public License version 2
+// ("GPL") and the Apache License version 2 ("ASL"). For the MPL, please see
+// LICENSE-MPL-RabbitMQ. For the GPL, please see LICENSE-GPL2.  For the ASL,
+// please see LICENSE-APACHE2.
+//
+// This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND,
+// either express or implied. See the LICENSE file for specific language governing
+// rights and limitations of this software.
+//
+// If you have any questions regarding licensing, please contact us at
+// info@rabbitmq.com.
+
 package com.rabbitmq.client.impl;
 
 /**
diff --git a/src/main/java/com/rabbitmq/client/impl/DefaultCredentialsProvider.java b/src/main/java/com/rabbitmq/client/impl/DefaultCredentialsProvider.java
@@ -1,3 +1,18 @@
+// Copyright (c) 2018-2020 Pivotal Software, Inc.  All rights reserved.
+//
+// This software, the RabbitMQ Java client library, is triple-licensed under the
+// Mozilla Public License 1.1 ("MPL"), the GNU General Public License version 2
+// ("GPL") and the Apache License version 2 ("ASL"). For the MPL, please see
+// LICENSE-MPL-RabbitMQ. For the GPL, please see LICENSE-GPL2.  For the ASL,
+// please see LICENSE-APACHE2.
+//
+// This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND,
+// either express or implied. See the LICENSE file for specific language governing
+// rights and limitations of this software.
+//
+// If you have any questions regarding licensing, please contact us at
+// info@rabbitmq.com.
+
 package com.rabbitmq.client.impl;
 
 /**
diff --git a/src/main/java/com/rabbitmq/client/impl/ValueReader.java b/src/main/java/com/rabbitmq/client/impl/ValueReader.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2019 Pivotal Software, Inc.  All rights reserved.
+// Copyright (c) 2007-2020 Pivotal Software, Inc.  All rights reserved.
 //
 // This software, the RabbitMQ Java client library, is triple-licensed under the
 // Mozilla Public License 1.1 ("MPL"), the GNU General Public License version 2
diff --git a/src/main/java/com/rabbitmq/client/impl/ValueWriter.java b/src/main/java/com/rabbitmq/client/impl/ValueWriter.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2019 Pivotal Software, Inc.  All rights reserved.
+// Copyright (c) 2007-2020 Pivotal Software, Inc.  All rights reserved.
 //
 // This software, the RabbitMQ Java client library, is triple-licensed under the
 // Mozilla Public License 1.1 ("MPL"), the GNU General Public License version 2
diff --git a/src/main/java/com/rabbitmq/tools/jsonrpc/JacksonJsonRpcMapper.java b/src/main/java/com/rabbitmq/tools/jsonrpc/JacksonJsonRpcMapper.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2018-2019 Pivotal Software, Inc.  All rights reserved.
+// Copyright (c) 2018-2020 Pivotal Software, Inc.  All rights reserved.
 //
 // This software, the RabbitMQ Java client library, is triple-licensed under the
 // Mozilla Public License 1.1 ("MPL"), the GNU General Public License version 2
diff --git a/src/test/java/com/rabbitmq/client/test/TestUtils.java b/src/test/java/com/rabbitmq/client/test/TestUtils.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2007-Present Pivotal Software, Inc.  All rights reserved.
+// Copyright (c) 2007-2020 Pivotal Software, Inc.  All rights reserved.
 //
 // This software, the RabbitMQ Java client library, is triple-licensed under the
 // Mozilla Public License 1.1 ("MPL"), the GNU General Public License version 2
diff --git a/src/test/java/com/rabbitmq/client/test/functional/Metrics.java b/src/test/java/com/rabbitmq/client/test/functional/Metrics.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2019 Pivotal Software, Inc.  All rights reserved.
+// Copyright (c) 2007-2020 Pivotal Software, Inc.  All rights reserved.
 //
 // This software, the RabbitMQ Java client library, is triple-licensed under the
 // Mozilla Public License 1.1 ("MPL"), the GNU General Public License version 2

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// Copyright (c) 2007-2019 Pivotal Software, Inc. All rights reserved.`
	`1`	`+// Copyright (c) 2007-2020 Pivotal Software, Inc. All rights reserved.`
`2`	`2`	`//`
`3`	`3`	`// This software, the RabbitMQ Java client library, is triple-licensed under the`
`4`	`4`	`// Mozilla Public License 1.1 ("MPL"), the GNU General Public License version 2`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// Copyright (c) 2018-2019 Pivotal Software, Inc. All rights reserved.`
	`1`	`+// Copyright (c) 2018-2020 Pivotal Software, Inc. All rights reserved.`
`2`	`2`	`//`
`3`	`3`	`// This software, the RabbitMQ Java client library, is triple-licensed under the`
`4`	`4`	`// Mozilla Public License 1.1 ("MPL"), the GNU General Public License version 2`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// Copyright (c) 2007-Present Pivotal Software, Inc. All rights reserved.`
	`1`	`+// Copyright (c) 2007-2020 Pivotal Software, Inc. All rights reserved.`
`2`	`2`	`//`
`3`	`3`	`// This software, the RabbitMQ Java client library, is triple-licensed under the`
`4`	`4`	`// Mozilla Public License 1.1 ("MPL"), the GNU General Public License version 2`