From fbbc8c80bb1e7fe675f86c6f51042dbca202a2a7 Mon Sep 17 00:00:00 2001 From: ebrahimiar <66822910+ebrahimiar@users.noreply.github.com> Date: Mon, 8 Apr 2024 17:26:08 +0330 Subject: [PATCH 1/6] [feature] add X-Request-ID and X-User-IP fields to headers. the value of X-Request-ID is extracted from requestId field in MDC. the value of X-User-IP is extracted from clientIP field in MDC. --- .../java/com/tosan/client/http/core/Constants.java | 6 ++++++ .../configuration/AbstractFeignConfiguration.java | 12 ++++++++++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/tosan-httpclient-spring-boot-core/src/main/java/com/tosan/client/http/core/Constants.java b/tosan-httpclient-spring-boot-core/src/main/java/com/tosan/client/http/core/Constants.java index f88ebd1..3af9c4e 100644 --- a/tosan-httpclient-spring-boot-core/src/main/java/com/tosan/client/http/core/Constants.java +++ b/tosan-httpclient-spring-boot-core/src/main/java/com/tosan/client/http/core/Constants.java @@ -10,4 +10,10 @@ public interface Constants { SecureParameter AUTHORIZATION_SECURE_PARAM = new SecureParameter("authorization", MaskType.COMPLETE); SecureParameter PROXY_AUTHORIZATION_SECURE_PARAM = new SecureParameter("proxy-authorization", MaskType.COMPLETE); + String X_USER_IP = "X-User-IP"; + String MDC_CLIENT_IP = "clientIP"; + String MDC_REQUEST_ID = "requestId"; + String X_REQUEST_ID = "X-Request-ID"; + String ACCEPT_HEADER = "Accept"; + String CONTENT_TYPE_HEADER = "Content-Type"; } diff --git a/tosan-httpclient-spring-boot-starter/src/main/java/com/tosan/client/http/starter/configuration/AbstractFeignConfiguration.java b/tosan-httpclient-spring-boot-starter/src/main/java/com/tosan/client/http/starter/configuration/AbstractFeignConfiguration.java index 068c7df..2982a05 100644 --- a/tosan-httpclient-spring-boot-starter/src/main/java/com/tosan/client/http/starter/configuration/AbstractFeignConfiguration.java +++ b/tosan-httpclient-spring-boot-starter/src/main/java/com/tosan/client/http/starter/configuration/AbstractFeignConfiguration.java @@ -27,6 +27,7 @@ import org.apache.hc.client5.http.impl.classic.HttpClientBuilder; import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManagerBuilder; import org.apache.hc.core5.http.ContentType; +import org.slf4j.MDC; import org.springframework.beans.factory.ObjectFactory; import org.springframework.boot.autoconfigure.http.HttpMessageConverters; import org.springframework.cloud.openfeign.AnnotatedParameterProcessor; @@ -49,6 +50,7 @@ import java.util.List; import java.util.concurrent.TimeUnit; +import static com.tosan.client.http.core.Constants.*; import static com.tosan.tools.mask.starter.configuration.MaskBeanConfiguration.SECURED_PARAMETERS; /** @@ -110,8 +112,14 @@ public Client feignClient(HttpClient httpClient) { public RequestInterceptor requestInterceptor() { return requestTemplate -> { - requestTemplate.header("Accept", ContentType.APPLICATION_JSON.getMimeType()); - requestTemplate.header("Content-Type", ContentType.APPLICATION_JSON.getMimeType()); + requestTemplate.header(ACCEPT_HEADER, ContentType.APPLICATION_JSON.getMimeType()); + requestTemplate.header(CONTENT_TYPE_HEADER, ContentType.APPLICATION_JSON.getMimeType()); + if (MDC.get(MDC_REQUEST_ID) != null) { + requestTemplate.header(X_REQUEST_ID, MDC.get(MDC_REQUEST_ID)); + } + if (MDC.get(MDC_CLIENT_IP) != null) { + requestTemplate.header(X_USER_IP, MDC.get(MDC_CLIENT_IP)); + } }; } From 3a85052f6ff5d27e1ef06ad8d3a32bdc2e482087 Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Mon, 8 Apr 2024 13:59:56 +0000 Subject: [PATCH 2/6] [maven-release-plugin] prepare release v3.1.7 --- pom.xml | 4 ++-- tosan-httpclient-spring-boot-core/pom.xml | 2 +- tosan-httpclient-spring-boot-resttemplate-starter/pom.xml | 2 +- tosan-httpclient-spring-boot-sample/pom.xml | 2 +- tosan-httpclient-spring-boot-starter/pom.xml | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index 6937b0b..42df13d 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.tosan.client.http tosan-httpclient-spring-boot-root - 3.1.7-SNAPSHOT + 3.1.7 pom @@ -47,7 +47,7 @@ scm:git:https://github.com/Tosan/tosan-httpclient-spring-boot-starter.git scm:git:https://github.com/Tosan/tosan-httpclient-spring-boot-starter.git https://github.com/Tosan/tosan-httpclient-spring-boot-starter - HEAD + v3.1.7 diff --git a/tosan-httpclient-spring-boot-core/pom.xml b/tosan-httpclient-spring-boot-core/pom.xml index ad8e234..31178ab 100644 --- a/tosan-httpclient-spring-boot-core/pom.xml +++ b/tosan-httpclient-spring-boot-core/pom.xml @@ -5,7 +5,7 @@ tosan-httpclient-spring-boot-root com.tosan.client.http - 3.1.7-SNAPSHOT + 3.1.7 tosan-httpclient-spring-boot-core diff --git a/tosan-httpclient-spring-boot-resttemplate-starter/pom.xml b/tosan-httpclient-spring-boot-resttemplate-starter/pom.xml index c793ad1..0c3d1c6 100644 --- a/tosan-httpclient-spring-boot-resttemplate-starter/pom.xml +++ b/tosan-httpclient-spring-boot-resttemplate-starter/pom.xml @@ -5,7 +5,7 @@ tosan-httpclient-spring-boot-root com.tosan.client.http - 3.1.7-SNAPSHOT + 3.1.7 tosan-httpclient-spring-boot-resttemplate-starter diff --git a/tosan-httpclient-spring-boot-sample/pom.xml b/tosan-httpclient-spring-boot-sample/pom.xml index 9249730..0391c9a 100644 --- a/tosan-httpclient-spring-boot-sample/pom.xml +++ b/tosan-httpclient-spring-boot-sample/pom.xml @@ -5,7 +5,7 @@ tosan-httpclient-spring-boot-root com.tosan.client.http - 3.1.7-SNAPSHOT + 3.1.7 tosan-httpclient-spring-boot-sample diff --git a/tosan-httpclient-spring-boot-starter/pom.xml b/tosan-httpclient-spring-boot-starter/pom.xml index e05546c..d97d54b 100644 --- a/tosan-httpclient-spring-boot-starter/pom.xml +++ b/tosan-httpclient-spring-boot-starter/pom.xml @@ -5,7 +5,7 @@ com.tosan.client.http tosan-httpclient-spring-boot-root - 3.1.7-SNAPSHOT + 3.1.7 tosan-httpclient-spring-boot-starter From 4100902f84f662fbbdfc62d836773f8b24a84ac2 Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Mon, 8 Apr 2024 13:59:58 +0000 Subject: [PATCH 3/6] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- tosan-httpclient-spring-boot-core/pom.xml | 2 +- tosan-httpclient-spring-boot-resttemplate-starter/pom.xml | 2 +- tosan-httpclient-spring-boot-sample/pom.xml | 2 +- tosan-httpclient-spring-boot-starter/pom.xml | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index 42df13d..0226d51 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.tosan.client.http tosan-httpclient-spring-boot-root - 3.1.7 + 3.1.8-SNAPSHOT pom @@ -47,7 +47,7 @@ scm:git:https://github.com/Tosan/tosan-httpclient-spring-boot-starter.git scm:git:https://github.com/Tosan/tosan-httpclient-spring-boot-starter.git https://github.com/Tosan/tosan-httpclient-spring-boot-starter - v3.1.7 + HEAD diff --git a/tosan-httpclient-spring-boot-core/pom.xml b/tosan-httpclient-spring-boot-core/pom.xml index 31178ab..87c1d92 100644 --- a/tosan-httpclient-spring-boot-core/pom.xml +++ b/tosan-httpclient-spring-boot-core/pom.xml @@ -5,7 +5,7 @@ tosan-httpclient-spring-boot-root com.tosan.client.http - 3.1.7 + 3.1.8-SNAPSHOT tosan-httpclient-spring-boot-core diff --git a/tosan-httpclient-spring-boot-resttemplate-starter/pom.xml b/tosan-httpclient-spring-boot-resttemplate-starter/pom.xml index 0c3d1c6..e337bee 100644 --- a/tosan-httpclient-spring-boot-resttemplate-starter/pom.xml +++ b/tosan-httpclient-spring-boot-resttemplate-starter/pom.xml @@ -5,7 +5,7 @@ tosan-httpclient-spring-boot-root com.tosan.client.http - 3.1.7 + 3.1.8-SNAPSHOT tosan-httpclient-spring-boot-resttemplate-starter diff --git a/tosan-httpclient-spring-boot-sample/pom.xml b/tosan-httpclient-spring-boot-sample/pom.xml index 0391c9a..dd5848f 100644 --- a/tosan-httpclient-spring-boot-sample/pom.xml +++ b/tosan-httpclient-spring-boot-sample/pom.xml @@ -5,7 +5,7 @@ tosan-httpclient-spring-boot-root com.tosan.client.http - 3.1.7 + 3.1.8-SNAPSHOT tosan-httpclient-spring-boot-sample diff --git a/tosan-httpclient-spring-boot-starter/pom.xml b/tosan-httpclient-spring-boot-starter/pom.xml index d97d54b..6db6220 100644 --- a/tosan-httpclient-spring-boot-starter/pom.xml +++ b/tosan-httpclient-spring-boot-starter/pom.xml @@ -5,7 +5,7 @@ com.tosan.client.http tosan-httpclient-spring-boot-root - 3.1.7 + 3.1.8-SNAPSHOT tosan-httpclient-spring-boot-starter From 017b530b72c30c17cb28396375f4974d1e851d84 Mon Sep 17 00:00:00 2001 From: "A.Alimohammadi" Date: Mon, 13 May 2024 12:53:25 +0330 Subject: [PATCH 4/6] [bug] set connection time out and request time out incorrectly change unit of time to millisecond and remove timeToLiveUnit --- pom.xml | 4 +-- .../http/core/HttpClientProperties.java | 28 +++++-------------- .../ConfigurableApacheHttpClientFactory.java | 23 +++++++-------- ...figurableApacheHttpClientFactoryUTest.java | 20 ------------- .../util/HttpLoggingInterceptorUtil.java | 3 +- .../impl/feign/CustomErrorDecoder.java | 3 +- 6 files changed, 25 insertions(+), 56 deletions(-) diff --git a/pom.xml b/pom.xml index 0226d51..0ea778d 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ org.springframework.boot spring-boot-starter-parent - 3.2.2 + 3.2.4 @@ -52,7 +52,7 @@ 17 - 2023.0.0 + 2023.0.1 2.2.0 diff --git a/tosan-httpclient-spring-boot-core/src/main/java/com/tosan/client/http/core/HttpClientProperties.java b/tosan-httpclient-spring-boot-core/src/main/java/com/tosan/client/http/core/HttpClientProperties.java index 20b8b97..5b37730 100644 --- a/tosan-httpclient-spring-boot-core/src/main/java/com/tosan/client/http/core/HttpClientProperties.java +++ b/tosan-httpclient-spring-boot-core/src/main/java/com/tosan/client/http/core/HttpClientProperties.java @@ -4,8 +4,6 @@ import org.springframework.boot.context.properties.NestedConfigurationProperty; import org.springframework.validation.annotation.Validated; -import java.util.concurrent.TimeUnit; - /** * @author Ali Alimohammadi * @since 1/22/2021 @@ -260,14 +258,9 @@ public static class ConnectionConfiguration { public static final int DEFAULT_MAX_CONNECTIONS_PER_ROUTE = 50; /** - * Default value for time to live. - */ - public static final long DEFAULT_TIME_TO_LIVE = 900L; - - /** - * Default time to live unit. + * Default value for time to live in milliseconds. */ - public static final TimeUnit DEFAULT_TIME_TO_LIVE_UNIT = TimeUnit.SECONDS; + public static final long DEFAULT_TIME_TO_LIVE = 900000L; /** * Default value for following redirects. @@ -275,7 +268,7 @@ public static class ConnectionConfiguration { public static final boolean DEFAULT_FOLLOW_REDIRECTS = true; /** - * Default value for connection timeout. + * Default value for connection timeout in milliseconds. * A timeout value of zero is interpreted as an infinite timeout. * A negative value is interpreted as undefined (system default if applicable). */ @@ -287,7 +280,7 @@ public static class ConnectionConfiguration { public static final int DEFAULT_CONNECTION_TIMER_REPEAT = 3000; /** - * Default value for socket timeout. + * Default value for socket timeout in milliseconds. * A timeout value of zero is interpreted as an infinite timeout. * A negative value is interpreted as undefined (system default if applicable). */ @@ -299,8 +292,6 @@ public static class ConnectionConfiguration { private long timeToLive = DEFAULT_TIME_TO_LIVE; - private TimeUnit timeToLiveUnit = DEFAULT_TIME_TO_LIVE_UNIT; - private boolean followRedirects = DEFAULT_FOLLOW_REDIRECTS; private int connectionTimeout = DEFAULT_CONNECTION_TIMEOUT; @@ -332,18 +323,13 @@ public long getTimeToLive() { return timeToLive; } + /** + * @param timeToLive Defines the total span of time connections can be kept alive or execute requests in seconds. + */ public void setTimeToLive(long timeToLive) { this.timeToLive = timeToLive; } - public TimeUnit getTimeToLiveUnit() { - return timeToLiveUnit; - } - - public void setTimeToLiveUnit(TimeUnit timeToLiveUnit) { - this.timeToLiveUnit = timeToLiveUnit; - } - public boolean isFollowRedirects() { return followRedirects; } diff --git a/tosan-httpclient-spring-boot-core/src/main/java/com/tosan/client/http/core/factory/ConfigurableApacheHttpClientFactory.java b/tosan-httpclient-spring-boot-core/src/main/java/com/tosan/client/http/core/factory/ConfigurableApacheHttpClientFactory.java index 4cf723c..e528106 100644 --- a/tosan-httpclient-spring-boot-core/src/main/java/com/tosan/client/http/core/factory/ConfigurableApacheHttpClientFactory.java +++ b/tosan-httpclient-spring-boot-core/src/main/java/com/tosan/client/http/core/factory/ConfigurableApacheHttpClientFactory.java @@ -5,6 +5,7 @@ import org.apache.commons.lang3.StringUtils; import org.apache.hc.client5.http.auth.AuthScope; import org.apache.hc.client5.http.auth.UsernamePasswordCredentials; +import org.apache.hc.client5.http.config.ConnectionConfig; import org.apache.hc.client5.http.config.RequestConfig; import org.apache.hc.client5.http.impl.DefaultAuthenticationStrategy; import org.apache.hc.client5.http.impl.auth.BasicCredentialsProvider; @@ -16,6 +17,7 @@ import org.apache.hc.client5.http.ssl.SSLConnectionSocketFactory; import org.apache.hc.core5.http.HttpHost; import org.apache.hc.core5.util.TimeValue; +import org.apache.hc.core5.util.Timeout; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -24,7 +26,6 @@ import java.security.KeyStore; import java.util.Timer; import java.util.TimerTask; -import java.util.concurrent.TimeUnit; /** * Factory used to create a HttpClient Instance @@ -48,7 +49,7 @@ public ConfigurableApacheHttpClientFactory(HttpClientBuilder httpClientBuilder, } public HttpClientBuilder createBuilder() { - configureTimeouts(httpClientBuilder); + configureRequest(httpClientBuilder); configureConnectionManager(httpClientBuilder); HttpClientProperties.ProxyConfiguration proxyConfig = httpClientProperties.getProxy(); if (proxyConfig.isEnable()) { @@ -59,22 +60,22 @@ public HttpClientBuilder createBuilder() { return httpClientBuilder; } - private void configureTimeouts(HttpClientBuilder builder) { + private void configureRequest(HttpClientBuilder builder) { builder.setDefaultRequestConfig(RequestConfig.custom() - .setConnectTimeout(httpClientProperties.getConnection().getConnectionTimeout(), TimeUnit.MILLISECONDS) - .setConnectionRequestTimeout(httpClientProperties.getConnection().getSocketTimeout(), TimeUnit.MILLISECONDS) - .setRedirectsEnabled(httpClientProperties.getConnection().isFollowRedirects()) - .setCookieSpec(httpClientProperties.getConnection().getCookieSpecPolicy()) - .build()); + .setRedirectsEnabled(httpClientProperties.getConnection().isFollowRedirects()) + .setCookieSpec(httpClientProperties.getConnection().getCookieSpecPolicy()) + .build()); } private void configureConnectionManager(HttpClientBuilder builder) { - TimeValue timeToLive = TimeValue.of(httpClientProperties.getConnection().getTimeToLive(), - httpClientProperties.getConnection().getTimeToLiveUnit()); connectionManagerBuilder .setMaxConnTotal(httpClientProperties.getConnection().getMaxConnections()) .setMaxConnPerRoute(httpClientProperties.getConnection().getMaxConnectionsPerRoute()) - .setConnectionTimeToLive(timeToLive); + .setDefaultConnectionConfig(ConnectionConfig.custom() + .setConnectTimeout(Timeout.ofMilliseconds(httpClientProperties.getConnection().getConnectionTimeout())) + .setSocketTimeout(Timeout.ofMilliseconds(httpClientProperties.getConnection().getSocketTimeout())) + .setTimeToLive(TimeValue.ofMilliseconds(httpClientProperties.getConnection().getTimeToLive())) + .build()); String baseServiceUrl = httpClientProperties.getBaseServiceUrl(); if (baseServiceUrl != null && baseServiceUrl.startsWith("https")) { configureSSL(connectionManagerBuilder); diff --git a/tosan-httpclient-spring-boot-core/src/test/java/com/tosan/client/http/core/factory/ConfigurableApacheHttpClientFactoryUTest.java b/tosan-httpclient-spring-boot-core/src/test/java/com/tosan/client/http/core/factory/ConfigurableApacheHttpClientFactoryUTest.java index 8308e35..1fab1b6 100644 --- a/tosan-httpclient-spring-boot-core/src/test/java/com/tosan/client/http/core/factory/ConfigurableApacheHttpClientFactoryUTest.java +++ b/tosan-httpclient-spring-boot-core/src/test/java/com/tosan/client/http/core/factory/ConfigurableApacheHttpClientFactoryUTest.java @@ -11,7 +11,6 @@ import org.apache.hc.client5.http.impl.routing.SystemDefaultRoutePlanner; import org.apache.hc.client5.http.routing.HttpRoutePlanner; import org.apache.hc.core5.http.protocol.BasicHttpContext; -import org.apache.hc.core5.util.Timeout; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -58,29 +57,10 @@ public void createBuilder_defaultConfiguration() { HttpClientBuilder builder = underTest.createBuilder(); RequestConfig requestConfig = (RequestConfig) ReflectionTestUtils.getField(builder, HttpClientBuilder.class, "defaultRequestConfig"); assertThat(requestConfig).isNotNull(); - assertThat(requestConfig.getConnectTimeout()) - .isEqualTo(Timeout.ofMilliseconds(HttpClientProperties.ConnectionConfiguration.DEFAULT_CONNECTION_TIMEOUT)); - assertThat(requestConfig.getConnectionRequestTimeout()) - .isEqualTo(Timeout.ofMilliseconds(HttpClientProperties.ConnectionConfiguration.DEFAULT_SOCKET_TIMEOUT)); - HttpRoutePlanner proxySelector = (SystemDefaultRoutePlanner) ReflectionTestUtils.getField(builder, HttpClientBuilder.class, "routePlanner"); assertThat(proxySelector).isNull(); } - @Test - public void createBuilder_timeoutConfiguration() { - connectionConfiguration.setConnectionTimeout(1234); - connectionConfiguration.setSocketTimeout(5678); - ConfigurableApacheHttpClientFactory underTest = new ConfigurableApacheHttpClientFactory(HttpClientBuilder.create(), - PoolingHttpClientConnectionManagerBuilder.create(), httpClientProperties); - HttpClientBuilder builder = underTest.createBuilder(); - - RequestConfig requestConfig = (RequestConfig) ReflectionTestUtils.getField(builder, HttpClientBuilder.class, "defaultRequestConfig"); - - assertThat(requestConfig.getConnectTimeout()).isEqualTo(Timeout.ofMilliseconds(1234)); - assertThat(requestConfig.getConnectionRequestTimeout()).isEqualTo(Timeout.ofMilliseconds(5678)); - } - @Test public void createBuilder_proxyConfiguration_noAuthentication() { when(httpClientProperties.getProxy()).thenReturn(hostConfig); diff --git a/tosan-httpclient-spring-boot-resttemplate-starter/src/main/java/com/tosan/client/http/resttemplate/starter/util/HttpLoggingInterceptorUtil.java b/tosan-httpclient-spring-boot-resttemplate-starter/src/main/java/com/tosan/client/http/resttemplate/starter/util/HttpLoggingInterceptorUtil.java index c465f4f..9a54471 100644 --- a/tosan-httpclient-spring-boot-resttemplate-starter/src/main/java/com/tosan/client/http/resttemplate/starter/util/HttpLoggingInterceptorUtil.java +++ b/tosan-httpclient-spring-boot-resttemplate-starter/src/main/java/com/tosan/client/http/resttemplate/starter/util/HttpLoggingInterceptorUtil.java @@ -12,6 +12,7 @@ import org.springframework.http.HttpHeaders; import org.springframework.http.HttpRequest; import org.springframework.http.client.ClientHttpResponse; +import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder; import org.springframework.util.StreamUtils; import java.io.IOException; @@ -26,7 +27,7 @@ * @since 8/3/2022 */ public class HttpLoggingInterceptorUtil { - private static final ObjectMapper mapper = new ObjectMapper(); + private static final ObjectMapper mapper = new Jackson2ObjectMapperBuilder().build(); static { mapper.enable(SerializationFeature.INDENT_OUTPUT) diff --git a/tosan-httpclient-spring-boot-starter/src/main/java/com/tosan/client/http/starter/impl/feign/CustomErrorDecoder.java b/tosan-httpclient-spring-boot-starter/src/main/java/com/tosan/client/http/starter/impl/feign/CustomErrorDecoder.java index 3c066a3..4d9ec6a 100644 --- a/tosan-httpclient-spring-boot-starter/src/main/java/com/tosan/client/http/starter/impl/feign/CustomErrorDecoder.java +++ b/tosan-httpclient-spring-boot-starter/src/main/java/com/tosan/client/http/starter/impl/feign/CustomErrorDecoder.java @@ -46,7 +46,8 @@ public Exception decode(String methodKey, Response response) { Response.Body body = response.body(); String responseBody = StreamUtils.copyToString(body.asInputStream(), StandardCharsets.UTF_8); int status = response.status(); - LOGGER.info("ServerErrorResponse:\n ResponseStatus: {}\n ResponseBody: {}", status, responseBody); + LOGGER.info("ServerErrorResponse :\n ResponseStatus:{}\n ResponseBody:{}", status, + responseBody); Map> exceptionMap = customErrorDecoderConfig.getExceptionMap(); if (status >= 400 && status < 500) { return extractBadRequestErrorException(responseBody, exceptionMap); From e29e5b132be345ca479319f6353557019d392061 Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Mon, 13 May 2024 09:27:53 +0000 Subject: [PATCH 5/6] [maven-release-plugin] prepare release v3.1.8 --- pom.xml | 4 ++-- tosan-httpclient-spring-boot-core/pom.xml | 2 +- tosan-httpclient-spring-boot-resttemplate-starter/pom.xml | 2 +- tosan-httpclient-spring-boot-sample/pom.xml | 2 +- tosan-httpclient-spring-boot-starter/pom.xml | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index 0ea778d..dd877e7 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.tosan.client.http tosan-httpclient-spring-boot-root - 3.1.8-SNAPSHOT + 3.1.8 pom @@ -47,7 +47,7 @@ scm:git:https://github.com/Tosan/tosan-httpclient-spring-boot-starter.git scm:git:https://github.com/Tosan/tosan-httpclient-spring-boot-starter.git https://github.com/Tosan/tosan-httpclient-spring-boot-starter - HEAD + v3.1.8 diff --git a/tosan-httpclient-spring-boot-core/pom.xml b/tosan-httpclient-spring-boot-core/pom.xml index 87c1d92..12aecc4 100644 --- a/tosan-httpclient-spring-boot-core/pom.xml +++ b/tosan-httpclient-spring-boot-core/pom.xml @@ -5,7 +5,7 @@ tosan-httpclient-spring-boot-root com.tosan.client.http - 3.1.8-SNAPSHOT + 3.1.8 tosan-httpclient-spring-boot-core diff --git a/tosan-httpclient-spring-boot-resttemplate-starter/pom.xml b/tosan-httpclient-spring-boot-resttemplate-starter/pom.xml index e337bee..b27b27f 100644 --- a/tosan-httpclient-spring-boot-resttemplate-starter/pom.xml +++ b/tosan-httpclient-spring-boot-resttemplate-starter/pom.xml @@ -5,7 +5,7 @@ tosan-httpclient-spring-boot-root com.tosan.client.http - 3.1.8-SNAPSHOT + 3.1.8 tosan-httpclient-spring-boot-resttemplate-starter diff --git a/tosan-httpclient-spring-boot-sample/pom.xml b/tosan-httpclient-spring-boot-sample/pom.xml index dd5848f..56a8248 100644 --- a/tosan-httpclient-spring-boot-sample/pom.xml +++ b/tosan-httpclient-spring-boot-sample/pom.xml @@ -5,7 +5,7 @@ tosan-httpclient-spring-boot-root com.tosan.client.http - 3.1.8-SNAPSHOT + 3.1.8 tosan-httpclient-spring-boot-sample diff --git a/tosan-httpclient-spring-boot-starter/pom.xml b/tosan-httpclient-spring-boot-starter/pom.xml index 6db6220..4c06ea1 100644 --- a/tosan-httpclient-spring-boot-starter/pom.xml +++ b/tosan-httpclient-spring-boot-starter/pom.xml @@ -5,7 +5,7 @@ com.tosan.client.http tosan-httpclient-spring-boot-root - 3.1.8-SNAPSHOT + 3.1.8 tosan-httpclient-spring-boot-starter From 84fb98a0264f5a0b14ff9450e225d8989a1c5f12 Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Mon, 13 May 2024 09:27:54 +0000 Subject: [PATCH 6/6] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- tosan-httpclient-spring-boot-core/pom.xml | 2 +- tosan-httpclient-spring-boot-resttemplate-starter/pom.xml | 2 +- tosan-httpclient-spring-boot-sample/pom.xml | 2 +- tosan-httpclient-spring-boot-starter/pom.xml | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index dd877e7..82fb1e6 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.tosan.client.http tosan-httpclient-spring-boot-root - 3.1.8 + 3.1.9-SNAPSHOT pom @@ -47,7 +47,7 @@ scm:git:https://github.com/Tosan/tosan-httpclient-spring-boot-starter.git scm:git:https://github.com/Tosan/tosan-httpclient-spring-boot-starter.git https://github.com/Tosan/tosan-httpclient-spring-boot-starter - v3.1.8 + HEAD diff --git a/tosan-httpclient-spring-boot-core/pom.xml b/tosan-httpclient-spring-boot-core/pom.xml index 12aecc4..084310f 100644 --- a/tosan-httpclient-spring-boot-core/pom.xml +++ b/tosan-httpclient-spring-boot-core/pom.xml @@ -5,7 +5,7 @@ tosan-httpclient-spring-boot-root com.tosan.client.http - 3.1.8 + 3.1.9-SNAPSHOT tosan-httpclient-spring-boot-core diff --git a/tosan-httpclient-spring-boot-resttemplate-starter/pom.xml b/tosan-httpclient-spring-boot-resttemplate-starter/pom.xml index b27b27f..f6dc4d0 100644 --- a/tosan-httpclient-spring-boot-resttemplate-starter/pom.xml +++ b/tosan-httpclient-spring-boot-resttemplate-starter/pom.xml @@ -5,7 +5,7 @@ tosan-httpclient-spring-boot-root com.tosan.client.http - 3.1.8 + 3.1.9-SNAPSHOT tosan-httpclient-spring-boot-resttemplate-starter diff --git a/tosan-httpclient-spring-boot-sample/pom.xml b/tosan-httpclient-spring-boot-sample/pom.xml index 56a8248..c0f64e3 100644 --- a/tosan-httpclient-spring-boot-sample/pom.xml +++ b/tosan-httpclient-spring-boot-sample/pom.xml @@ -5,7 +5,7 @@ tosan-httpclient-spring-boot-root com.tosan.client.http - 3.1.8 + 3.1.9-SNAPSHOT tosan-httpclient-spring-boot-sample diff --git a/tosan-httpclient-spring-boot-starter/pom.xml b/tosan-httpclient-spring-boot-starter/pom.xml index 4c06ea1..6a478b3 100644 --- a/tosan-httpclient-spring-boot-starter/pom.xml +++ b/tosan-httpclient-spring-boot-starter/pom.xml @@ -5,7 +5,7 @@ com.tosan.client.http tosan-httpclient-spring-boot-root - 3.1.8 + 3.1.9-SNAPSHOT tosan-httpclient-spring-boot-starter