Spring/spring-amqp
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Upgrade Versions; Prepare for Release

Browse Source
This commit is contained in:
Gary Russell
2023-02-21 09:57:19 -05:00
parent 3af693506b
commit 508484c963
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
build.gradle
View File

@@ -52,7 +52,7 @@ ext {
googleJsr305Version = '3.0.2'
hamcrestVersion = '2.2'
hibernateValidationVersion = '8.0.0.Final'
jacksonBomVersion = '2.14.0'
jacksonBomVersion = '2.14.2'
jaywayJsonPathVersion = '2.7.0'
junit4Version = '4.13.2'
junitJupiterVersion = '5.9.1'
@@ -60,15 +60,15 @@ ext {
logbackVersion = '1.4.4'
lz4Version = '1.8.0'
micrometerDocsVersion = '1.0.1'
micrometerVersion = '1.10.3'
micrometerTracingVersion = '1.0.1'
micrometerVersion = '1.10.4'
micrometerTracingVersion = '1.0.2'
mockitoVersion = '4.8.1'
rabbitmqStreamVersion = '0.8.0'
rabbitmqVersion = project.hasProperty('rabbitmqVersion') ? project.rabbitmqVersion : '5.16.0'
reactorVersion = '2022.0.2'
snappyVersion = '1.1.8.4'
springDataVersion = '2022.0.1'
springVersion = project.hasProperty('springVersion') ? project.springVersion : '6.0.4'
springDataVersion = '2022.0.2'
springVersion = project.hasProperty('springVersion') ? project.springVersion : '6.0.5'
springRetryVersion = '2.0.0'
testcontainersVersion = '1.17.6'
zstdJniVersion = '1.5.0-2'

6
spring-amqp/src/main/java/org/springframework/amqp/core/Base64UrlNamingStrategy.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2018-2019 the original author or authors.
* Copyright 2018-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.
@@ -17,10 +17,10 @@
package org.springframework.amqp.core;
import java.nio.ByteBuffer;
import java.util.Base64;
import java.util.UUID;
import org.springframework.util.Assert;
import org.springframework.util.Base64Utils;
/**
* Generates names with the form {@code <prefix><base64url>} where 'prefix' is
@@ -66,7 +66,7 @@ public class Base64UrlNamingStrategy implements NamingStrategy {
bb.putLong(uuid.getMostSignificantBits())
.putLong(uuid.getLeastSignificantBits());
// Convert to base64 and remove trailing =
return this.prefix + Base64Utils.encodeToUrlSafeString(bb.array())
return this.prefix + Base64.getUrlEncoder().encodeToString(bb.array())
.replaceAll("=", "");
}

6
spring-rabbit-junit/src/main/java/org/springframework/amqp/rabbit/junit/BrokerRunningSupport.java
View File

@@ -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.
@@ -29,6 +29,7 @@ import java.nio.ByteBuffer;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Base64;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -39,7 +40,6 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.http.HttpStatus;
import org.springframework.util.Base64Utils;
import org.springframework.util.StringUtils;
import org.springframework.web.util.UriUtils;
@@ -447,7 +447,7 @@ public final class BrokerRunningSupport {
ByteBuffer bb = ByteBuffer.wrap(new byte[SIXTEEN]);
bb.putLong(uuid.getMostSignificantBits())
.putLong(uuid.getLeastSignificantBits());
return "SpringBrokerRunning." + Base64Utils.encodeToUrlSafeString(bb.array()).replaceAll("=", "");
return "SpringBrokerRunning." + Base64.getUrlEncoder().encodeToString(bb.array()).replaceAll("=", "");
}
private boolean isDefaultQueue(String queue) {