4bec8b06c5
* chore(deps): spring-boot upgrade from 3.4.10 to 4.0.5 * chore(deps): micrometer upgrade from 1.12.8 to 1.13.0 * chore(deps): replace javax.annotation with jakarta.annotation * chore(deps): spring-boot upgrade from 3.4.10 to 4.0.5 * chore(deps): spring-boot upgrade from 3.4.10 to 4.0.5: fix controller response * chore(deps): spring-boot upgrade from 4.0.5 to 4.0.6 * chore(deps): spring-boot upgrade from 3.5.13 to 4.0.6: Restore blank line indentation whitespace to match develop Blank lines adjacent to @Mock → @MockitoBean changes lost their indentation spaces (e.g., 4 spaces became empty). Restore the original whitespace to minimize unrelated diff noise. * chore(deps): spring-boot upgrade from 3.5.13 to 4.0.6: Remove duplicate micrometer version override in pom.xml The old 1.13.0 override was superseded by 1.15.10 (for Spring Boot upgrade compatibility, see #15033). Having two definitions is confusing; only the latter takes effect in Maven. * chore(deps): spring-boot upgrade from 3.5.13 to 4.0.6: Restore blank line indentation whitespace to match develop * style: apply spotless formatting fixes Assisted-by: Claude Code * Merge branch 'develop' into xuxiaowei/spring-boot-4 # Conflicts: # .github/workflows/it-new.yml # config/src/test/java/com/alibaba/nacos/config/server/controller/v3/ConfigOpsControllerV3Test.java # config/src/test/java/com/alibaba/nacos/config/server/exception/GlobalExceptionHandlerTest.java # config/src/test/java/com/alibaba/nacos/config/server/service/capacity/CapacityServiceTest.java * style: apply spotless formatting * chore(build): bump MCP SDK from 0.17.0 to 0.18.2 Assisted-by: Claude Code * Remove spring-boot-starter-ldap-test dependency from console module * Apply spotless formatting to ConfigOpenApiITCase * Update TomcatConnectorCustomizer import for Spring Boot 4 compatibility Assisted-by: Claude Code * Replace ObjectNode with Map<String, Object> in ClientService API for Spring Boot 4 compatibility * Remove redundant dependencies from test aggregator POM for Spring Boot 4 compatibility * Makefile: Enhance Makefile for local dev workflow: add auth-disabled args, release-nacos profile, and IT test targets * Makefile: Extract auth-disabled JVM args into standalone AUTH_DISABLED_ARGS variable * Makefile: Add missing IT test targets to .PHONY declaration Assisted-by: Claude Code * build(deps): Refactor LDAP dependency: move spring-boot-starter-ldap to nacos-ldap-auth-plugin only * build(deps): Add nacos-ldap-auth-plugin dependency to nacos-server module * build(deps): Add nacos-ldap-auth-plugin dependency to nacos-console module * build(deps): Remove nacos-ldap-auth-plugin dependency and LdapAutoConfiguration exclusion * build(deps): Remove nacos-ldap-auth-plugin dependency and LdapAutoConfiguration exclusion * Remove ConfigInfoBetaPersistService references and fix formatting in tests Assisted-by: Claude Code * Migrate javax.annotation to jakarta.annotation for Spring Boot 4 compatibility Replace javax.annotation.{PostConstruct,PreDestroy,Resource} imports and native-image reflect-config entries with jakarta.annotation equivalents. * Add issue link for Makefile usage guide (#15338) * Add test, check-maven, build-maven-test targets to Makefile (#15338) --------- Co-authored-by: 杨翊 SionYang <xiweng.yy@alibaba-inc.com>
100 lines
3.5 KiB
XML
100 lines
3.5 KiB
XML
<?xml version="1.0" encoding="UTF-8"?>
|
|
<!--
|
|
~ Copyright 1999-2021 Alibaba Group Holding Ltd.
|
|
~
|
|
~ Licensed under the Apache License, Version 2.0 (the "License");
|
|
~ you may not use this file except in compliance with the License.
|
|
~ You may obtain a copy of the License at
|
|
~
|
|
~ http://www.apache.org/licenses/LICENSE-2.0
|
|
~
|
|
~ Unless required by applicable law or agreed to in writing, software
|
|
~ distributed under the License is distributed on an "AS IS" BASIS,
|
|
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
~ See the License for the specific language governing permissions and
|
|
~ 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">
|
|
<parent>
|
|
<artifactId>nacos-all</artifactId>
|
|
<groupId>com.alibaba.nacos</groupId>
|
|
<version>${revision}</version>
|
|
</parent>
|
|
|
|
<modelVersion>4.0.0</modelVersion>
|
|
<artifactId>nacos-prometheus</artifactId>
|
|
<packaging>jar</packaging>
|
|
|
|
<name>nacos-prometheus ${project.version}</name>
|
|
<url>https://nacos.io</url>
|
|
|
|
<dependencies>
|
|
<dependency>
|
|
<groupId>${project.groupId}</groupId>
|
|
<artifactId>nacos-api</artifactId>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>${project.groupId}</groupId>
|
|
<artifactId>nacos-naming</artifactId>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>${project.groupId}</groupId>
|
|
<artifactId>nacos-core</artifactId>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>org.springframework.boot</groupId>
|
|
<artifactId>spring-boot-test-autoconfigure</artifactId>
|
|
<scope>test</scope>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>org.springframework</groupId>
|
|
<artifactId>spring-test</artifactId>
|
|
<scope>test</scope>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>org.hamcrest</groupId>
|
|
<artifactId>hamcrest</artifactId>
|
|
<scope>test</scope>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>org.springframework.boot</groupId>
|
|
<artifactId>spring-boot-starter-webmvc-test</artifactId>
|
|
<scope>test</scope>
|
|
</dependency>
|
|
</dependencies>
|
|
|
|
|
|
<build>
|
|
<plugins>
|
|
<plugin>
|
|
<artifactId>maven-source-plugin</artifactId>
|
|
<executions>
|
|
<execution>
|
|
<id>attach-sources</id>
|
|
<goals>
|
|
<goal>jar</goal>
|
|
</goals>
|
|
</execution>
|
|
</executions>
|
|
</plugin>
|
|
<plugin>
|
|
<groupId>org.apache.maven.plugins</groupId>
|
|
<artifactId>maven-assembly-plugin</artifactId>
|
|
<configuration>
|
|
<archive>
|
|
<manifest>
|
|
<mainClass>com.alibaba.nacos.prometheus.PrometheusApp</mainClass>
|
|
</manifest>
|
|
</archive>
|
|
<descriptorRefs>
|
|
<descriptorRef>jar-with-dependencies</descriptorRef>
|
|
</descriptorRefs>
|
|
</configuration>
|
|
</plugin>
|
|
|
|
</plugins>
|
|
</build>
|
|
</project>
|