Merge remote-tracking branch 'origin/master'
# Conflicts: # docs/pom.xml
This commit is contained in:
@@ -10,7 +10,7 @@
|
||||
<artifactId>spring-cloud-bus-parent</artifactId>
|
||||
<version>3.0.0-SNAPSHOT</version>
|
||||
</parent>
|
||||
<packaging>pom</packaging>
|
||||
<packaging>jar</packaging>
|
||||
<name>Spring Cloud Bus Docs</name>
|
||||
<description>Spring Cloud Docs</description>
|
||||
<properties>
|
||||
@@ -19,6 +19,9 @@
|
||||
<configprops.inclusionPattern>spring.cloud.bus.*</configprops.inclusionPattern>
|
||||
<upload-docs-zip.phase>deploy</upload-docs-zip.phase>
|
||||
</properties>
|
||||
<build>
|
||||
<sourceDirectory>src/main/asciidoc</sourceDirectory>
|
||||
</build>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>${project.groupId}</groupId>
|
||||
|
||||
Reference in New Issue
Block a user