Skip to content

Commit

Permalink
Upgrade plugins to avoid jcenter issues
Browse files Browse the repository at this point in the history
  • Loading branch information
rpalcolea committed Nov 8, 2022
1 parent f463982 commit 4e71c56
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 18 deletions.
10 changes: 8 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
plugins {
id 'java-gradle-plugin'
id 'groovy'
id "com.netflix.nebula.plugin-plugin" version "19.0.1"
id "com.netflix.nebula.plugin-plugin" version "19.0.2"
}

description = "Template for NetflixOSS projects"
Expand All @@ -23,7 +23,7 @@ dependencies {
implementation("com.netflix.nebula:nebula-release-plugin:latest.release")
implementation("com.netflix.nebula:gradle-java-cross-compile-plugin:latest.release")
implementation("gradle.plugin.com.hierynomus.gradle.plugins:license-gradle-plugin:0.16.1")
testImplementation("org.ajoberstar.grgit:grgit-core:3.1.1") {
testImplementation("org.ajoberstar.grgit:grgit-core:4.1.1") {
exclude group: 'org.codehaus.groovy', module: 'groovy'
}
}
Expand All @@ -40,5 +40,11 @@ gradlePlugin {
description = project.description
implementationClass = 'nebula.plugin.netflixossproject.NetflixOssProjectPlugin'
}
legacyNetflixOss {
id = "nebula.netflixoss"
displayName = "Netflix OSS Project Template"
description = project.description
implementationClass = 'nebula.plugin.netflixossproject.NetflixOssProjectPlugin'
}
}
}
21 changes: 6 additions & 15 deletions gradle.lockfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,14 @@
# This file is expected to be part of source control.
cglib:cglib-nodep:3.2.2=integTestRuntimeClasspath,testRuntimeClasspath
com.github.zafarkhaja:java-semver:0.9.0=integTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
com.googlecode.javaewah:JavaEWAH:1.1.12=integTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
com.googlecode.javaewah:JavaEWAH:1.1.6=integTestCompileClasspath,testCompileClasspath
com.googlecode.javaewah:JavaEWAH:1.1.12=integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.jcraft:jsch.agentproxy.connector-factory:0.0.7=integTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
com.jcraft:jsch.agentproxy.core:0.0.7=integTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
com.jcraft:jsch.agentproxy.pageant:0.0.7=integTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
com.jcraft:jsch.agentproxy.sshagent:0.0.7=integTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
com.jcraft:jsch.agentproxy.svnkit-trilead-ssh2:0.0.7=integTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
com.jcraft:jsch.agentproxy.usocket-jna:0.0.7=integTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
com.jcraft:jsch.agentproxy.usocket-nc:0.0.7=integTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
com.jcraft:jsch:0.1.54=integTestCompileClasspath,testCompileClasspath
com.jcraft:jzlib:1.1.1=integTestCompileClasspath,testCompileClasspath
com.jcraft:jzlib:1.1.2=integTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
com.mycila.xmltool:xmltool:3.3=integTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
com.mycila:license-maven-plugin:3.0=integTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
Expand All @@ -28,8 +25,8 @@ com.netflix.nebula:nebula-gradle-interop:2.0.0=integTestRuntimeClasspath,runtime
com.netflix.nebula:nebula-oss-publishing-plugin:3.1.0=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.netflix.nebula:nebula-project-plugin:10.0.1=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.netflix.nebula:nebula-publishing-plugin:19.0.0=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.netflix.nebula:nebula-release-plugin:17.0.0=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.netflix.nebula:nebula-test:10.2.0=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
com.netflix.nebula:nebula-release-plugin:17.1.0=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.netflix.nebula:nebula-test:10.3.0=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
com.perforce:p4java:2015.2.1365273=integTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
com.squareup.moshi:moshi:1.12.0=integTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
com.squareup.okio:okio:2.10.0=integTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
Expand All @@ -43,23 +40,18 @@ junit:junit:4.13.2=integTestCompileClasspath,integTestRuntimeClasspath,testCompi
net.java.dev.jna:jna-platform:5.7.0=integTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
net.java.dev.jna:jna:5.7.0=integTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
net.java.dev.jna:platform:3.4.0=integTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
org.ajoberstar.grgit:grgit-core:3.1.1=integTestCompileClasspath,testCompileClasspath
org.ajoberstar.grgit:grgit-core:4.0.2=integTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
org.ajoberstar.grgit:grgit-core:4.1.1=integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
org.antlr:antlr-runtime:3.4=integTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
org.apache.commons:commons-pool2:2.2=integTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
org.apache.maven:maven-model:3.6.2=integTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
org.apache.maven:maven-settings-builder:3.0.4=integTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
org.apache.maven:maven-settings:3.0.4=integTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
org.apiguardian:apiguardian-api:1.1.2=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
org.bouncycastle:bcpg-jdk15on:1.60=integTestCompileClasspath,testCompileClasspath
org.bouncycastle:bcpkix-jdk15on:1.60=integTestCompileClasspath,testCompileClasspath
org.bouncycastle:bcprov-jdk15on:1.60=integTestCompileClasspath,testCompileClasspath
org.codehaus.groovy:groovy:3.0.9=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
org.codehaus.plexus:plexus-component-annotations:1.5.5=integTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
org.codehaus.plexus:plexus-interpolation:1.14=integTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
org.codehaus.plexus:plexus-utils:3.2.1=integTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
org.eclipse.jgit:org.eclipse.jgit:5.13.0.202109080827-r=integTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
org.eclipse.jgit:org.eclipse.jgit:5.3.0.201903130848-r=integTestCompileClasspath,testCompileClasspath
org.eclipse.jgit:org.eclipse.jgit:5.13.0.202109080827-r=integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
org.hamcrest:hamcrest-core:1.3=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
org.hamcrest:hamcrest:2.2=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
org.jetbrains.kotlin:kotlin-reflect:1.5.31=embeddedKotlin
Expand All @@ -76,8 +68,7 @@ org.junit.platform:junit-platform-commons:1.8.1=integTestCompileClasspath,integT
org.junit.platform:junit-platform-engine:1.8.1=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
org.objenesis:objenesis:2.4=integTestRuntimeClasspath,testRuntimeClasspath
org.opentest4j:opentest4j:1.2.0=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
org.slf4j:slf4j-api:1.7.2=integTestCompileClasspath,testCompileClasspath
org.slf4j:slf4j-api:1.7.30=integTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
org.slf4j:slf4j-api:1.7.30=integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
org.sonatype.plexus:plexus-cipher:1.4=integTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
org.sonatype.plexus:plexus-sec-dispatcher:1.3=integTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
org.spockframework:spock-core:2.1-M2-groovy-3.0=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-rc-1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-rc-2-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

0 comments on commit 4e71c56

Please sign in to comment.