Merge remote-tracking branch 'origin/main' into main-codaxy

.github/dependabot.yml

@@ -5,9 +5,9 @@ updates:
     schedule:
       interval: "weekly"
     reviewers:
-      - "aravindanr"
-      - "jxu-nflx"
-      - "apanicker-nflx"
+      - "v1r3n"
+      - "boney9"
+      - "c4lm"
   - package-ecosystem: "github-actions"
     directory: "/"
     schedule:

.github/pull_request_template.md

@@ -3,7 +3,7 @@ Pull Request type
 - [ ] Bugfix
 - [ ] Feature
 - [ ] Refactoring (no functional changes, no api changes)
-- [ ] Build related changes (Please run `./gradlew generateLock saveLock` to refresh dependencies)
+- [ ] Build related changes
 - [ ] WHOSUSING.md
 - [ ] Other (please describe):
 

.github/workflows/generate_gh_pages.yml

@@ -1,8 +1,6 @@
 name: Publish docs via GitHub Pages
 on:
-  push:
-    branches:
-      - main
+  workflow_dispatch
 
 jobs:
   build:

.github/workflows/publish.yml

@@ -1,4 +1,4 @@
-name: Publish to NetflixOSS and Maven Central
+name: Publish Conductor OSS toMaven Central
 on:
   release:
     types:
@@ -28,39 +28,13 @@ jobs:
           key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
           restore-keys: |
             ${{ runner.os }}-gradle-
-      - name: Publish candidate
-        if: startsWith(github.ref, 'refs/tags/v') && contains(github.ref, '-rc.')
-        run: ./gradlew -Prelease.useLastTag=true candidate --scan
-        env:
-          NETFLIX_OSS_SONATYPE_USERNAME: ${{ secrets.ORG_SONATYPE_USERNAME }}
-          NETFLIX_OSS_SONATYPE_PASSWORD: ${{ secrets.ORG_SONATYPE_PASSWORD }}
-          NETFLIX_OSS_SIGNING_KEY: ${{ secrets.ORG_SIGNING_KEY }}
-          NETFLIX_OSS_SIGNING_PASSWORD: ${{ secrets.ORG_SIGNING_PASSWORD }}
-          NETFLIX_OSS_REPO_USERNAME: ${{ secrets.ORG_NETFLIXOSS_USERNAME }}
-          NETFLIX_OSS_REPO_PASSWORD: ${{ secrets.ORG_NETFLIXOSS_PASSWORD }}
       - name: Publish release
-        if: startsWith(github.ref, 'refs/tags/v') && (!contains(github.ref, '-rc.'))
-        run: ./gradlew -Prelease.useLastTag=true final --scan
-        env:
-          NETFLIX_OSS_SONATYPE_USERNAME: ${{ secrets.ORG_SONATYPE_USERNAME }}
-          NETFLIX_OSS_SONATYPE_PASSWORD: ${{ secrets.ORG_SONATYPE_PASSWORD }}
-          NETFLIX_OSS_SIGNING_KEY: ${{ secrets.ORG_SIGNING_KEY }}
-          NETFLIX_OSS_SIGNING_PASSWORD: ${{ secrets.ORG_SIGNING_PASSWORD }}
-          NETFLIX_OSS_REPO_USERNAME: ${{ secrets.ORG_NETFLIXOSS_USERNAME }}
-          NETFLIX_OSS_REPO_PASSWORD: ${{ secrets.ORG_NETFLIXOSS_PASSWORD }}
-      - name: Publish tag to community repo
-        if: startsWith(github.ref, 'refs/tags/v')
         run: |
-          export TAG=$(git describe --tags --abbrev=0)
-          echo "Current release version is $TAG"
-          echo "Triggering community build"
-          curl \
-            -H "Accept: application/vnd.github.v3+json" \
-            -H "Authorization: Bearer ${{ secrets.COMMUNITY_REPO_TRIGGER }}" \
-            -X POST https://api.github.com/repos/Netflix/conductor-community/dispatches \
-            -d '{"event_type": "publish_build","client_payload": {"tag":"'"$TAG"'"}}'
-      - name: Publish Test Report
-        uses: mikepenz/action-junit-report@v3
-        if: always() # always run even if the previous step fails
-        with:
-          report_paths: '**/build/test-results/test/TEST-*.xml'
+          export VERSION="${{github.ref_name}}"
+          export PUBLISH_VERSION=`echo ${VERSION:1}`
+          echo Publishing version $PUBLISH_VERSION
+          ./gradlew publish -Pversion=$PUBLISH_VERSION -Pusername=${{ secrets.SONATYPE_USERNAME }} -Ppassword=${{ secrets.SONATYPE_PASSWORD }}
+        env:
+          ORG_GRADLE_PROJECT_signingKeyId: ${{ secrets.SIGNING_KEY_ID }}
+          ORG_GRADLE_PROJECT_signingKey: ${{ secrets.SIGNING_KEY }}
+          ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.SIGNING_PASSWORD }}

README.md

@@ -91,3 +91,9 @@ docker pull conductoross/conductor:3.15.0
 ## Get Support
 There are several ways to get in touch with us:
 * [Slack Community](https://join.slack.com/t/orkes-conductor/shared_invite/zt-xyxqyseb-YZ3hwwAgHJH97bsrYRnSZg)
+
+## Contributors
+
+<a href="https://github.com/conductor-oss/conductor/graphs/contributors">
+  <img src="https://contrib.rocks/image?repo=conductor-oss/conductor" />
+</a>

annotations-processor/build.gradle

@@ -6,8 +6,8 @@ sourceSets {
 dependencies {
     implementation project(':conductor-annotations')
     api 'com.google.guava:guava:31.1-jre'
-    api 'com.squareup:javapoet:1.13.+'
-    api 'com.github.jknack:handlebars:4.3.+'
+    api 'com.squareup:javapoet:1.13.0'
+    api 'com.github.jknack:handlebars:4.3.1'
     api 'com.google.protobuf:protobuf-java:3.21.12'
     api 'jakarta.annotation:jakarta.annotation-api:2.1.1'
     api gradleApi()

build.gradle

@@ -17,23 +17,12 @@ plugins {
     id 'io.spring.dependency-management' version '1.0.13.RELEASE'
     id 'java'
     id 'application'
-    id 'jacoco'
-    id 'nebula.netflixoss' version '10.6.0'
+    id 'maven-publish'
+    id 'signing'
+    id 'java-library'
+    id "com.diffplug.spotless" version "5.0.0"
 }
 
-/*
- *  Copyright 2023 Conductor authors
- *  <p>
- *  Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- *  the License. You may obtain a copy of the License at
- *  <p>
- *  http://www.apache.org/licenses/LICENSE-2.0
- *  <p>
- *  Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- *  an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- *  specific language governing permissions and limitations under the License.
- */
-
 // Establish version and status
 ext.githubProjectName = rootProject.name // Change if github project name is not the same as the root project's name
 
@@ -43,17 +32,17 @@ subprojects {
 
 apply from: "$rootDir/dependencies.gradle"
 apply from: "$rootDir/springboot-bom-overrides.gradle"
+apply from: "$rootDir/deploy.gradle"
 
 allprojects {
-    apply plugin: 'nebula.netflixoss'
     apply plugin: 'io.spring.dependency-management'
     apply plugin: 'java-library'
     apply plugin: 'project-report'
 
     sourceCompatibility = JavaVersion.VERSION_17
     targetCompatibility = JavaVersion.VERSION_17
 
-    group = 'com.netflix.conductor'
+    group = 'org.conductoross'
 
     configurations.all {
         exclude group: 'ch.qos.logback', module: 'logback-classic'
@@ -111,14 +100,6 @@ allprojects {
     }
 }
 
-jacocoTestReport {
-    reports {
-        html.required = true
-        xml.required = true
-        csv.required = false
-    }
-}
-
 task server {
     dependsOn ':conductor-server:bootRun'
 }

dependencies.gradle

@@ -31,7 +31,7 @@ ext {
     revGrpc = '1.57.2'
     revGuava = '30.0-jre'
     revHamcrestAllMatchers = '1.8'
-    revHealth = '1.1.+'
+    revHealth = '1.1.4'
     revProtoBuf = '3.21.12'
     revJakartaAnnotation = '2.1.1'
     revJAXB = '4.0.1'

dependencies.lock

@@ -21,16 +21,6 @@
             "locked": "2.20.0"
         }
     },
-    "jacocoAgent": {
-        "org.jacoco:org.jacoco.agent": {
-            "locked": "0.8.8"
-        }
-    },
-    "jacocoAnt": {
-        "org.jacoco:org.jacoco.ant": {
-            "locked": "0.8.8"
-        }
-    },
     "runtimeClasspath": {
         "org.apache.logging.log4j:log4j-api": {
             "locked": "2.20.0"

deploy.gradle

@@ -0,0 +1,77 @@
+
+subprojects {
+
+    apply plugin: 'maven-publish'
+    apply plugin: 'java-library'
+    apply plugin: 'signing'
+
+    group = 'org.conductoross'
+
+    java {
+        withSourcesJar()
+        withJavadocJar()
+    }
+
+    publishing {
+        publications {
+            mavenJava(MavenPublication) {
+                from components.java
+                versionMapping {
+                    usage('java-api') {
+                        fromResolutionOf('runtimeClasspath')
+                    }
+                    usage('java-runtime') {
+                        fromResolutionResult()
+                    }
+                }
+                pom {
+                    name = 'Conductor OSS'
+                    description = 'Conductor OSS build.'
+                    url = 'https://github.com/conductor-oss/conductor'
+                    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'
+                    }
+                    licenses {
+                        license {
+                            name = 'The Apache License, Version 2.0'
+                            url = 'http://www.apache.org/licenses/LICENSE-2.0.txt'
+                        }
+                    }
+                    developers {
+                        developer {
+                            organization = 'Conductor OSS'
+                            organizationUrl = 'https://conductor-oss.org/'
+                            name = 'Conductor OSS'
+                        }
+                    }
+                }
+            }
+        }
+
+        repositories {
+            maven {
+                url = "https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/"
+                credentials {
+                    username project.properties.username
+                    password project.properties.password
+                }
+            }
+        }
+    }
+
+    signing {
+        def signingKeyId = findProperty('signingKeyId')
+        if (signingKeyId) {
+            def signingKey = findProperty('signingKey')
+            def signingPassword = findProperty('signingPassword')
+            if (signingKeyId && signingKey && signingPassword) {
+                useInMemoryPgpKeys(signingKeyId, signingKey, signingPassword)
+            }
+            sign publishing.publications
+        }
+
+    }
+
+}

es6-persistence/build.gradle

@@ -37,6 +37,6 @@ dependencies {
 
 switch (org.gradle.internal.os.OperatingSystem.current()) {
     case org.gradle.internal.os.OperatingSystem.MAC_OS:
-        //tasks.forEach(task -> task.onlyIf { project.hasProperty('ES6Test') })
+        tasks.forEach(task -> task.onlyIf { project.hasProperty('ES6Test') })
         break;
 }

java-sdk/src/test/resources/application-integrationtest.properties

@@ -14,6 +14,8 @@
 #
 
 conductor.db.type=memory
+# disable trying to connect to redis and use in-memory
+conductor.queue.type=xxx
 conductor.workflow-execution-lock.type=local_only
 conductor.external-payload-storage.type=mock
 conductor.indexing.enabled=false

kafka/build.gradle

@@ -26,5 +26,6 @@ dependencies {
 
     testImplementation project(':conductor-test-util')
     testImplementation project(':conductor-test-util').sourceSets.test.output
+    testImplementation "redis.clients:jedis:${revJedis}"
 
 }

kafka/src/test/resources/application-integrationtest.properties

@@ -14,6 +14,8 @@
 #
 
 conductor.db.type=memory
+# disable trying to connect to redis and use in-memory
+conductor.queue.type=xxx
 conductor.workflow-execution-lock.type=local_only
 conductor.external-payload-storage.type=dummy
 conductor.indexing.enabled=false

mysql-persistence/build.gradle

@@ -33,7 +33,7 @@ dependencies {
 
     testImplementation project(':conductor-test-util').sourceSets.test.output
     testImplementation project(':conductor-common-persistence').sourceSets.test.output
-
+    testImplementation "redis.clients:jedis:${revJedis}"
 }
 
 test {

postgres-persistence/build.gradle

@@ -29,6 +29,7 @@ dependencies {
 
     testImplementation project(':conductor-test-util').sourceSets.test.output
     testImplementation project(':conductor-common-persistence').sourceSets.test.output
+    testImplementation "redis.clients:jedis:${revJedis}"
 
 }
 

test-harness/build.gradle

@@ -7,7 +7,7 @@ dependencies {
     testImplementation project(':conductor-core')
     testImplementation project(':conductor-redis-persistence')
     testImplementation project(':conductor-cassandra-persistence')
-    testImplementation project(':conductor-es6-persistence')
+    testImplementation project(':conductor-es7-persistence')
     testImplementation project(':conductor-grpc-server')
     testImplementation project(':conductor-client')
     testImplementation project(':conductor-grpc-client')
@@ -32,8 +32,8 @@ dependencies {
     testImplementation "org.spockframework:spock-core:${revSpock}"
     testImplementation "org.spockframework:spock-spring:${revSpock}"
 
-    testImplementation "org.elasticsearch.client:elasticsearch-rest-client:6.8.23"
-    testImplementation "org.elasticsearch.client:elasticsearch-rest-high-level-client:6.8.23"
+    testImplementation "org.elasticsearch.client:elasticsearch-rest-client:${revElasticSearch7}"
+    testImplementation "org.elasticsearch.client:elasticsearch-rest-high-level-client:${revElasticSearch7}"
 
     testImplementation "org.testcontainers:elasticsearch:${revTestContainer}"
     testImplementation('junit:junit:4.13.2')