Skip to content

Commit c87a780

Browse files
committed
chore(deps): bump dependencies
BREAKING CHANGE: require APIM 4.4.x
1 parent 4b86a85 commit c87a780

File tree

4 files changed

+33
-18
lines changed

4 files changed

+33
-18
lines changed

README.adoc

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,9 @@ execution. If no variable is configured the result of the callout is no longer a
3939
|===
4040
|Plugin version | APIM version
4141

42-
|2.x and upper | 3.18.x to latest
42+
|4.x | 4.4.x to latest
43+
|3.x | 4.0.x to 4.3.x
44+
|2.x | 3.18.x to 3.20.x
4345
|1.15.x and upper | 3.15.x to 3.17.x
4446
|1.13.x to 1.14.x | 3.10.x to 3.14.x
4547
|Up to 1.12.x | Up to 3.9.x

pom.xml

Lines changed: 26 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
<groupId>io.gravitee.policy</groupId>
2424
<artifactId>gravitee-policy-callout-http</artifactId>
25-
<version>3.0.0</version>
25+
<version>4.0.0</version>
2626

2727
<name>Gravitee.io APIM - Policy - Callout HTTP</name>
2828
<description>Invoke an HTTP(S) URL and place a subset or all of the content in one or more variables of the request execution context</description>
@@ -34,16 +34,17 @@
3434
</parent>
3535

3636
<properties>
37-
<gravitee-apim-gateway-tests-sdk.version>4.1.5</gravitee-apim-gateway-tests-sdk.version>
38-
<gravitee-bom.version>6.0.47</gravitee-bom.version>
39-
<gravitee-common.version>3.4.1</gravitee-common.version>
37+
<gravitee-bom.version>7.0.23</gravitee-bom.version>
38+
<gravitee-common.version>4.4.0</gravitee-common.version>
4039
<gravitee-expression-language.version>3.2.0</gravitee-expression-language.version>
41-
<gravitee-gateway-api.version>3.1.0</gravitee-gateway-api.version>
42-
<gravitee-node.version>4.8.7</gravitee-node.version>
40+
<gravitee-gateway-api.version>3.5.0</gravitee-gateway-api.version>
41+
<gravitee-node.version>5.18.3</gravitee-node.version>
4342
<gravitee-policy-api.version>1.11.0</gravitee-policy-api.version>
43+
<gravitee-apim.version>4.4.0</gravitee-apim.version>
4444

45-
<gravitee-reactor-message.version>1.0.3</gravitee-reactor-message.version>
46-
<gravitee-entrypoint-sse.version>4.0.2</gravitee-entrypoint-sse.version>
45+
46+
<gravitee-reactor-message.version>3.0.0</gravitee-reactor-message.version>
47+
<gravitee-entrypoint-sse.version>4.1.0</gravitee-entrypoint-sse.version>
4748

4849
<maven-assembly-plugin.version>3.7.1</maven-assembly-plugin.version>
4950
<json-schema-generator-maven-plugin.version>1.3.0</json-schema-generator-maven-plugin.version>
@@ -63,6 +64,13 @@
6364
<scope>import</scope>
6465
<type>pom</type>
6566
</dependency>
67+
<dependency>
68+
<groupId>io.gravitee.node</groupId>
69+
<artifactId>gravitee-node</artifactId>
70+
<version>${gravitee-node.version}</version>
71+
<scope>import</scope>
72+
<type>pom</type>
73+
</dependency>
6674
</dependencies>
6775
</dependencyManagement>
6876

@@ -81,6 +89,12 @@
8189
<version>${gravitee-node.version}</version>
8290
<scope>provided</scope>
8391
</dependency>
92+
<dependency>
93+
<groupId>io.gravitee.node</groupId>
94+
<artifactId>gravitee-node-vertx</artifactId>
95+
<version>${gravitee-node.version}</version>
96+
<scope>provided</scope>
97+
</dependency>
8498

8599
<dependency>
86100
<groupId>io.gravitee.el</groupId>
@@ -130,25 +144,25 @@
130144
<dependency>
131145
<groupId>io.gravitee.apim.gateway</groupId>
132146
<artifactId>gravitee-apim-gateway-tests-sdk</artifactId>
133-
<version>${gravitee-apim-gateway-tests-sdk.version}</version>
147+
<version>${gravitee-apim.version}</version>
134148
<scope>test</scope>
135149
</dependency>
136150
<dependency>
137151
<groupId>io.gravitee.apim.plugin.entrypoint</groupId>
138152
<artifactId>gravitee-apim-plugin-entrypoint-http-proxy</artifactId>
139-
<version>${gravitee-apim-gateway-tests-sdk.version}</version>
153+
<version>${gravitee-apim.version}</version>
140154
<scope>test</scope>
141155
</dependency>
142156
<dependency>
143157
<groupId>io.gravitee.apim.plugin.endpoint</groupId>
144158
<artifactId>gravitee-apim-plugin-endpoint-http-proxy</artifactId>
145-
<version>${gravitee-apim-gateway-tests-sdk.version}</version>
159+
<version>${gravitee-apim.version}</version>
146160
<scope>test</scope>
147161
</dependency>
148162
<dependency>
149163
<groupId>io.gravitee.apim.plugin.endpoint</groupId>
150164
<artifactId>gravitee-apim-plugin-endpoint-mock</artifactId>
151-
<version>${gravitee-apim-gateway-tests-sdk.version}</version>
165+
<version>${gravitee-apim.version}</version>
152166
<scope>test</scope>
153167
</dependency>
154168
<dependency>

src/main/java/io/gravitee/policy/callout/CalloutHttpPolicy.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@
1515
*/
1616
package io.gravitee.policy.callout;
1717

18-
import static io.gravitee.common.util.VertxProxyOptionsUtils.setSystemProxy;
1918
import static java.util.stream.Collectors.toList;
2019

2120
import io.gravitee.gateway.reactive.api.ExecutionFailure;
2221
import io.gravitee.gateway.reactive.api.context.HttpExecutionContext;
2322
import io.gravitee.gateway.reactive.api.policy.Policy;
2423
import io.gravitee.node.api.configuration.Configuration;
24+
import io.gravitee.node.vertx.proxy.VertxProxyOptionsUtils;
2525
import io.gravitee.policy.callout.configuration.CalloutHttpPolicyConfiguration;
2626
import io.gravitee.policy.callout.configuration.HttpHeader;
2727
import io.gravitee.policy.v3.callout.CalloutHttpPolicyV3;
@@ -144,7 +144,7 @@ private HttpClientOptions buildHttpClientOptions(HttpExecutionContext ctx, URI t
144144
if (configuration.isUseSystemProxy()) {
145145
Configuration configuration = ctx.getComponent(Configuration.class);
146146
try {
147-
setSystemProxy(options, configuration);
147+
options.setProxyOptions(VertxProxyOptionsUtils.buildProxyOptions(configuration));
148148
} catch (IllegalStateException e) {
149149
log.warn(
150150
"CalloutHttp requires a system proxy to be defined but some configurations are missing or not well defined: {}. Ignoring proxy",

src/main/java/io/gravitee/policy/v3/callout/CalloutHttpPolicyV3.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@
1515
*/
1616
package io.gravitee.policy.v3.callout;
1717

18-
import static io.gravitee.common.util.VertxProxyOptionsUtils.setSystemProxy;
19-
2018
import io.gravitee.el.TemplateEngine;
2119
import io.gravitee.gateway.api.ExecutionContext;
2220
import io.gravitee.gateway.api.Request;
@@ -27,6 +25,7 @@
2725
import io.gravitee.gateway.api.stream.ReadWriteStream;
2826
import io.gravitee.gateway.api.stream.SimpleReadWriteStream;
2927
import io.gravitee.node.api.configuration.Configuration;
28+
import io.gravitee.node.vertx.proxy.VertxProxyOptionsUtils;
3029
import io.gravitee.policy.api.PolicyChain;
3130
import io.gravitee.policy.api.PolicyResult;
3231
import io.gravitee.policy.api.annotations.OnRequest;
@@ -203,7 +202,7 @@ private void doCallout(ExecutionContext context, Consumer<Void> onSuccess, Consu
203202
if (configuration.isUseSystemProxy()) {
204203
Configuration configuration = context.getComponent(Configuration.class);
205204
try {
206-
setSystemProxy(options, configuration);
205+
options.setProxyOptions(VertxProxyOptionsUtils.buildProxyOptions(configuration));
207206
} catch (IllegalStateException e) {
208207
LOGGER.warn(
209208
"CalloutHttp requires a system proxy to be defined but some configurations are missing or not well defined: {}. Ignoring proxy",

0 commit comments

Comments
 (0)