more cleanup

conductor-oss · Dec 22, 2023 · 5c06b37 · 5c06b37
1 parent dbbc9a8
commit 5c06b37
Show file tree

Hide file tree

Showing 43 changed files with 68 additions and 89 deletions.
diff --git a/awss3-storage/build.gradle b/awss3-storage/build.gradle
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2022 Netflix, Inc.
+ *  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

diff --git a/build.gradle b/build.gradle
@@ -8,7 +8,6 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'com.netflix.nebula:gradle-extra-configurations-plugin:7.0.0'
         classpath 'org.springframework.boot:spring-boot-gradle-plugin:3.1.4'
         classpath 'com.diffplug.spotless:spotless-plugin-gradle:6.+'
     }
@@ -20,11 +19,10 @@ plugins {
     id 'application'
     id 'jacoco'
     id 'nebula.netflixoss' version '10.6.0'
-    id 'org.sonarqube' version '3.4.0.2513'
 }
 
 /*
- *  Copyright 2021 Netflix, Inc.
+ *  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
@@ -66,26 +64,6 @@ allprojects {
 
     repositories {
         mavenCentral()
-
-        // oss-candidate for -rc.* verions:
-        maven {
-            url "https://artifactory-oss.prod.netflix.net/artifactory/maven-oss-candidates"
-        }
-
-        /**
-         * This repository locates artifacts that don't exist in maven central but we had to backup from jcenter
-         * The exclusiveContent
-         */
-        exclusiveContent {
-            forRepository {
-                maven {
-                    url "https://artifactory-oss.prod.netflix.net/artifactory/required-jcenter-modules-backup"
-                }
-            }
-            filter {
-                includeGroupByRegex "com\\.github\\.vmg.*"
-            }
-        }
     }
 
     dependencyManagement {
@@ -145,14 +123,6 @@ task server {
     dependsOn ':conductor-server:bootRun'
 }
 
-sonarqube {
-    properties {
-        property "sonar.projectKey", "com.netflix.conductor:conductor"
-        property "sonar.organization", "netflix"
-        property "sonar.host.url", "https://sonarcloud.io"
-    }
-}
-
 configure(allprojects - project(':conductor-grpc')) {
     apply plugin: 'com.diffplug.spotless'
 

diff --git a/cassandra-persistence/build.gradle b/cassandra-persistence/build.gradle
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2021 Netflix, Inc.
+ *  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

diff --git a/common/build.gradle b/common/build.gradle
@@ -26,7 +26,7 @@ dependencies {
 }
 
 /*
- *  Copyright 2021 Netflix, Inc.
+ *  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

diff --git a/core/build.gradle b/core/build.gradle
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2021 Netflix, Inc.
+ *  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

diff --git a/core/src/main/resources/META-INF/validation.xml b/core/src/main/resources/META-INF/validation.xml
@@ -1,6 +1,6 @@
 <!--
 
-    Copyright 2020 Netflix, Inc.
+    Copyright 2023 Conductor authors
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.

diff --git a/core/src/main/resources/META-INF/validation/constraints.xml b/core/src/main/resources/META-INF/validation/constraints.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright 2020 Netflix, Inc.
+    Copyright 2023 Conductor authors
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.

diff --git a/dependencies.gradle b/dependencies.gradle
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2022 Netflix, Inc.
+ *  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

diff --git a/docker/server/bin/startup.sh b/docker/server/bin/startup.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-#  Copyright 2021 Netflix, Inc.
+#  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

diff --git a/docker/server/config/log4j-file-appender.properties b/docker/server/config/log4j-file-appender.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2020 Netflix, Inc.
+# Copyright 2023 Conductor authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/docker/server/config/log4j.properties b/docker/server/config/log4j.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2017 Netflix, Inc.
+# Copyright 2023 Conductor authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/docker/ui/Dockerfile b/docker/ui/Dockerfile
@@ -1,5 +1,5 @@
 #
-# conductor:ui - Netflix Conductor UI
+# conductor:ui - Conductor UI
 #
 FROM node:20-alpine
 LABEL maintainer="Orkes OSS <[email protected]>"

diff --git a/docs/documentation/configuration/workflowdef/operators/do-while-task.md b/docs/documentation/configuration/workflowdef/operators/do-while-task.md
@@ -133,7 +133,7 @@ will produce the following execution, assuming 3 executions occurred (alongside
 
 ### Example using iteration key
 
-Sometimes, you may want to use the iteration value/counter in the tasks used in the loop.  In this example, an API call is made to GitHub (to the Netflix Conductor repository), but each loop increases the pagination.
+Sometimes, you may want to use the iteration value/counter in the tasks used in the loop.  In this example, an API call is made to GitHub (to the Conductor repository), but each loop increases the pagination.
 
 The Loop ```taskReferenceName``` is "get_all_stars_loop_ref".
 

diff --git a/docs/index.md b/docs/index.md
@@ -11,7 +11,7 @@ hide:
         Scalable Workflow Orchestration
       </div>
       <div class="caption" style="padding-top:15px">
-        Conductor is a platform created by <b>Netflix</b> to orchestrate workflows that span across microservices.
+        Conductor is a platform originally created at Netflix to orchestrate workflows that span across microservices.
       </div >
       <div style="display: flex; margin-top: 45px;">
         <a type="button" class="btn btn-primary" href="../devguide/concepts/index.html">Get Started</a>

diff --git a/es6-persistence/build.gradle b/es6-persistence/build.gradle
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2021 Netflix, Inc.
+ *  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

diff --git a/es7-persistence/README.md b/es7-persistence/README.md
@@ -16,8 +16,8 @@ More information can be found here: https://www.elastic.co/guide/en/elasticsearc
 
 1. In order to use the ES7, you must change the following files from ES6 to ES7:
 
-https://github.com/Netflix/conductor/blob/main/build.gradle
-https://github.com/Netflix/conductor/blob/main/server/src/main/resources/application.properties
+https://github.com/conductor-oss/conductor/blob/main/build.gradle
+https://github.com/conductor-oss/conductor/blob/main/server/src/main/resources/application.properties
 
 In file:
 
@@ -41,8 +41,8 @@ Also you need to recreate dependencies.lock files with ES7 dependencies. To do t
 
 2. To use the ES7 for all modules include test-harness, you must change also the following files:
 
-https://github.com/Netflix/conductor/blob/main/test-harness/build.gradle
-https://github.com/Netflix/conductor/blob/main/test-harness/src/test/java/com/netflix/conductor/test/integration/AbstractEndToEndTest.java
+https://github.com/conductor-oss/conductor/blob/main/test-harness/build.gradle
+https://github.com/conductor-oss/conductor/blob/main/test-harness/src/test/java/com/netflix/conductor/test/integration/AbstractEndToEndTest.java
 
 In file:
 

diff --git a/grpc-client/build.gradle b/grpc-client/build.gradle
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2021 Netflix, Inc.
+ *  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
@@ -23,4 +23,7 @@ dependencies {
     implementation "org.apache.commons:commons-lang3"
     implementation "jakarta.annotation:jakarta.annotation-api:${revJakartaAnnotation}"
     implementation "com.google.guava:guava:${revGuava}"
+    implementation "com.fasterxml.jackson.core:jackson-databind"
+    implementation "com.fasterxml.jackson.core:jackson-core"
+    implementation "com.fasterxml.jackson.core:jackson-annotations"
 }
diff --git a/grpc-server/build.gradle b/grpc-server/build.gradle
@@ -9,6 +9,9 @@ dependencies {
     implementation "io.grpc:grpc-services:${revGrpc}"
     implementation "io.grpc:grpc-protobuf:${revGrpc}"
     implementation "org.apache.commons:commons-lang3"
+    implementation "com.fasterxml.jackson.core:jackson-databind"
+    implementation "com.fasterxml.jackson.core:jackson-core"
+    implementation "com.fasterxml.jackson.core:jackson-annotations"
 
     testImplementation "io.grpc:grpc-testing:${revGrpc}"
     testImplementation "io.grpc:grpc-protobuf:${revGrpc}"

diff --git a/grpc-server/src/test/resources/log4j.properties b/grpc-server/src/test/resources/log4j.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2019 Netflix, Inc.
+# Copyright 2023 Conductor authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/grpc/build.gradle b/grpc/build.gradle
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2021 Netflix, Inc.
+ *  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
@@ -35,6 +35,9 @@ dependencies {
     implementation "io.grpc:grpc-stub:${revGrpc}"
     implementation "jakarta.annotation:jakarta.annotation-api:${revJakartaAnnotation}"
     implementation "javax.annotation:javax.annotation-api:1.3.2" //Needs to be added as a workaround for the generated tags
+    implementation "com.fasterxml.jackson.core:jackson-databind"
+    implementation "com.fasterxml.jackson.core:jackson-core"
+    implementation "com.fasterxml.jackson.core:jackson-annotations"
 
 }
 

diff --git a/grpc/src/main/java/com/netflix/conductor/grpc/ProtoMapper.java b/grpc/src/main/java/com/netflix/conductor/grpc/ProtoMapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Netflix, Inc.
+ * 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

diff --git a/grpc/src/test/java/com/netflix/conductor/grpc/TestProtoMapper.java b/grpc/src/test/java/com/netflix/conductor/grpc/TestProtoMapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Netflix, Inc.
+ * 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

diff --git a/http-task/build.gradle b/http-task/build.gradle
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2022 Netflix, Inc.
+ *  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

diff --git a/java-sdk/src/test/resources/application-integrationtest.properties b/java-sdk/src/test/resources/application-integrationtest.properties
@@ -1,6 +1,6 @@
 #
 # /*
-#  * Copyright 2021 Netflix, Inc.
+#  * 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

diff --git a/java-sdk/src/test/resources/log4j2.xml b/java-sdk/src/test/resources/log4j2.xml
@@ -1,6 +1,6 @@
 <!--
 
-    Copyright 2020 Netflix, Inc.
+    Copyright 2023 Conductor authors
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.

diff --git a/java-sdk/worker_sdk.md b/java-sdk/worker_sdk.md
@@ -75,7 +75,7 @@ Output:
 ```
 
 ## Managing Task Workers
-Annotated Workers are managed by [WorkflowExecutor](https://github.com/Netflix/conductor/blob/main/java-sdk/src/main/java/com/netflix/conductor/sdk/workflow/executor/WorkflowExecutor.java)
+Annotated Workers are managed by [WorkflowExecutor](https://github.com/conductor-oss/conductor/blob/main/java-sdk/src/main/java/com/netflix/conductor/sdk/workflow/executor/WorkflowExecutor.java)
 
 ### Start Workers
 ```java

diff --git a/java-sdk/workflow_sdk.md b/java-sdk/workflow_sdk.md
@@ -3,7 +3,7 @@ Workflow SDK provides fluent API to create workflows with strongly typed interfa
 
 ## APIs
 ### ConductorWorkflow
-[ConductorWorkflow](https://github.com/Netflix/conductor/blob/main/java-sdk/src/main/java/com/netflix/conductor/sdk/workflow/def/ConductorWorkflow.java) is the SDK representation of a Conductor workflow.
+[ConductorWorkflow](https://github.com/conductor-oss/conductor/blob/main/java-sdk/src/main/java/com/netflix/conductor/sdk/workflow/def/ConductorWorkflow.java) is the SDK representation of a Conductor workflow.
 
 #### Create a `ConductorWorkflow` Instance
 ```java
@@ -18,7 +18,7 @@ ConductorWorkflow<GetInsuranceQuote> conductorWorkflow = new WorkflowBuilder<Get
     .build();
 ```
 ### Working with Simple Worker Tasks
-Use [SimpleTask](https://github.com/Netflix/conductor/blob/main/java-sdk/src/main/java/com/netflix/conductor/sdk/workflow/def/tasks/SimpleTask.java) to add a simple task to a workflow.
+Use [SimpleTask](https://github.com/conductor-oss/conductor/blob/main/java-sdk/src/main/java/com/netflix/conductor/sdk/workflow/def/tasks/SimpleTask.java) to add a simple task to a workflow.
 
 Example:
 ```java
@@ -43,16 +43,16 @@ builder.add(
 ### Working with Operators
 Each operator has its own class that can be added to the workflow builder.
 
-* [ForkJoin](https://github.com/Netflix/conductor/blob/main/java-sdk/src/main/java/com/netflix/conductor/sdk/workflow/def/tasks/ForkJoin.java) 
-* [Wait](https://github.com/Netflix/conductor/blob/main/java-sdk/src/main/java/com/netflix/conductor/sdk/workflow/def/tasks/Wait.java)
-* [Switch](https://github.com/Netflix/conductor/blob/main/java-sdk/src/main/java/com/netflix/conductor/sdk/workflow/def/tasks/Switch.java)
-* [DynamicFork](https://github.com/Netflix/conductor/blob/main/java-sdk/src/main/java/com/netflix/conductor/sdk/workflow/def/tasks/DynamicFork.java)
-* [DoWhile](https://github.com/Netflix/conductor/blob/main/java-sdk/src/main/java/com/netflix/conductor/sdk/workflow/def/tasks/DoWhile.java)
-* [Join](https://github.com/Netflix/conductor/blob/main/java-sdk/src/main/java/com/netflix/conductor/sdk/workflow/def/tasks/Join.java)
-* [Dynamic](https://github.com/Netflix/conductor/blob/main/java-sdk/src/main/java/com/netflix/conductor/sdk/workflow/def/tasks/Dynamic.java)
-* [Terminate](https://github.com/Netflix/conductor/blob/main/java-sdk/src/main/java/com/netflix/conductor/sdk/workflow/def/tasks/Terminate.java)
-* [SubWorkflow](https://github.com/Netflix/conductor/blob/main/java-sdk/src/main/java/com/netflix/conductor/sdk/workflow/def/tasks/SubWorkflow.java)
-* [SetVariable](https://github.com/Netflix/conductor/blob/main/java-sdk/src/main/java/com/netflix/conductor/sdk/workflow/def/tasks/SetVariable.java)
+* [ForkJoin](https://github.com/conductor-oss/conductor/blob/main/java-sdk/src/main/java/com/netflix/conductor/sdk/workflow/def/tasks/ForkJoin.java) 
+* [Wait](https://github.com/conductor-oss/conductor/blob/main/java-sdk/src/main/java/com/netflix/conductor/sdk/workflow/def/tasks/Wait.java)
+* [Switch](https://github.com/conductor-oss/conductor/blob/main/java-sdk/src/main/java/com/netflix/conductor/sdk/workflow/def/tasks/Switch.java)
+* [DynamicFork](https://github.com/conductor-oss/conductor/blob/main/java-sdk/src/main/java/com/netflix/conductor/sdk/workflow/def/tasks/DynamicFork.java)
+* [DoWhile](https://github.com/conductor-oss/conductor/blob/main/java-sdk/src/main/java/com/netflix/conductor/sdk/workflow/def/tasks/DoWhile.java)
+* [Join](https://github.com/conductor-oss/conductor/blob/main/java-sdk/src/main/java/com/netflix/conductor/sdk/workflow/def/tasks/Join.java)
+* [Dynamic](https://github.com/conductor-oss/conductor/blob/main/java-sdk/src/main/java/com/netflix/conductor/sdk/workflow/def/tasks/Dynamic.java)
+* [Terminate](https://github.com/conductor-oss/conductor/blob/main/java-sdk/src/main/java/com/netflix/conductor/sdk/workflow/def/tasks/Terminate.java)
+* [SubWorkflow](https://github.com/conductor-oss/conductor/blob/main/java-sdk/src/main/java/com/netflix/conductor/sdk/workflow/def/tasks/SubWorkflow.java)
+* [SetVariable](https://github.com/conductor-oss/conductor/blob/main/java-sdk/src/main/java/com/netflix/conductor/sdk/workflow/def/tasks/SetVariable.java)
 
 
 #### Register Workflow with Conductor Server
@@ -99,7 +99,7 @@ String workflowId = workflowRun.getWorkflowId();
 //Get the status of workflow execution
 WorkflowStatus status = workflowRun.getStatus();
 ```
-See [Workflow](https://github.com/Netflix/conductor/blob/main/common/src/main/java/com/netflix/conductor/common/run/Workflow.java) for more details on the Workflow object.
+See [Workflow](https://github.com/conductor-oss/conductor/blob/main/common/src/main/java/com/netflix/conductor/common/run/Workflow.java) for more details on the Workflow object.
 
 #### Start Dynamic Workflow Execution
 Dynamic workflows are executed by specifying the workflow definition along with the execution and do not require registering the workflow on the server before executing.

diff --git a/json-jq-task/build.gradle b/json-jq-task/build.gradle
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2022 Netflix, Inc.
+ *  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

diff --git a/kafka/src/test/groovy/com/netflix/conductor/test/integration/KafkaPublishTaskSpec.groovy b/kafka/src/test/groovy/com/netflix/conductor/test/integration/KafkaPublishTaskSpec.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 Netflix, Inc.
+ * 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

diff --git a/kafka/src/test/resources/application-integrationtest.properties b/kafka/src/test/resources/application-integrationtest.properties
@@ -1,6 +1,6 @@
 #
 # /*
-#  * Copyright 2021 Netflix, Inc.
+#  * 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

diff --git a/mkdocs.yml b/mkdocs.yml
@@ -1,5 +1,5 @@
 site_name: Conductor Documentation
-site_description: Conductor is a platform created by Netflix to orchestrate workflows that span across microservices.
+site_description: Conductor is a platform created to orchestrate workflows that span across microservices.
 repo_url: https://github.com/conductor-oss/conductor
 site_url: https://conductor-oss.github.io/conductor
 edit_uri: ''

diff --git a/redis-persistence/build.gradle b/redis-persistence/build.gradle
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2021 Netflix, Inc.
+ *  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