diff --git a/.github/workflows/pr-build.yml b/.github/workflows/pr-build.yml index 06c35e5..f54f421 100644 --- a/.github/workflows/pr-build.yml +++ b/.github/workflows/pr-build.yml @@ -9,7 +9,7 @@ on: jobs: build: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: # Set fetch-depth: 0 to fetch commit history and tags for use in version calculation - name: Check out code diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 96933b0..f6a5dab 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -8,7 +8,7 @@ on: jobs: publish-artifacts: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: # Set fetch-depth: 0 to fetch commit history and tags for use in version calculation - name: Check out code @@ -21,6 +21,6 @@ jobs: with: args: publish env: - ORG_GRADLE_PROJECT_artifactory_contextUrl: ${{ secrets.ARTIFACTORY_CONTEXT_URL }} - ORG_GRADLE_PROJECT_artifactory_user: ${{ secrets.ARTIFACTORY_PUBLISH_USER }} - ORG_GRADLE_PROJECT_artifactory_password: ${{ secrets.ARTIFACTORY_PUBLISH_TOKEN }} + ORG_GRADLE_PROJECT_maven_repo_url: ${{ secrets.HAR_REPO_URL }} + ORG_GRADLE_PROJECT_maven_user: ${{ secrets.HAR_PUBLISH_USER }} + ORG_GRADLE_PROJECT_maven_password: ${{ secrets.HAR_PUBLISH_TOKEN }} diff --git a/build.gradle.kts b/build.gradle.kts index 3c7fd57..f3bf259 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,7 +1,7 @@ import org.hypertrace.gradle.publishing.License.APACHE_2_0 plugins { - id("org.hypertrace.publish-plugin") version "1.0.5" + id("org.hypertrace.publish-plugin") version "1.1.1" id("org.hypertrace.ci-utils-plugin") version "0.3.2" `java-gradle-plugin` } diff --git a/settings.gradle.kts b/settings.gradle.kts index dbd8c66..500876a 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -3,7 +3,7 @@ pluginManagement { mavenLocal() gradlePluginPortal() maven { - url = uri("https://hypertrace.jfrog.io/artifactory/maven") + url = uri("https://us-maven.pkg.dev/hypertrace-repos/maven") } } } diff --git a/src/main/java/org/hypertrace/gradle/dependency/HypertraceDependencySettingsPlugin.java b/src/main/java/org/hypertrace/gradle/dependency/HypertraceDependencySettingsPlugin.java index 87fa1e8..6596d2e 100644 --- a/src/main/java/org/hypertrace/gradle/dependency/HypertraceDependencySettingsPlugin.java +++ b/src/main/java/org/hypertrace/gradle/dependency/HypertraceDependencySettingsPlugin.java @@ -21,7 +21,7 @@ public class HypertraceDependencySettingsPlugin implements Plugin { private static final String HYPERTRACE_REPOSITORY_URL = - "https://hypertrace.jfrog.io/artifactory/maven"; + "https://us-maven.pkg.dev/hypertrace-repos/maven"; private static final String CONFLUENT_REPOSITORY_URL = "https://packages.confluent.io/maven"; private static final List DEFAULT_LOCKED_CONFIGURATIONS = List.of( @@ -187,7 +187,7 @@ private void addVersionCatalog( * mavenLocal() * mavenCentral() * maven("https://packages.confluent.io/maven") - * maven("https://hypertrace.jfrog.io/artifactory/maven") + * maven("https://us-maven.pkg.dev/hypertrace-repos/maven") * } * } *