Merge branch '4.1.x'

This commit is contained in:
Ryan Baxter
2024-12-17 11:19:09 -05:00
2 changed files with 15 additions and 7 deletions

View File

@@ -26,16 +26,24 @@
<micrometer-docs-generator.inclusionPattern>.*</micrometer-docs-generator.inclusionPattern>
<micrometer-docs-generator.outputPath>${maven.multiModuleProjectDirectory}/docs/modules/ROOT/partials/</micrometer-docs-generator.outputPath>
</properties>
<!-- <dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>spring-cloud-starter-zookeeper-all</artifactId>
</dependency>
</dependencies> -->
<build>
<sourceDirectory>src/main/asciidoc</sourceDirectory>
</build>
<profiles>
<profile>
<id>enable-configuration-properties</id>
<activation>
<property>
<name>!disableConfigurationProperties</name>
</property>
</activation>
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>spring-cloud-starter-zookeeper-all</artifactId>
</dependency>
</dependencies>
</profile>
<profile>
<id>docs</id>
<build>