Skip to content

Commit da08b2f

Browse files
author
Ronald Holshausen
authoredFeb 17, 2020
Merge pull request #1017 from asteffey/jcenter-https
fix: provider:pact-jvm-provider-maven:pluginDescriptor
2 parents 676c7f6 + 887908f commit da08b2f

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed
 

‎.travis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jdk:
99
env:
1010
- JAVA_OPTS="-Xmx512m" GRADLE_OPTS="-Xms128m" PROJECT='-p core'
1111
- JAVA_OPTS="-Xmx512m" GRADLE_OPTS="-Xms128m" PROJECT='-p consumer'
12-
- JAVA_OPTS="-Xmx512m" GRADLE_OPTS="-Xms128m" PROJECT='-p provider -x :provider:pact-jvm-provider-maven:pluginDescriptor'
12+
- JAVA_OPTS="-Xmx512m" GRADLE_OPTS="-Xms128m" PROJECT='-p provider'
1313
- JAVA_OPTS="-Xmx512m" GRADLE_OPTS="-Xms128m" PROJECT='-p pact-specification-test'
1414
script:
1515
- unset _JAVA_OPTIONS

‎provider/pact-jvm-provider-maven/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,9 @@ task generatePom(type: GenerateMavenPom, dependsOn: [":provider:pact-jvm-provide
4545
task pluginDescriptor(type: Exec, dependsOn: generatePom) {
4646
if (isWindows()) {
4747
commandLine 'mvn.bat', '-f', "${buildDir}/poms/pom.xml", '--settings',
48-
'src/main/resources/settings.xml', '-e', '-B', 'org.apache.maven.plugins:maven-plugin-plugin:3.5:descriptor'
48+
'src/main/resources/settings.xml', '-e', '-B', 'org.apache.maven.plugins:maven-plugin-plugin:3.6.0:descriptor'
4949
} else {
50-
commandLine 'sh', '-c', "mvn -f ${buildDir}/poms/pom.xml --settings src/main/resources/settings.xml -e -B org.apache.maven.plugins:maven-plugin-plugin:3.5:descriptor"
50+
commandLine 'sh', '-c', "mvn -f ${buildDir}/poms/pom.xml --settings src/main/resources/settings.xml -e -B org.apache.maven.plugins:maven-plugin-plugin:3.6.0:descriptor"
5151
}
5252

5353
doLast {

‎provider/pact-jvm-provider-maven/src/main/resources/settings.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
</snapshots>
1212
<id>central</id>
1313
<name>bintray</name>
14-
<url>http://jcenter.bintray.com</url>
14+
<url>https://jcenter.bintray.com</url>
1515
</repository>
1616
</repositories>
1717
<pluginRepositories>
@@ -21,7 +21,7 @@
2121
</snapshots>
2222
<id>central</id>
2323
<name>bintray-plugins</name>
24-
<url>http://jcenter.bintray.com</url>
24+
<url>https://jcenter.bintray.com</url>
2525
</pluginRepository>
2626
</pluginRepositories>
2727
<id>bintray</id>

0 commit comments

Comments
 (0)
Please sign in to comment.