Skip to content

Commit

Permalink
Merge pull request #12 from conductor-oss/community_merge
Browse files Browse the repository at this point in the history
Merge community module into main conductor repo.  
Update community to springboot 3
  • Loading branch information
v1r3n authored Dec 20, 2023
2 parents 2978701 + a444e23 commit b84b9af
Show file tree
Hide file tree
Showing 233 changed files with 36,774 additions and 196 deletions.
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ Apache License
same "printed page" as the copyright notice for easier
identification within third-party archives.

Copyright {yyyy} Netflix, Inc.
Copyright {yyyy} Orkes, Inc.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion SECURITY.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@

## Reporting a Vulnerability

Please email conductor@netflix.com to report vulnerabilities.
Please email oss@orkes.com to report vulnerabilities.
15 changes: 15 additions & 0 deletions amqp/build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
dependencies {
implementation project(':conductor-common')
implementation project(':conductor-core')

implementation "com.rabbitmq:amqp-client:${revAmqpClient}"
implementation "org.apache.commons:commons-lang3:"
implementation "com.google.guava:guava:${revGuava}"
implementation "io.reactivex:rxjava:${revRxJava}"

compileOnly 'org.springframework.boot:spring-boot-starter'
compileOnly 'org.springframework.boot:spring-boot-starter-web'



}
177 changes: 177 additions & 0 deletions amqp/dependencies.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,177 @@
{
"annotationProcessor": {
"org.springframework.boot:spring-boot-configuration-processor": {
"locked": "2.7.16"
}
},
"compileClasspath": {
"com.google.guava:guava": {
"locked": "32.1.2-jre"
},
"com.netflix.conductor:conductor-common": {
"locked": "3.15.0"
},
"com.netflix.conductor:conductor-core": {
"locked": "3.15.0"
},
"com.rabbitmq:amqp-client": {
"locked": "5.13.0"
},
"io.reactivex:rxjava": {
"locked": "1.2.2"
},
"org.apache.commons:commons-lang3": {
"locked": "3.12.0"
},
"org.apache.logging.log4j:log4j-api": {
"locked": "2.17.2"
},
"org.apache.logging.log4j:log4j-core": {
"locked": "2.17.2"
},
"org.apache.logging.log4j:log4j-jul": {
"locked": "2.17.2"
},
"org.apache.logging.log4j:log4j-slf4j-impl": {
"locked": "2.17.2"
},
"org.apache.logging.log4j:log4j-web": {
"locked": "2.17.2"
},
"org.springframework.boot:spring-boot-starter": {
"locked": "2.7.16"
},
"org.springframework.boot:spring-boot-starter-web": {
"locked": "2.7.16"
}
},
"runtimeClasspath": {
"com.google.guava:guava": {
"locked": "32.1.2-jre"
},
"com.netflix.conductor:conductor-common": {
"locked": "3.15.0"
},
"com.netflix.conductor:conductor-core": {
"locked": "3.15.0"
},
"com.rabbitmq:amqp-client": {
"locked": "5.13.0"
},
"io.reactivex:rxjava": {
"locked": "1.2.2"
},
"org.apache.commons:commons-lang3": {
"locked": "3.12.0"
},
"org.apache.logging.log4j:log4j-api": {
"locked": "2.17.2"
},
"org.apache.logging.log4j:log4j-core": {
"locked": "2.17.2"
},
"org.apache.logging.log4j:log4j-jul": {
"locked": "2.17.2"
},
"org.apache.logging.log4j:log4j-slf4j-impl": {
"locked": "2.17.2"
},
"org.apache.logging.log4j:log4j-web": {
"locked": "2.17.2"
}
},
"testCompileClasspath": {
"com.google.guava:guava": {
"locked": "32.1.2-jre"
},
"com.netflix.conductor:conductor-common": {
"locked": "3.15.0"
},
"com.netflix.conductor:conductor-core": {
"locked": "3.15.0"
},
"com.rabbitmq:amqp-client": {
"locked": "5.13.0"
},
"io.reactivex:rxjava": {
"locked": "1.2.2"
},
"junit:junit": {
"locked": "4.13.2"
},
"org.apache.commons:commons-lang3": {
"locked": "3.12.0"
},
"org.apache.logging.log4j:log4j-api": {
"locked": "2.17.2"
},
"org.apache.logging.log4j:log4j-core": {
"locked": "2.17.2"
},
"org.apache.logging.log4j:log4j-jul": {
"locked": "2.17.2"
},
"org.apache.logging.log4j:log4j-slf4j-impl": {
"locked": "2.17.2"
},
"org.apache.logging.log4j:log4j-web": {
"locked": "2.17.2"
},
"org.junit.vintage:junit-vintage-engine": {
"locked": "5.8.2"
},
"org.springframework.boot:spring-boot-starter-log4j2": {
"locked": "2.7.16"
},
"org.springframework.boot:spring-boot-starter-test": {
"locked": "2.7.16"
}
},
"testRuntimeClasspath": {
"com.google.guava:guava": {
"locked": "32.1.2-jre"
},
"com.netflix.conductor:conductor-common": {
"locked": "3.15.0"
},
"com.netflix.conductor:conductor-core": {
"locked": "3.15.0"
},
"com.rabbitmq:amqp-client": {
"locked": "5.13.0"
},
"io.reactivex:rxjava": {
"locked": "1.2.2"
},
"junit:junit": {
"locked": "4.13.2"
},
"org.apache.commons:commons-lang3": {
"locked": "3.12.0"
},
"org.apache.logging.log4j:log4j-api": {
"locked": "2.17.2"
},
"org.apache.logging.log4j:log4j-core": {
"locked": "2.17.2"
},
"org.apache.logging.log4j:log4j-jul": {
"locked": "2.17.2"
},
"org.apache.logging.log4j:log4j-slf4j-impl": {
"locked": "2.17.2"
},
"org.apache.logging.log4j:log4j-web": {
"locked": "2.17.2"
},
"org.junit.vintage:junit-vintage-engine": {
"locked": "5.8.2"
},
"org.springframework.boot:spring-boot-starter-log4j2": {
"locked": "2.7.16"
},
"org.springframework.boot:spring-boot-starter-test": {
"locked": "2.7.16"
}
}
}
Loading

0 comments on commit b84b9af

Please sign in to comment.