From dcc6c7aeba2486b33876bd4ff11f50e727e82c97 Mon Sep 17 00:00:00 2001 From: Carlos Amengual Date: Sun, 12 Nov 2023 17:02:17 +0100 Subject: [PATCH] Maven repository deployment fixes --- .../src/main/groovy/echosvg.java-conventions.gradle | 10 ++++++---- echosvg-test-scripts/build.gradle | 5 ++++- echosvg-test-swing/build.gradle | 5 ++++- echosvg-test/build.gradle | 2 +- 4 files changed, 15 insertions(+), 7 deletions(-) diff --git a/buildSrc/src/main/groovy/echosvg.java-conventions.gradle b/buildSrc/src/main/groovy/echosvg.java-conventions.gradle index 6a81ac293..0f1b3b432 100644 --- a/buildSrc/src/main/groovy/echosvg.java-conventions.gradle +++ b/buildSrc/src/main/groovy/echosvg.java-conventions.gradle @@ -1,8 +1,5 @@ plugins { id 'java-library' - /* - * Use 'gradle publishToMavenLocal' to install in local Maven repo - */ id 'maven-publish' id 'org.owasp.dependencycheck' } @@ -142,13 +139,18 @@ publishing { maven(MavenPublication) { from(components.java) pom { - url = "https://github.com/css4j/echosvg/" + url = "https://github.com/css4j/echosvg/wiki" licenses { license { name = "The Apache License, Version 2.0" url = "http://www.apache.org/licenses/LICENSE-2.0.txt" } } + scm { + connection = "scm:git:https://github.com/css4j/echosvg.git" + developerConnection = "scm:git:git://git@github.com:css4j/echosvg.git" + url = "https://github.com/css4j/echosvg" + } } } } diff --git a/echosvg-test-scripts/build.gradle b/echosvg-test-scripts/build.gradle index 34ce58f04..501ce3500 100644 --- a/echosvg-test-scripts/build.gradle +++ b/echosvg-test-scripts/build.gradle @@ -122,6 +122,9 @@ build.dependsOn jarCheckPermissionsDeniedJar build.dependsOn jarCheckPermissionsGrantedJar build.dependsOn copyScriptJars, copyPolicyJar -tasks.withType(PublishToMavenRepository).configureEach { +/* + * Maven repository deployments (disabled) + */ +tasks.withType(AbstractPublishToMaven).configureEach { it.enabled = false } diff --git a/echosvg-test-swing/build.gradle b/echosvg-test-swing/build.gradle index e3ff3d4f3..7b99518c9 100644 --- a/echosvg-test-swing/build.gradle +++ b/echosvg-test-swing/build.gradle @@ -12,6 +12,9 @@ publishing.publications.maven(MavenPublication).pom { description = "EchoSVG Swing Tests" } -tasks.withType(PublishToMavenRepository).configureEach { +/* + * Maven repository deployments (disabled) + */ +tasks.withType(AbstractPublishToMaven).configureEach { it.enabled = false } diff --git a/echosvg-test/build.gradle b/echosvg-test/build.gradle index d748a8221..055de42cc 100644 --- a/echosvg-test/build.gradle +++ b/echosvg-test/build.gradle @@ -173,6 +173,6 @@ task runJmh(type: JavaExec) { */ // Disable Maven publication (shipped security policies are not // adequate for running tests from a jar) -tasks.withType(PublishToMavenRepository).configureEach { +tasks.withType(AbstractPublishToMaven).configureEach { it.enabled = false }