Update SNAPSHOT to 3.1.4

Bumping versions
Allow overriding binary content types. Fixes gh-734.
2022-09-06 20:20:22 +00:00 · 2022-09-06 10:57:04 +00:00 · 2022-09-05 16:37:12 +02:00 · 2022-09-02 23:46:06 +00:00 · 2022-09-02 23:46:05 +00:00 · 2022-09-02 23:44:34 +00:00
11 changed files with 72 additions and 49 deletions
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-openfeign</artifactId>
-		<version>3.1.2</version>
+		<version>3.1.4</version>
 	</parent>
 	<artifactId>spring-cloud-openfeign-docs</artifactId>
 	<packaging>jar</packaging>
@@ -17,6 +17,8 @@
 		<main.basedir>${basedir}/..</main.basedir>
 		<configprops.inclusionPattern>feign.*</configprops.inclusionPattern>
 		<upload-docs-zip.phase>deploy</upload-docs-zip.phase>
+		<!-- Don't upload docs jar to central / repo.spring.io -->
+		<maven-deploy-plugin-default.phase>none</maven-deploy-plugin-default.phase>
 	</properties>
 	<dependencies>
 		<dependency>
@@ -1,38 +1,38 @@
 |===
 |Name | Default | Description

-|feign.autoconfiguration.jackson.enabled | `false` | If true, PageJacksonModule and SortJacksonModule bean will be provided for Jackson page decoding.
-|feign.circuitbreaker.alphanumeric-ids.enabled | `false` | If true, Circuit Breaker ids will only contain alphanumeric characters to allow for configuration via configuration properties.
-|feign.circuitbreaker.enabled | `false` | If true, an OpenFeign client will be wrapped with a Spring Cloud CircuitBreaker circuit breaker.
-|feign.circuitbreaker.group.enabled | `false` | If true, an OpenFeign client will be wrapped with a Spring Cloud CircuitBreaker circuit breaker with with group.
+|feign.autoconfiguration.jackson.enabled | `+++false+++` | If true, PageJacksonModule and SortJacksonModule bean will be provided for Jackson page decoding.
+|feign.circuitbreaker.alphanumeric-ids.enabled | `+++false+++` | If true, Circuit Breaker ids will only contain alphanumeric characters to allow for configuration via configuration properties.
+|feign.circuitbreaker.enabled | `+++false+++` | If true, an OpenFeign client will be wrapped with a Spring Cloud CircuitBreaker circuit breaker.
+|feign.circuitbreaker.group.enabled | `+++false+++` | If true, an OpenFeign client will be wrapped with a Spring Cloud CircuitBreaker circuit breaker with with group.
 |feign.client.config |  | 
-|feign.client.decode-slash | `true` | Feign clients do not encode slash `/` characters by default. To change this behavior, set the `decodeSlash` to `false`.
-|feign.client.default-config | `default` | 
-|feign.client.default-to-properties | `true` | 
-|feign.client.refresh-enabled | `false` | Enables options value refresh capability for Feign.
-|feign.compression.request.enabled | `false` | Enables the request sent by Feign to be compressed.
-|feign.compression.request.mime-types | `[text/xml, application/xml, application/json]` | The list of supported mime types.
-|feign.compression.request.min-request-size | `2048` | The minimum threshold content size.
-|feign.compression.response.enabled | `false` | Enables the response from Feign to be compressed.
-|feign.encoder.charset-from-content-type | `false` | Indicates whether the charset should be derived from the {@code Content-Type} header.
-|feign.httpclient.connection-timeout | `2000` | 
-|feign.httpclient.connection-timer-repeat | `3000` | 
-|feign.httpclient.disable-ssl-validation | `false` | 
-|feign.httpclient.enabled | `true` | Enables the use of the Apache HTTP Client by Feign.
-|feign.httpclient.follow-redirects | `true` | 
-|feign.httpclient.hc5.enabled | `false` | Enables the use of the Apache HTTP Client 5 by Feign.
+|feign.client.decode-slash | `+++true+++` | Feign clients do not encode slash `/` characters by default. To change this behavior, set the `decodeSlash` to `false`.
+|feign.client.default-config | `+++default+++` | 
+|feign.client.default-to-properties | `+++true+++` | 
+|feign.client.refresh-enabled | `+++false+++` | Enables options value refresh capability for Feign.
+|feign.compression.request.enabled | `+++false+++` | Enables the request sent by Feign to be compressed.
+|feign.compression.request.mime-types | `+++[text/xml, application/xml, application/json]+++` | The list of supported mime types.
+|feign.compression.request.min-request-size | `+++2048+++` | The minimum threshold content size.
+|feign.compression.response.enabled | `+++false+++` | Enables the response from Feign to be compressed.
+|feign.encoder.charset-from-content-type | `+++false+++` | Indicates whether the charset should be derived from the {@code Content-Type} header.
+|feign.httpclient.connection-timeout | `+++2000+++` | 
+|feign.httpclient.connection-timer-repeat | `+++3000+++` | 
+|feign.httpclient.disable-ssl-validation | `+++false+++` | 
+|feign.httpclient.enabled | `+++true+++` | Enables the use of the Apache HTTP Client by Feign.
+|feign.httpclient.follow-redirects | `+++true+++` | 
+|feign.httpclient.hc5.enabled | `+++false+++` | Enables the use of the Apache HTTP Client 5 by Feign.
 |feign.httpclient.hc5.pool-concurrency-policy |  | Pool concurrency policies.
 |feign.httpclient.hc5.pool-reuse-policy |  | Pool connection re-use policies.
-|feign.httpclient.hc5.socket-timeout | `5` | Default value for socket timeout.
+|feign.httpclient.hc5.socket-timeout | `+++5+++` | Default value for socket timeout.
 |feign.httpclient.hc5.socket-timeout-unit |  | Default value for socket timeout unit.
-|feign.httpclient.max-connections | `200` | 
-|feign.httpclient.max-connections-per-route | `50` | 
-|feign.httpclient.ok-http.read-timeout | `60s` | {@link OkHttpClient} read timeout; defaults to 60 seconds.
-|feign.httpclient.time-to-live | `900` | 
+|feign.httpclient.max-connections | `+++200+++` | 
+|feign.httpclient.max-connections-per-route | `+++50+++` | 
+|feign.httpclient.ok-http.read-timeout | `+++60s+++` | {@link OkHttpClient} read timeout; defaults to 60 seconds.
+|feign.httpclient.time-to-live | `+++900+++` | 
 |feign.httpclient.time-to-live-unit |  | 
-|feign.metrics.enabled | `true` | Enables metrics capability for Feign.
-|feign.oauth2.enabled | `false` | Enables feign interceptor for managing oauth2 access token.
-|feign.oauth2.load-balanced | `false` | Enables load balancing for oauth2 access token provider.
-|feign.okhttp.enabled | `false` | Enables the use of the OK HTTP Client by Feign.
+|feign.metrics.enabled | `+++true+++` | Enables metrics capability for Feign.
+|feign.oauth2.enabled | `+++false+++` | Enables feign interceptor for managing oauth2 access token.
+|feign.oauth2.load-balanced | `+++false+++` | Enables load balancing for oauth2 access token provider.
+|feign.okhttp.enabled | `+++false+++` | Enables the use of the OK HTTP Client by Feign.

 |===
@@ -202,7 +202,7 @@ feign:

 Default configurations can be specified in the `@EnableFeignClients` attribute `defaultConfiguration` in a similar manner as described above. The difference is that this configuration will apply to _all_ feign clients.

-If you prefer using configuration properties to configured all `@FeignClient`, you can create configuration properties with `default` feign name.
+If you prefer using configuration properties to configure all `@FeignClient`, you can create configuration properties with `default` feign name.

 You can use `feign.client.config.feignName.defaultQueryParameters` and `feign.client.config.feignName.defaultRequestHeaders` to specify query parameters and headers that will be sent with every request of the client named `feignName`.

@@ -385,7 +385,7 @@ For example, if you had this Feign client

 [source,java,indent=0]
 ----
-@FeignClienturl = "http://localhost:8080")
+@FeignClient(url = "http://localhost:8080")
 public interface DemoClient {

    @GetMapping("demo")
@@ -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.2</version>
+	<version>3.1.4</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.2</version>
+		<version>3.1.4</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.2</spring-cloud-commons.version>
+		<spring-cloud-commons.version>3.1.4</spring-cloud-commons.version>

 		<!-- Plugin versions -->
 		<maven-eclipse-plugin.version>2.10</maven-eclipse-plugin.version>
@@ -142,7 +142,7 @@
 				<repository>
 					<id>spring-snapshots</id>
 					<name>Spring Snapshots</name>
-					<url>https://repo.spring.io/libs-snapshot-local</url>
+					<url>https://repo.spring.io/snapshot</url>
 					<snapshots>
 						<enabled>true</enabled>
 					</snapshots>
@@ -153,7 +153,7 @@
 				<repository>
 					<id>spring-milestones</id>
 					<name>Spring Milestones</name>
-					<url>https://repo.spring.io/libs-milestone-local</url>
+					<url>https://repo.spring.io/milestone</url>
 					<snapshots>
 						<enabled>false</enabled>
 					</snapshots>
@@ -171,7 +171,7 @@
 				<pluginRepository>
 					<id>spring-snapshots</id>
 					<name>Spring Snapshots</name>
-					<url>https://repo.spring.io/libs-snapshot-local</url>
+					<url>https://repo.spring.io/snapshot</url>
 					<snapshots>
 						<enabled>true</enabled>
 					</snapshots>
@@ -182,7 +182,7 @@
 				<pluginRepository>
 					<id>spring-milestones</id>
 					<name>Spring Milestones</name>
-					<url>https://repo.spring.io/libs-milestone-local</url>
+					<url>https://repo.spring.io/milestone</url>
 					<snapshots>
 						<enabled>false</enabled>
 					</snapshots>
@@ -190,7 +190,7 @@
 				<pluginRepository>
 					<id>spring-releases</id>
 					<name>Spring Releases</name>
-					<url>https://repo.spring.io/libs-release-local</url>
+					<url>https://repo.spring.io/release</url>
 					<snapshots>
 						<enabled>false</enabled>
 					</snapshots>
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-openfeign</artifactId>
-		<version>3.1.2</version>
+		<version>3.1.4</version>
 		<relativePath>..</relativePath> <!-- lookup parent from repository -->
 	</parent>
 	<artifactId>spring-cloud-openfeign-core</artifactId>
@@ -99,6 +99,13 @@
 		<dependency>
 			<groupId>io.github.openfeign.form</groupId>
 			<artifactId>feign-form-spring</artifactId>
+			<exclusions>
+<!--				Vulnerable in 3.8.0-->
+				<exclusion>
+					<groupId>commons-io</groupId>
+					<artifactId>commons-io</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>io.github.openfeign</groupId>
@@ -148,6 +155,10 @@
 					<groupId>javax.activation</groupId>
 					<artifactId>javax.activation-api</artifactId>
 				</exclusion>
+				<exclusion>
+					<groupId>com.sun.activation</groupId>
+					<artifactId>jakarta.activation</artifactId>
+				</exclusion>
 			</exclusions>
 		</dependency>
 		<dependency>
@@ -208,6 +219,12 @@
 			<artifactId>spring-cloud-loadbalancer</artifactId>
 			<optional>true</optional>
 		</dependency>
+		<dependency>
+			<groupId>commons-io</groupId>
+			<artifactId>commons-io</artifactId>
+			<version>2.11.0</version>
+			<scope>test</scope>
+		</dependency>
 	</dependencies>
 	<profiles>
 		<profile>
@@ -346,6 +346,7 @@ public class FeignAutoConfiguration {
 	@Configuration(proxyBeanMethods = false)
 	@ConditionalOnClass(OAuth2ClientContext.class)
 	@ConditionalOnProperty("feign.oauth2.enabled")
+	@Deprecated // spring-security-oauth2 reached EOL
 	protected static class Oauth2FeignConfiguration {

 		@ConditionalOnBean({ RetryLoadBalancerInterceptor.class, OAuth2ClientContext.class,
@@ -43,6 +43,7 @@ import org.springframework.security.oauth2.common.OAuth2AccessToken;
 * @author Tim Ysewyn
 * @since 3.0.0
 */
+@Deprecated // spring-security-oauth2 reached EOL
 public class OAuth2FeignRequestInterceptor implements RequestInterceptor {

 	/**
@@ -247,7 +247,7 @@ public class SpringEncoder implements Encoder {
 		return Objects.equals(APPLICATION_FORM_URLENCODED, requestContentType);
 	}

-	private boolean binaryContentType(FeignOutputMessage outputMessage) {
+	protected boolean binaryContentType(FeignOutputMessage outputMessage) {
 		MediaType contentType = outputMessage.getHeaders().getContentType();
 		return contentType == null || Stream
 				.of(MediaType.APPLICATION_CBOR, MediaType.APPLICATION_OCTET_STREAM, MediaType.APPLICATION_PDF,
@@ -6,18 +6,19 @@
 	<parent>
 		<artifactId>spring-cloud-dependencies-parent</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.1.2</version>
+		<version>3.1.4</version>
 		<relativePath/>
 	</parent>
 	<artifactId>spring-cloud-openfeign-dependencies</artifactId>
-	<version>3.1.2</version>
+	<version>3.1.4</version>
 	<packaging>pom</packaging>
 	<name>spring-cloud-openfeign-dependencies</name>
 	<description>Spring Cloud OpenFeign Dependencies</description>
 	<properties>
 		<feign.version>11.8</feign.version>
 		<feign-form.version>3.8.0</feign-form.version>
-		<spring-security-oauth2-autoconfigure.version>2.1.2.RELEASE</spring-security-oauth2-autoconfigure.version>
+		<!-- Deprecated - reached EOL -->
+		<spring-security-oauth2-autoconfigure.version>2.5.2</spring-security-oauth2-autoconfigure.version>
 	</properties>
 	<dependencyManagement>
 		<dependencies>
@@ -57,7 +58,7 @@
 				<repository>
 					<id>spring-snapshots</id>
 					<name>Spring Snapshots</name>
-					<url>https://repo.spring.io/libs-snapshot-local</url>
+					<url>https://repo.spring.io/snapshot</url>
 					<snapshots>
 						<enabled>true</enabled>
 					</snapshots>
@@ -68,7 +69,7 @@
 				<repository>
 					<id>spring-milestones</id>
 					<name>Spring Milestones</name>
-					<url>https://repo.spring.io/libs-milestone-local</url>
+					<url>https://repo.spring.io/milestone</url>
 					<snapshots>
 						<enabled>false</enabled>
 					</snapshots>
@@ -86,7 +87,7 @@
 				<pluginRepository>
 					<id>spring-snapshots</id>
 					<name>Spring Snapshots</name>
-					<url>https://repo.spring.io/libs-snapshot-local</url>
+					<url>https://repo.spring.io/snapshot</url>
 					<snapshots>
 						<enabled>true</enabled>
 					</snapshots>
@@ -97,7 +98,7 @@
 				<pluginRepository>
 					<id>spring-milestones</id>
 					<name>Spring Milestones</name>
-					<url>https://repo.spring.io/libs-milestone-local</url>
+					<url>https://repo.spring.io/milestone</url>
 					<snapshots>
 						<enabled>false</enabled>
 					</snapshots>
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-openfeign</artifactId>
-		<version>3.1.2</version>
+		<version>3.1.4</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>spring-cloud-starter-openfeign</artifactId>
@@ -12,6 +12,7 @@
 	<suppress files=".*ProtobufSpringEncoderTest.*" checks="LineLengthCheck" />
 	<suppress files=".*ProtobufTest.*" checks="LineLengthCheck" />
 	<suppress files=".*Hello.*" checks="RedundantModifier"/>
+	<suppress files=".*test.*" checks="JavadocStyle"/>
 	<!-- Important -->
 	<suppress files=".*HttpEncoding.*" checks="InterfaceIsTypeCheck" />
 </suppressions>
Author	SHA1	Message	Date
buildmaster	9a8dae2cba	Update SNAPSHOT to 3.1.4	2022-09-06 20:20:22 +00:00
buildmaster	a95f2a23d2	Bumping versions	2022-09-06 10:57:04 +00:00
Olga Maciaszek-Sharma	bdcbaa7f3b	Allow overriding binary content types. Fixes gh-734.	2022-09-05 16:37:12 +02:00
buildmaster	375241803d	Bumping versions to 3.1.5-SNAPSHOT after release	2022-09-02 23:46:06 +00:00
buildmaster	0213d4be21	Going back to snapshots	2022-09-02 23:46:05 +00:00
buildmaster	73cde28fcf	Update SNAPSHOT to 3.1.4	2022-09-02 23:44:34 +00:00
Olga Maciaszek-Sharma	efbf71294d	Merge remote-tracking branch 'origin/3.0.x' into 3.1.x	2022-07-25 16:27:38 +02:00
fml2	b4c9567de5	Update spring-cloud-openfeign.adoc	2022-07-25 16:00:28 +02:00
fml2	9529e43c01	Update spring-cloud-openfeign.adoc	2022-07-25 15:52:05 +02:00
Kwangyong Kim	a26095bb6c	Fix a typo in sample code I found a typo in the latest release. It should be `@FeignClient(url = "http://localhost:8080")`	2022-07-25 15:22:52 +02:00
Nikita Konev	8fdb488697	fix cascading deserialization Spring Data's Page by setting @JsonIgnoreProperties(ignoreUnknown = true), revert ignoring getTotalPages(), getNumberOfElements(), isFirst(), isLast() (#653 )	2022-07-25 15:12:22 +02:00
spencergibb	8989036e93	Removes libs-*-local repos	2022-07-18 12:59:55 -04:00
Olga Maciaszek-Sharma	a29f28506f	Remove vulnerable transitive dependency.	2022-07-01 16:38:55 +02:00
Olga Maciaszek-Sharma	926f1151c1	Add deprecations for OAuth2.	2022-07-01 16:14:32 +02:00
buildmaster	1e70aec75c	Bumping versions	2022-06-30 10:59:53 +00:00
buildmaster	7e01355317	Bumping versions to 3.0.8-SNAPSHOT after release	2022-06-29 22:15:46 +00:00
buildmaster	fc459044b5	Going back to snapshots	2022-06-29 22:15:46 +00:00
buildmaster	e321e72e3d	Update SNAPSHOT to 3.0.7	2022-06-29 22:14:15 +00:00
Olga Maciaszek-Sharma	ae63aae6eb	Add deprecations for OAuth2.	2022-06-29 17:40:23 +02:00
Olga Maciaszek-Sharma	10fefea29b	Remove incompatible test.	2022-06-28 15:46:11 +02:00
Olga MaciaszekSharma	24d9b08d5c	Backport bugfix and resolve conflicts.	2022-06-28 15:36:06 +02:00
Olga Maciaszek-Sharma	d4832788f6	Resolve conflicts for backport.	2022-06-28 15:02:16 +02:00
Olga Maciaszek-Sharma	ff96850ec0	Wrap underlying checked exception with IllegalStateException. Add tests.	2022-06-28 14:53:37 +02:00
Olga Maciaszek-Sharma	9023cc2dc5	Unwarap InvocationTargetException and NoFallbackAvailableException.	2022-06-28 14:53:27 +02:00
Olga Maciaszek-Sharma	6c3b8c257e	Fixes gh-680.	2022-06-28 14:44:00 +02:00
spencergibb	f8b3ed971e	Bumps to next snapshot version	2022-05-27 13:45:43 -04:00
buildmaster	bc7d39fa04	Update SNAPSHOT to 3.1.3	2022-05-26 20:27:01 +00:00
Spencer Gibb	4cba1de153	don't upload docs to maven central	2022-05-26 12:08:43 -04:00
buildmaster	1bed516e03	Bumping versions	2022-04-28 10:56:37 +00:00
buildmaster	a142f6f2c0	Bumping versions to 3.1.3-SNAPSHOT after release	2022-04-27 10:53:18 +00:00
buildmaster	434ce22328	Going back to snapshots	2022-04-27 10:53:18 +00:00
buildmaster	fe43b6c52b	Bumping versions	2022-02-24 10:52:51 +00:00