From 001cc1007e18a66ae923091ebda7c4a242d73453 Mon Sep 17 00:00:00 2001 From: James Yuzawa Date: Mon, 15 Jun 2026 10:45:47 -0400 Subject: [PATCH 01/11] java packaging --- java/build.gradle.kts | 14 ++++++-------- java/gradle.properties | 5 +++-- java/settings.gradle.kts | 2 +- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/java/build.gradle.kts b/java/build.gradle.kts index cb9c406..570a25c 100644 --- a/java/build.gradle.kts +++ b/java/build.gradle.kts @@ -51,7 +51,7 @@ dependencies { implementation("org.apache.commons:commons-lang3:3.0") implementation("com.jayway.jsonpath:json-path:2.9.0") implementation("io.github.resilience4j:resilience4j-retry:2.2.0") - implementation(enforcedPlatform("com.fasterxml.jackson:jackson-bom:2.17.0")) + implementation(platform("com.fasterxml.jackson:jackson-bom:2.17.0")) implementation("com.fasterxml.jackson.core:jackson-core") implementation("com.fasterxml.jackson.core:jackson-annotations") implementation("com.fasterxml.jackson.core:jackson-databind") @@ -201,16 +201,14 @@ tasks.javadoc { } } +java { + withJavadocJar() + withSourcesJar() +} + tasks { - jar { - archiveBaseName.set("DemandDrivenTrafficEvaluator") - archiveClassifier.set("core") - archiveVersion.set("2.0.0") // Set your library version - } named("shadowJar") { - archiveBaseName.set("DemandDrivenTrafficEvaluator") archiveClassifier.set("fat") - archiveVersion.set("2.0.0") // Set your library version destinationDirectory.set(layout.buildDirectory.dir("libs")) configurations = listOf(project.configurations.runtimeClasspath.get()) diff --git a/java/gradle.properties b/java/gradle.properties index 70ebcc6..f8bb508 100644 --- a/java/gradle.properties +++ b/java/gradle.properties @@ -4,6 +4,7 @@ # This file was generated by the Gradle 'init' task. # https://docs.gradle.org/current/userguide/build_environment.html#sec:gradle_configuration_properties -org.gradle.parallel=true -org.gradle.caching=true +version=2.0.0 +org.gradle.parallel=true +org.gradle.caching=true \ No newline at end of file diff --git a/java/settings.gradle.kts b/java/settings.gradle.kts index e1f83b8..604844f 100644 --- a/java/settings.gradle.kts +++ b/java/settings.gradle.kts @@ -15,5 +15,5 @@ plugins { id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0" } -rootProject.name = "DemandDrivenTrafficEvaluator" +rootProject.name = "demand-driven-traffic-evaluator" include("lib") From 590157134ddc1d2d646a5bc2d88080d29943dced Mon Sep 17 00:00:00 2001 From: James Yuzawa Date: Mon, 15 Jun 2026 10:56:08 -0400 Subject: [PATCH 02/11] bump gradle --- java/gradle/wrapper/gradle-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/gradle/wrapper/gradle-wrapper.properties b/java/gradle/wrapper/gradle-wrapper.properties index 0aaefbc..5dd3c01 100644 --- a/java/gradle/wrapper/gradle-wrapper.properties +++ b/java/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME From 3db29ea2955b1eb08c6d80645ef4c30028299614 Mon Sep 17 00:00:00 2001 From: James Yuzawa Date: Mon, 15 Jun 2026 10:56:20 -0400 Subject: [PATCH 03/11] add ci job --- .github/workflows/build.yml | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 .github/workflows/build.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 0000000..9022f2d --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,31 @@ +name: build + +on: + push: + branches: + - main + pull_request: + branches: + - main + +jobs: + java: + strategy: + matrix: + java: [17] + os: ['ubuntu-latest'] + runs-on: ${{ matrix.os }} + name: Build on ${{ matrix.os }} on Java ${{ matrix.java }} + steps: + - uses: actions/checkout@v6 + - name: Set up JDK ${{ matrix.java }} + uses: actions/setup-java@v5 + with: + distribution: coretto + java-version: ${{ matrix.java }} + - name: Setup Gradle + uses: gradle/actions/setup-gradle@v6 + - name: Build with Gradle + run: | + cd java && ./gradlew --no-daemon -s :build + # TODO: add golang build \ No newline at end of file From 354f9f6662fc0499adbad86d47ee99908276b6a7 Mon Sep 17 00:00:00 2001 From: James Yuzawa Date: Mon, 15 Jun 2026 10:57:52 -0400 Subject: [PATCH 04/11] test --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9022f2d..5e441ce 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -4,6 +4,7 @@ on: push: branches: - main + - java-packaging pull_request: branches: - main From 303ffd070e0e0498f2b58e301365a8940d906759 Mon Sep 17 00:00:00 2001 From: James Yuzawa Date: Mon, 15 Jun 2026 10:58:33 -0400 Subject: [PATCH 05/11] bump version --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5e441ce..3ba46d1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -13,7 +13,7 @@ jobs: java: strategy: matrix: - java: [17] + java: [25] os: ['ubuntu-latest'] runs-on: ${{ matrix.os }} name: Build on ${{ matrix.os }} on Java ${{ matrix.java }} From 39ee1188ecd40946f2601fae1d1b11d5d69a4d38 Mon Sep 17 00:00:00 2001 From: James Yuzawa Date: Mon, 15 Jun 2026 10:59:45 -0400 Subject: [PATCH 06/11] spelling --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3ba46d1..ace4c38 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -22,7 +22,7 @@ jobs: - name: Set up JDK ${{ matrix.java }} uses: actions/setup-java@v5 with: - distribution: coretto + distribution: corretto java-version: ${{ matrix.java }} - name: Setup Gradle uses: gradle/actions/setup-gradle@v6 From 402da38452ca2d3922c3b45fbe7c9152c0ee2f30 Mon Sep 17 00:00:00 2001 From: James Yuzawa Date: Mon, 15 Jun 2026 11:12:05 -0400 Subject: [PATCH 07/11] Revert "bump gradle" This reverts commit 590157134ddc1d2d646a5bc2d88080d29943dced. --- java/gradle/wrapper/gradle-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/gradle/wrapper/gradle-wrapper.properties b/java/gradle/wrapper/gradle-wrapper.properties index 5dd3c01..0aaefbc 100644 --- a/java/gradle/wrapper/gradle-wrapper.properties +++ b/java/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME From e3e0e19c490c7d64de0c65ce1484b46ae53d1728 Mon Sep 17 00:00:00 2001 From: James Yuzawa Date: Mon, 15 Jun 2026 11:12:47 -0400 Subject: [PATCH 08/11] fix build --- java/settings.gradle.kts | 1 - 1 file changed, 1 deletion(-) diff --git a/java/settings.gradle.kts b/java/settings.gradle.kts index 604844f..1a8e8da 100644 --- a/java/settings.gradle.kts +++ b/java/settings.gradle.kts @@ -16,4 +16,3 @@ plugins { } rootProject.name = "demand-driven-traffic-evaluator" -include("lib") From 5b1216e2cdacfdc416d725cd5893f43a74ad2bca Mon Sep 17 00:00:00 2001 From: James Yuzawa Date: Mon, 15 Jun 2026 11:26:41 -0400 Subject: [PATCH 09/11] bump version --- java/build.gradle.kts | 14 +++++++------- java/gradle/wrapper/gradle-wrapper.properties | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/java/build.gradle.kts b/java/build.gradle.kts index 570a25c..9d9bc54 100644 --- a/java/build.gradle.kts +++ b/java/build.gradle.kts @@ -14,13 +14,13 @@ plugins { // Apply the java-library plugin for API and implementation separation. `java-library` - id("com.google.protobuf") version "0.9.4" - id("io.freefair.lombok") version "8.6" - id("com.github.johnrengelman.shadow") version "7.1.2" + id("com.google.protobuf") version "0.10.0" + id("io.freefair.lombok") version "9.5.0" + id("com.gradleup.shadow") version "9.4.2" jacoco - id("com.github.spotbugs") version "6.0.7" + id("com.github.spotbugs") version "6.5.6" checkstyle - id("org.cyclonedx.bom") version "1.10.0" + id("org.cyclonedx.bom") version "3.2.4" } repositories { @@ -78,7 +78,7 @@ protobuf { } jacoco { - toolVersion = "0.8.9" // Use the latest version available + toolVersion = "0.8.15" // Use the latest version available } tasks.jacocoTestReport { @@ -122,7 +122,7 @@ tasks.jacocoTestCoverageVerification { } spotbugs { - toolVersion.set("4.8.3") + toolVersion.set("4.10.2") ignoreFailures.set(false) showProgress.set(true) effort.set(com.github.spotbugs.snom.Effort.MAX) diff --git a/java/gradle/wrapper/gradle-wrapper.properties b/java/gradle/wrapper/gradle-wrapper.properties index 0aaefbc..5dd3c01 100644 --- a/java/gradle/wrapper/gradle-wrapper.properties +++ b/java/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME From b1edbd8a6dd0d24be68e768fd714eb1dddcb9bdd Mon Sep 17 00:00:00 2001 From: James Yuzawa Date: Mon, 15 Jun 2026 11:42:09 -0400 Subject: [PATCH 10/11] add project group --- java/build.gradle.kts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/java/build.gradle.kts b/java/build.gradle.kts index 9d9bc54..f208354 100644 --- a/java/build.gradle.kts +++ b/java/build.gradle.kts @@ -241,3 +241,5 @@ tasks { finalizedBy(jacocoTestReport) } } + +project.group = "com.amazon.demanddriventrafficevaluator" From 0d0e7fd7c2c99a7317dc17314e1cd4a5f89901ee Mon Sep 17 00:00:00 2001 From: James Yuzawa Date: Mon, 15 Jun 2026 11:46:57 -0400 Subject: [PATCH 11/11] remove testing --- .github/workflows/build.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ace4c38..2c97cfa 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -4,7 +4,6 @@ on: push: branches: - main - - java-packaging pull_request: branches: - main