Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history
commit 55a31af3874bbb4da0f941191797c0a11704d361
Merge: 4e604c7d5 dc3a2e10c
Author: Viren Baraiya <[email protected]>
Date:   Thu Jul 18 07:56:17 2024 -0700

    Merge pull request #212 from danmiller192/fix_postgres_indexer_async_issue

    Updated Postgres indexer to handle out of order updates

commit dc3a2e10c23710bcaf90a331facfaca63ac5ea91
Author: DanMiller192 <[email protected]>
Date:   Sun Jul 14 21:50:47 2024 +0100

    Updated Postgres indexer to only index if the update is newer than the current index

commit 4e604c7d58b9a1a75da9c4f50a3d53db8408b8ab
Merge: abce46e09 29b314d5b
Author: Viren Baraiya <[email protected]>
Date:   Sun Jul 14 11:39:50 2024 -0700

    Merge pull request #203 from prathamjagga/patch-1

    Update JDK Version in Prerequisites

commit abce46e09aa36c711c92a67f4bb6aef73bb24eb2
Merge: 3a43cc675 29ec813da
Author: Viren Baraiya <[email protected]>
Date:   Sat Jul 13 08:28:07 2024 -0700

    Merge pull request #207 from conductor-oss/flyway_upgrade

    Upgrade flyway

commit 29ec813dacc53108f536cf6c42402f864a04cdca
Author: Viren Baraiya <[email protected]>
Date:   Sat Jul 13 07:57:59 2024 -0700

    add flyway to external storage module

commit 02c7499c7fa3c85bebc1d58fd1d6a81f1629cc16
Author: Viren Baraiya <[email protected]>
Date:   Sat Jul 13 01:54:25 2024 -0700

    upgrade flyway

commit 29b314d5b50eb3a05dec8f6218da2014193837fd
Author: Knight1001 <[email protected]>
Date:   Tue Jul 9 13:45:34 2024 +0530

    Update JDK Version in Prerequisites

    Conductor requires JDK 17 for building from source code. Updated the required JDK version in the docs.

commit 3a43cc67543b5a8004f73ccfbe9db196262b8d40
Author: Viren Baraiya <[email protected]>
Date:   Sun Jul 7 13:52:54 2024 -0700

    Update README.md

commit 98760b2ce048d8e88770e1c62d07cb8597720d1e
Author: Viren Baraiya <[email protected]>
Date:   Sun Jul 7 13:52:07 2024 -0700

    Update README.md

commit 641fe8a9a36a1d9468e6db196c6b8ab23b7bbede
Author: Viren Baraiya <[email protected]>
Date:   Sun Jul 7 13:50:16 2024 -0700

    Update README.md

commit 0b48fe901834d2d13bb9b5751a3059f1249ccef6
Author: Viren Baraiya <[email protected]>
Date:   Sun Jul 7 13:49:28 2024 -0700

    Update README.md

commit 7436974f419b9839515c0fb6bfcb6d22da44df42
Merge: 237a47976 1e0bf0142
Author: Viren Baraiya <[email protected]>
Date:   Sat Jul 6 12:44:40 2024 -0700

    Merge pull request #200 from conductor-oss/cvefixes

    Vulnerability fixes

commit 1e0bf01424705f785c1008d97598854c57767042
Author: Viren Baraiya <[email protected]>
Date:   Sat Jul 6 11:26:33 2024 -0700

    more fixes

commit 600ba09796a5e24fc82188b2823e1a286de97886
Author: Viren Baraiya <[email protected]>
Date:   Fri Jul 5 21:50:50 2024 -0700

    vulnerability fixes

commit 237a47976954b43e1c7ad8faad968b9a437841c9
Author: Viren Baraiya <[email protected]>
Date:   Wed Jul 3 00:20:36 2024 -0700

    update README

commit 9ed5e5490fb1bd7635d5253db7281ea50b6ebf34
Merge: 8f10dcec4 24671edef
Author: Miguel Prieto <[email protected]>
Date:   Tue Jul 2 19:45:19 2024 -0400

    Merge pull request #198 from conductor-oss/add_back_om_afterburner_module

    Add back `AfterburnerModule` to `ObjectMapperConfiguration`

commit 8f10dcec458823e37fdc90572dd9e4551bb50aeb
Merge: 17b790e48 5596acf0c
Author: Viren Baraiya <[email protected]>
Date:   Tue Jul 2 16:37:38 2024 -0700

    Merge pull request #197 from conductor-oss/decider_completion_logic_test

    Adds Test for Decider completion logic

commit 24671edef6c156604024a209b2c5f5d004a7617b
Author: Miguel Prieto <[email protected]>
Date:   Tue Jul 2 18:57:14 2024 -0400

    Adding back AfterburnerModule to ObjectMapperConfiguration. This instance is the one that Spring Boot is going to inject to its beans.

commit 5596acf0c7c770a8ee958c3e229b409b6d933eab
Author: Miguel Prieto <[email protected]>
Date:   Tue Jul 2 17:58:04 2024 -0400

    Added test for decider completion logic: a workflow with all optional tasks in terminal state should be COMPLETED

commit 17b790e486b4c676448e0a18ee0926171d8c4505
Merge: 896a12e33 bf024b8f2
Author: Viren Baraiya <[email protected]>
Date:   Tue Jul 2 12:59:29 2024 -0700

    Merge pull request #194 from conductor-oss/core_updates

    Core updates

commit bf024b8f272b60eb0e69d99a54f21912ea321915
Author: Viren Baraiya <[email protected]>
Date:   Tue Jul 2 12:20:19 2024 -0700

    fix tests

commit ac6f13f735156f10999e054ad2787fbcc82c62d6
Author: Viren Baraiya <[email protected]>
Date:   Tue Jul 2 11:36:56 2024 -0700

    formatting

commit 81ab5ee8b15622466c4a53b488dc3b8cdbb2ace4
Author: Viren Baraiya <[email protected]>
Date:   Tue Jul 2 11:23:02 2024 -0700

    add AfterburnerModule

commit b0efce7c0e95101e283860484ba5682cc72a7a84
Author: Viren Baraiya <[email protected]>
Date:   Mon Jul 1 17:32:19 2024 -0700

    update tests

commit 896a12e33a066b93a5cec904ff2b168fdeee3812
Merge: 0c921930f 0c52c4b4b
Author: Viren Baraiya <[email protected]>
Date:   Mon Jul 1 01:31:55 2024 -0700

    Merge pull request #166 from scippacercola/main

    fix: logging of connection failures due to bad evaluation of a string…

commit 8947e6732cf30c6451c953499071d85dd5218a43
Author: Viren Baraiya <[email protected]>
Date:   Mon Jul 1 01:31:26 2024 -0700

    back to async

commit 52f0ddb77acd07c63df51106bd04a8e4b8484fdb
Author: Viren Baraiya <[email protected]>
Date:   Mon Jul 1 01:16:44 2024 -0700

    updates

commit ce423299d306810a38b26109f4ddc904406045fa
Author: Viren Baraiya <[email protected]>
Date:   Sun Jun 30 23:24:57 2024 -0700

    updates to the classes

commit e78e569dc2d351a017c09d3c7b0dae6b494724b1
Author: Viren Baraiya <[email protected]>
Date:   Sun Jun 30 14:14:57 2024 -0700

    update tests

commit 498e1daf5c31e25dad4051187418bdda9422b7ff
Author: Viren Baraiya <[email protected]>
Date:   Sun Jun 30 14:11:52 2024 -0700

    clean up

commit 7198ed26e228db61bd7aba058ae053e48bd1b192
Author: Viren Baraiya <[email protected]>
Date:   Sun Jun 30 13:44:25 2024 -0700

    update from Orkes

commit 0c921930f465b9eff8a908461ef6578bee1a48ee
Merge: eedc05250 1ce3318a7
Author: Viren Baraiya <[email protected]>
Date:   Fri Jun 21 01:13:51 2024 -0700

    Merge branch 'main' of github.com:conductor-oss/conductor

commit eedc052500325dbe1157dcd0fb92ee4d41d7b97d
Author: Viren Baraiya <[email protected]>
Date:   Fri Jun 21 01:13:32 2024 -0700

    clean up

commit 1ce3318a750f9d36cb4b1864bb0b83d6bf29c9ab
Merge: aefeea534 fe9c8b544
Author: Viren Baraiya <[email protected]>
Date:   Fri Jun 21 01:12:45 2024 -0700

    Merge pull request #183 from marcellusm2/fix/webhook-property-validation

    fix webhook property validation

commit aefeea534052f638e31b97f5aa96e1291ae76015
Merge: 3e909abee 9ccf28e71
Author: Viren Baraiya <[email protected]>
Date:   Fri Jun 21 01:11:57 2024 -0700

    Merge pull request #189 from astelmashenko/feature/nats-jetstream-config-props

    added additional configuration properties, error listener, proper han…

commit 3e909abeeeeb6fdb1fad405220860691dcb4278d
Merge: 89e7a6cf6 6bbafd8d1
Author: Viren Baraiya <[email protected]>
Date:   Thu Jun 20 08:00:02 2024 -0700

    Merge pull request #191 from RizaFarheen/main

    Update directed-acyclic-graph.md

commit 89e7a6cf637dd8cbf388c82435cdfb8f010e0530
Merge: 6d8125535 e2000cfca
Author: Viren Baraiya <[email protected]>
Date:   Thu Jun 20 07:59:42 2024 -0700

    Merge pull request #190 from conductor-oss/build_fix

    Sub workflow sync test fix.

commit 6bbafd8d12a2ed7f1387bd4b28ec5433f1e581e4
Author: RizaFarheen <[email protected]>
Date:   Thu Jun 20 15:01:38 2024 +0400

    Update directed-acyclic-graph.md

commit 9ccf28e710026f7c89f0ec96cf1b5bd87659a023
Author: astelmashenko <[email protected]>
Date:   Thu Jun 20 11:11:35 2024 +0300

    fix: spotless apply

commit e2000cfca766c93432c64e27e74b1e7bef5d7bf3
Author: manan164 <[email protected]>
Date:   Thu Jun 20 13:09:13 2024 +0530

    added in other tests

commit 540bbce0bbc82b71ace58472c2775381e1df49aa
Author: manan164 <[email protected]>
Date:   Thu Jun 20 12:52:25 2024 +0530

    Sub workflow sync test fix.

    Since the ordering of the task can be different. The integration_task_2 will be polled and completed.

commit 6d8125535aa5b3aff54a75b5ae0652ee395befc4
Merge: c5d38389c d481f6c55
Author: Viren Baraiya <[email protected]>
Date:   Wed Jun 19 12:02:51 2024 -0700

    Merge pull request #180 from conductor-oss/sub_workflow_sync

    Change Sub workflow to sync task

commit c1cb5f621138645f8bece9d75a6b36ad77bb6f9e
Author: astelmashenko <[email protected]>
Date:   Wed Jun 19 15:21:14 2024 +0300

    added additional configuration properties, error listener, proper handling of queue groups

commit fe9c8b544234b54de2a2fdeb2adecccc7023a452
Author: Marcellus <[email protected]>
Date:   Tue Jun 11 23:13:58 2024 -0300

    fix webhook property validation

     - parameterizing log with placeholder

commit d481f6c55d381d321bf5b72e428079f1d08d2b88
Author: manan164 <[email protected]>
Date:   Tue Jun 11 19:40:43 2024 +0530

    fixes

commit 135837ae20defa1157ab149992b4c255fd529345
Author: manan164 <[email protected]>
Date:   Mon Jun 10 19:57:36 2024 +0530

    fixes

commit d4d1bb3a23883e123be94acf0ae91b1c53e9fe28
Author: manan164 <[email protected]>
Date:   Mon Jun 10 19:00:32 2024 +0530

    more fixes.

commit 8c73f1896358744c3b7d6a9136b2aaaaf66ee43c
Author: manan164 <[email protected]>
Date:   Mon Jun 10 18:34:33 2024 +0530

    rerun test fix.

commit 2b7073ce37312bef4acd86e2fd63f7b0728f9253
Author: manan164 <[email protected]>
Date:   Mon Jun 10 17:27:14 2024 +0530

    remove not required pop

commit b62b70997a2ee3be93ebee195f2c6134a5e0108f
Author: manan164 <[email protected]>
Date:   Mon Jun 10 17:06:24 2024 +0530

    fix sub workflow tests

commit 2de6993430b1ae52c0c67c04e05c365fbd07d1d1
Author: manan164 <[email protected]>
Date:   Mon Jun 10 11:25:41 2024 +0530

    assertion

commit 3d287a44fcb3b463e38f03965c6db9f7a9bb3d8f
Author: manan164 <[email protected]>
Date:   Mon Jun 10 11:16:29 2024 +0530

    Make sub workflow task sync

commit c5d38389cf6fb18f921ac3d0d19daa7441d30bb8
Merge: 99958d28c 50bb82ced
Author: Viren Baraiya <[email protected]>
Date:   Mon Jun 3 12:29:25 2024 +0800

    Merge pull request #169 from conductor-oss/dependabot/gradle/com.diffplug.spotless-6.25.0

    Bump com.diffplug.spotless from 5.0.0 to 6.25.0

commit 50bb82ced7e4257949506f570bd596d8442b98fa
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Mon May 27 13:01:07 2024 +0000

    Bump com.diffplug.spotless from 5.0.0 to 6.25.0

    Bumps com.diffplug.spotless from 5.0.0 to 6.25.0.

    ---
    updated-dependencies:
    - dependency-name: com.diffplug.spotless
      dependency-type: direct:production
      update-type: version-update:semver-major
    ...

    Signed-off-by: dependabot[bot] <[email protected]>

commit 99958d28c3c8ba5108365446945260e340349d9d
Merge: 3e85e965c ed47d7fa5
Author: Viren Baraiya <[email protected]>
Date:   Sun May 26 07:36:04 2024 -0700

    Merge pull request #133 from JCHacking/fix_webhook_without_headers

    fix: Fix error with headers in webhook

commit 3e85e965ce612bd92ee3d8f0a0858e372635ee05
Merge: b7946d097 1a1b459f5
Author: Viren Baraiya <[email protected]>
Date:   Sun May 26 07:35:08 2024 -0700

    Merge pull request #136 from sriharimalagi/feature/keepLastN

    Feature/keepLastN

commit b7946d097a6bbfe31c919f17c5dc5d8495ce412e
Merge: 68e30597e 528e524c2
Author: Viren Baraiya <[email protected]>
Date:   Sun May 26 07:33:38 2024 -0700

    Merge pull request #165 from conductor-oss/dependabot/gradle/io.micrometer-micrometer-registry-datadog-1.13.0

    Bump io.micrometer:micrometer-registry-datadog from 1.12.1 to 1.13.0

commit 68e30597eac048337ba08816aae96de5d5555fa4
Merge: 31e202478 1f2988fd4
Author: Viren Baraiya <[email protected]>
Date:   Sun May 26 07:32:51 2024 -0700

    Merge pull request #167 from conductor-oss/concrrent_exec_limit

    Fix for concurrentExecLimit

commit 1f2988fd44837e2c00fd342d4443a0290e1fb5f4
Author: manan164 <[email protected]>
Date:   Thu May 23 19:20:46 2024 +0530

    Fix for concurrentExecLimit

commit 0c52c4b4bfd72378cfe242cd9b27f10a86a4ed04
Author: Fabio Scippacercola <[email protected]>
Date:   Wed May 22 19:13:31 2024 +0200

    fix: logging of connection failures due to bad evaluation of a string comparison

commit 528e524c2420ed154fcd3b7460e6e7cffe7ffe74
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Mon May 20 12:41:34 2024 +0000

    Bump io.micrometer:micrometer-registry-datadog from 1.12.1 to 1.13.0

    Bumps [io.micrometer:micrometer-registry-datadog](https://github.com/micrometer-metrics/micrometer) from 1.12.1 to 1.13.0.
    - [Release notes](https://github.com/micrometer-metrics/micrometer/releases)
    - [Commits](https://github.com/micrometer-metrics/micrometer/compare/v1.12.1...v1.13.0)

    ---
    updated-dependencies:
    - dependency-name: io.micrometer:micrometer-registry-datadog
      dependency-type: direct:production
      update-type: version-update:semver-minor
    ...

    Signed-off-by: dependabot[bot] <[email protected]>

commit 31e2024780e19053fca3e9eb2eaf31564b0649d6
Merge: 71ee4f0a8 0376d7cbd
Author: Viren Baraiya <[email protected]>
Date:   Sun May 12 12:01:07 2024 -0700

    Merge pull request #128 from ivakoleva/fix-client-abort-exception-nested-in-closed-channel-exception

    Exception handler test coverage added

commit 71ee4f0a81bb8f3b7ad43f2d17451b1550960ada
Author: Viren Baraiya <[email protected]>
Date:   Sun May 12 12:00:17 2024 -0700

    Delete .github/workflows/codacy.yml

commit 30e555c595cffff3e317cd5f2d5db9b098297d4a
Merge: 6aefcc075 ca07ebe1d
Author: Viren Baraiya <[email protected]>
Date:   Sun May 12 11:55:49 2024 -0700

    Merge pull request #143 from ghkdwlgns612/cancled-task

    Fix Issue: notify cancelled task

commit 6aefcc075e2d21c65080f4d2d0b81b2857798dcd
Merge: 098a72006 021934f42
Author: Viren Baraiya <[email protected]>
Date:   Sun May 12 11:55:05 2024 -0700

    Merge pull request #149 from conductor-oss/v1r3n-patch-1

    Create codacy.yml

commit 021934f42a946ba76f8f134b9f01cd3db11d6981
Author: Viren Baraiya <[email protected]>
Date:   Sun May 12 11:53:54 2024 -0700

    Create codacy.yml

commit 098a72006ab9988b969da987554da326d0d61c18
Author: Viren Baraiya <[email protected]>
Date:   Sun May 12 11:41:56 2024 -0700

    add link to the roadmap

commit a0724003e669a0eba458e4daf6a78a679bb01d0b
Author: Viren Baraiya <[email protected]>
Date:   Sun May 12 11:40:13 2024 -0700

    publish roadmap

commit 8d8588ce6cc298d0e7758c7ebabb892a29b5760d
Merge: e669ab9ef cad47f486
Author: Viren Baraiya <[email protected]>
Date:   Wed May 8 22:49:14 2024 -0700

    Merge pull request #145 from VerstraeteBert/fix-pg-create-tasks

    Fix: Wrap PGExecutionDAO createTasks in a single transaction

commit cad47f486b513cf5bb879243f0ab63ed0895781d
Author: Bert Verstraete <[email protected]>
Date:   Tue May 7 17:47:38 2024 +0200

    Wrap PGExecutionDAO createTasks in a single transaction

commit ca07ebe1da8ad59f32923e8144bb644b52803c62
Author: Martini <[email protected]>
Date:   Thu May 2 13:17:32 2024 +0900

    change the point of cancellation

commit 2c16857ee700d3aa6aa5fc1ebd8fb66cf4be1ca0
Author: Martini <[email protected]>
Date:   Tue Apr 30 11:33:03 2024 +0900

    if status-listener error, task not executed

commit e669ab9effd68d788372540e8213f005ee674cf3
Author: Viren Baraiya <[email protected]>
Date:   Sat Apr 27 19:39:41 2024 -0700

    Update README.md

commit 0376d7cbdc93ee4ead77e2b9e368f84bee7b51ef
Author: Iva Avramova <[email protected]>
Date:   Mon Apr 22 14:38:02 2024 +0300

    Why:
    Ignoring a particular exception based on its stack trace
    should be rather an alerting concern.

    What:
    Reverted ClientAbortedException specific handler.
    Added test coverage for the existing exception handler.

    Testing done: local run

    Signed-off-by: Iva Avramova <[email protected]>

commit ef267ad3863e184b337573793bb91da8db9f6d87
Author: Iva Avramova <[email protected]>
Date:   Mon Apr 22 14:12:12 2024 +0300

    added tests; generalized the exception

    Signed-off-by: Iva Avramova <[email protected]>

commit 2e919e535f28a200f8b1494550e7fc023f9a74e6
Author: Iva Avramova <[email protected]>
Date:   Mon Apr 22 13:58:02 2024 +0300

    added tests; generalized the exception

    Signed-off-by: Iva Avramova <[email protected]>

commit ed47d7fa555413129baf2b1345d6c50cc8a8d54c
Author: Juan Cruz <[email protected]>
Date:   Wed Apr 17 21:04:53 2024 +0200

    style: Fix style

commit 1a1b459f5d966043eb2f61b55888aeb23ec21812
Author: Srihari K. Malagi <[email protected]>
Date:   Wed Apr 17 17:04:20 2024 +0530

    Updating DoWhileTask keepLastN iteration endIndex

commit 97c0a5fe8014df0ba7c8bc37a8e3e72db496019b
Author: Srihari Malagi <[email protected]>
Date:   Tue Apr 16 16:39:11 2024 +0530

    Fixed formatting issues

commit eb46749fe18cf7cfdd4c0d092ff303abae3d54a8
Author: Srihari Malagi <[email protected]>
Date:   Tue Apr 16 16:28:12 2024 +0530

    Remove unused code block

commit 36875403ed3db95ea1958000729db7d7ee4b4b3d
Author: Srihari Malagi <[email protected]>
Date:   Tue Apr 16 16:26:53 2024 +0530

    Remove unused code block

commit edd0b1f6c4fedf763c326108203d2e1650afe234
Author: Srihari Malagi <[email protected]>
Date:   Tue Apr 16 16:22:14 2024 +0530

    Added logic to remove stale iteration outputs based on keepLastN parameter

commit 4cea47f7c4753e0ed4b33b8fdb5fb8e72c4ed4a0
Author: Juan Cruz <[email protected]>
Date:   Mon Apr 15 13:48:14 2024 +0200

    fix: Fix error with headers in webhook

commit f1a1afeadf7a1415beb1469c2421ae27dee2c19f
Author: Iva Avramova <[email protected]>
Date:   Sun Apr 14 12:59:57 2024 +0300

    Fix of exception handler trying to write response to a disconnected client

    Why:
    On Conductor server side, an exception gets raised
    `Failure in @ExceptionHandler com.netflix.conductor.rest.controllers.ApplicationExceptionMapper#handleAll(HttpServletRequest, Throwable)`.
    Cause is attempting to write while the client aborted the connection
    `org.apache.catalina.connector.ClientAbortException: java.io.IOException: Broken pipe`, while the exception was nested in `ClosedChannelException`.

    What:
    Added a ClosedChannelException handler for exception chain containing
    ClientAbortException.

    Testing done: Local run. Not trivial to emulate the issue in a test.
    Such a test may rely on timing out the client before server responded.

    Signed-off-by: Iva Avramova <[email protected]>

commit b6ec55f1ccf26972faee887ec49733bad0768cff
Author: Iva Avramova <[email protected]>
Date:   Mon Mar 11 10:00:04 2024 +0200

    Fix of exception handler trying to write response to a disconnected client

    Why:
    On Conductor server side, an exception gets raised
    `Failure in @ExceptionHandler com.netflix.conductor.rest.controllers.ApplicationExceptionMapper#handleAll(HttpServletRequest, Throwable)`.
    Cause is attempting to write while the client aborted the connection
    `org.apache.catalina.connector.ClientAbortException: java.io.IOException: Broken pipe`, while the exception was wrapped in `ClosedChannelException`.

    What:
    Added a ClosedChannelException handler for such exceptions root caused by
    ClientAbortException.

    Testing done: Local run. Not trivial to emulate the issue in a test.
    Such a test may rely on timing out the client before server responded.

    Signed-off-by: Iva Avramova <[email protected]>

commit 55268f0633969379874cc425ef32c9048bbddbfa
Author: Viren Baraiya <[email protected]>
Date:   Wed Apr 10 10:23:48 2024 -0700

    Update README.md

commit cfea67f6810f3a1b20ff689a9824d4cf83bb79ba
Merge: 2963612d7 979146297
Author: Viren Baraiya <[email protected]>
Date:   Wed Apr 10 01:39:37 2024 -0700

    Merge pull request #126 from bjpirt/fix-bad-migration

    Fix the name of the task index migration

commit 979146297e58da7bd678787fecd5599ef56d1458
Author: Ben Pirt <[email protected]>
Date:   Wed Apr 10 08:44:28 2024 +0100

    Fix the name of the task index migration

commit 2963612d788a2c4922c8ed0ca68a0c82fdf9a315
Author: Viren Baraiya <[email protected]>
Date:   Tue Apr 9 23:26:46 2024 -0700

    update the tests for the JOIN task fix

commit dfd07c7cdf2881aef4a64a08ba1253cd16af3a45
Merge: 540e552cd 48e3f873b
Author: Viren Baraiya <[email protected]>
Date:   Tue Apr 9 22:36:58 2024 -0700

    Merge pull request #115 from UofL-BACS-Conductor-Capstone-Team-1/feature/task_webhook

    Feature: Webhooks for Workflow and Task Statuses

commit 540e552cdc0e74b0fad7c6685ec5bcd5af20b5b1
Merge: 177d6ff5c 4d8481814
Author: Viren Baraiya <[email protected]>
Date:   Tue Apr 9 21:53:19 2024 -0700

    Merge pull request #124 from conductor-oss/pg_test_fixes

    Fix tests

commit 177d6ff5c0113249112c86fbc7f2a864775d01c1
Merge: 7e0128d97 e6b91f163
Author: Viren Baraiya <[email protected]>
Date:   Tue Apr 9 21:20:11 2024 -0700

    Merge pull request #120 from conductor-oss/sync_join_task

    Mark join task synchronous

commit 4d8481814d3bf6396b99b53c849e40664997dc1d
Author: Viren Baraiya <[email protected]>
Date:   Tue Apr 9 20:49:05 2024 -0700

    fix formatting

commit 2944753e7349142c1f15aa7417d050f8660975d7
Author: Viren Baraiya <[email protected]>
Date:   Tue Apr 9 20:06:45 2024 -0700

    fix tests

commit 48e3f873bbcb29c78e2e46a895506d8537cec84b
Author: CollinDewey <[email protected]>
Date:   Tue Apr 9 14:41:19 2024 -0400

    Status Notifier Properties Cleanup

commit e6b91f16377eda20e7bb5a8dca28edde244e4cba
Merge: 5e0d0d3d4 7e0128d97
Author: Viren Baraiya <[email protected]>
Date:   Tue Apr 9 09:57:45 2024 -0700

    Merge pull request #122 from conductor-oss/main

    merge from main

commit 7e0128d9700347515ab5fabf60382de170665446
Merge: 0f649b522 9b142cd4d
Author: Viren Baraiya <[email protected]>
Date:   Tue Apr 9 09:51:05 2024 -0700

    Merge pull request #102 from VerstraeteBert/pg-locking

    Postgres locking DAO

commit c6d71c418640d03b3041439d88718a8a32948a50
Author: CollinDewey <[email protected]>
Date:   Tue Apr 9 10:49:17 2024 -0400

    Revert unrelated changes

commit 5e0d0d3d4b48179b52ceb9338df975836c5e6537
Author: Viren Baraiya <[email protected]>
Date:   Tue Apr 9 00:32:16 2024 -0700

    mark join task synchronous

commit 0f649b5220e811d576f30f22685409862f186bfe
Author: Bert Verstraete <[email protected]>
Date:   Fri Apr 5 21:04:08 2024 +0200

    Join task fixes (#117)

    * fix join completing with errors when a task has failed or some tasks are not terminal yet

    * add more tests

    * add more comments to join routine

commit 698c973958faaf06f911867ec056887b3b03f1b3
Author: Elijah Spicer <[email protected]>
Date:   Wed Apr 3 18:26:11 2024 -0400

    revert WorkflowDef changes

commit ff040fe78621a77207c40e8cdd131fb7bc8a6ecd
Author: Olivia Bailey <[email protected]>
Date:   Wed Apr 3 18:17:24 2024 -0400

    Workflow bulk deletion API and action module options (#110)

    * Initial commit to add bulk workflow deletion

    * Added an API endpoint for bulk deletion

    * Add archiveworkflow param

    * Added bulk delete action to BulkActionModule

    * Added archive option to bulk delete

    * Addition of terminateRemove() Functions (#9)

    * Added an API endpoint for bulk deletion

    * Fixed WorkflowBulkServiceTest, added test cases for deleteWorkflow an… (#10)

    * Fixed WorkflowBulkServiceTest, added test cases for deleteWorkflow and terminateRemove, and added WorkflowResourceTest test for single terminateRemove

    * pass spotlessjava

    ---------

    Co-authored-by: JeffP <[email protected]>

    ---------

    Co-authored-by: jeffp1 <[email protected]>
    Co-authored-by: Ayush Thengne <[email protected]>
    Co-authored-by: Jeff P <[email protected]>
    Co-authored-by: Doe1111 <[email protected]>

commit 7e7b88b030497a89de085b1c0ef2e84a46d7ea45
Author: ivakoleva <[email protected]>
Date:   Wed Apr 3 20:46:58 2024 +0300

    Fix of exception handler trying to write response to a disconnected client (#109)

    Why:
    On Conductor server side, an exception gets raised
    `Failure in @ExceptionHandler com.netflix.conductor.rest.controllers.ApplicationExceptionMapper#handleAll(HttpServletRequest, Throwable)`.
    Cause is attempting to write while the client aborted the connection
    `org.apache.catalina.connector.ClientAbortException: java.io.IOException: Broken pipe`

    What:
    Added a ClientAbortException handler.

    Testing done: Local run. Not trivial to emulate the issue in a test.
    Such a test may rely on timing out the client before server responded.

    Signed-off-by: Iva Avramova <[email protected]>

commit 05e7f727efb1c1016fd1bb835b986d4536248edf
Author: Ben Pirt <[email protected]>
Date:   Wed Apr 3 18:31:38 2024 +0100

    Add a migration to relax the size constraint on task_index columns (#114)

commit 9b142cd4d0fd17d342d8c915e956ccddc6cbea50
Merge: 52f06cd6b 416f1391a
Author: Bert Verstraete <[email protected]>
Date:   Wed Apr 3 11:00:14 2024 +0200

    Merge branch 'conductor-oss:main' into pg-locking

commit 416f1391a425e57262fdee281e38d218fddb8a2c
Author: Riza Farheen <[email protected]>
Date:   Wed Apr 3 10:01:56 2024 +0400

    Update README.md (#113)

commit cc5f8c0ff13cf8679b6c532273d263568eaeaaea
Author: omadaan <[email protected]>
Date:   Wed Apr 3 16:59:33 2024 +1100

    Fix PostgresIndexQueryBuilder null pointer exception (#116)

    * Throw IllegalArgumentException when query string does not match regex

    * Unit test for exception

commit 14c0c8d205a99daf37518f96a227053b46d6b159
Author: CollinDewey <[email protected]>
Date:   Tue Apr 2 00:08:24 2024 -0400

    Workflow and task status notifier

    Co-authored-by: ToastedTaco <[email protected]>
    Co-authored-by: BabyBlue0214 <[email protected]>
    Co-authored-by: Elijah Spicer <[email protected]>

commit 1fc19167e14a96da18d5472b334b3cec15ac1f50
Author: Viren Baraiya <[email protected]>
Date:   Wed Mar 27 10:52:09 2024 -0700

    Update README.md

commit 52f06cd6bace2d5221c4d678dd5200ce17235b30
Author: Bert Verstraete <[email protected]>
Date:   Mon Mar 25 13:43:51 2024 +0100

    timeunit ms

commit 9b918530864d240c201337ab48e9b2f7b82c4d66
Author: Bert Verstraete <[email protected]>
Date:   Mon Mar 25 12:44:03 2024 +0100

    fix tests

commit 495eac67b3f59b743e7bf4f0e281f7764502a848
Author: Anup Chatterjee <[email protected]>
Date:   Tue Mar 19 18:42:07 2024 +0200

    Adding redis username support for clusters (#105)

    Co-authored-by: Anup Chatterjee <[email protected]>

commit cf72cc6ebe461e10ca7665d531ebb77b1f48e359
Author: Bert Verstraete <[email protected]>
Date:   Mon Mar 18 11:37:09 2024 +0100

    simplify query

commit 3de9aabf5221f1e04219d2e192b4c7892931e2c8
Author: Bert Verstraete <[email protected]>
Date:   Mon Mar 18 11:22:42 2024 +0100

    fix pg query

commit 101d6811479b1d89ed641bbaff102a8ba64fa70a
Author: Bert Verstraete <[email protected]>
Date:   Wed Mar 13 09:46:43 2024 +0000

    fix test

commit 845e7efd6e5b7ef32cb0195a9f6a944b0f6597b0
Author: Bert Verstraete <[email protected]>
Date:   Tue Mar 12 11:16:55 2024 +0000

    refactor query - the pg now() function is already UTC

commit e64505c5d8085414469f090ec683abe8bd2caf30
Author: Bert Verstraete <[email protected]>
Date:   Tue Mar 12 11:14:01 2024 +0000

    rename locking db migration

commit 617c42dae2f539c9477803bca9d573c57d82dd56
Author: Bert Verstraete <[email protected]>
Date:   Thu Mar 7 15:10:11 2024 +0000

    add postgres locking mention in docs

commit 9e5f5d38b739074aa6d9641923cca7f0bec7f136
Merge: 5d7697e60 e195ef621
Author: Bert Verstraete <[email protected]>
Date:   Thu Mar 7 15:07:04 2024 +0000

    Merge branch 'conductor-oss:main' into pg-locking

commit 5d7697e609f60809850427ecead7f5724dc471b9
Author: Bert Verstraete <[email protected]>
Date:   Thu Mar 7 12:22:45 2024 +0000

    Implement postgres lock DAO

commit e195ef621b76f8be8e33957996b16232bba71266
Author: Ben Pirt <[email protected]>
Date:   Tue Mar 5 18:54:48 2024 +0000

    Add option to only index workflows on Postgres when their status changes (#83)

commit ce2185430b7259d8cc4aa5daa543b9eea32bed41
Author: Young-Zen <[email protected]>
Date:   Wed Mar 6 01:36:07 2024 +0800

    Fix ElasticSearch health check failure when ES sets password (#59)

commit 04691b1709ea26f60bf8a0c8a01e3e77456a7384
Author: Ben Pirt <[email protected]>
Date:   Tue Mar 5 17:30:39 2024 +0000

    Update the postgres docs with all configurable properties (#99)

commit afa9499e201dc1130809585909978788e858acbc
Author: Ben Pirt <[email protected]>
Date:   Tue Mar 5 17:14:08 2024 +0000

    Initial implementation of an experimental queue optimisation using Postgres LISTEN/NOTIFY (#87)

    * Initial implementation of an experimental queue optimisation using Postgres LISTEN/NOTIFY

    * Use Optional instead of returning null for getSize()

    * Update connection method for queue listener to make it more thread safe

    * Only apply the queue notify migrations if configured

commit 71c9f957da89853a6959bf866029229b4edd77d6
Author: Ben Pirt <[email protected]>
Date:   Tue Mar 5 15:10:24 2024 +0000

    Implementation of Postgres PollDataDAO with read and write caching (#82)

commit 4008a070601b5e3c7d367b029df5c9396f3ec13f
Author: Young-Zen <[email protected]>
Date:   Tue Mar 5 13:23:49 2024 +0800

    Fix SpringBoot imports file location error (#89)

commit 700619abaa37d4666232a118de2de2536cafae64
Author: Hoony <[email protected]>
Date:   Tue Mar 5 14:20:29 2024 +0900

    Feature: Use TaskStatusListener.onTaskInProgress()  (#58)

    * apply task-task-status-listener

    * fix test error

    * prevent NPE

commit 26af4cb416b4275f4f87caef2e4c7cb9b7711c72
Author: Ben Pirt <[email protected]>
Date:   Mon Mar 4 22:16:19 2024 +0000

    Enable the migration to run without always recreating an index (#98)

commit f73e2a4191254311eb2f3f1666c92ba4b44a0adf
Merge: fd675a1d3 7a0e7c893
Author: Boney <[email protected]>
Date:   Mon Mar 4 14:15:14 2024 -0800

    Merge pull request #66 from bjpirt/postgres-index-delete

    Implement removeWorkflow and removeTask for PostgresIndexDAO

commit 7a0e7c89324430243ae5317f03b790bea186306b
Author: Ben Pirt <[email protected]>
Date:   Mon Feb 5 08:55:17 2024 +0000

    Implement removeWorkflow for postgres index

commit fd675a1d3ff07fd161940198da53a56efd176182
Author: Ben Pirt <[email protected]>
Date:   Sun Mar 3 23:05:16 2024 +0000

    Enable finer-grained control over the postgres indexing and searching (#93)

    * Enable the searching of the JSON field in Postgres to be configured

    * Enable the indexing of tasks to be enabled / disabled

commit 98925165130d62cdbb6671d0db3463e39e5894fb
Author: Ben Pirt <[email protected]>
Date:   Sun Mar 3 23:04:52 2024 +0000

    Upgrade the postgres lib to prevent CVE-2024-1597 (#94)

commit 9d3632753b21f5ed36d1bde076694f223b69d70d
Author: Ben Pirt <[email protected]>
Date:   Sun Mar 3 23:04:34 2024 +0000

    Fix an issue with the postgres indices as they weren't being used properly (#92)

commit 2b86a87fa5dd19132d7c1f1d1889e9c6e38873f8
Author: Vasiliy Pankov <[email protected]>
Date:   Sat Feb 24 00:11:26 2024 +0400

    Feature - use environment variable to set ES6 support mode for Nashorn script evaluator (#88)

    Use environment variable CONDUCTOR_NASHORN_ES6_ENABLED=true  to set ES6 support mode for Nashorn script evaluator.

commit 06bc5fd4c9a57e9f532a6ad8eab39667ce92678d
Author: Ben Pirt <[email protected]>
Date:   Wed Feb 21 12:43:23 2024 +0000

    Optimise the postgres queries for popping messages (#76)

commit e04c9bf129c887d5bf227df604211b9ab51706dc
Author: Ikko Eltociear Ashimine <[email protected]>
Date:   Fri Feb 16 03:26:25 2024 +0900

    Update README.md (#72)

    againt -> against

commit 874896d5cd7b9758ec55b021a61050ff3192d72f
Author: Kunal Kumar <[email protected]>
Date:   Thu Feb 15 23:56:04 2024 +0530

    Update source.md (#75)

    changed excuted -> executed

commit fe073aa9752560e0753646393718ac90a92e3657
Author: Riza Farheen <[email protected]>
Date:   Thu Feb 15 22:25:28 2024 +0400

    Left menu URL fix for docs site (#77)

    Update mkdocs.yml by @RizaFarheen

commit 386dde51069bff2280efc1b1cbb572b6da81a6da
Author: Viren Baraiya <[email protected]>
Date:   Sun Feb 11 19:12:35 2024 -0800

    Update README.md

commit 1fb3405e6ebc56bbb5f177ea4a647ffb0d27d8f7
Author: Viren Baraiya <[email protected]>
Date:   Mon Feb 5 19:01:59 2024 -0800

    fixes

commit 60c1d5e7d63a0f06970e361dffbf243958400bbb
Author: Viren Baraiya <[email protected]>
Date:   Mon Feb 5 11:13:57 2024 -0800

    update the workflow template

commit b95d37c38ffc787c621d5f5c6f5d3bf0223319c5
Author: Young-Zen <[email protected]>
Date:   Sat Feb 3 02:37:33 2024 +0800

    Add imports file that define auto configure classes supported by spring-boot 2.7 (#60)

commit 9a6abede48c87eee6d84d8b3b2f517d2850ed6f1
Author: Richard Meng <[email protected]>
Date:   Thu Feb 1 03:03:59 2024 +0800

    Fix redundant taskDef in DB (#17)

commit abf29a0848be266cf47aafa5d458bf864f787f97
Author: HOA PHAN <[email protected]>
Date:   Thu Feb 1 05:55:54 2024 +1100

    upgrade from gradle 7.6.2 to gradle 8.5 (#28)

commit 2cab4f9e53c99b9216cef07429bf74b838761277
Author: tiffany jernigan <[email protected]>
Date:   Tue Jan 30 14:58:12 2024 -0800

    Remove unnecessary Autowired from Constructors (#36)

    * Remove unnecessary Autowired from Constructors

    * Add @Autowired back to property classes

    ---------

    Co-authored-by: tiffany jernigan <[email protected]>

commit 54772643f123ecb050a661ea4c78de0470b1c8ab
Author: Hoony <[email protected]>
Date:   Wed Jan 31 07:57:51 2024 +0900

    Change dependency group,version (#48)

commit 5cc377f6c22f1ea6e698c0a2f2a8a2f5cbe4251c
Author: Riza Farheen <[email protected]>
Date:   Wed Jan 31 02:57:32 2024 +0400

    Documentation link update in Readme (#54)

    * Update README.md

    * Revert "Update README.md"

    This reverts commit fe16da94b68dff80313a262c6db49f4a78425fe9.

    * Update README.md

commit 042e95c2a62e22b9dc71354cd4142d44cdc5c4fd
Author: Brian Hawkins <[email protected]>
Date:   Tue Jan 30 15:57:12 2024 -0700

    prevents orkes-queues from pulling in old version of condcutor (#55)

commit ac00735d423dce451c94273e01fa916867e07718
Author: Dennis Caldwell <[email protected]>
Date:   Tue Jan 30 17:56:51 2024 -0500

    Fix CVEs in 3.16. (#46)

    * Upgraded ES7 to 7.17.16, alpine to 3.19

    * Update ElasticSearch to 7.17.16, some sdk tests are failing.

    * Server would not run, StackOverflow - 54742540 had this handy fix.

    * Use the new image in test container.

    * Update Spring Boot to 3.2.1. One failing test in end to end.

    * Handle the change in exceptions from Spring Framework.

    * Update AWS SDK for CVE fix.

    * Replace generic import with specific class.

    * Removed dependencies.lock file from projects. No longer used.

commit 582a74c0c16f25df5e2df8c2150335cf4dc707b3
Author: Viren Baraiya <[email protected]>
Date:   Tue Jan 23 12:02:19 2024 -0800

    Update README.md

commit 2e309b2a0b3780937f9c56a02f81d0153504eb7d
Author: Hari R <[email protected]>
Date:   Tue Jan 9 10:21:53 2024 +0530

    Fixes #7, another dormant bug (#9)

    * Fixes #7, another dormant bug

    * Review comment - Combine Regexes

commit f42a2798480436a7929f8b8d9791959fa8ff58f2
Author: Viren Baraiya <[email protected]>
Date:   Sat Jan 6 11:06:19 2024 -0800

    update deployment properties

commit 64073f080f834dc580583367d6205c78b50f6088
Author: Viren Baraiya <[email protected]>
Date:   Fri Jan 5 22:00:08 2024 -0800

    Test fixes (#35)

    * Update the tests

commit a8f1260105f59d3603e056f999392bc020f07145
Author: Viren Baraiya <[email protected]>
Date:   Fri Jan 5 14:13:30 2024 -0800

    deployment preparation

commit 3faeec6a0311c78ebc0f0cf94caf5c357631de82
Author: Viren Baraiya <[email protected]>
Date:   Thu Jan 4 14:51:52 2024 -0800

    Update README.md

commit 50c88c5d351d88fd2d7da3759a4c2a364feb6725
Merge: fec31166c 8c1d5f328
Author: Viren Baraiya <[email protected]>
Date:   Thu Jan 4 14:08:07 2024 -0800

    Merge pull request #34 from conductor-oss/oss-publishing

    Update publishing flow

commit 8c1d5f328cb72875554ef82c80b726bbf964906d
Author: c4lm <[email protected]>
Date:   Fri Jan 5 01:31:39 2024 +0400

    Update publishing flow

commit fec31166c543af40186cd44b4f82ad29196aaa63
Merge: e60b0e6ef 965fb58ce
Author: Viren Baraiya <[email protected]>
Date:   Tue Dec 26 19:27:13 2023 -0800

    Merge pull request #19 from saksham2105/conductor-oss-fixDynamicForkIssue

    conductor-oss-fixDynamicForkIssue: Sync FORK_JOIN_DYNAMIC with Enterprise Version

commit e60b0e6ef2f58cdae6bbc4be5103f0e2e1747ef1
Merge: 88f6e18ac fdf5f5e73
Author: Viren Baraiya <[email protected]>
Date:   Fri Dec 22 19:25:52 2023 -0800

    Merge pull request #3 from ivakoleva/permissive-task-feature

    Permissive task capability

commit 88f6e18acd6c7c6adc75fb1f78ea82b2120b4238
Merge: d73a991ee 508c9fb8e
Author: Viren Baraiya <[email protected]>
Date:   Fri Dec 22 10:58:12 2023 -0800

    Merge pull request #15 from boney9/task-update-api

    Add the task update API by reference name

commit d73a991eeb3c7cd5363cb1d053a486c552787d18
Merge: c016206d0 fd4eb9507
Author: Viren Baraiya <[email protected]>
Date:   Fri Dec 22 10:56:29 2023 -0800

    Merge pull request #23 from s50600822/main

    classifier is deprecated since gradle 5.1(replaced by archiveClassifier) and removed in 8

commit c016206d0934df7f3eab4283012ceba7bfea9cba
Merge: 00c0673a2 5c06b37ad
Author: Viren Baraiya <[email protected]>
Date:   Fri Dec 22 10:55:54 2023 -0800

    Merge pull request #27 from conductor-oss/community-docs-cleanup-2

    cleanup docs

commit 5c06b37ad18038d8a34e0f438d3efe10c179ec97
Author: c4lm <[email protected]>
Date:   Fri Dec 22 22:24:59 2023 +0400

    more cleanup

commit 965fb58ce6029d2fc2932a0d6c92fd004b873fef
Author: saksham2105 <[email protected]>
Date:   Fri Dec 22 20:29:45 2023 +0530

    conductor-oss-fixDynamicForIssue: Update the doc for dynamic fork sync with version

commit 3896ef2e1a79f01c9e11235c870b353dfce0694c
Author: saksham2105 <[email protected]>
Date:   Wed Dec 20 19:47:42 2023 +0530

    conductor-oss-fixDynamicForkIssue: Fix groovy testcase failure

commit 2a55004c02d042b10a4dfec524cff6c3a30de651
Author: saksham2105 <[email protected]>
Date:   Wed Dec 20 18:18:47 2023 +0530

    conductor-oss-fixDynamicForkIssue: Fix for dynamic fork issue

commit dbbc9a86f1982bb0a98297f625aac50cbb88a5cf
Merge: 235b5c184 00c0673a2
Author: c4lm <[email protected]>
Date:   Fri Dec 22 02:35:11 2023 +0400

    Merge branch 'main' into community-docs-cleanup-2

    # Conflicts:
    #	CONTRIBUTING.md

commit 00c0673a2157bf0653e0a44b5c89b7b564b7a000
Merge: eaae3b685 be682db3c
Author: Viren Baraiya <[email protected]>
Date:   Thu Dec 21 14:11:36 2023 -0800

    Merge pull request #21 from conductor-oss/oss_prep

    Prepare for the build and release

commit 235b5c1847974b026f5d1def1b36e7d410d30c2c
Author: c4lm <[email protected]>
Date:   Fri Dec 22 01:57:23 2023 +0400

    more cleanup and mention js sdk

commit 9d584168fecd9fff8765dbbde85dc48b06a33f59
Author: c4lm <[email protected]>
Date:   Thu Dec 21 23:28:28 2023 +0400

    cleanup docs

commit eaae3b6851ea1c2021de52d6e2f006a854f4e68f
Merge: 0c5c760c0 65cb6ea39
Author: Dilip Lukose <[email protected]>
Date:   Thu Dec 21 00:19:03 2023 -0800

    Merge pull request #24 from conductor-oss/dilip-lukose-patch-1

    Update README.md

commit 65cb6ea39393fb26d57a2e59a4f982dbea3c93cf
Author: Dilip Lukose <[email protected]>
Date:   Thu Dec 21 00:01:57 2023 -0800

    Update README.md with correct logo path

commit 25de43153e09a46d2d59abbd2a4ddf0828ab17b0
Author: Dilip Lukose <[email protected]>
Date:   Wed Dec 20 23:40:42 2023 -0800

    Update README.md

    Updated logo file

commit fd4eb9507852ad0ffe092af43053f235d41517b0
Author: s50600822 <[email protected]>
Date:   Thu Dec 21 15:28:48 2023 +1100

    classifier is deprecated since gradle 5.1(replaced by archiveClassifier) and removed in 8

commit 0c5c760c0ec68ddf5277a1875126685d5a7b5633
Author: c4lm <[email protected]>
Date:   Thu Dec 21 01:13:38 2023 +0400

    update doc gen

commit 80bfb019a1ff53b2bb1b0ecb33e75f4428ccd201
Author: Vasiliy Pankov <[email protected]>
Date:   Thu Dec 21 00:59:56 2023 +0400

    Update generate_gh_pages.yml

commit 62fe7370ddec98c14042ab7733a5feb526049378
Author: Vasiliy Pankov <[email protected]>
Date:   Thu Dec 21 00:56:32 2023 +0400

    Update generate_gh_pages.yml

    Use personal token

commit be682db3c0528019d39edd9d599c37e411a92d64
Author: Viren Baraiya <[email protected]>
Date:   Wed Dec 20 12:55:07 2023 -0800

    Update CODE_OF_CONDUCT.md

commit 8de01b899accd0df0b35c23bce225b73a21427bd
Author: Vasiliy Pankov <[email protected]>
Date:   Thu Dec 21 00:52:28 2023 +0400

    Update generate_gh_pages.yml

    Update token

commit 5091fdcd969086ccee32c64522d080c28b2e6c23
Author: Viren Baraiya <[email protected]>
Date:   Wed Dec 20 12:45:39 2023 -0800

    fixes

commit 3952a895cdd16851a702a53e15a5f33667755200
Author: Vasiliy Pankov <[email protected]>
Date:   Thu Dec 21 00:30:54 2023 +0400

    Update generate_gh_pages.yml

commit 42fd59e1bae2c96e008c2801f93588772740222c
Author: Vasiliy Pankov <[email protected]>
Date:   Thu Dec 21 00:27:41 2023 +0400

    Community docs initial (#22)

    Changes to make github pages based docs work

commit d14d6b221874e39c1e08ef1573f03be05faa663b
Author: Viren Baraiya <[email protected]>
Date:   Wed Dec 20 12:01:54 2023 -0800

    Update CODE_OF_CONDUCT.md

commit e90d7079929806c35a4abc7baa745ab0eb91167b
Author: Viren Baraiya <[email protected]>
Date:   Wed Dec 20 11:55:24 2023 -0800

    clean up

commit c8a7164812b91dee4ac1bbba6def30e4961bf7ec
Author: Viren Baraiya <[email protected]>
Date:   Wed Dec 20 11:53:12 2023 -0800

    Update CONTRIBUTING.md

commit 9d2af68ebb1bbc924bff3c0121d2b4ccebdc33fe
Author: Viren Baraiya <[email protected]>
Date:   Wed Dec 20 11:52:28 2023 -0800

    Update contributing.md

commit b1c5d6892904836ea5982f5cc0fd4deb84e1f730
Author: Viren Baraiya <[email protected]>
Date:   Wed Dec 20 11:42:41 2023 -0800

    fixes

commit 83b7eef9b3de24f12c7a1892cd0c8be1ea051bd1
Author: Viren Baraiya <[email protected]>
Date:   Wed Dec 20 11:41:30 2023 -0800

    fix typo

commit 71b2b5731d11b70dd304179df5737e8f7bf09334
Author: Viren Baraiya <[email protected]>
Date:   Wed Dec 20 11:20:22 2023 -0800

    license header changes

commit b84b9af4d35dcc35c37663ac12901f5beb78441e
Merge: 297870197 a444e23d6
Author: Viren Baraiya <[email protected]>
Date:   Wed Dec 20 01:12:25 2023 -0800

    Merge pull request #12 from conductor-oss/community_merge

    Merge community module into main conductor repo.
    Update community to springboot 3

commit a444e23d6cb5896b20a570ef400a90a9eac2ab62
Author: Viren Baraiya <[email protected]>
Date:   Tue Dec 19 13:06:54 2023 -0800

    Update SECURITY.md

commit 7128d66a49a0b83188b3a29fdc66558d1c278059
Author: Viren Baraiya <[email protected]>
Date:   Tue Dec 19 13:06:38 2023 -0800

    Update SECURITY.md

commit fdf5f5e73839e196b472dd2d15a178e6dea29fc9
Author: Iva Koleva <[email protected]>
Date:   Tue Dec 19 21:38:19 2023 +0200

    WorkflowTask permissive property added, so various task types
    can be permissive.

commit e8d17df0a6945ad93e6db2675808a536b7c6d65e
Author: Viren Baraiya <[email protected]>
Date:   Tue Dec 19 01:06:22 2023 -0800

    Update RedisLockTest.java

commit 7dcb6c209b66785eaf273ba0dad0f30dace7e252
Author: Viren Baraiya <[email protected]>
Date:   Tue Dec 19 00:13:27 2023 -0800

    test fixes

commit 508c9fb8e7ca51a8ff9fbc6bf9c70fe9f0aa21c4
Author: boneys <[email protected]>
Date:   Mon Dec 18 23:48:35 2023 -0800

    Add the task update API by reference name

commit 39faefd5e7450501c197994f1b9f2660645a7012
Author: Viren Baraiya <[email protected]>
Date:   Mon Dec 18 23:42:16 2023 -0800

    build fixes

commit a08d1eb3ef3d7491ca8a3fa265a5a53912635b3a
Author: Viren Baraiya <[email protected]>
Date:   Mon Dec 18 23:17:53 2023 -0800

    build fixes

commit 5ef4cfdffc25f7cd3704daf9efc939ea58ba941b
Author: Viren Baraiya <[email protected]>
Date:   Mon Dec 18 22:44:24 2023 -0800

    docker compose

commit 6445f3b86e4dd71c00497eea2b041bd4a5259dc3
Merge: 72543e47c 297870197
Author: Viren Baraiya <[email protected]>
Date:   Mon Dec 18 09:48:39 2023 -0800

    Merge branch 'main' into community_merge

commit 297870197194253f6557d8b56bd49451b4d3d822
Merge: f2ee41a68 922f52818
Author: Viren Baraiya <[email protected]>
Date:   Mon Dec 18 09:46:30 2023 -0800

    Merge pull request #11 from Young-Zen/fix-elasticsearch-dependency

    Fix elasticsearch dependency error

commit 922f528180872caff666c9fad790fb2aed3d28e4
Author: yanghaojia <[email protected]>
Date:   Mon Dec 18 15:09:16 2023 +0800

    Fix elasticsearch dependency error

commit 72543e47ccfd805489cc5262cc6a54005719c56e
Author: Viren Baraiya <[email protected]>
Date:   Sun Dec 17 20:04:10 2023 -0800

    formatting

commit 5587e26f950841f9a0a1010fba379bf1d6687cd0
Author: Viren Baraiya <[email protected]>
Date:   Sun Dec 17 20:03:28 2023 -0800

    Update application.properties

commit a9c1f1da7a6a0b06ec5474f87f133e104abafad4
Author: Viren Baraiya <[email protected]>
Date:   Sun Dec 17 19:59:09 2023 -0800

    datadog fixes

commit 57b1fa06fb09788f4907098fd5c3a835d89a4835
Author: Viren Baraiya <[email protected]>
Date:   Sun Dec 17 19:20:50 2023 -0800

    test fixes

commit a44c3c9075e2c11d2f7197bc17042e9f13984c89
Author: Viren Baraiya <[email protected]>
Date:   Sun Dec 17 19:08:16 2023 -0800

    event queues

commit 1f59457b4320d42f0d2cee9743f84c37ad392b14
Author: Viren Baraiya <[email protected]>
Date:   Sun Dec 17 19:04:00 2023 -0800

    external payload store

commit ffd014c95ebda08a96768f4f161205b28b2cc557
Author: Viren Baraiya <[email protected]>
Date:   Sun Dec 17 18:58:56 2023 -0800

    es7

commit e31f8bf90e24822a78f8cc0dd9130da11903abc7
Author: Viren Baraiya <[email protected]>
Date:   Sun Dec 17 18:48:20 2023 -0800

    Elasticsearch 7

commit cd160a2aba6e850adff00ac46f9911e80ecce181
Author: Viren Baraiya <[email protected]>
Date:   Sun Dec 17 18:43:42 2023 -0800

    metrics

commit a138919249ab5334c831c25db142e003f0ef762a
Author: Viren Baraiya <[email protected]>
Date:   Sun Dec 17 18:40:41 2023 -0800

    postgres and mysql persistence

commit f2ee41a68ce6aa8ab3a1c39bcf7c239bb1edae4f
Merge: fb122cbda 42d7a78fc
Author: Viren Baraiya <[email protected]>
Date:   Sun Dec 17 17:00:16 2023 -0800

    Merge pull request #10 from LuisLainez/issue/CleanUpSpring3Changes

    Cleanup previous changes

commit 42d7a78fc665ed5d1a4014e1d42555bea8b3a4b1
Author: Luis Lainez <[email protected]>
Date:   Mon Dec 18 08:00:22 2023 +1100

    Cleanup previous changes

commit 31505dd956290a405b0ec7972ce013983cfd7981
Author: Viren Baraiya <[email protected]>
Date:   Sun Dec 17 12:53:21 2023 -0800

    kafka task

commit da92c670d3a0c1ee10b41ad2dc3352c217da0156
Author: Viren Baraiya <[email protected]>
Date:   Sun Dec 17 12:39:10 2023 -0800

    status listener

commit fb122cbda6231d407090ba34fa11cfa30cde9a27
Merge: 0ed1fa0c8 ebd0fa2d1
Author: Viren Baraiya <[email protected]>
Date:   Sun Dec 17 11:08:46 2023 -0800

    Merge pull request #1 from conductor-oss/springboot3_upgrade

    springboot3 upgrade

    Authored by: @LuisLainez

commit ebd0fa2d152b4fcaac748127cf5856d5fb95ff2f
Author: Viren Baraiya <[email protected]>
Date:   Sun Dec 17 10:50:06 2023 -0800

    dependencies

commit dbbe6b5e7c855e1cc9718a827b420b3ca4d1b747
Author: Viren Baraiya <[email protected]>
Date:   Sun Dec 17 10:31:13 2023 -0800

    Update ci.yml

commit 67f699ca70abd091e2549ad21ae8beb40ef6adac
Author: Viren Baraiya <[email protected]>
Date:   Sun Dec 17 10:17:28 2023 -0800

    Update ci.yml

commit 9e2c85eaca07b365945b8acbb7d19201c271fb28
Author: Viren Baraiya <[email protected]>
Date:   Sun Dec 17 10:16:04 2023 -0800

    springdocs

commit c7652a98685be1ac7ff57e93e1632ab1a96a672f
Author: Viren Baraiya <[email protected]>
Date:   Sun Dec 17 10:02:04 2023 -0800

    dependencies

commit 693124e86484ef5c35a8da1863fae3825308af0a
Author: Viren Baraiya <[email protected]>
Date:   Sun Dec 17 09:56:12 2023 -0800

    dependency locks

commit ebc1cae73f434c75e3859405ad054420b040ee04
Merge: 064b0a629 0ed1fa0c8
Author: Viren Baraiya <[email protected]>
Date:   Sun Dec 17 09:37:27 2023 -0800

    Merge branch 'main' into springboot3_upgrade

commit 0ed1fa0c822ac8fde3a269022fca44c17e3cc5bd
Merge: a20779815 2bd645cd3
Author: Viren Baraiya <[email protected]>
Date:   Sat Dec 16 20:32:04 2023 -0800

    Merge pull request #5 from scottcarter87/conductor-vulnerabilities-fix

    Resolve open vulnerabilities in Conductor

commit a20779815e0e75e4ec1c4e796d4d8b32bf61b58e
Merge: c1bf1096d 4762cc2f0
Author: Viren Baraiya <[email protected]>
Date:   Sat Dec 16 20:31:42 2023 -0800

    Merge pull request #6 from Young-Zen/fix-typo-in-WorkflowTaskTypeConstraint

    Fix typo in WorkflowTaskTypeConstraint

commit c1bf1096db21c041619ead43b0f529e978ad4f47
Merge: 3c15237fd 4fe1aaeb1
Author: Viren Baraiya <[email protected]>
Date:   Fri Dec 15 20:00:40 2023 -0800

    Merge pull request #4 from math29/bugfix/setVariable-error-message

    bugfix: wrong unit used in SetVariable error message

commit 2bd645cd33e00fb6734b3854fc5a2f554b4bb71d
Author: Scott Carter <[email protected]>
Date:   Thu Dec 14 10:22:28 2023 -0500

    Resolve open CVEs in Conductor code.

commit 4fe1aaeb179d65fffdd4614edbabef20beaff84a
Author: mallain <[email protected]>
Date:   Thu Dec 14 13:18:14 2023 +0100

    bugfix: wrong unit used in SetVariable error message on payloadSize > maxThreshold

commit 92f06bf1bf397d5d92ff9a835d59a3e2e5bb51bf
Author: Iva Koleva <[email protected]>
Date:   Thu Dec 14 10:25:00 2023 +0200

    Permissive task capability

    Why:
    We need idempotent forked tasks, meaning all tasks get
    executed, but any failures are still detected upon join.
    Feature request https://github.com/Netflix/conductor/issues/3861

    What:
    Introduced the concept of Permissive tasks.
    A Permissive task is similar to a Simple task. The
    difference is, it permits the other tasks to continue -
    in case a Permissive task failed.
    Result is:
    1. Forked Permissive tasks will let each other
    be evaluated, until all the forked tasks had terminated.
    Only then, the join task should fail. In case of Permissive
    optional tasks, the join will not fail.
    2. Permissive sequential tasks will let subsequent tasks
    continue. While at the end, the workflow will fail in case
    a permissive task had failed. The workflow would not fail
    in case of Permissive optional task failure.

    Testing done: PermissiveTaskMapperTest added,
    TestDeciderOutcomes.testPermissive() added,
    WorkflowAndTaskConfigurationSpec
    "Test simple workflow which has a permissive task" and
    "Test simple workflow which has a permissive optional task added"
    that cover retry, ForkJoinSpec
    "Test a simple workflow with fork join permissive failure flow"
    added and "Test retrying a failed permissive fork join workflow" added.
    In addition, performed e2e tests locally running a Conductor instance.
    Did build a docker image with the code changes made, started it locally,
    and started a SampleWorker to poll 3 tasks in parallel.
    Verified e2e scenarios of task_def_permissive, task_def_permissive_optional,
    task_def_simple.json, task_def_simple_optional.json, each joining on
    6 forked tasks, then running simple task 7 after join.

commit 3c15237fdf8a1f93c2885834af76cc25a5db8b8b
Author: Viren Baraiya <[email protected]>
Date:   Wed Dec 13 12:36:50 2023 -0800

    Update README.md

commit c68ca4e58f0ae3a5c2740a1e71c1da0c2319ab81
Author: Viren Baraiya <[email protected]>
Date:   Wed Dec 13 11:36:58 2023 -0800

    Update README.md

commit e8dec7ad63a9052e12e591a6fd0628265c68dd5e
Author: Viren Baraiya <[email protected]>
Date:   Wed Dec 13 11:34:47 2023 -0800

    Update README.md

commit 1c3442eb059f83f029a15ced05d62df38f08a71f
Author: Viren Baraiya <[email protected]>
Date:   Wed Dec 13 10:54:01 2023 -0800

    Update README.md

commit f1136f7bb16db6c2088fc48cb83347d2a534acca
Author: Viren Baraiya <[email protected]>
Date:   Wed Dec 13 10:33:22 2023 -0800

    Update README.md

commit 11ae434b3c7a18857f64b2af17e46ef65efa1e43
Author: Viren Baraiya <[email protected]>
Date:   Wed Dec 13 10:32:08 2023 -0800

    Update README.md

commit aa31ca1872e01fb3cee5515b1af349db44a1b5b3
Author: Viren Baraiya <[email protected]>
Date:   Wed Dec 13 10:08:26 2023 -0800

    Update README.md

commit adbfac6119cf3178bffe3e36b768fe38e42c04c0
Author: Viren Baraiya <[email protected]>
Date:   Wed Dec 13 10:05:29 2023 -0800

    Update README.md

commit 9b2b5a6681d86d969a177a8b5ffc86ef8ee9e549
Author: Viren Baraiya <[email protected]>
Date:   Wed Dec 13 08:55:23 2023 -0800

    Update README.md

commit 83d6d8c5e15171a0e48f5d50bdb3871a65664ca7
Author: Viren Baraiya <[email protected]>
Date:   Tue Dec 12 13:43:21 2023 -0800

    Update README.md

commit 673d7173089d483d86645aad3739539acbf3af84
Author: Viren Baraiya <[email protected]>
Date:   Tue Dec 12 13:29:41 2023 -0800

    Update README.md

commit d888738c19d011a78364bb9b03ea5cbdacb13c9b
Author: Viren Baraiya <[email protected]>
Date:   Tue Dec 12 13:21:41 2023 -0800

    Update README.md

commit 06e61158bfbf3a1c8dbc6b912ddff4ed3e30fda7
Author: Viren Baraiya <[email protected]>
Date:   Tue Dec 12 13:19:39 2023 -0800

    Update README.md

commit 8af6706c790e1aaf8ce075cc8acbb1083da90b8d
Author: Viren Baraiya <[email protected]>
Date:   Fri Dec 8 13:58:13 2023 -0800

    Update README.md

commit cf0cfe47567389b510110004bbead7d5541ca513
Author: Viren Baraiya <[email protected]>
Date:   Fri Dec 8 13:31:21 2023 -0800

    update readme

commit d7373de5e955a4c83a4cd3704e57eb7dccb2d9d0
Author: Viren Baraiya <[email protected]>
Date:   Fri Dec 8 13:29:06 2023 -0800

    update code of conduct

commit 4336cfb9cc3974d1b32b55af65c69ffa2aed54ab
Merge: ca422db22 3a67c2507
Author: Viren Baraiya <[email protected]>
Date:   Fri Dec 8 00:09:05 2023 -0800

    Merge pull request #2 from conductor-oss/oss_update

    OSS update

commit 3a67c25075ebf4baa620343f7a31e40fc2897578
Author: Viren Baraiya <[email protected]>
Date:   Thu Dec 7 23:38:04 2023 -0800

    Update README.md

commit 18cb5b28f639389d13ad240f98a896faf23b41d4
Author: Viren Baraiya <[email protected]>
Date:   Thu Dec 7 23:26:10 2023 -0800

    docker and docs

commit b412fe3c01e1ab47fa3add73a3bec49ef36bb4d2
Author: Viren Baraiya <[email protected]>
Date:   Thu Dec 7 23:07:21 2023 -0800

    Update README.md

commit 17c6db1da0f902ec0d0cc7c6141850c3de56781a
Author: Viren Baraiya <[email protected]>
Date:   Thu Dec 7 23:03:26 2023 -0800

    update readme with the links

commit 4762cc2f0485ca956cf9d78cb8173c9d795197f5
Author: yanghaojia <[email protected]>
Date:   Mon Nov 27 16:26:41 2023 +0800

    Fix typo in WorkflowTaskTypeConstraint

commit 064b0a6292f84a7518c10d47b95b7f0554402502
Author: LuisLainez <[email protected]>
Date:   Wed Nov 1 03:08:06 2023 +1100

    Issue/upgrade to spring (#3828)

    SB3 upgrades
  • Loading branch information
Ben Stout committed Sep 16, 2024
1 parent 9878e62 commit f4bd335
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 0 deletions.
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
/*
<<<<<<<< HEAD:common-persistence/src/test/java/com/netflix/conductor/dao/TestBase.java
* Copyright 2023 Conductor Authors.
========
* Copyright 2022 Conductor Authors.
>>>>>>>> daba08be3 (Squashed commit of the following:):core/src/main/java/com/netflix/conductor/core/operation/WorkflowOperation.java
* <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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@

import jakarta.validation.ConstraintViolationException;

import jakarta.validation.ConstraintViolationException;

import static com.netflix.conductor.TestUtils.getConstraintViolationMessages;

import static org.junit.Assert.*;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
/*
<<<<<<<< HEAD:es7-persistence/src/main/java/com/netflix/conductor/es7/dao/query/parser/internal/ParserException.java
* Copyright 2023 Conductor Authors.
========
* Copyright 2022 Conductor Authors.
>>>>>>>> daba08be3 (Squashed commit of the following:):core/src/main/java/com/netflix/conductor/core/event/WorkflowCreationEvent.java
* <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
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
/*
<<<<<<<< HEAD:nats/src/main/java/com/netflix/conductor/contribs/queue/nats/JsmMessage.java
* Copyright 2023 Conductor Authors.
========
* Copyright 2022 Conductor Authors.
>>>>>>>> daba08be3 (Squashed commit of the following:):core/src/main/java/com/netflix/conductor/core/event/WorkflowEvaluationEvent.java
* <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
Expand Down

0 comments on commit f4bd335

Please sign in to comment.