SpringCloud/spring-cloud-commons
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/4.1.x'

Browse Source 
# Conflicts:
#	pom.xml
This commit is contained in:
Olga Maciaszek-Sharma
2024-09-27 14:38:18 +02:00
parent 10d2e301aa 496fab2eac
commit 922e6977c5
3 changed files with 0 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
spring-cloud-loadbalancer/pom.xml
View File

@@ -84,25 +84,6 @@
</exclusion>
</exclusions>
</dependency>
<!--<dependency>
<groupId>org.springframework.security.oauth.boot</groupId>
<artifactId>spring-security-oauth2-autoconfigure</artifactId>
<optional>true</optional>
<exclusions>
<exclusion>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
</exclusion>
<exclusion>
<groupId>com.sun.activation</groupId>
<artifactId>jakarta.activation</artifactId>
</exclusion>
<exclusion>
<groupId>javax.activation</groupId>
<artifactId>javax.activation-api</artifactId>
</exclusion>
</exclusions>
</dependency>-->
<dependency>
<groupId>io.micrometer</groupId>
<artifactId>micrometer-core</artifactId>