Merge pull request #1657 from spring-cloud/jdk16_boot_2_5
Works with JDK16
This commit is contained in:
Spencer Gibb
@@ -61,11 +61,6 @@
|
||||
<artifactId>spring-boot-starter-test</artifactId>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>info.solidsoft.spock</groupId>
|
||||
<artifactId>spock-global-unroll</artifactId>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.springframework.cloud</groupId>
|
||||
<artifactId>spring-cloud-contract-wiremock</artifactId>
|
||||
@@ -81,6 +76,11 @@
|
||||
<artifactId>rest-assured</artifactId>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.spockframework</groupId>
|
||||
<artifactId>spock-junit4</artifactId>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
<build>
|
||||
<plugins>
|
||||
|
||||
@@ -2,19 +2,11 @@ buildscript {
|
||||
repositories {
|
||||
mavenCentral()
|
||||
mavenLocal()
|
||||
if (project.hasProperty('fatJar')) {
|
||||
jcenter()
|
||||
}
|
||||
//For plugin-publish-plugin. Could be limited only to that dependency with Gradle 5.1+ - https://docs.gradle.org/5.1.1/release-notes.html#repository-to-dependency-matching
|
||||
gradlePluginPortal()
|
||||
}
|
||||
dependencies {
|
||||
classpath "com.bmuschko:gradle-nexus-plugin:2.3"
|
||||
classpath "io.codearte.gradle.nexus:gradle-nexus-staging-plugin:0.5.3"
|
||||
classpath 'com.gradle.publish:plugin-publish-plugin:0.11.0'
|
||||
if (project.hasProperty('fatJar')) {
|
||||
classpath 'com.github.jengelman.gradle.plugins:shadow:1.2.3'
|
||||
}
|
||||
classpath 'com.gradle.publish:plugin-publish-plugin:0.14.0'
|
||||
}
|
||||
}
|
||||
|
||||
@@ -47,8 +39,7 @@ repositories {
|
||||
jcenter()
|
||||
maven { url "https://repo.spring.io/snapshot" }
|
||||
maven { url "https://repo.spring.io/milestone" }
|
||||
maven { url "https://repo.spring.io/libs-release-local" }
|
||||
maven { url "https://repo.spring.io/libs-staging-local/" }
|
||||
maven { url "https://repo.spring.io/release" }
|
||||
}
|
||||
|
||||
//Dependencies in all subprojects - https://solidsoft.wordpress.com/2014/11/13/gradle-tricks-display-dependencies-for-all-subprojects-in-multi-project-build/
|
||||
@@ -70,9 +61,9 @@ dependencies {
|
||||
implementation "org.apache.maven.resolver:maven-resolver-api:1.4.1"
|
||||
implementation "org.eclipse.jgit:org.eclipse.jgit:5.5.1.201910021850-r"
|
||||
implementation "com.jcraft:jsch.agentproxy.jsch:0.0.9"
|
||||
implementation "com.fasterxml.jackson.core:jackson-databind:2.11.3"
|
||||
implementation "com.fasterxml.jackson.core:jackson-databind:2.11.4"
|
||||
|
||||
implementation "org.springframework:spring-core:5.3.2"
|
||||
implementation "org.springframework:spring-core:5.3.6"
|
||||
implementation("org.springframework.cloud:spring-cloud-contract-shade:${project.version}")
|
||||
api("org.springframework.cloud:spring-cloud-contract-stub-runner:${project.version}") {
|
||||
exclude(group: '*')
|
||||
@@ -81,10 +72,9 @@ dependencies {
|
||||
exclude(group: '*')
|
||||
}
|
||||
|
||||
testImplementation('org.spockframework:spock-core:1.3-groovy-2.5') {
|
||||
testImplementation('org.spockframework:spock-core:2.0-M5-groovy-3.0') { // @releaser:version-check-off
|
||||
exclude(group: 'org.codehaus.groovy')
|
||||
}
|
||||
testImplementation 'info.solidsoft.spock:spock-global-unroll:0.5.0'
|
||||
testImplementation localGroovy()
|
||||
testImplementation gradleTestKit()
|
||||
}
|
||||
@@ -112,16 +102,6 @@ dependencies {
|
||||
jansi 'org.fusesource.jansi:jansi:1.11'
|
||||
}
|
||||
|
||||
/*jacoco {
|
||||
toolVersion = "0.7.7.201606060606"
|
||||
}
|
||||
|
||||
jacocoTestReport {
|
||||
reports {
|
||||
xml.enabled true
|
||||
}
|
||||
}*/
|
||||
|
||||
jar {
|
||||
manifest {
|
||||
attributes 'Implementation-Version': project.version
|
||||
|
||||
@@ -1,10 +1,7 @@
|
||||
// This setup seems to work. Let's not touch it.
|
||||
|
||||
apply plugin: 'maven'
|
||||
apply plugin: 'maven-publish'
|
||||
//apply plugin: 'signing'
|
||||
|
||||
uploadArchives.dependsOn { [check] }
|
||||
//apply plugin: 'signing'
|
||||
|
||||
task sourcesJar(type: Jar) {
|
||||
classifier 'sources'
|
||||
@@ -82,63 +79,6 @@ if (isReleaseToCentral) {
|
||||
}
|
||||
}
|
||||
|
||||
afterEvaluate {
|
||||
uploadArchives {
|
||||
repositories {
|
||||
mavenDeployer {
|
||||
// POM signature
|
||||
if (isReleaseVersion && isReleaseToCentral) {
|
||||
beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
|
||||
}
|
||||
// Target repository
|
||||
String repoUserName = isReleaseToCentral ? getProp("SONATYPE_USER") : repoUser
|
||||
String repoPass = isReleaseToCentral ? getProp("SONATYPE_PASSWORD") : repoPass
|
||||
repository(url: repoUrl) {
|
||||
authentication(userName: repoUserName, password: repoPass)
|
||||
}
|
||||
pom.project {
|
||||
name "$project.name"
|
||||
packaging 'jar'
|
||||
description 'Spring Cloud Contract Gradle Plugin'
|
||||
url 'https://github.com/spring-cloud/spring-cloud-contract'
|
||||
inceptionYear '2014'
|
||||
|
||||
scm {
|
||||
connection 'scm:git:git@github.com:spring-cloud/spring-cloud-contract.git'
|
||||
developerConnection 'scm:git:git@github.com:spring-cloud/spring-cloud-contract.git'
|
||||
url 'https://github.com/spring-cloud/spring-cloud-contract'
|
||||
}
|
||||
|
||||
licenses {
|
||||
license {
|
||||
name 'The Apache License, Version 2.0'
|
||||
url 'https://www.apache.org/licenses/LICENSE-2.0.txt'
|
||||
}
|
||||
}
|
||||
|
||||
developers {
|
||||
developer {
|
||||
id 'jkubrynski'
|
||||
name 'Jakub Kubrynski'
|
||||
email 'jk ATT codearte DOTT io'
|
||||
}
|
||||
developer {
|
||||
id 'marcingrzejszczak'
|
||||
name 'Marcin Grzejszczak'
|
||||
email 'mgrzejszczak ATT pivotal DOTT io'
|
||||
}
|
||||
developer {
|
||||
id 'dsyer'
|
||||
name 'Dave Syer'
|
||||
email 'dsyer ATT pivotal DOTT io'
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
String getProp(String propName) {
|
||||
return hasProperty(propName) ?
|
||||
(getProperty(propName) ?: System.properties[propName]) : System.properties[propName] ?:
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-6.4-bin.zip
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
zipStorePath=wrapper/dists
|
||||
|
||||
@@ -61,11 +61,6 @@
|
||||
<artifactId>spring-boot-starter-test</artifactId>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>info.solidsoft.spock</groupId>
|
||||
<artifactId>spock-global-unroll</artifactId>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.springframework.cloud</groupId>
|
||||
<artifactId>spring-cloud-contract-wiremock</artifactId>
|
||||
|
||||
Reference in New Issue
Block a user