diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index e047443..5e2ae7a 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -33,7 +33,8 @@ jobs: with: args: publish -x avroCompatibility env: - ORG_GRADLE_PROJECT_publishUser: ${{ secrets.BINTRAY_USER }} - ORG_GRADLE_PROJECT_publishApiKey: ${{ secrets.BINTRAY_API_KEY }} + 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 }} diff --git a/build.gradle.kts b/build.gradle.kts index c13d9ed..0717695 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -2,10 +2,10 @@ import org.hypertrace.gradle.publishing.HypertracePublishExtension import org.hypertrace.gradle.publishing.License plugins { - id("org.hypertrace.repository-plugin") version "0.1.2" - id("org.hypertrace.ci-utils-plugin") version "0.1.1" - id("org.hypertrace.publish-plugin") version "0.3.0" apply false - id("org.hypertrace.jacoco-report-plugin") version "0.1.0" apply false + id("org.hypertrace.repository-plugin") version "0.4.0" + id("org.hypertrace.ci-utils-plugin") version "0.3.0" + id("org.hypertrace.publish-plugin") version "1.0.2" apply false + id("org.hypertrace.jacoco-report-plugin") version "0.2.0" apply false } subprojects { diff --git a/data-model/build.gradle.kts b/data-model/build.gradle.kts index b4926e3..be43398 100644 --- a/data-model/build.gradle.kts +++ b/data-model/build.gradle.kts @@ -1,7 +1,7 @@ plugins { `java-library` jacoco - id("org.hypertrace.avro-plugin") version "0.2.1" + id("org.hypertrace.avro-plugin") version "0.3.1" id("org.hypertrace.publish-plugin") id("org.hypertrace.jacoco-report-plugin") } @@ -11,7 +11,7 @@ tasks.test { } dependencies { - api("org.apache.avro:avro:1.10.1") + api("org.apache.avro:avro:1.10.2") api("commons-codec:commons-codec:1.14") api("io.micrometer:micrometer-core:1.5.3") diff --git a/settings.gradle.kts b/settings.gradle.kts index f735597..062c45d 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -4,12 +4,12 @@ pluginManagement { repositories { mavenLocal() gradlePluginPortal() - maven("https://dl.bintray.com/hypertrace/maven") + maven("https://hypertrace.jfrog.io/artifactory/maven") } } plugins { - id("org.hypertrace.version-settings") version "0.1.1" + id("org.hypertrace.version-settings") version "0.2.0" } include(":data-model")