Spring/spring-security
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update Gradle to 7.2

Browse Source 
Closes gh-9615
This commit is contained in:
Marcus Da Coregio
2021-10-01 14:50:39 -03:00
committed by Marcus Hert Da Coregio
parent 7d81a52780
commit d2e5f2ae0d
47 changed files with 218 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
buildSrc/src/test/java/io/spring/gradle/convention/SpringMavenPluginITest.java
View File

@@ -55,19 +55,6 @@ public class SpringMavenPluginITest {
assertThat(signature).exists();
}
@Test
public void upload() throws Exception {
BuildResult result = this.testKit.withProjectResource("samples/maven/upload")
.withArguments("uploadArchives")
.forwardOutput()
.build();
assertThat(result.getOutput()).contains("SUCCESS");
File pom = new File(testKit.getRootDir(), "build/poms/pom-default.xml");
assertThat(pom).exists();
String pomText = new String(Files.readAllBytes(pom.toPath()));
assertThat(pomText.replaceAll("\\s", "")).contains("<dependency>\n <groupId>aopalliance</groupId>\n <artifactId>aopalliance</artifactId>\n <version>1.0</version>\n <scope>compile</scope>\n <optional>true</optional>\n </dependency>".replaceAll("\\s", ""));
}
public String getSigningKey() throws Exception {
return IOUtils.toString(getClass().getResource("/test-private.pgp"));
}

1
buildSrc/src/test/resources/samples/integrationtest/withpropdeps/build.gradle
View File

@@ -3,7 +3,6 @@ plugins {
}
apply plugin: 'java'
apply plugin: 'propdeps'
repositories {
mavenCentral()

1
buildSrc/src/test/resources/samples/maven/install/build.gradle
View File

@@ -2,7 +2,6 @@ plugins {
id 'io.spring.convention.root'
}
apply plugin: 'propdeps-maven'
apply plugin: 'io.spring.convention.maven'
repositories {

1
buildSrc/src/test/resources/samples/maven/signing/build.gradle
View File

@@ -4,7 +4,6 @@ plugins {
version = "1.0.0.RELEASE"
apply plugin: 'propdeps-maven'
apply plugin: 'io.spring.convention.maven'
repositories {

2
buildSrc/src/test/resources/samples/maven/upload/build.gradle
View File

@@ -2,8 +2,6 @@ plugins {
id 'io.spring.convention.root'
}
apply plugin: 'propdeps-maven'
repositories {
mavenCentral()
}

6
buildSrc/src/test/resources/samples/showcase/sgbcs-api/sgbcs-api.gradle
View File

@@ -1,9 +1,9 @@
apply plugin: 'io.spring.convention.spring-module'
dependencies {
management platform('org.springframework.boot:spring-boot-dependencies:2.5.2')
compile 'org.springframework:spring-web'
compile 'org.springframework:spring-core'
api platform('org.springframework.boot:spring-boot-dependencies:2.5.2')
implementation 'org.springframework:spring-web'
implementation 'org.springframework:spring-core'
testImplementation "org.junit.jupiter:junit-jupiter-api"
testImplementation "org.junit.jupiter:junit-jupiter-engine"
}

2
buildSrc/src/test/resources/samples/showcase/sgbcs-core/sgbcs-core.gradle
View File

@@ -1,7 +1,7 @@
apply plugin: 'io.spring.convention.spring-module'
dependencies {
management platform('org.springframework.boot:spring-boot-dependencies:2.5.2')
api platform('org.springframework.boot:spring-boot-dependencies:2.5.2')
optional 'ch.qos.logback:logback-classic'
testImplementation "org.junit.jupiter:junit-jupiter-api"
testImplementation "org.junit.jupiter:junit-jupiter-engine"

4
buildSrc/src/test/resources/samples/testsconfiguration/web/build.gradle
View File

@@ -5,6 +5,6 @@ repositories {
}
dependencies {
testCompile project(path: ':core', configuration: 'tests')
testCompile 'junit:junit:4.12'
testImplementation project(path: ':core', configuration: 'tests')
testImplementation 'junit:junit:4.12'
}