From 8b65a66a4cd9a7613b393f069f4ad7ebfa10986a Mon Sep 17 00:00:00 2001 From: Omer Zidkoni <50792403+omerzi@users.noreply.github.com> Date: Sun, 2 Feb 2025 09:52:23 +0200 Subject: [PATCH 1/4] Gradle Setup - Improve init script --- .../commands/gradle/resources/jfrog.init.gradle | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/artifactory/commands/gradle/resources/jfrog.init.gradle b/artifactory/commands/gradle/resources/jfrog.init.gradle index cba6f37e..5f414e40 100644 --- a/artifactory/commands/gradle/resources/jfrog.init.gradle +++ b/artifactory/commands/gradle/resources/jfrog.init.gradle @@ -2,7 +2,9 @@ def artifactoryUrl = '{{ .ArtifactoryURL }}' def gradleRepoName = '{{ .GradleRepoName }}' def artifactoryUsername = '{{ .ArtifactoryUsername }}' def artifactoryAccessToken = '{{ .ArtifactoryAccessToken }}' +def gradleVersion = GradleVersion.current() +// Set up pluginManagement repositories gradle.settingsEvaluated { settings -> settings.pluginManagement { repositories { @@ -12,15 +14,16 @@ gradle.settingsEvaluated { settings -> username = artifactoryUsername password = artifactoryAccessToken } - } - if (artifactoryUrl.startsWith("http://")) { - allowInsecureProtocol = true + if (gradleVersion >= GradleVersion.version("6.2") && artifactoryUrl.startsWith("http://")) { + allowInsecureProtocol = true + } } gradlePluginPortal() // Fallback to Gradle Plugin Portal } } } +// Set up project repositories allprojects { project -> project.repositories { maven { @@ -29,9 +32,9 @@ allprojects { project -> username = artifactoryUsername password = artifactoryAccessToken } - if (artifactoryUrl.startsWith("http://")) { + if (gradleVersion >= GradleVersion.version("6.2") && artifactoryUrl.startsWith("http://")) { allowInsecureProtocol = true } } } -} \ No newline at end of file +} From 78c3a375c1599eac7afe8ef494e35b7ab8c81eec Mon Sep 17 00:00:00 2001 From: Omer Zidkoni <50792403+omerzi@users.noreply.github.com> Date: Sun, 2 Feb 2025 10:09:40 +0200 Subject: [PATCH 2/4] Gradle Setup - Improve init script --- artifactory/commands/gradle/resources/jfrog.init.gradle | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/artifactory/commands/gradle/resources/jfrog.init.gradle b/artifactory/commands/gradle/resources/jfrog.init.gradle index 5f414e40..e4ea5f53 100644 --- a/artifactory/commands/gradle/resources/jfrog.init.gradle +++ b/artifactory/commands/gradle/resources/jfrog.init.gradle @@ -2,6 +2,10 @@ def artifactoryUrl = '{{ .ArtifactoryURL }}' def gradleRepoName = '{{ .GradleRepoName }}' def artifactoryUsername = '{{ .ArtifactoryUsername }}' def artifactoryAccessToken = '{{ .ArtifactoryAccessToken }}' + +// Import the GradleVersion class +import org.gradle.util.GradleVersion + def gradleVersion = GradleVersion.current() // Set up pluginManagement repositories @@ -37,4 +41,4 @@ allprojects { project -> } } } -} +} \ No newline at end of file From c94de7f16d330c704fd2cfe88f09d54a9d82a91c Mon Sep 17 00:00:00 2001 From: Omer Zidkoni <50792403+omerzi@users.noreply.github.com> Date: Sun, 2 Feb 2025 10:24:27 +0200 Subject: [PATCH 3/4] Gradle Setup - Improve init script --- .../gradle/resources/jfrog.init.gradle | 46 ++++++++----------- 1 file changed, 20 insertions(+), 26 deletions(-) diff --git a/artifactory/commands/gradle/resources/jfrog.init.gradle b/artifactory/commands/gradle/resources/jfrog.init.gradle index e4ea5f53..ea472115 100644 --- a/artifactory/commands/gradle/resources/jfrog.init.gradle +++ b/artifactory/commands/gradle/resources/jfrog.init.gradle @@ -1,44 +1,38 @@ +import org.gradle.util.GradleVersion + def artifactoryUrl = '{{ .ArtifactoryURL }}' def gradleRepoName = '{{ .GradleRepoName }}' def artifactoryUsername = '{{ .ArtifactoryUsername }}' def artifactoryAccessToken = '{{ .ArtifactoryAccessToken }}' - -// Import the GradleVersion class -import org.gradle.util.GradleVersion - def gradleVersion = GradleVersion.current() +def allowInsecure = gradleVersion >= GradleVersion.version("6.2") && artifactoryUrl.startsWith("http://") -// Set up pluginManagement repositories +void configureMavenRepo(repositories, String rtUrl, String rtUser, String rtPass, boolean allowInsecure) { + repositories.maven { + url rtUrl + credentials { + username = rtUser + password = rtPass + } + if (allowInsecure) { + allowInsecureProtocol = true + } + } +} + +// Configure the pluginManagement repositories gradle.settingsEvaluated { settings -> settings.pluginManagement { repositories { - maven { - url "${artifactoryUrl}/${gradleRepoName}" - credentials { - username = artifactoryUsername - password = artifactoryAccessToken - } - if (gradleVersion >= GradleVersion.version("6.2") && artifactoryUrl.startsWith("http://")) { - allowInsecureProtocol = true - } - } + configureMavenRepo(it, "${artifactoryUrl}/${gradleRepoName}", artifactoryUsername, artifactoryAccessToken, allowInsecure) gradlePluginPortal() // Fallback to Gradle Plugin Portal } } } -// Set up project repositories +// Configure the project repositories allprojects { project -> project.repositories { - maven { - url "${artifactoryUrl}/${gradleRepoName}" - credentials { - username = artifactoryUsername - password = artifactoryAccessToken - } - if (gradleVersion >= GradleVersion.version("6.2") && artifactoryUrl.startsWith("http://")) { - allowInsecureProtocol = true - } - } + configureMavenRepo(it, "${artifactoryUrl}/${gradleRepoName}", artifactoryUsername, artifactoryAccessToken, allowInsecure) } } \ No newline at end of file From bec9a53f3e21365f7656252f44628154efea1ee0 Mon Sep 17 00:00:00 2001 From: Omer Zidkoni <50792403+omerzi@users.noreply.github.com> Date: Sun, 2 Feb 2025 17:02:27 +0200 Subject: [PATCH 4/4] Add comment for HTTP mode in jfrog.init.gradle --- artifactory/commands/gradle/resources/jfrog.init.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/artifactory/commands/gradle/resources/jfrog.init.gradle b/artifactory/commands/gradle/resources/jfrog.init.gradle index ea472115..66ca15d6 100644 --- a/artifactory/commands/gradle/resources/jfrog.init.gradle +++ b/artifactory/commands/gradle/resources/jfrog.init.gradle @@ -14,6 +14,7 @@ void configureMavenRepo(repositories, String rtUrl, String rtUser, String rtPass username = rtUser password = rtPass } + // This is used when Artifactory is running in HTTP mode if (allowInsecure) { allowInsecureProtocol = true }