Skip to content

Commit

Permalink
repo organization
Browse files Browse the repository at this point in the history
  • Loading branch information
Foxcapades committed Apr 22, 2024
1 parent 63d2055 commit b6b2e5d
Show file tree
Hide file tree
Showing 625 changed files with 274 additions and 270 deletions.
8 changes: 3 additions & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,8 @@ WORKDIR /workspace
COPY settings.gradle.kts settings.gradle.kts
COPY build.gradle.kts build.gradle.kts
COPY platform platform
COPY daemons daemons
COPY lanes lanes
COPY components components
COPY src src
COPY service service
COPY lib lib

RUN gradle --no-daemon test shadowJar --info

Expand All @@ -38,6 +36,6 @@ ENV JVM_MEM_ARGS="-Xms32M -Xmx256M" \
JVM_ARGS=""

COPY --from=prep /workspace/build/libs/service.jar /service.jar
COPY startup.sh startup.sh
COPY service/startup.sh startup.sh

CMD /startup.sh
40 changes: 5 additions & 35 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -55,36 +55,6 @@ allprojects {
}
}

dependencies {
implementation(platform(project(":platform")))

implementation("org.veupathdb.vdi:vdi-component-common")

implementation(project(":components:module-core"))

implementation(project(":daemons:event-router"))
implementation(project(":daemons:reconciler"))
implementation(project(":daemons:pruner"))
implementation(project(":daemons:rest-service"))

implementation(project(":lanes:hard-delete"))
implementation(project(":lanes:import"))
implementation(project(":lanes:install"))
implementation(project(":lanes:reconciliation"))
implementation(project(":lanes:sharing"))
implementation(project(":lanes:soft-delete"))
implementation(project(":lanes:update-meta"))

implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core")
implementation("org.veupathdb.lib:jaxrs-container-core")

implementation("org.slf4j:slf4j-api")
implementation("org.slf4j:jul-to-slf4j")
implementation("org.apache.logging.log4j:log4j-api")
implementation("org.apache.logging.log4j:log4j-core")
implementation("org.apache.logging.log4j:log4j-slf4j-impl")
implementation(kotlin("stdlib-jdk8"))
}

tasks.shadowJar {
exclude("**/Log4j2Plugins.dat")
Expand All @@ -95,8 +65,6 @@ tasks.shadowJar {
}
}

// region Custom Tasks

tasks.create("compile-design-doc") {
doLast {
val command = arrayOf(
Expand All @@ -119,10 +87,10 @@ tasks.create("compile-design-doc") {
}

tasks.create("generate-raml-docs") {
dependsOn(":daemons:rest-service:generate-raml-docs")
dependsOn(":service:daemon:rest-service:generate-raml-docs")

doLast {
val restModule = project(":daemons:rest-service")
val restModule = project(":service:daemon:rest-service")
val docsDir = file("docs")
docsDir.mkdir()

Expand All @@ -139,4 +107,6 @@ tasks.create("generate-raml-docs") {
}
}

// endregion Custom Tasks
dependencies {
implementation(project(":service:bootstrap"))
}
16 changes: 0 additions & 16 deletions components/install-cleanup/build.gradle.kts

This file was deleted.

26 changes: 0 additions & 26 deletions lanes/install/build.gradle.kts

This file was deleted.

26 changes: 0 additions & 26 deletions lanes/soft-delete/build.gradle.kts

This file was deleted.

25 changes: 0 additions & 25 deletions lanes/update-meta/build.gradle.kts

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ plugins {
dependencies {
implementation(platform(project(":platform")))

implementation(project(":components:ldap"))
implementation(project(":lib:ldap"))

implementation("org.veupathdb.vdi:vdi-component-common")

Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ plugins {
dependencies {
implementation(platform(project(":platform")))

implementation(project(":components:env"))
implementation(project(":lib:env"))

implementation("org.veupathdb.vdi:vdi-component-json")
implementation("org.veupathdb.vdi:vdi-component-common")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ plugins {
dependencies {
implementation(platform(project(":platform")))

implementation(project(":components:app-db"))
implementation(project(":components:env"))
implementation(project(":components:handler-client"))
implementation(project(":components:metrics"))
implementation(project(":components:plugin-mapping"))
implementation(project(":components:s3"))
implementation(project(":lib:app-db"))
implementation(project(":lib:env"))
implementation(project(":lib:handler-client"))
implementation(project(":lib:metrics"))
implementation(project(":lib:plugin-mapping"))
implementation(project(":lib:s3"))

implementation("org.veupathdb.vdi:vdi-component-common")
implementation("org.veupathdb.lib.s3:s34k-minio")
Expand Down
File renamed without changes.
File renamed without changes.
16 changes: 16 additions & 0 deletions lib/install-cleanup/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
plugins {
kotlin("jvm")
}

dependencies {
implementation(platform(project(":platform")))

implementation(project(":lib:app-db"))
implementation(project(":lib:cache-db"))
implementation(project(":lib:handler-client"))
implementation(project(":lib:plugin-mapping"))

implementation("org.veupathdb.vdi:vdi-component-common")

implementation("org.slf4j:slf4j-api")
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ plugins {
dependencies {
implementation(platform(project(":platform")))

implementation(project(":components:env"))
implementation(project(":lib:env"))

implementation("org.veupathdb.vdi:vdi-component-json")
implementation("org.veupathdb.vdi:vdi-component-common")
Expand Down
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ plugins {
dependencies {
implementation(platform(project(":platform")))

api(project(":components:async"))
implementation(project(":components:kafka"))
implementation(project(":components:s3"))
api(project(":lib:async"))
implementation(project(":lib:kafka"))
implementation(project(":lib:s3"))

implementation("org.veupathdb.vdi:vdi-component-common")
implementation("org.veupathdb.lib.s3:s34k-minio")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ plugins {
dependencies {
implementation(platform(project(":platform")))

implementation(project(":components:env"))
implementation(project(":components:handler-client"))
implementation(project(":lib:env"))
implementation(project(":lib:handler-client"))

implementation("org.veupathdb.vdi:vdi-component-common")

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ plugins {
dependencies {
implementation(platform(project(":platform")))

implementation(project(":components:app-db"))
implementation(project(":components:cache-db"))
implementation(project(":components:env"))
implementation(project(":components:metrics"))
implementation(project(":components:s3"))
implementation(project(":lib:app-db"))
implementation(project(":lib:cache-db"))
implementation(project(":lib:env"))
implementation(project(":lib:metrics"))
implementation(project(":lib:s3"))

implementation("org.veupathdb.vdi:vdi-component-common")
implementation("org.veupathdb.lib.s3:s34k-minio")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ plugins {
dependencies {
implementation(platform(project(":platform")))

implementation(project(":components:async"))
implementation(project(":components:env"))
implementation(project(":components:metrics"))
implementation(project(":lib:async"))
implementation(project(":lib:env"))
implementation(project(":lib:metrics"))

implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core")
implementation("org.veupathdb.vdi:vdi-component-common")
Expand Down
4 changes: 2 additions & 2 deletions components/s3/build.gradle.kts → lib/s3/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ tasks.test {
dependencies {
implementation(platform(project(":platform")))

implementation(project(":components:env"))
implementation(project(":components:metrics"))
implementation(project(":lib:env"))
implementation(project(":lib:metrics"))

implementation("org.veupathdb.vdi:vdi-component-common")
implementation("org.veupathdb.vdi:vdi-component-json")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ dependencies {

implementation("org.veupathdb.vdi:vdi-component-common")

implementation(project(":components:app-db"))
implementation(project(":components:cache-db"))
implementation(project(":components:kafka"))
implementation(project(":components:s3"))
implementation(project(":lib:app-db"))
implementation(project(":lib:cache-db"))
implementation(project(":lib:kafka"))
implementation(project(":lib:s3"))
}
Loading

0 comments on commit b6b2e5d

Please sign in to comment.