From 83e05eddcac35b41678541cae29e17d68e081646 Mon Sep 17 00:00:00 2001 From: Viren Baraiya Date: Thu, 12 Jun 2025 00:51:23 -0700 Subject: [PATCH 1/4] fix imports --- .github/workflows/ci.yml | 2 +- .github/workflows/integration-tests.yml | 2 +- .github/workflows/publish-release.yml | 2 +- .../client/metrics/prometheus/PrometheusMetricsCollector.java | 4 ++-- .../conductor/sdk/examples/events/EventListenerExample.java | 4 ++-- gradle.properties | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cd1668d1e..a7a7f1589 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,4 +1,4 @@ -name: Java Client v4 Build +name: Java Client Build on: push: diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index 2a1163e04..c31f572c3 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -1,4 +1,4 @@ -name: Java Client v4 Integration Tests +name: Java Client Integration Tests on: workflow_run: diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml index 7792f46f6..4c9a9db1f 100644 --- a/.github/workflows/publish-release.yml +++ b/.github/workflows/publish-release.yml @@ -3,7 +3,7 @@ # separate terms of service, privacy policy, and support # documentation. -name: Publish Java Client v4 to Maven Central +name: Publish Java Client to Maven Central on: workflow_dispatch: diff --git a/conductor-client-metrics/src/main/java/com/netflix/conductor/client/metrics/prometheus/PrometheusMetricsCollector.java b/conductor-client-metrics/src/main/java/com/netflix/conductor/client/metrics/prometheus/PrometheusMetricsCollector.java index e94f633f2..97e7d644f 100644 --- a/conductor-client-metrics/src/main/java/com/netflix/conductor/client/metrics/prometheus/PrometheusMetricsCollector.java +++ b/conductor-client-metrics/src/main/java/com/netflix/conductor/client/metrics/prometheus/PrometheusMetricsCollector.java @@ -29,8 +29,8 @@ import com.netflix.conductor.client.metrics.MetricsCollector; import com.sun.net.httpserver.HttpServer; -import io.micrometer.prometheus.PrometheusConfig; -import io.micrometer.prometheus.PrometheusMeterRegistry; +import io.micrometer.prometheusmetrics.PrometheusConfig; +import io.micrometer.prometheusmetrics.PrometheusMeterRegistry; public class PrometheusMetricsCollector implements MetricsCollector { diff --git a/examples/src/main/java/com/netflix/conductor/sdk/examples/events/EventListenerExample.java b/examples/src/main/java/com/netflix/conductor/sdk/examples/events/EventListenerExample.java index 9d4368bd4..147ebe52d 100644 --- a/examples/src/main/java/com/netflix/conductor/sdk/examples/events/EventListenerExample.java +++ b/examples/src/main/java/com/netflix/conductor/sdk/examples/events/EventListenerExample.java @@ -28,8 +28,8 @@ import io.orkes.conductor.sdk.examples.util.ClientUtil; import com.sun.net.httpserver.HttpServer; -import io.micrometer.prometheus.PrometheusConfig; -import io.micrometer.prometheus.PrometheusMeterRegistry; +import io.micrometer.prometheusmetrics.PrometheusConfig; +import io.micrometer.prometheusmetrics.PrometheusMeterRegistry; import lombok.extern.slf4j.Slf4j; /** diff --git a/gradle.properties b/gradle.properties index dfecf49a9..e627dfe99 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1 +1 @@ -version=4.0.4 +version=4.0.5 From 34cfae9455125861cef181b4070e1863ea3921f5 Mon Sep 17 00:00:00 2001 From: Viren Baraiya Date: Thu, 12 Jun 2025 00:56:45 -0700 Subject: [PATCH 2/4] Update build.gradle --- sdk/build.gradle | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/sdk/build.gradle b/sdk/build.gradle index 589a7d722..164141e2e 100644 --- a/sdk/build.gradle +++ b/sdk/build.gradle @@ -5,19 +5,14 @@ plugins { id 'signing' } -ext { - artifactId = 'java-sdk' - artifactName = 'Orkes Conductor SDK' - artifactDescription = 'OSS & Orkes Conductor SDK' -} - apply plugin: 'publish-config' dependencies { implementation project(":conductor-client") testImplementation 'org.mockito:mockito-core:5.4.0' - testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.1' - testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.13.1' + + testImplementation "org.junit.jupiter:junit-jupiter-api:${versions.junit}" + testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:${versions.junit}" } java { From 5f08169791938480eae7db59db13f0f925afca3d Mon Sep 17 00:00:00 2001 From: Viren Baraiya Date: Thu, 12 Jun 2025 01:02:51 -0700 Subject: [PATCH 3/4] Update publish-release.yml --- .github/workflows/publish-release.yml | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml index 4c9a9db1f..a8296c6fa 100644 --- a/.github/workflows/publish-release.yml +++ b/.github/workflows/publish-release.yml @@ -6,16 +6,10 @@ name: Publish Java Client to Maven Central on: - workflow_dispatch: - inputs: - version: - description: 'Version to publish (e.g., v1.0.0)' - required: true - maven_central: - description: 'Publish to Maven Central' - required: true - default: 'true' - + release: + types: + - released + - prereleased jobs: publish: runs-on: ubuntu-latest @@ -31,7 +25,7 @@ jobs: java-version: '17' - name: Publish run: | - export VERSION="${{ github.event.inputs.version }}" + export VERSION="${{github.ref_name}}" export CONDUCTOR_CLIENT_VERSION=`echo ${VERSION:1}` echo Publishing version $CONDUCTOR_CLIENT_VERSION ./gradlew publish -Pversion=$CONDUCTOR_CLIENT_VERSION -PmavenCentral=${{ github.event.inputs.maven_central }} -Pusername=${{ secrets.SONATYPE_USERNAME }} -Ppassword=${{ secrets.SONATYPE_PASSWORD }} From 3a8e015612768bbfc47cdaa84d81fda4a0daaf99 Mon Sep 17 00:00:00 2001 From: Shailesh Jagannath Padave Date: Fri, 27 Jun 2025 18:29:17 +0530 Subject: [PATCH 4/4] Updated URLs --- .../io/orkes/conductor/gradle/PublishConfigPlugin.groovy | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/buildSrc/src/main/groovy/io/orkes/conductor/gradle/PublishConfigPlugin.groovy b/buildSrc/src/main/groovy/io/orkes/conductor/gradle/PublishConfigPlugin.groovy index a71b9418e..0a37571ed 100644 --- a/buildSrc/src/main/groovy/io/orkes/conductor/gradle/PublishConfigPlugin.groovy +++ b/buildSrc/src/main/groovy/io/orkes/conductor/gradle/PublishConfigPlugin.groovy @@ -51,11 +51,11 @@ class PublishConfigPlugin implements Plugin { pom { name = project.findProperty('artifactName') description = project.findProperty('artifactDescription') - url = 'https://github.com/conductor-oss/conductor.git' + url = 'https://github.com/conductor-oss/conductor-java-sdk.git' scm { - connection = 'scm:git:git://github.com/conductor-oss/conductor.git' - developerConnection = 'scm:git:ssh://github.com/conductor-oss/conductor.git' - url = 'https://github.com/conductor-oss/conductor.git' + connection = 'scm:git:git://github.com/conductor-oss/conductor-java-sdk.git' + developerConnection = 'scm:git:ssh://github.com/conductor-oss/conductor-java-sdk.git' + url = 'https://github.com/conductor-oss/conductor-java-sdk.git' } licenses { license {