Update SNAPSHOT to 4.0.0-M1

Bumping versions
formatting
2022-01-27 21:45:39 +00:00 · 2022-01-27 00:24:12 +00:00 · 2022-01-26 16:33:21 -05:00 · 2022-01-20 00:23:54 +00:00 · 2022-01-17 12:41:39 +01:00 · 2022-01-17 10:51:54 +01:00
23 changed files with 31 additions and 44 deletions
@@ -16,7 +16,7 @@ jobs:

    strategy:
      matrix:
-        java: ["8", "11", "16"]
+        java: ["17"]

    steps:
      - uses: actions/checkout@v2
@@ -1,3 +1,3 @@
 # Enable auto-env through the sdkman_auto_env config
 # Add key=value pairs of SDKs to use below
-java=8.0.292.hs-adpt
+java=17.0.1-tem
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-openfeign</artifactId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>4.0.0-M1</version>
 	</parent>
 	<artifactId>spring-cloud-openfeign-docs</artifactId>
 	<packaging>jar</packaging>
@@ -4,14 +4,14 @@
 		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>spring-cloud-openfeign</artifactId>
-	<version>3.1.1-SNAPSHOT</version>
+	<version>4.0.0-M1</version>
 	<packaging>pom</packaging>
 	<name>Spring Cloud OpenFeign</name>
 	<description>Spring Cloud OpenFeign</description>
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-build</artifactId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>4.0.0-M1</version>
 		<relativePath/>
 	</parent>
 	<scm>
@@ -26,7 +26,7 @@
 	<properties>
 		<main.basedir>${basedir}</main.basedir>
 		<jackson.version>2.11.3</jackson.version>
-		<spring-cloud-commons.version>3.1.1-SNAPSHOT</spring-cloud-commons.version>
+		<spring-cloud-commons.version>4.0.0-M1</spring-cloud-commons.version>

 		<!-- Plugin versions -->
 		<maven-eclipse-plugin.version>2.10</maven-eclipse-plugin.version>
@@ -64,13 +64,6 @@
 					</additionalConfig>
 				</configuration>
 			</plugin>
-			<plugin>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<configuration>
-					<source>1.8</source>
-					<target>1.8</target>
-				</configuration>
-			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-checkstyle-plugin</artifactId>
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-openfeign</artifactId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>4.0.0-M1</version>
 		<relativePath>..</relativePath> <!-- lookup parent from repository -->
 	</parent>
 	<artifactId>spring-cloud-openfeign-core</artifactId>
@@ -25,8 +25,6 @@ import java.util.Timer;
 import java.util.TimerTask;
 import java.util.concurrent.TimeUnit;

-import javax.annotation.PreDestroy;
-
 import com.fasterxml.jackson.databind.Module;
 import feign.Capability;
 import feign.Client;
@@ -36,6 +34,7 @@ import feign.Target;
 import feign.hc5.ApacheHttp5Client;
 import feign.httpclient.ApacheHttpClient;
 import feign.okhttp.OkHttpClient;
+import jakarta.annotation.PreDestroy;
 import okhttp3.ConnectionPool;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -23,11 +23,11 @@ import java.security.cert.CertificateException;
 import java.security.cert.X509Certificate;
 import java.util.concurrent.TimeUnit;

-import javax.annotation.PreDestroy;
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.TrustManager;
 import javax.net.ssl.X509TrustManager;

+import jakarta.annotation.PreDestroy;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.hc.client5.http.config.RequestConfig;
@@ -20,8 +20,7 @@ import java.io.IOException;
 import java.util.Timer;
 import java.util.TimerTask;

-import javax.annotation.PreDestroy;
-
+import jakarta.annotation.PreDestroy;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.http.client.config.RequestConfig;
@@ -19,8 +19,7 @@ package org.springframework.cloud.openfeign.clientconfig;
 import java.time.Duration;
 import java.util.concurrent.TimeUnit;

-import javax.annotation.PreDestroy;
-
+import jakarta.annotation.PreDestroy;
 import okhttp3.ConnectionPool;
 import okhttp3.OkHttpClient;

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2021 the original author or authors.
+ * Copyright 2016-2022 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.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 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.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2021 the original author or authors.
+ * Copyright 2016-2022 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.
@@ -32,8 +32,6 @@ import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;

-import javax.servlet.http.HttpServletRequest;
-
 import feign.Capability;
 import feign.Feign;
 import feign.InvocationHandlerFactory;
@@ -47,6 +45,7 @@ import feign.codec.EncodeException;
 import feign.codec.Encoder;
 import feign.codec.ErrorDecoder;
 import feign.micrometer.MicrometerCapability;
+import jakarta.servlet.http.HttpServletRequest;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.condition.DisabledForJreRange;
 import org.junit.jupiter.api.condition.JRE;
@@ -48,8 +48,9 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen
 * @author Olga Maciaszek-Sharma
 */
@SpringBootTest(classes = FeignHttpClientUrlTestsWithRetryableLoadBalancer.TestConfig.class,
-		webEnvironment = DEFINED_PORT, value = { "spring.application.name=feignclienturlwithretryableloadbalancertest",
-				"feign.hystrix.enabled=false", "feign.okhttp.enabled=false" })
+		webEnvironment = DEFINED_PORT,
+		value = { "spring.application.name=feignclienturlwithretryableloadbalancertest", "feign.hystrix.enabled=false",
+				"feign.okhttp.enabled=false" })
@DirtiesContext
 class FeignHttpClientUrlTestsWithRetryableLoadBalancer {

@@ -21,9 +21,8 @@ import java.util.Objects;
 import java.util.UUID;
 import java.util.function.Function;

-import javax.servlet.http.HttpServletRequest;
-
 import feign.RequestInterceptor;
+import jakarta.servlet.http.HttpServletRequest;
 import org.junit.jupiter.api.Test;

 import org.springframework.beans.factory.ObjectProvider;
@@ -51,8 +51,9 @@ import static org.assertj.core.api.Assertions.assertThat;
 /**
 * @author Spencer Gibb
 */
-@SpringBootTest(classes = CircuitBreakerTests.Application.class, webEnvironment = WebEnvironment.DEFINED_PORT, value = {
-		"spring.application.name=springcircuittest", "spring.jmx.enabled=false", "feign.circuitbreaker.enabled=true" })
+@SpringBootTest(classes = CircuitBreakerTests.Application.class, webEnvironment = WebEnvironment.DEFINED_PORT,
+		value = { "spring.application.name=springcircuittest", "spring.jmx.enabled=false",
+				"feign.circuitbreaker.enabled=true" })
@DirtiesContext
 class CircuitBreakerTests {

@@ -65,9 +65,9 @@ import static org.mockito.Mockito.when;
 * Commons project, so here we are only testing the interactions between
 * {@link FeignBlockingLoadBalancerClient} and its delegates.
 *
+ * @author Olga Maciaszek-Sharma
 * @see <a href=
 * "https://github.com/spring-cloud/spring-cloud-commons/blob/main/spring-cloud-loadbalancer/src/test/java/org/springframework/cloud/loadbalancer/blocking/client/BlockingLoadBalancerClientTests.java">BlockingLoadBalancerClientTests</a>
- * @author Olga Maciaszek-Sharma
 */
@ExtendWith(MockitoExtension.class)
 class FeignBlockingLoadBalancerClientTests {
@@ -69,9 +69,9 @@ import static org.mockito.Mockito.when;
 * Commons project, so here we are only testing the interactions between
 * {@link RetryableFeignBlockingLoadBalancerClient} and its delegates.
 *
+ * @author Olga Maciaszek-Sharma
 * @see <a href=
 * "https://github.com/spring-cloud/spring-cloud-commons/blob/main/spring-cloud-loadbalancer/src/test/java/org/springframework/cloud/loadbalancer/blocking/client/BlockingLoadBalancerClientTests.java">BlockingLoadBalancerClientTests</a>
- * @author Olga Maciaszek-Sharma
 */
@ExtendWith(MockitoExtension.class)
 class RetryableFeignBlockingLoadBalancerClientTests {
@@ -16,8 +16,7 @@

 package org.springframework.cloud.openfeign.security;

-import javax.servlet.http.HttpServletRequest;
-
+import jakarta.servlet.http.HttpServletRequest;
 import org.junit.jupiter.api.Test;

 import org.springframework.beans.factory.annotation.Autowired;
@@ -16,8 +16,7 @@

 package org.springframework.cloud.openfeign.security;

-import javax.servlet.http.HttpServletRequest;
-
+import jakarta.servlet.http.HttpServletRequest;
 import org.junit.jupiter.api.Test;

 import org.springframework.beans.factory.annotation.Autowired;
@@ -32,13 +32,12 @@ import java.util.Optional;
 import java.util.UUID;
 import java.util.stream.Collectors;

-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.Part;
-
 import feign.Client;
 import feign.Logger;
 import feign.RequestInterceptor;
 import feign.codec.EncodeException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.Part;
 import org.junit.jupiter.api.Test;

 import org.springframework.beans.factory.annotation.Autowired;
@@ -6,11 +6,11 @@
 	<parent>
 		<artifactId>spring-cloud-dependencies-parent</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.1.0</version>
+		<version>4.0.0-M1</version>
 		<relativePath/>
 	</parent>
 	<artifactId>spring-cloud-openfeign-dependencies</artifactId>
-	<version>3.1.1-SNAPSHOT</version>
+	<version>4.0.0-M1</version>
 	<packaging>pom</packaging>
 	<name>spring-cloud-openfeign-dependencies</name>
 	<description>Spring Cloud OpenFeign Dependencies</description>
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-openfeign</artifactId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>4.0.0-M1</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>spring-cloud-starter-openfeign</artifactId>
Author	SHA1	Message	Date
buildmaster	53428758ad	Update SNAPSHOT to 4.0.0-M1	2022-01-27 21:45:39 +00:00
buildmaster	59ac5c1b3c	Bumping versions	2022-01-27 00:24:12 +00:00
spencergibb	4f7892f34d	formatting	2022-01-26 16:33:21 -05:00
buildmaster	261fc58a5e	Bumping versions	2022-01-20 00:23:54 +00:00
Olga MaciaszekSharma	67e8c9072d	Merge remote-tracking branch 'origin/3.1.x'	2022-01-17 12:41:39 +01:00
Olga MaciaszekSharma	7b08279aae	Merge remote-tracking branch 'origin/3.1.x'	2022-01-17 10:51:54 +01:00
buildmaster	f60859120d	Bumping versions	2022-01-15 00:23:41 +00:00
Olga MaciaszekSharma	c665d2c029	Merge remote-tracking branch 'origin/3.1.x'	2022-01-14 20:02:56 +01:00
Olga MaciaszekSharma	7f425704e4	Merge remote-tracking branch 'origin/3.1.x'	2022-01-14 17:23:03 +01:00
Olga MaciaszekSharma	6c130af613	Merge remote-tracking branch 'origin/3.1.x'	2022-01-14 17:04:11 +01:00
Olga MaciaszekSharma	98b2511d1f	Merge remote-tracking branch 'origin/3.1.x'	2022-01-12 18:14:46 +01:00
Olga MaciaszekSharma	10ad8a0c6e	Update license entries.	2022-01-11 15:05:02 +01:00
Olga MaciaszekSharma	505894315d	Merge remote-tracking branch 'origin/3.1.x'	2022-01-11 15:03:45 +01:00
Olga MaciaszekSharma	e2048b3719	Merge remote-tracking branch 'origin/3.1.x'	2022-01-11 14:28:05 +01:00
buildmaster	e389726ba2	Bumping versions	2022-01-06 00:32:53 +00:00
Spencer Gibb	2cf8adf482	Update github actions to use java 17	2022-01-04 13:16:49 -05:00
spencergibb	6a1d9fe074	Updates to version 4.0.0-SNAPSHOT Updates to java 17, framework 6, boot 3 and javax -> jakarta	2022-01-04 13:02:13 -05:00
spencergibb	b6b16a034a	Updates to version 4.0.0-SNAPSHOT Updates to java 17, framework 6, boot 3 and javax -> jakarta	2022-01-04 12:26:00 -05:00