Merge branch '2.0.x'

This commit is contained in:
Andy Wilkinson
2022-01-12 12:36:42 +00:00
22 changed files with 665 additions and 208 deletions

View File

@@ -6,10 +6,10 @@ apply plugin: 'java'
apply plugin: 'eclipse'
repositories {
mavenLocal()
maven { url 'https://repo.spring.io/milestone' }
maven { url 'https://repo.spring.io/snapshot' }
mavenCentral()
mavenLocal()
}
group = 'com.example'
@@ -29,11 +29,11 @@ configurations {
dependencies {
asciidoctorExtensions "org.springframework.restdocs:spring-restdocs-asciidoctor:$restdocsVersion"
implementation 'org.springframework:spring-context:6.0.0-SNAPSHOT'
implementation 'org.springframework:spring-webflux:6.0.0-SNAPSHOT'
implementation 'org.springframework:spring-context:6.0.0-M1'
implementation 'org.springframework:spring-webflux:6.0.0-M1'
testImplementation 'junit:junit:4.12'
testImplementation 'org.springframework:spring-test:6.0.0-SNAPSHOT'
testImplementation 'junit:junit:4.13.1'
testImplementation 'org.springframework:spring-test:6.0.0-M1'
testImplementation "org.springframework.restdocs:spring-restdocs-webtestclient:$restdocsVersion"
}

View File

@@ -1,5 +1,5 @@
/*
* Copyright 2014-2021 the original author or authors.
* Copyright 2014-2022 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.