Skip to content

Commit 6addcf4

Browse files
lony2003lony2003
committed
fix(springcloud openfeign): Fix poms to match the upstream
1 parent 1ae5ace commit 6addcf4

File tree

5 files changed

+80
-6
lines changed

5 files changed

+80
-6
lines changed

‎dapr-spring/dapr-openfeign-client/pom.xml‎

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>io.dapr.spring</groupId>
88
<artifactId>dapr-spring-parent</artifactId>
9-
<version>0.15.0-SNAPSHOT</version>
9+
<version>0.16.0-SNAPSHOT</version>
1010
</parent>
1111

1212
<artifactId>dapr-openfeign-client</artifactId>
@@ -31,6 +31,27 @@
3131
<version>13.5</version>
3232
<scope>test</scope>
3333
</dependency>
34+
<dependency>
35+
<groupId>io.dapr</groupId>
36+
<artifactId>dapr-sdk</artifactId>
37+
<version>${dapr.sdk.version}</version>
38+
<scope>compile</scope>
39+
</dependency>
40+
<dependency>
41+
<groupId>org.mockito</groupId>
42+
<artifactId>mockito-core</artifactId>
43+
<scope>test</scope>
44+
</dependency>
45+
<dependency>
46+
<groupId>org.mockito</groupId>
47+
<artifactId>mockito-junit-jupiter</artifactId>
48+
<scope>test</scope>
49+
</dependency>
50+
<dependency>
51+
<groupId>org.junit.jupiter</groupId>
52+
<artifactId>junit-jupiter</artifactId>
53+
<scope>test</scope>
54+
</dependency>
3455
</dependencies>
3556

3657
</project>

‎dapr-spring/dapr-spring-openfeign/pom.xml‎

Lines changed: 34 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>io.dapr.spring</groupId>
88
<artifactId>dapr-spring-parent</artifactId>
9-
<version>0.15.0-SNAPSHOT</version>
9+
<version>0.16.0-SNAPSHOT</version>
1010
</parent>
1111

1212
<artifactId>dapr-spring-openfeign</artifactId>
@@ -37,6 +37,39 @@
3737
<artifactId>spring-boot-starter-web</artifactId>
3838
<scope>test</scope>
3939
</dependency>
40+
<dependency>
41+
<groupId>org.testcontainers</groupId>
42+
<artifactId>testcontainers</artifactId>
43+
<scope>test</scope>
44+
</dependency>
45+
<dependency>
46+
<groupId>org.testcontainers</groupId>
47+
<artifactId>junit-jupiter</artifactId>
48+
<scope>test</scope>
49+
<exclusions>
50+
<exclusion>
51+
<groupId>com.vaadin.external.google</groupId>
52+
<artifactId>android-json</artifactId>
53+
</exclusion>
54+
</exclusions>
55+
</dependency>
56+
<dependency>
57+
<groupId>io.dapr</groupId>
58+
<artifactId>testcontainers-dapr</artifactId>
59+
<scope>test</scope>
60+
</dependency>
61+
<dependency>
62+
<groupId>org.springframework</groupId>
63+
<artifactId>spring-beans</artifactId>
64+
</dependency>
65+
<dependency>
66+
<groupId>org.springframework</groupId>
67+
<artifactId>spring-context</artifactId>
68+
</dependency>
69+
<dependency>
70+
<groupId>org.springframework.boot</groupId>
71+
<artifactId>spring-boot-starter-test</artifactId>
72+
</dependency>
4073
<dependency>
4174
<groupId>org.springframework.cloud</groupId>
4275
<artifactId>spring-cloud-starter-openfeign</artifactId>

‎dapr-spring/dapr-spring-openfeign/src/main/java/io/dapr/spring/openfeign/autoconfigure/FeignClientAnnoationEnabledCondition.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package io.dapr.spring.openfeign.autoconfigure;
22

3-
import org.jetbrains.annotations.NotNull;
43
import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
54
import org.springframework.cloud.openfeign.EnableFeignClients;
65
import org.springframework.context.annotation.Condition;
@@ -12,7 +11,7 @@
1211
public class FeignClientAnnoationEnabledCondition implements Condition {
1312
@Override
1413
@SuppressWarnings("null")
15-
public boolean matches(@NotNull ConditionContext context, @NotNull AnnotatedTypeMetadata metadata) {
14+
public boolean matches(ConditionContext context, AnnotatedTypeMetadata metadata) {
1615
try {
1716
ConfigurableListableBeanFactory factory = Objects.requireNonNull(context.getBeanFactory());
1817
String[] beanNames = factory.getBeanNamesForAnnotation(EnableFeignClients.class);

‎pom.xml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@
4949
<snakeyaml.version>2.0</snakeyaml.version>
5050
<testcontainers.version>1.20.5</testcontainers.version>
5151
<springboot.version>3.4.3</springboot.version>
52+
<springcloud.version>2024.0.0</springcloud.version>
5253
<nexus-staging-maven-plugin.version>1.7.0</nexus-staging-maven-plugin.version>
5354
<assertj.version>3.27.3</assertj.version>
5455
<grpc.version>1.69.0</grpc.version>
@@ -112,6 +113,11 @@
112113
<artifactId>mockito-core</artifactId>
113114
<version>3.11.2</version>
114115
</dependency>
116+
<dependency>
117+
<groupId>org.mockito</groupId>
118+
<artifactId>mockito-junit-jupiter</artifactId>
119+
<version>3.11.2</version>
120+
</dependency>
115121
<dependency>
116122
<groupId>io.projectreactor</groupId>
117123
<artifactId>reactor-test</artifactId>

‎spring-boot-examples/openfeign-app/pom.xml‎

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>io.dapr</groupId>
88
<artifactId>spring-boot-examples</artifactId>
9-
<version>0.15.0-SNAPSHOT</version>
9+
<version>0.16.0-SNAPSHOT</version>
1010
</parent>
1111

1212
<artifactId>openfeign-app</artifactId>
@@ -26,12 +26,17 @@
2626
</dependency>
2727
<dependency>
2828
<groupId>org.springframework.boot</groupId>
29-
<artifactId>spring-boot-starter-actuator</artifactId>
29+
<artifactId>spring-boot-starter-test</artifactId>
3030
</dependency>
3131
<dependency>
3232
<groupId>io.dapr.spring</groupId>
3333
<artifactId>dapr-spring-boot-starter</artifactId>
3434
</dependency>
35+
<dependency>
36+
<groupId>io.dapr.spring</groupId>
37+
<artifactId>dapr-spring-boot-starter-test</artifactId>
38+
<scope>test</scope>
39+
</dependency>
3540
<dependency>
3641
<groupId>org.springframework.cloud</groupId>
3742
<artifactId>spring-cloud-starter-openfeign</artifactId>
@@ -56,6 +61,16 @@
5661
<artifactId>rest-assured</artifactId>
5762
<scope>test</scope>
5863
</dependency>
64+
<dependency>
65+
<groupId>org.junit.jupiter</groupId>
66+
<artifactId>junit-jupiter-api</artifactId>
67+
<scope>test</scope>
68+
</dependency>
69+
<dependency>
70+
<groupId>org.mockito</groupId>
71+
<artifactId>mockito-core</artifactId>
72+
<scope>test</scope>
73+
</dependency>
5974
</dependencies>
6075

6176
</project>

0 commit comments

Comments
 (0)