This is an automated email from the ASF dual-hosted git repository.
Aias00 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shenyu.git
The following commit(s) were added to refs/heads/master by this push:
new 7c99d60908 [ISSUE #6602] Enforce Maven and Java build requirements
(#7680)
7c99d60908 is described below
commit 7c99d609089732f1744965aceb54cee256756d7e
Author: redyyang <[email protected]>
AuthorDate: Sat Oct 17 20:47:22 2026 +0800
[ISSUE #6602] Enforce Maven and Java build requirements (#7680)
* [ISSUE #6602] Enforce Maven and Java build requirements
* test(apollo): assert proxy selector deletion identity
---
pom.xml | 25 ++++++++++++++++++++++
.../sync/data/apollo/ApolloDataServiceTest.java | 4 ++--
2 files changed, 27 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 6370a8e1c3..9cf3128c59 100644
--- a/pom.xml
+++ b/pom.xml
@@ -93,6 +93,7 @@
<maven-surefire-plugin.version>3.0.0-M4</maven-surefire-plugin.version>
<maven-javadoc-plugin.version>3.6.0</maven-javadoc-plugin.version>
<maven-compiler-plugin.version>3.7.0</maven-compiler-plugin.version>
+ <maven-enforcer-plugin.version>3.6.3</maven-enforcer-plugin.version>
<maven-resources-plugin.version>3.2.0</maven-resources-plugin.version>
<maven-release-plugin.version>2.5.3</maven-release-plugin.version>
<versions-maven-plugin.version>2.5</versions-maven-plugin.version>
@@ -665,6 +666,30 @@
<build>
<plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <version>${maven-enforcer-plugin.version}</version>
+ <executions>
+ <execution>
+ <id>enforce-build-requirements</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <requireMavenVersion>
+ <version>[3.6.3,)</version>
+ </requireMavenVersion>
+ <requireJavaVersion>
+ <version>[${java.version},)</version>
+ </requireJavaVersion>
+ </rules>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-remote-resources-plugin</artifactId>
diff --git
a/shenyu-sync-data-center/shenyu-sync-data-apollo/src/test/java/org/apache/shenyu/sync/data/apollo/ApolloDataServiceTest.java
b/shenyu-sync-data-center/shenyu-sync-data-apollo/src/test/java/org/apache/shenyu/sync/data/apollo/ApolloDataServiceTest.java
index 9db5392159..20e86c6cd1 100644
---
a/shenyu-sync-data-center/shenyu-sync-data-apollo/src/test/java/org/apache/shenyu/sync/data/apollo/ApolloDataServiceTest.java
+++
b/shenyu-sync-data-center/shenyu-sync-data-apollo/src/test/java/org/apache/shenyu/sync/data/apollo/ApolloDataServiceTest.java
@@ -271,7 +271,7 @@ class ApolloDataServiceTest {
ApolloDataService apolloDataService = createApolloDataService();
ConfigChangeEvent event = mockConfigChangeEvent(
- NAMESPACE + "." + ApolloPathConstants.PROXY_SELECTOR_DATA_ID +
".test-plugin.test-proxy",
+ NAMESPACE + "." + ApolloPathConstants.PROXY_SELECTOR_DATA_ID +
".test-plugin.selector-id",
null,
PropertyChangeType.DELETED
);
@@ -280,7 +280,7 @@ class ApolloDataServiceTest {
ArgumentCaptor<ProxySelectorData> captor =
ArgumentCaptor.forClass(ProxySelectorData.class);
verify(proxySelectorDataSubscriber,
times(1)).unSubscribe(captor.capture());
assertEquals("test-plugin", captor.getValue().getPluginName());
- assertEquals("test-proxy", captor.getValue().getName());
+ assertEquals("selector-id", captor.getValue().getId());
}
@Test
