Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sentinel compatible with Spring Cloud 2023.0.0 #3572

Merged
merged 8 commits into from
Jan 4, 2024
Merged

Sentinel compatible with Spring Cloud 2023.0.0 #3572

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f40e0bf
Sentinel compatible with Spring Cloud 2023.0.0
twelvet-s Dec 11, 2023
8b45a28
Sentinel compatible with Spring Cloud 2023.0.0
twelvet-s Dec 11, 2023
711b4ba
Sentinel compatible with Spring Cloud 2023.0.0
twelvet-s Dec 11, 2023
c6e2177
Mybatis is compatible with Spring Boot 3.2. x
twelvet-s Dec 12, 2023
b82ecc3
Spring Cloud 2023.0.0
twelvet-s Dec 12, 2023
6424aa3
Spring Cloud 2023.0.0
twelvet-s Dec 12, 2023
12ad2e5
Spring Cloud 2023.0.0
twelvet-s Dec 12, 2023
15b54a5
remove mockito-inline
twelvet-s Dec 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-build</artifactId>
<version>4.0.0</version>
<version>4.1.0</version>
<relativePath/>
</parent>

Expand Down Expand Up @@ -83,10 +83,10 @@
<revision>2022.0.0.0</revision>

<!-- Spring Cloud -->
<spring.cloud.version>2022.0.0</spring.cloud.version>
<spring.cloud.version>2023.0.0</spring.cloud.version>

<!-- Spring Boot -->
<spring-boot.version>3.0.2</spring-boot.version>
<spring-boot.version>3.2.0</spring-boot.version>

<curator.version>4.0.1</curator.version>

Expand Down
2 changes: 1 addition & 1 deletion spring-cloud-alibaba-dependencies/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dependencies-parent</artifactId>
<version>4.0.0</version>
<version>4.1.0</version>
<relativePath/>
</parent>

Expand Down
10 changes: 4 additions & 6 deletions spring-cloud-alibaba-examples/integrated-example/integrated-account/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,8 @@
<name>Spring Cloud Alibaba Integrated Account Example</name>

<properties>
<mysql.version>8.0.28</mysql.version>
<durid.version>1.1.10</durid.version>
<mybatis.version>3.0.0</mybatis.version>
<mybatis.version>3.0.3</mybatis.version>
</properties>

<dependencies>
Expand All @@ -30,9 +29,8 @@
<artifactId>spring-boot-starter-jdbc</artifactId>
</dependency>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>${mysql.version}</version>
<groupId>com.mysql</groupId>
<artifactId>mysql-connector-j</artifactId>
</dependency>

<dependency>
Expand Down Expand Up @@ -75,4 +73,4 @@
</plugin>
</plugins>
</build>
</project>
</project>
10 changes: 4 additions & 6 deletions spring-cloud-alibaba-examples/integrated-example/integrated-order/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,8 @@
<name>Spring Cloud Alibaba Integrated Order Example</name>

<properties>
<mysql.version>8.0.28</mysql.version>
<druid.version>1.1.10</druid.version>
<mybatis.version>3.0.0</mybatis.version>
<mybatis.version>3.0.3</mybatis.version>
</properties>

<dependencies>
Expand All @@ -30,9 +29,8 @@
<artifactId>spring-boot-starter-jdbc</artifactId>
</dependency>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>${mysql.version}</version>
<groupId>com.mysql</groupId>
<artifactId>mysql-connector-j</artifactId>
</dependency>

<dependency>
Expand Down Expand Up @@ -86,4 +84,4 @@
</plugin>
</plugins>
</build>
</project>
</project>
10 changes: 4 additions & 6 deletions spring-cloud-alibaba-examples/integrated-example/integrated-praise-consumer/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,8 @@
<name>Spring Cloud Alibaba Integrated Praise Consumer Example</name>

<properties>
<mysql.version>8.0.28</mysql.version>
<druid.version>1.1.10</druid.version>
<mybatis.version>3.0.0</mybatis.version>
<mybatis.version>3.0.3</mybatis.version>
</properties>

<dependencies>
Expand All @@ -35,9 +34,8 @@
<artifactId>spring-boot-starter-jdbc</artifactId>
</dependency>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>${mysql.version}</version>
<groupId>com.mysql</groupId>
<artifactId>mysql-connector-j</artifactId>
</dependency>

<dependency>
Expand Down Expand Up @@ -70,4 +68,4 @@
</plugin>
</plugins>
</build>
</project>
</project>
10 changes: 4 additions & 6 deletions spring-cloud-alibaba-examples/integrated-example/integrated-storage/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,8 @@
<name>Spring Cloud Alibaba Integrated Storage Example</name>

<properties>
<mysql.version>8.0.28</mysql.version>
<druid.version>1.1.10</druid.version>
<mybatis.version>3.0.0</mybatis.version>
<mybatis.version>3.0.3</mybatis.version>
</properties>

<dependencies>
Expand All @@ -30,9 +29,8 @@
<artifactId>spring-boot-starter-jdbc</artifactId>
</dependency>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>${mysql.version}</version>
<groupId>com.mysql</groupId>
<artifactId>mysql-connector-j</artifactId>
</dependency>

<dependency>
Expand Down Expand Up @@ -75,4 +73,4 @@
</plugin>
</plugins>
</build>
</project>
</project>
4 changes: 2 additions & 2 deletions spring-cloud-alibaba-examples/seata-example/account-service/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@
<artifactId>spring-boot-starter-jdbc</artifactId>
</dependency>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<groupId>com.mysql</groupId>
<artifactId>mysql-connector-j</artifactId>
</dependency>
<dependency>
<groupId>log4j</groupId>
Expand Down
4 changes: 2 additions & 2 deletions spring-cloud-alibaba-examples/seata-example/order-service/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@
</dependency>

<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<groupId>com.mysql</groupId>
<artifactId>mysql-connector-j</artifactId>
</dependency>
<dependency>
<groupId>log4j</groupId>
Expand Down
4 changes: 2 additions & 2 deletions spring-cloud-alibaba-examples/seata-example/storage-service/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@
<artifactId>spring-boot-starter-jdbc</artifactId>
</dependency>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<groupId>com.mysql</groupId>
<artifactId>mysql-connector-j</artifactId>
</dependency>
<dependency>
<groupId>log4j</groupId>
Expand Down
6 changes: 0 additions & 6 deletions spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-discovery/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,12 +100,6 @@
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-inline</artifactId>
<scope>test</scope>
</dependency>

</dependencies>

</project>
4 changes: 2 additions & 2 deletions ...tarter-alibaba-sentinel/src/main/java/com/alibaba/cloud/sentinel/feign/SentinelFeign.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ public Builder contract(Contract contract) {
}

@Override
public Feign build() {
public Feign internalBuild() {
super.invocationHandlerFactory(new InvocationHandlerFactory() {
@Override
public InvocationHandler create(Target target,
Expand Down Expand Up @@ -160,7 +160,7 @@ private Object getFromContext(String name, String type,
});

super.contract(new SentinelContractHolder(contract));
return super.build();
return super.internalBuild();
}

private Object getFieldValue(Object instance, String fieldName) {
Expand Down
Loading