Skip to content

Commit c9e02c3

Browse files
dcorbachodcorbacho
authored
Merge pull request #132 from rabbitmq/switch-to-MPL-2.0
Switch to Mozilla Public License 2.0 (MPL 2.0)
2 parents 572e2ca + 0b729d2 commit c9e02c3

File tree

111 files changed

+918
-581
lines changed

Some content is hidden

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

111 files changed

+918
-581
lines changed

‎LICENSE‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
This package, the RabbitMQ JMS client library, is double-licensed
2-
under the Mozilla Public License 1.1 ("MPL") and the Apache License
2+
under the Mozilla Public License 2.0 ("MPL") and the Apache License
33
version 2 ("ASL"). For the MPL, please see LICENSE-MPL-RabbitMQ. For
44
the ASL, please see LICENSE-APACHE2.
55

‎LICENSE-MPL-RabbitMQ‎

Lines changed: 373 additions & 467 deletions
Large diffs are not rendered by default.

‎README.md‎

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

9696
This package, the RabbitMQ JMS client library, is double-licensed
9797
under the Apache License version 2 ("ASL") and the Mozilla Public License
98-
1.1 ("MPL").
98+
2.0 ("MPL").
9999

100100
See [LICENSE](./LICENSE).

‎pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
<distribution>repo</distribution>
1919
</license>
2020
<license>
21-
<name>MPL 1.1</name>
22-
<url>https://www.mozilla.org/MPL/MPL-1.1.txt</url>
21+
<name>MPL 2.0</name>
22+
<url>https://www.mozilla.org/MPL/2.0</url>
2323
<distribution>repo</distribution>
2424
</license>
2525
</licenses>

‎src/main/java/com/rabbitmq/jms/client/BrowsingConsumer.java‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1-
/* Copyright (c) 2014-2020 VMware, Inc. or its affiliates. All rights reserved. */
1+
// This Source Code Form is subject to the terms of the Mozilla Public
2+
// License, v. 2.0. If a copy of the MPL was not distributed with this
3+
// file, You can obtain one at https://mozilla.org/MPL/2.0/.
4+
//
5+
// Copyright (c) 2014-2020 VMware, Inc. or its affiliates. All rights reserved.
26
package com.rabbitmq.jms.client;
37

48
import java.io.IOException;
@@ -76,4 +80,4 @@ public void handleDelivery(String consumerTag,
7680
this.getChannel().basicCancel(consumerTag);
7781
}
7882
}
79-
}
83+
}

‎src/main/java/com/rabbitmq/jms/client/BrowsingMessageEnumeration.java‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1-
/* Copyright (c) 2014-2020 VMware, Inc. or its affiliates. All rights reserved. */
1+
// This Source Code Form is subject to the terms of the Mozilla Public
2+
// License, v. 2.0. If a copy of the MPL was not distributed with this
3+
// file, You can obtain one at https://mozilla.org/MPL/2.0/.
4+
//
5+
// Copyright (c) 2014-2020 VMware, Inc. or its affiliates. All rights reserved.
26
package com.rabbitmq.jms.client;
37

48
import java.util.Enumeration;

‎src/main/java/com/rabbitmq/jms/client/BrowsingMessageQueue.java‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1-
/* Copyright (c) 2014-2020 VMware, Inc. or its affiliates. All rights reserved. */
1+
// This Source Code Form is subject to the terms of the Mozilla Public
2+
// License, v. 2.0. If a copy of the MPL was not distributed with this
3+
// file, You can obtain one at https://mozilla.org/MPL/2.0/.
4+
//
5+
// Copyright (c) 2014-2020 VMware, Inc. or its affiliates. All rights reserved.
26
package com.rabbitmq.jms.client;
37

48
import java.util.Enumeration;

‎src/main/java/com/rabbitmq/jms/client/Completion.java‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1-
/* Copyright (c) 2013-2020 VMware, Inc. or its affiliates. All rights reserved. */
1+
// This Source Code Form is subject to the terms of the Mozilla Public
2+
// License, v. 2.0. If a copy of the MPL was not distributed with this
3+
// file, You can obtain one at https://mozilla.org/MPL/2.0/.
4+
//
5+
// Copyright (c) 2013-2020 VMware, Inc. or its affiliates. All rights reserved.
26
package com.rabbitmq.jms.client;
37

48
import java.util.concurrent.TimeUnit;

‎src/main/java/com/rabbitmq/jms/client/ConfirmListener.java‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1-
/* Copyright (c) 2019-2020 VMware, Inc. or its affiliates. All rights reserved. */
1+
// This Source Code Form is subject to the terms of the Mozilla Public
2+
// License, v. 2.0. If a copy of the MPL was not distributed with this
3+
// file, You can obtain one at https://mozilla.org/MPL/2.0/.
4+
//
5+
// Copyright (c) 2019-2020 VMware, Inc. or its affiliates. All rights reserved.
26
package com.rabbitmq.jms.client;
37

48
/**

‎src/main/java/com/rabbitmq/jms/client/ConnectionParams.java‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1-
/* Copyright (c) 2016-2020 VMware, Inc. or its affiliates. All rights reserved. */
1+
// This Source Code Form is subject to the terms of the Mozilla Public
2+
// License, v. 2.0. If a copy of the MPL was not distributed with this
3+
// file, You can obtain one at https://mozilla.org/MPL/2.0/.
4+
//
5+
// Copyright (c) 2016-2020 VMware, Inc. or its affiliates. All rights reserved.
26
package com.rabbitmq.jms.client;
37

48
import com.rabbitmq.client.AMQP;

0 commit comments

Comments
 (0)