diff --git a/build.gradle b/build.gradle index 6d1c618b2..c538f5ccd 100644 --- a/build.gradle +++ b/build.gradle @@ -6,11 +6,9 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.5' - classpath "org.jfrog.buildinfo:build-info-extractor-gradle:4.21.0" - classpath "com.gradle.publish:plugin-publish-plugin:0.14.0" + classpath "com.gradle.publish:plugin-publish-plugin:0.16.0" classpath 'org.ajoberstar:gradle-git-publish:3.0.0' - classpath "com.github.node-gradle:gradle-node-plugin:3.0.1" + classpath "com.github.node-gradle:gradle-node-plugin:3.1.1" } } diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle index 70bb9321a..7dd4e5595 100644 --- a/gradle/dependencies.gradle +++ b/gradle/dependencies.gradle @@ -2,15 +2,14 @@ dependencies { shadow localGroovy() shadow gradleApi() - shadow 'org.codehaus.groovy:groovy-backports-compat23:3.0.7' + shadow 'org.codehaus.groovy:groovy-backports-compat23:3.0.8' - implementation "com.gradle.publish:plugin-publish-plugin:0.14.0" implementation 'org.jdom:jdom2:2.0.6' implementation 'org.ow2.asm:asm:9.2' implementation 'org.ow2.asm:asm-commons:9.2' - implementation 'commons-io:commons-io:2.8.0' + implementation 'commons-io:commons-io:2.11.0' implementation 'org.apache.ant:ant:1.10.11' - implementation 'org.codehaus.plexus:plexus-utils:3.3.0' + implementation 'org.codehaus.plexus:plexus-utils:3.4.1' implementation "org.apache.logging.log4j:log4j-core:2.14.1" implementation('org.vafer:jdependency:2.7.0') { exclude group: 'org.ow2.asm' @@ -22,7 +21,7 @@ dependencies { testImplementation 'org.spockframework:spock-junit4:2.0-groovy-3.0' testImplementation 'xmlunit:xmlunit:1.6' testImplementation 'org.apache.commons:commons-lang3:3.12.0' - testImplementation 'com.google.guava:guava:30.1.1-jre' - testImplementation 'org.junit.jupiter:junit-jupiter-api:5.7.2' - testRuntimeOnly 'org.junit.vintage:junit-vintage-engine' + testImplementation 'com.google.guava:guava:31.0.1-jre' + testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.1' + testRuntimeOnly 'org.junit.vintage:junit-vintage-engine:5.8.1' } diff --git a/gradle/publish.gradle b/gradle/publish.gradle index 879f7f023..4a946ba00 100644 --- a/gradle/publish.gradle +++ b/gradle/publish.gradle @@ -1,5 +1,4 @@ apply plugin: 'maven-publish' -apply plugin: 'com.jfrog.artifactory' apply plugin: "com.gradle.plugin-publish" group = 'com.github.johnrengelman' @@ -49,38 +48,6 @@ publishing { } } -artifactory { - contextUrl = 'https://oss.jfrog.org/artifactory' - publish { - repository { - repoKey = 'oss-snapshot-local' - } - defaults { - publications 'pluginMaven' - } - } -} - -artifactoryPublish { task -> - doFirst { - if (!isSnapshot) { - throw new GradleException('Cannot publish non-SNAPSHOT versions to OJO!') - } - } - gradle.taskGraph.whenReady { taskGraph -> - if (taskGraph.hasTask(task)) { - project.artifactory { - publish { - repository { - username = bintrayUser - password = bintrayKey - } - } - } - } - } -} - // Workaround for configuring the artifact that publish-plugins uses: https://github.com/JLLeitschuh/ktlint-gradle/blob/master/plugin/build.gradle.kts // Need to move publishing configuration into afterEvaluate {} // to override changes done by "com.gradle.plugin-publish" plugin in afterEvaluate {} block