This is an automated email from the ASF dual-hosted git repository. liuhongyu pushed a commit to branch 2.7.0.1-release in repository https://gitbox.apache.org/repos/asf/shenyu.git
commit 3fefee6251e6e094d98b39915e7657f4ce4bf485 Merge: 46c63a3915 bb269ff41d Author: liuhy <[email protected]> AuthorDate: Wed Apr 23 17:09:44 2025 +0800 Merge branch 'refs/heads/master' into 2.7.0.1-release # Conflicts: # shenyu-plugin/shenyu-plugin-ai/pom.xml shenyu-plugin/shenyu-plugin-ai/pom.xml | 11 ++--------- .../shenyu-plugin-ai/shenyu-plugin-ai-token-limiter/pom.xml | 5 ----- 2 files changed, 2 insertions(+), 14 deletions(-) diff --cc shenyu-plugin/shenyu-plugin-ai/pom.xml index 47682a72be,63558f3816..d78df044b9 --- a/shenyu-plugin/shenyu-plugin-ai/pom.xml +++ b/shenyu-plugin/shenyu-plugin-ai/pom.xml @@@ -16,22 -16,18 +16,15 @@@ ~ limitations under the License. --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> - +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> - <modelVersion>4.0.0</modelVersion> - <packaging>pom</packaging> <parent> <groupId>org.apache.shenyu</groupId> <artifactId>shenyu-plugin</artifactId> - <version>2.7.1-SNAPSHOT</version> + <version>2.7.0.2-SNAPSHOT</version> </parent> - + <modelVersion>4.0.0</modelVersion> <artifactId>shenyu-plugin-ai</artifactId> - - <properties> - <maven.compiler.source>18</maven.compiler.source> - <maven.compiler.target>18</maven.compiler.target> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - </properties> + <packaging>pom</packaging> <modules> <module>shenyu-plugin-ai-common</module>
