Merge branch '2.7.x'
This commit is contained in:
commit
433364601d
|
@ -8,7 +8,6 @@ plugins {
|
||||||
repositories {
|
repositories {
|
||||||
mavenCentral()
|
mavenCentral()
|
||||||
gradlePluginPortal()
|
gradlePluginPortal()
|
||||||
maven { url "https://repo.spring.io/release" }
|
|
||||||
}
|
}
|
||||||
|
|
||||||
sourceCompatibility = 17
|
sourceCompatibility = 17
|
||||||
|
|
|
@ -13,16 +13,6 @@ configurations {
|
||||||
documentation
|
documentation
|
||||||
}
|
}
|
||||||
|
|
||||||
repositories {
|
|
||||||
maven {
|
|
||||||
url "https://repo.spring.io/release"
|
|
||||||
mavenContent {
|
|
||||||
includeGroup "io.spring.asciidoctor"
|
|
||||||
includeGroup "io.spring.asciidoctor.backends"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
asciidoctorExtensions("org.springframework.restdocs:spring-restdocs-asciidoctor")
|
asciidoctorExtensions("org.springframework.restdocs:spring-restdocs-asciidoctor")
|
||||||
asciidoctorExtensions("io.spring.asciidoctor:spring-asciidoctor-extensions-section-ids")
|
asciidoctorExtensions("io.spring.asciidoctor:spring-asciidoctor-extensions-section-ids")
|
||||||
|
|
|
@ -8,7 +8,6 @@
|
||||||
<ivy pattern="${user.home}/.m2/[organisation]/[module]/[revision]/[module]-[revision].pom" />
|
<ivy pattern="${user.home}/.m2/[organisation]/[module]/[revision]/[module]-[revision].pom" />
|
||||||
</filesystem>
|
</filesystem>
|
||||||
<ibiblio name="ibiblio" m2compatible="true" />
|
<ibiblio name="ibiblio" m2compatible="true" />
|
||||||
<ibiblio name="spring-releases" m2compatible="true" root="https://repo.spring.io/release" />
|
|
||||||
<ibiblio name="spring-milestones" m2compatible="true" root="https://repo.spring.io/milestone" />
|
<ibiblio name="spring-milestones" m2compatible="true" root="https://repo.spring.io/milestone" />
|
||||||
<ibiblio name="spring-snapshots" m2compatible="true" root="https://repo.spring.io/snapshot" />
|
<ibiblio name="spring-snapshots" m2compatible="true" root="https://repo.spring.io/snapshot" />
|
||||||
</chain>
|
</chain>
|
||||||
|
|
|
@ -12,16 +12,6 @@ configurations {
|
||||||
documentation
|
documentation
|
||||||
}
|
}
|
||||||
|
|
||||||
repositories {
|
|
||||||
maven {
|
|
||||||
url "https://repo.spring.io/release"
|
|
||||||
mavenContent {
|
|
||||||
includeGroup "io.spring.asciidoctor"
|
|
||||||
includeGroup "io.spring.asciidoctor.backends"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compileOnly("org.apache.maven.plugin-tools:maven-plugin-annotations")
|
compileOnly("org.apache.maven.plugin-tools:maven-plugin-annotations")
|
||||||
compileOnly("org.sonatype.plexus:plexus-build-api")
|
compileOnly("org.sonatype.plexus:plexus-build-api")
|
||||||
|
|
|
@ -9,7 +9,6 @@
|
||||||
<ivy pattern="${projectDir}/build/test-repository/[organisation]/[module]/[revision]/[module]-[revision].pom" />
|
<ivy pattern="${projectDir}/build/test-repository/[organisation]/[module]/[revision]/[module]-[revision].pom" />
|
||||||
</filesystem>
|
</filesystem>
|
||||||
<ibiblio name="ibiblio" m2compatible="true" />
|
<ibiblio name="ibiblio" m2compatible="true" />
|
||||||
<ibiblio name="spring-releases" m2compatible="true" root="https://repo.spring.io/release" />
|
|
||||||
<ibiblio name="spring-milestones" m2compatible="true" root="https://repo.spring.io/milestone" />
|
<ibiblio name="spring-milestones" m2compatible="true" root="https://repo.spring.io/milestone" />
|
||||||
<ibiblio name="spring-snapshots" m2compatible="true" root="https://repo.spring.io/snapshot" />
|
<ibiblio name="spring-snapshots" m2compatible="true" root="https://repo.spring.io/snapshot" />
|
||||||
</chain>
|
</chain>
|
||||||
|
|
Loading…
Reference in New Issue