generated from CDCgov/template
-
Notifications
You must be signed in to change notification settings - Fork 43
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #16147 from CDCgov/deployment/2024-10-08
Deployment of 2024-10-08
- Loading branch information
Showing
15 changed files
with
370 additions
and
70 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -35,7 +35,7 @@ apply(from = rootProject.file("buildSrc/shared.gradle.kts")) | |
| plugins { | ||
| val kotlinVersion by System.getProperties() | ||
| id("reportstream.project-conventions") | ||
| id("org.flywaydb.flyway") version "10.18.0" | ||
| id("org.flywaydb.flyway") version "10.18.2" | ||
| id("nu.studer.jooq") version "9.0" | ||
| id("com.github.johnrengelman.shadow") version "8.1.1" | ||
| id("com.microsoft.azure.azurefunctions") version "1.16.1" | ||
|
|
@@ -75,7 +75,7 @@ val javaVersion = when (appJvmTarget) { | |
| } | ||
| val ktorVersion = "2.3.12" | ||
| val kotlinVersion by System.getProperties() | ||
| val jacksonVersion = "2.17.2" | ||
| val jacksonVersion = "2.18.0" | ||
| jacoco.toolVersion = "0.8.12" | ||
|
|
||
| // Local database information, first one wins: | ||
|
|
@@ -271,16 +271,17 @@ sourceSets.create("testIntegration") { | |
| runtimeClasspath += sourceSets["main"].output | ||
| } | ||
|
|
||
| // Add generated version object | ||
| sourceSets["main"].java.srcDir("$buildDir/generated-src/version") | ||
|
|
||
| val compileTestIntegrationKotlin: KotlinCompile by tasks | ||
| compileTestIntegrationKotlin.kotlinOptions.jvmTarget = appJvmTarget | ||
|
|
||
| val testIntegrationImplementation: Configuration by configurations.getting { | ||
| extendsFrom(configurations["testImplementation"]) | ||
| } | ||
|
|
||
| tasks.withType<KotlinCompile> { | ||
| mustRunAfter("generateVersionObject") | ||
| } | ||
|
|
||
| configurations["testIntegrationRuntimeOnly"].extendsFrom(configurations["runtimeOnly"]) | ||
|
|
||
| tasks.register<Test>("testIntegration") { | ||
|
|
@@ -353,7 +354,7 @@ tasks.withType<Test>().configureEach { | |
| } | ||
|
|
||
| tasks.processResources { | ||
| dependsOn("generateVersionObject") | ||
| mustRunAfter("generateVersionObject") | ||
| // Set the proper build values in the build.properties file | ||
| filesMatching("build.properties") { | ||
| val dateFormatter = DateTimeFormatter.ofPattern("yyyyMMdd") | ||
|
|
@@ -427,7 +428,7 @@ tasks.register<JavaExec>("primeCLI") { | |
| // Use arguments passed by another task in the project.extra["cliArgs"] property. | ||
| doFirst { | ||
| if (project.extra.has("cliArgs") && project.extra["cliArgs"] is List<*>) { | ||
| args = (project.extra["cliArgs"] as List<*>).filterIsInstance(String::class.java) | ||
| args = (project.extra["cliArgs"] as List<*>).filterIsInstance<String>() | ||
| } else if (args.isNullOrEmpty()) { | ||
| args = listOf("-h") | ||
| println("primeCLI Gradle task usage: gradle primeCLI --args='<args>'") | ||
|
|
@@ -521,12 +522,13 @@ tasks.register("generateVersionFile") { | |
| } | ||
| } | ||
|
|
||
| tasks.register("generateVersionObject") { | ||
| val sourceDir = file("$buildDir/generated-src/version") | ||
| val sourceFile = file("$sourceDir/Version.kt") | ||
| sourceDir.mkdirs() | ||
| sourceFile.writeText( | ||
| """ | ||
| val generateVersionObject = tasks.register("generateVersionObject") { | ||
| doLast { | ||
| val sourceDir = file("$buildDir/generated-src/version/src/main/kotlin/gov/cdc/prime/router") | ||
| val sourceFile = file("$sourceDir/Version.kt") | ||
| sourceDir.mkdirs() | ||
| sourceFile.writeText( | ||
| """ | ||
| package gov.cdc.prime.router.version | ||
| /** | ||
|
|
@@ -537,7 +539,12 @@ tasks.register("generateVersionObject") { | |
| const val commitId = "$commitId" | ||
| } | ||
| """.trimIndent() | ||
| ) | ||
| ) | ||
| } | ||
| } | ||
| sourceSets.getByName("main").kotlin.srcDir("$buildDir/generated-src/version/src/main/kotlin") | ||
| tasks.named("compileKotlin").configure { | ||
| dependsOn(generateVersionObject) | ||
| } | ||
|
|
||
| val azureResourcesTmpDir = File(buildDir, "$azureFunctionsDir-resources/$azureAppName") | ||
|
|
@@ -645,7 +652,6 @@ task<Exec>("uploadSwaggerUI") { | |
| } | ||
|
|
||
| tasks.register("killFunc") { | ||
| doLast { | ||
| val processName = "func" | ||
| if (org.gradle.internal.os.OperatingSystem.current().isWindows) { | ||
| exec { | ||
|
|
@@ -658,7 +664,6 @@ tasks.register("killFunc") { | |
| commandLine = listOf("sh", "-c", "pkill -9 $processName || true") | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| tasks.register("run") { | ||
|
|
@@ -772,6 +777,7 @@ tasks.named<nu.studer.gradle.jooq.JooqGenerate>("generateJooq") { | |
| tasks.register("compile") { | ||
| group = rootProject.description ?: "" | ||
| description = "Compile the code" | ||
| dependsOn("generateVersionObject") | ||
| dependsOn("compileKotlin") | ||
| } | ||
|
|
||
|
|
@@ -833,7 +839,7 @@ buildscript { | |
| // will need to be removed once this issue is resolved in Maven. | ||
| classpath("net.minidev:json-smart:2.5.1") | ||
| // as per flyway v10 docs the postgres flyway module must be on the project buildpath | ||
| classpath("org.flywaydb:flyway-database-postgresql:10.18.0") | ||
| classpath("org.flywaydb:flyway-database-postgresql:10.18.2") | ||
| } | ||
| } | ||
|
|
||
|
|
@@ -861,7 +867,7 @@ dependencies { | |
| implementation("com.azure:azure-storage-queue:12.22.0") { | ||
| exclude(group = "com.azure", module = "azure-core") | ||
| } | ||
| implementation("com.azure:azure-security-keyvault-secrets:4.8.6") { | ||
| implementation("com.azure:azure-security-keyvault-secrets:4.8.7") { | ||
| exclude(group = "com.azure", module = "azure-core") | ||
| exclude(group = "com.azure", module = "azure-core-http-netty") | ||
| } | ||
|
|
@@ -891,36 +897,36 @@ dependencies { | |
| branch = "master" | ||
| } | ||
| } | ||
| implementation("ca.uhn.hapi.fhir:hapi-fhir-structures-r4:7.2.2") | ||
| implementation("ca.uhn.hapi.fhir:hapi-fhir-structures-r4:7.4.2") | ||
| // https://mvnrepository.com/artifact/ca.uhn.hapi.fhir/hapi-fhir-caching-caffeine | ||
| implementation("ca.uhn.hapi.fhir:hapi-fhir-caching-caffeine:7.2.2") | ||
| implementation("ca.uhn.hapi.fhir:hapi-fhir-client:7.2.2") | ||
| implementation("ca.uhn.hapi.fhir:hapi-fhir-caching-caffeine:7.4.2") | ||
| implementation("ca.uhn.hapi.fhir:hapi-fhir-client:7.4.2") | ||
| // pin | ||
| implementation("ca.uhn.hapi.fhir:org.hl7.fhir.utilities:6.3.24") | ||
| implementation("ca.uhn.hapi.fhir:org.hl7.fhir.utilities:6.3.29") | ||
| implementation("ca.uhn.hapi.fhir:org.hl7.fhir.r4:6.3.24") | ||
| implementation("ca.uhn.hapi:hapi-base:2.5.1") | ||
| implementation("ca.uhn.hapi:hapi-structures-v251:2.5.1") | ||
| implementation("ca.uhn.hapi:hapi-structures-v27:2.5.1") | ||
| implementation("com.googlecode.libphonenumber:libphonenumber:8.13.46") | ||
| implementation("org.thymeleaf:thymeleaf:3.1.2.RELEASE") | ||
| implementation("com.sendgrid:sendgrid-java:4.10.2") | ||
| implementation("com.sendgrid:sendgrid-java:4.10.3") | ||
| implementation("com.okta.jwt:okta-jwt-verifier:0.5.7") | ||
| implementation("org.json:json:20240303") | ||
| // DO NOT INCREMENT SSHJ to a newer version without first thoroughly testing it locally. | ||
| implementation("com.hierynomus:sshj:0.38.0") | ||
| implementation("com.jcraft:jsch:0.1.55") | ||
| implementation("org.apache.poi:poi:5.3.0") | ||
| implementation("org.apache.commons:commons-csv:1.11.0") | ||
| implementation("org.apache.commons:commons-csv:1.12.0") | ||
| implementation("org.apache.commons:commons-lang3:3.15.0") | ||
| implementation("org.apache.commons:commons-text:1.12.0") | ||
| implementation("commons-codec:commons-codec:1.17.1") | ||
| implementation("commons-io:commons-io:2.16.1") | ||
| implementation("commons-io:commons-io:2.17.0") | ||
| implementation("org.postgresql:postgresql:42.7.4") | ||
| implementation("com.zaxxer:HikariCP:5.1.0") | ||
| implementation("org.flywaydb:flyway-core:10.18.0") | ||
| implementation("org.flywaydb:flyway-database-postgresql:10.18.0") | ||
| implementation("org.commonmark:commonmark:0.22.0") | ||
| implementation("com.google.guava:guava:33.3.0-jre") | ||
| implementation("com.zaxxer:HikariCP:6.0.0") | ||
| implementation("org.flywaydb:flyway-core:10.18.2") | ||
| implementation("org.flywaydb:flyway-database-postgresql:10.18.2") | ||
| implementation("org.commonmark:commonmark:0.23.0") | ||
| implementation("com.google.guava:guava:33.3.1-jre") | ||
| implementation("com.helger.as2:as2-lib:5.1.2") | ||
| implementation("org.bouncycastle:bcprov-jdk15to18:1.78.1") | ||
| implementation("org.bouncycastle:bcprov-jdk18on:1.78.1") | ||
|
|
@@ -944,7 +950,7 @@ dependencies { | |
| implementation("org.apache.poi:poi:5.3.0") | ||
| implementation("org.apache.poi:poi-ooxml:5.3.0") | ||
| implementation("org.apache.commons:commons-compress:1.27.1") | ||
| implementation("commons-io:commons-io:2.16.1") | ||
| implementation("commons-io:commons-io:2.17.0") | ||
| implementation("com.anyascii:anyascii:0.3.2") | ||
| // force jsoup since [email protected]+ has not updated | ||
| implementation("org.jsoup:jsoup:1.18.1") | ||
|
|
@@ -972,7 +978,7 @@ dependencies { | |
| implementation("xalan:xalan:2.7.3") | ||
|
|
||
| // validations | ||
| implementation("com.networknt:json-schema-validator:1.5.1") | ||
| implementation("com.networknt:json-schema-validator:1.5.2") | ||
| implementation("io.konform:konform-jvm:0.4.0") | ||
|
|
||
| runtimeOnly("com.okta.jwt:okta-jwt-verifier-impl:0.5.7") | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -67,6 +67,9 @@ | |
| "type": "string" | ||
| } | ||
| }, | ||
| "function": { | ||
| "type": "string" | ||
| }, | ||
| "valueSet": { | ||
| "anyOf": [ | ||
| { | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.