From 01be865e320e5986957d218b26580eff5ecc1a3b Mon Sep 17 00:00:00 2001 From: Zachary Bischoff <116595361+bischoffz@users.noreply.github.com> Date: Wed, 24 Apr 2024 02:20:00 -0400 Subject: [PATCH 01/12] increment version --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index afd9f6c..ab065ec 100644 --- a/pom.xml +++ b/pom.xml @@ -50,7 +50,7 @@ - 2.8.0 + 2.8.1-SNAPSHOT UTF-8 @@ -409,4 +409,4 @@ - \ No newline at end of file + From 39555ee944a0d39500aed7dec6e7dd3e7afe4f1b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 6 May 2024 14:32:18 -0400 Subject: [PATCH 02/12] Bump the standard-plugins group with 2 updates (#46) Bumps the standard-plugins group with 2 updates: [org.apache.maven.plugins:maven-install-plugin](https://github.com/apache/maven-install-plugin) and [org.apache.maven.plugins:maven-deploy-plugin](https://github.com/apache/maven-deploy-plugin). Updates `org.apache.maven.plugins:maven-install-plugin` from 3.1.1 to 3.1.2 - [Release notes](https://github.com/apache/maven-install-plugin/releases) - [Commits](https://github.com/apache/maven-install-plugin/compare/maven-install-plugin-3.1.1...maven-install-plugin-3.1.2) Updates `org.apache.maven.plugins:maven-deploy-plugin` from 3.1.1 to 3.1.2 - [Release notes](https://github.com/apache/maven-deploy-plugin/releases) - [Commits](https://github.com/apache/maven-deploy-plugin/compare/maven-deploy-plugin-3.1.1...maven-deploy-plugin-3.1.2) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-install-plugin dependency-type: direct:production update-type: version-update:semver-patch dependency-group: standard-plugins - dependency-name: org.apache.maven.plugins:maven-deploy-plugin dependency-type: direct:production update-type: version-update:semver-patch dependency-group: standard-plugins ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index ab065ec..0a3fca5 100644 --- a/pom.xml +++ b/pom.xml @@ -62,8 +62,8 @@ 3.2.5 3.2.5 3.3.1 - 3.1.1 - 3.1.1 + 3.1.2 + 3.1.2 3.6.3 3.2.4 0.4.0 From 93cba367561eb21542487db1a028bbabcbcc2f4a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 6 May 2024 14:35:04 -0400 Subject: [PATCH 03/12] Bump gov.hhs.aspr.ms.taskit:protobuf in the aspr-ms-dependencies group (#45) Bumps the aspr-ms-dependencies group with 1 update: [gov.hhs.aspr.ms.taskit:protobuf](https://github.com/HHS/aspr-ms-taskit). Updates `gov.hhs.aspr.ms.taskit:protobuf` from 4.0.0 to 4.0.1 - [Release notes](https://github.com/HHS/aspr-ms-taskit/releases) - [Commits](https://github.com/HHS/aspr-ms-taskit/compare/v4.0.0...v4.0.1) --- updated-dependencies: - dependency-name: gov.hhs.aspr.ms.taskit:protobuf dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aspr-ms-dependencies ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0a3fca5..1c9845d 100644 --- a/pom.xml +++ b/pom.xml @@ -69,7 +69,7 @@ 0.4.0 - 4.0.0 + 4.0.1 4.2.0 0.8.12 5.10.2 From 80121c2cfb129502107688921fcdeb91aaecd41e Mon Sep 17 00:00:00 2001 From: bischoffz Date: Fri, 10 May 2024 08:35:35 -0400 Subject: [PATCH 04/12] add dev PR build --- .github/workflows/dev_build.yml | 2 - .github/workflows/dev_pr_build.yml | 83 ++++++++++++++++++++++++++++++ 2 files changed, 83 insertions(+), 2 deletions(-) create mode 100644 .github/workflows/dev_pr_build.yml diff --git a/.github/workflows/dev_build.yml b/.github/workflows/dev_build.yml index 8fb5349..cc75742 100644 --- a/.github/workflows/dev_build.yml +++ b/.github/workflows/dev_build.yml @@ -11,8 +11,6 @@ name: GCM Taskit Development Build on: push: branches: [ "dev" ] - pull_request: - branches: [ "dev" ] jobs: dev-build: diff --git a/.github/workflows/dev_pr_build.yml b/.github/workflows/dev_pr_build.yml new file mode 100644 index 0000000..fb73208 --- /dev/null +++ b/.github/workflows/dev_pr_build.yml @@ -0,0 +1,83 @@ +# This workflow will build a Java project with Maven, and cache/restore any dependencies to improve the workflow execution time +# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-java-with-maven + +# This workflow uses actions that are not certified by GitHub. +# They are provided by a third-party and are governed by +# separate terms of service, privacy policy, and support +# documentation. + +name: GCM Taskit Development PR Build + +on: + pull_request: + branches-ignore: [ "main" ] + +jobs: + dev-build: + runs-on: ubuntu-latest + steps: + - name: Checkout GCM Taskit + uses: actions/checkout@v4 + + - name: Set up JDK 17 + uses: actions/setup-java@v4 + with: + java-version: '17' + distribution: 'temurin' + cache: maven + + - name: Get GCM Version + run: | + echo "gcm_version=v$(mvn help:evaluate -Dexpression=gcm.version -q -DforceStdout --file pom.xml)" >> "$GITHUB_ENV" + + - name: Checkout GCM + if: ${{ endsWith(env.gcm_version, 'SNAPSHOT') }} + uses: actions/checkout@v4 + with: + repository: HHS/ASPR-8 + path: gcm + ref: dev + + - name: Get Taskit Version + run: | + echo "taskit_version=v$(mvn help:evaluate -Dexpression=taskit.version -q -DforceStdout --file pom.xml)" >> "$GITHUB_ENV" + + - name: Checkout Taskit + if: ${{ endsWith(env.taskit_version, 'SNAPSHOT') }} + uses: actions/checkout@v4 + with: + repository: HHS/ASPR-ms-taskit + path: taskit + ref: dev + + - name: Get Util Version + if: ${{ endsWith(env.gcm_version, 'SNAPSHOT') }} + run: | + echo "util_version=v$(mvn help:evaluate -Dexpression=util.version -q -DforceStdout --file gcm/pom.xml)" >> "$GITHUB_ENV" + + - name: Checkout Util + if: ${{ endsWith(env.util_version, 'SNAPSHOT') }} + uses: actions/checkout@v4 + with: + repository: HHS/ASPR-ms-util + path: util + ref: dev + + - name: Build Util + if: ${{ endsWith(env.util_version, 'SNAPSHOT') }} + run: mvn clean install -DskipTests --file util/pom.xml + + - name: Build GCM + if: ${{ endsWith(env.gcm_version, 'SNAPSHOT') }} + run: mvn clean install -DskipTests --file gcm/simulation/pom.xml + + - name: Build Taskit + if: ${{ endsWith(env.taskit_version, 'SNAPSHOT') }} + run: mvn clean install -DskipTests --file taskit/pom.xml + + - name: Build GCM Taskit + run: mvn clean install --file pom.xml + + # Optional: Uploads the full dependency graph to GitHub to improve the quality of Dependabot alerts this repository can receive + # - name: Update dependency graph + # uses: advanced-security/maven-dependency-submission-action@571e99aab1055c2e71a1e2309b9691de18d6b7d6 From 3825a78de64da4a0521dd1ddae9924f9d39acd0c Mon Sep 17 00:00:00 2001 From: Zachary Bischoff <116595361+bischoffz@users.noreply.github.com> Date: Fri, 17 May 2024 01:18:55 -0400 Subject: [PATCH 05/12] update to util 4.2.0 (#48) --- pom.xml | 4 ++-- .../protobuf/nucleus/IT_NucleusTranslator.java | 6 +++--- .../IT_GlobalPropertiesTranslator.java | 6 +++--- .../protobuf/plugins/groups/IT_GroupsTranslator.java | 6 +++--- .../plugins/materials/IT_MaterialsTranslator.java | 12 ++++++------ .../plugins/partitions/IT_PartitionsTranslator.java | 4 ++-- .../protobuf/plugins/people/IT_PeopleTranslator.java | 4 ++-- .../IT_PersonPropertiesTranslator.java | 8 ++++---- .../MT_PersonPropertiesTranslator.java | 4 ++-- .../plugins/properties/IT_PropertiesTranslator.java | 4 ++-- .../plugins/regions/IT_RegionsTranslator.java | 8 ++++---- .../plugins/reports/IT_ReportsTranslator.java | 4 ++-- .../plugins/resources/IT_ResourcesTranslator.java | 10 +++++----- .../stochastics/IT_StochasticsTranslator.java | 4 ++-- 14 files changed, 42 insertions(+), 42 deletions(-) diff --git a/pom.xml b/pom.xml index 0ee3fce..4db50fb 100644 --- a/pom.xml +++ b/pom.xml @@ -69,8 +69,8 @@ 0.4.0 - 4.0.2 - 4.2.0 + 4.1.0-SNAPSHOT + 4.2.1-SNAPSHOT 0.8.12 5.10.2 diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/nucleus/IT_NucleusTranslator.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/nucleus/IT_NucleusTranslator.java index 9b9152f..561b92b 100644 --- a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/nucleus/IT_NucleusTranslator.java +++ b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/nucleus/IT_NucleusTranslator.java @@ -19,14 +19,14 @@ public class IT_NucleusTranslator { Path basePath = ResourceHelper.getResourceDir(this.getClass()); - Path filePath = ResourceHelper.makeOutputDir(basePath, "test-output"); + Path filePath = ResourceHelper.createDirectory(basePath, "test-output"); @Test @UnitTestForCoverage public void testSimulationStateTranslator() { String fileName = "simulationState.json"; - ResourceHelper.createOutputFile(filePath, fileName); + ResourceHelper.createFile(filePath, fileName); TranslationController translatorController = TranslationController.builder() .addTranslationEngine( @@ -57,7 +57,7 @@ public void testSimulationStateTranslator() { public void testExperimentParameterDataTranslator() { String fileName = "experimentParameterData.json"; - ResourceHelper.createOutputFile(filePath, fileName); + ResourceHelper.createFile(filePath, fileName); TranslationController translatorController = TranslationController.builder() .addTranslationEngine( diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/globalproperties/IT_GlobalPropertiesTranslator.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/globalproperties/IT_GlobalPropertiesTranslator.java index c30be36..106123f 100644 --- a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/globalproperties/IT_GlobalPropertiesTranslator.java +++ b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/globalproperties/IT_GlobalPropertiesTranslator.java @@ -26,14 +26,14 @@ public class IT_GlobalPropertiesTranslator { Path basePath = ResourceHelper.getResourceDir(this.getClass()); - Path filePath = ResourceHelper.makeOutputDir(basePath, "test-output"); + Path filePath = ResourceHelper.createDirectory(basePath, "test-output"); @Test @UnitTestForCoverage public void testGlobalPropertiesPluginDataIntegration() { String fileName = "globalPropertiesPluginData.json"; - ResourceHelper.createOutputFile(filePath, fileName); + ResourceHelper.createFile(filePath, fileName); ProtobufTranslationEngine protobufTranslationEngine = ProtobufTranslationEngine.builder() .addTranslator(GlobalPropertiesTranslator.getTranslator()) @@ -68,7 +68,7 @@ public void testGlobalPropertiesPluginDataIntegration() { public void testGlobalPropertyReportPluginDataIntegration() { String fileName = "propertyReport.json"; - ResourceHelper.createOutputFile(filePath, fileName); + ResourceHelper.createFile(filePath, fileName); ProtobufTranslationEngine protobufTranslationEngine = ProtobufTranslationEngine.builder() .addTranslator(GlobalPropertiesTranslator.getTranslator()) diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/IT_GroupsTranslator.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/IT_GroupsTranslator.java index 21dc800..67a449f 100644 --- a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/IT_GroupsTranslator.java +++ b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/IT_GroupsTranslator.java @@ -34,14 +34,14 @@ public class IT_GroupsTranslator { Path basePath = ResourceHelper.getResourceDir(this.getClass()); - Path filePath = ResourceHelper.makeOutputDir(basePath, "test-output"); + Path filePath = ResourceHelper.createDirectory(basePath, "test-output"); @Test @UnitTestForCoverage public void testGroupsTranslator() { String fileName = "groupsPluginData.json"; - ResourceHelper.createOutputFile(filePath, fileName); + ResourceHelper.createFile(filePath, fileName); ProtobufTranslationEngine protobufTranslationEngine = ProtobufTranslationEngine.builder() .addTranslator(GroupsTranslator.getTranslator()) @@ -99,7 +99,7 @@ public void testGroupsTranslator() { public void testGroupPropertyReportTranslatorSpec() { String fileName = "propertyReport.json"; - ResourceHelper.createOutputFile(filePath, fileName); + ResourceHelper.createFile(filePath, fileName); ProtobufTranslationEngine protobufTranslationEngine = ProtobufTranslationEngine.builder() .addTranslator(GroupsTranslator.getTranslator()) diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/IT_MaterialsTranslator.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/IT_MaterialsTranslator.java index 4b5a819..1ddc44a 100644 --- a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/IT_MaterialsTranslator.java +++ b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/IT_MaterialsTranslator.java @@ -32,14 +32,14 @@ public class IT_MaterialsTranslator { Path basePath = ResourceHelper.getResourceDir(this.getClass()); - Path filePath = ResourceHelper.makeOutputDir(basePath, "test-output"); + Path filePath = ResourceHelper.createDirectory(basePath, "test-output"); @Test @UnitTestForCoverage public void testMaterialsTranslator() { String fileName = "materialsPluginData.json"; - ResourceHelper.createOutputFile(filePath, fileName); + ResourceHelper.createFile(filePath, fileName); TranslationController translatorController = TranslationController.builder() .addTranslationEngine(ProtobufTranslationEngine.builder() @@ -76,7 +76,7 @@ public void testMaterialsTranslator() { public void testBatchStatusReportPluginDataTranslatorSpec() { String fileName = "batchStatusReport.json"; - ResourceHelper.createOutputFile(filePath, fileName); + ResourceHelper.createFile(filePath, fileName); TranslationController translatorController = TranslationController.builder() .addTranslationEngine(ProtobufTranslationEngine.builder() @@ -116,7 +116,7 @@ public void testBatchStatusReportPluginDataTranslatorSpec() { public void testMaterialsProducerPropertyReportPluginDataTranslatorSpec() { String fileName = "materialsProducerPropertyReport.json"; - ResourceHelper.createOutputFile(filePath, fileName); + ResourceHelper.createFile(filePath, fileName); TranslationController translatorController = TranslationController.builder() .addTranslationEngine(ProtobufTranslationEngine.builder() @@ -155,7 +155,7 @@ public void testMaterialsProducerPropertyReportPluginDataTranslatorSpec() { public void testMaterialsProducerResourceReportPluginDataTranslatorSpec() { String fileName = "materialsProducerResourceReport.json"; - ResourceHelper.createOutputFile(filePath, fileName); + ResourceHelper.createFile(filePath, fileName); TranslationController translatorController = TranslationController.builder() .addTranslationEngine(ProtobufTranslationEngine.builder() @@ -194,7 +194,7 @@ public void testMaterialsProducerResourceReportPluginDataTranslatorSpec() { public void testStageReportPluginDataTranslatorSpec() { String fileName = "stageReport.json"; - ResourceHelper.createOutputFile(filePath, fileName); + ResourceHelper.createFile(filePath, fileName); TranslationController translatorController = TranslationController.builder() .addTranslationEngine(ProtobufTranslationEngine.builder() diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/IT_PartitionsTranslator.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/IT_PartitionsTranslator.java index ee9dc9b..1533094 100644 --- a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/IT_PartitionsTranslator.java +++ b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/IT_PartitionsTranslator.java @@ -18,14 +18,14 @@ public class IT_PartitionsTranslator { Path basePath = ResourceHelper.getResourceDir(this.getClass()); - Path filePath = ResourceHelper.makeOutputDir(basePath, "test-output"); + Path filePath = ResourceHelper.createDirectory(basePath, "test-output"); @Test @UnitTestForCoverage public void testGroupsTranslator() { String fileName = "partitionsPluginData.json"; - ResourceHelper.createOutputFile(filePath, fileName); + ResourceHelper.createFile(filePath, fileName); TranslationController translatorController = TranslationController.builder() .addTranslationEngine(ProtobufTranslationEngine.builder() diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/people/IT_PeopleTranslator.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/people/IT_PeopleTranslator.java index 03af5b2..c3e8ef6 100644 --- a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/people/IT_PeopleTranslator.java +++ b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/people/IT_PeopleTranslator.java @@ -19,14 +19,14 @@ public class IT_PeopleTranslator { Path basePath = ResourceHelper.getResourceDir(this.getClass()); - Path filePath = ResourceHelper.makeOutputDir(basePath, "test-output"); + Path filePath = ResourceHelper.createDirectory(basePath, "test-output"); @Test @UnitTestForCoverage public void testPeopleTranslator() { String fileName = "peoplePluginData.json"; - ResourceHelper.createOutputFile(filePath, fileName); + ResourceHelper.createFile(filePath, fileName); TranslationController translatorController = TranslationController.builder() .addTranslationEngine( diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/personproperties/IT_PersonPropertiesTranslator.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/personproperties/IT_PersonPropertiesTranslator.java index cdc5158..483bd29 100644 --- a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/personproperties/IT_PersonPropertiesTranslator.java +++ b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/personproperties/IT_PersonPropertiesTranslator.java @@ -36,14 +36,14 @@ public class IT_PersonPropertiesTranslator { Path basePath = ResourceHelper.getResourceDir(this.getClass()); - Path filePath = ResourceHelper.makeOutputDir(basePath, "test-output"); + Path filePath = ResourceHelper.createDirectory(basePath, "test-output"); @Test @UnitTestForCoverage public void testPersonPropertiesTranslator() { String fileName = "personPropertiesPluginData.json"; - ResourceHelper.createOutputFile(filePath, fileName); + ResourceHelper.createFile(filePath, fileName); TranslationController translatorController = TranslationController.builder() .addTranslationEngine(ProtobufTranslationEngine.builder() @@ -83,7 +83,7 @@ public void testPersonPropertiesTranslator() { public void testPersonPropertyReportTranslatorSpec() { String fileName = "propertyReport.json"; - ResourceHelper.createOutputFile(filePath, fileName); + ResourceHelper.createFile(filePath, fileName); TranslationController translatorController = TranslationController.builder() .addTranslationEngine(ProtobufTranslationEngine.builder() @@ -135,7 +135,7 @@ public void testPersonPropertyReportTranslatorSpec() { public void testPersonInteractionReportTranslatorSpec() { String fileName = "interactionReport.json"; - ResourceHelper.createOutputFile(filePath, fileName); + ResourceHelper.createFile(filePath, fileName); TranslationController translatorController = TranslationController.builder() .addTranslationEngine(ProtobufTranslationEngine.builder() diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/personproperties/MT_PersonPropertiesTranslator.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/personproperties/MT_PersonPropertiesTranslator.java index 24cb6da..e4b5c10 100644 --- a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/personproperties/MT_PersonPropertiesTranslator.java +++ b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/personproperties/MT_PersonPropertiesTranslator.java @@ -22,7 +22,7 @@ public class MT_PersonPropertiesTranslator { long seed = 4684903523797799712L; String times = ""; Path basePath = ResourceHelper.getResourceDir(this.getClass()); - Path filePath = ResourceHelper.makeOutputDir(basePath, "test-output"); + Path filePath = ResourceHelper.createDirectory(basePath, "test-output"); ProtobufTranslationEngine protobufTranslationEngine; TimeElapser timeElapser = new TimeElapser(); PersonPropertiesPluginData pluginData; @@ -41,7 +41,7 @@ private MT_PersonPropertiesTranslator() { private void createPluginData(int population) { String fileName = "personPropertiesPluginData_mt-" + population + ".json"; - ResourceHelper.createOutputFile(filePath, fileName); + ResourceHelper.createFile(filePath, fileName); this.translationController = TranslationController.builder() .addTranslationEngine(this.protobufTranslationEngine) diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/properties/IT_PropertiesTranslator.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/properties/IT_PropertiesTranslator.java index df45921..f256add 100644 --- a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/properties/IT_PropertiesTranslator.java +++ b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/properties/IT_PropertiesTranslator.java @@ -16,14 +16,14 @@ public class IT_PropertiesTranslator { Path basePath = ResourceHelper.getResourceDir(this.getClass()); - Path filePath = ResourceHelper.makeOutputDir(basePath, "test-output"); + Path filePath = ResourceHelper.createDirectory(basePath, "test-output"); @Test @UnitTestForCoverage public void testPropertyValueMapTranslator() { String fileName = "propertyDefinition.json"; - ResourceHelper.createOutputFile(filePath, fileName); + ResourceHelper.createFile(filePath, fileName); TranslationController translatorController = TranslationController.builder() .addTranslationEngine( diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/IT_RegionsTranslator.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/IT_RegionsTranslator.java index c770171..9a002e4 100644 --- a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/IT_RegionsTranslator.java +++ b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/IT_RegionsTranslator.java @@ -37,14 +37,14 @@ public class IT_RegionsTranslator { Path basePath = ResourceHelper.getResourceDir(this.getClass()); - Path filePath = ResourceHelper.makeOutputDir(basePath, "test-output"); + Path filePath = ResourceHelper.createDirectory(basePath, "test-output"); @Test @UnitTestForCoverage public void testRegionsTranslator() { String fileName = "regionsPluginData.json"; - ResourceHelper.createOutputFile(filePath, fileName); + ResourceHelper.createFile(filePath, fileName); TranslationController translatorController = TranslationController.builder() .addTranslationEngine(ProtobufTranslationEngine.builder() @@ -83,7 +83,7 @@ public void testRegionsTranslator() { public void testRegionPropertyReportTranslatorSpec() { String fileName = "propertyReport.json"; - ResourceHelper.createOutputFile(filePath, fileName); + ResourceHelper.createFile(filePath, fileName); TranslationController translatorController = TranslationController.builder() .addTranslationEngine(ProtobufTranslationEngine.builder() @@ -134,7 +134,7 @@ public void testRegionPropertyReportTranslatorSpec() { public void testRegionTransferReportTranslatorSpec() { String fileName = "transferReport.json"; - ResourceHelper.createOutputFile(filePath, fileName); + ResourceHelper.createFile(filePath, fileName); TranslationController translatorController = TranslationController.builder() .addTranslationEngine(ProtobufTranslationEngine.builder() diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/reports/IT_ReportsTranslator.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/reports/IT_ReportsTranslator.java index c1783de..c752abb 100644 --- a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/reports/IT_ReportsTranslator.java +++ b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/reports/IT_ReportsTranslator.java @@ -17,14 +17,14 @@ public class IT_ReportsTranslator { Path basePath = ResourceHelper.getResourceDir(this.getClass()); - Path filePath = ResourceHelper.makeOutputDir(basePath, "test-output"); + Path filePath = ResourceHelper.createDirectory(basePath, "test-output"); @Test @UnitTestForCoverage public void testReportLabelTranslatorSpec() { String fileName = "reportLabel.json"; - ResourceHelper.createOutputFile(filePath, fileName); + ResourceHelper.createFile(filePath, fileName); TranslationController translatorController = TranslationController.builder() .addTranslationEngine( diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/resources/IT_ResourcesTranslator.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/resources/IT_ResourcesTranslator.java index 4976538..eca7dbc 100644 --- a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/resources/IT_ResourcesTranslator.java +++ b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/resources/IT_ResourcesTranslator.java @@ -40,14 +40,14 @@ public class IT_ResourcesTranslator { Path basePath = ResourceHelper.getResourceDir(this.getClass()); - Path filePath = ResourceHelper.makeOutputDir(basePath, "test-output"); + Path filePath = ResourceHelper.createDirectory(basePath, "test-output"); @Test @UnitTestForCoverage public void testResourcesTranslator() { String fileName = "resourcesPluginData.json"; - ResourceHelper.createOutputFile(filePath, fileName); + ResourceHelper.createFile(filePath, fileName); TranslationController translatorController = TranslationController.builder() .addTranslationEngine(ProtobufTranslationEngine.builder() @@ -87,7 +87,7 @@ public void testResourcesTranslator() { public void testPersonResourceReportTranslatorSpec() { String fileName = "personResourceReport.json"; - ResourceHelper.createOutputFile(filePath, fileName); + ResourceHelper.createFile(filePath, fileName); TranslationController translatorController = TranslationController.builder() .addTranslationEngine(ProtobufTranslationEngine.builder() @@ -140,7 +140,7 @@ public void testPersonResourceReportTranslatorSpec() { public void testResourcePropertyReportTranslatorSpec() { String fileName = "resourcePropertyReport.json"; - ResourceHelper.createOutputFile(filePath, fileName); + ResourceHelper.createFile(filePath, fileName); TranslationController translatorController = TranslationController.builder() .addTranslationEngine(ProtobufTranslationEngine.builder() @@ -178,7 +178,7 @@ public void testResourcePropertyReportTranslatorSpec() { public void testResourceReportTranslatorSpec() { String fileName = "resourceReport.json"; - ResourceHelper.createOutputFile(filePath, fileName); + ResourceHelper.createFile(filePath, fileName); TranslationController translatorController = TranslationController.builder() .addTranslationEngine(ProtobufTranslationEngine.builder() diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/stochastics/IT_StochasticsTranslator.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/stochastics/IT_StochasticsTranslator.java index e455e46..39f26b8 100644 --- a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/stochastics/IT_StochasticsTranslator.java +++ b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/stochastics/IT_StochasticsTranslator.java @@ -22,14 +22,14 @@ public class IT_StochasticsTranslator { Path basePath = ResourceHelper.getResourceDir(this.getClass()); - Path filePath = ResourceHelper.makeOutputDir(basePath, "test-output"); + Path filePath = ResourceHelper.createDirectory(basePath, "test-output"); @Test @UnitTestForCoverage public void testStochasticsTranslator() { String fileName = "stochasticsPluginData.json"; - ResourceHelper.createOutputFile(filePath, fileName); + ResourceHelper.createFile(filePath, fileName); TranslationController translatorController = TranslationController.builder() .addTranslationEngine(ProtobufTranslationEngine.builder() From 1dc6fa7e8d0af191cb574f92f87636a125479e74 Mon Sep 17 00:00:00 2001 From: bischoffz Date: Wed, 29 May 2024 02:45:26 -0400 Subject: [PATCH 06/12] change gcm sim scope --- pom.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4db50fb..f9bcfca 100644 --- a/pom.xml +++ b/pom.xml @@ -110,7 +110,6 @@ gov.hhs.aspr.ms.gcm simulation - provided org.jacoco From aa85972ccdc574347fc0087f513d09f6e8b15248 Mon Sep 17 00:00:00 2001 From: bischoffz Date: Wed, 29 May 2024 03:00:15 -0400 Subject: [PATCH 07/12] update dev pipelines --- .github/workflows/dev_build.yml | 7 ++----- .github/workflows/dev_pr_build.yml | 7 ++----- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/.github/workflows/dev_build.yml b/.github/workflows/dev_build.yml index cc75742..17cc8c9 100644 --- a/.github/workflows/dev_build.yml +++ b/.github/workflows/dev_build.yml @@ -26,9 +26,10 @@ jobs: distribution: 'temurin' cache: maven - - name: Get GCM Version + - name: Get GCM and Taskit Version run: | echo "gcm_version=v$(mvn help:evaluate -Dexpression=gcm.version -q -DforceStdout --file pom.xml)" >> "$GITHUB_ENV" + echo "taskit_version=v$(mvn help:evaluate -Dexpression=taskit.version -q -DforceStdout --file pom.xml)" >> "$GITHUB_ENV" - name: Checkout GCM if: ${{ endsWith(env.gcm_version, 'SNAPSHOT') }} @@ -38,10 +39,6 @@ jobs: path: gcm ref: dev - - name: Get Taskit Version - run: | - echo "taskit_version=v$(mvn help:evaluate -Dexpression=taskit.version -q -DforceStdout --file pom.xml)" >> "$GITHUB_ENV" - - name: Checkout Taskit if: ${{ endsWith(env.taskit_version, 'SNAPSHOT') }} uses: actions/checkout@v4 diff --git a/.github/workflows/dev_pr_build.yml b/.github/workflows/dev_pr_build.yml index fb73208..ab6b996 100644 --- a/.github/workflows/dev_pr_build.yml +++ b/.github/workflows/dev_pr_build.yml @@ -26,9 +26,10 @@ jobs: distribution: 'temurin' cache: maven - - name: Get GCM Version + - name: Get GCM and Taskit Version run: | echo "gcm_version=v$(mvn help:evaluate -Dexpression=gcm.version -q -DforceStdout --file pom.xml)" >> "$GITHUB_ENV" + echo "taskit_version=v$(mvn help:evaluate -Dexpression=taskit.version -q -DforceStdout --file pom.xml)" >> "$GITHUB_ENV" - name: Checkout GCM if: ${{ endsWith(env.gcm_version, 'SNAPSHOT') }} @@ -38,10 +39,6 @@ jobs: path: gcm ref: dev - - name: Get Taskit Version - run: | - echo "taskit_version=v$(mvn help:evaluate -Dexpression=taskit.version -q -DforceStdout --file pom.xml)" >> "$GITHUB_ENV" - - name: Checkout Taskit if: ${{ endsWith(env.taskit_version, 'SNAPSHOT') }} uses: actions/checkout@v4 From fe07cd16882eddb14e14ec55e34813fd4495be40 Mon Sep 17 00:00:00 2001 From: shawnhatch Date: Wed, 12 Jun 2024 15:42:35 -0400 Subject: [PATCH 08/12] Added support for SimpleRandomNumberGeneratorId --- .../stochastics/StochasticsTranslator.java | 3 + ...andomNumberGeneratorIdTranslationSpec.java | 38 ++++++++++++ .../plugins/stochastics/support.proto | 5 ++ ...andomNumberGeneratorIdTranslationSpec.java | 58 +++++++++++++++++++ 4 files changed, 104 insertions(+) create mode 100644 protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/stochastics/translationSpecs/SimpleRandomNumberGeneratorIdTranslationSpec.java create mode 100644 protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/stochastics/translationSpecs/AT_SimpleRandomNumberGeneratorIdTranslationSpec.java diff --git a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/stochastics/StochasticsTranslator.java b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/stochastics/StochasticsTranslator.java index f2fda0b..3fb5492 100644 --- a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/stochastics/StochasticsTranslator.java +++ b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/stochastics/StochasticsTranslator.java @@ -4,6 +4,7 @@ import java.util.List; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.stochastics.translationSpecs.RandomNumberGeneratorIdTranslationSpec; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.stochastics.translationSpecs.SimpleRandomNumberGeneratorIdTranslationSpec; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.stochastics.translationSpecs.StochasticsPluginDataTranslationSpec; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.stochastics.translationSpecs.TestRandomGeneratorIdTranslationSpec; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.stochastics.translationSpecs.WellStateTranslationSpec; @@ -27,6 +28,8 @@ private StochasticsTranslator() { list.add(new WellStateTranslationSpec()); list.add(new RandomNumberGeneratorIdTranslationSpec()); list.add(new TestRandomGeneratorIdTranslationSpec()); + list.add(new SimpleRandomNumberGeneratorIdTranslationSpec()); + return list; } diff --git a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/stochastics/translationSpecs/SimpleRandomNumberGeneratorIdTranslationSpec.java b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/stochastics/translationSpecs/SimpleRandomNumberGeneratorIdTranslationSpec.java new file mode 100644 index 0000000..540f487 --- /dev/null +++ b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/stochastics/translationSpecs/SimpleRandomNumberGeneratorIdTranslationSpec.java @@ -0,0 +1,38 @@ +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.stochastics.translationSpecs; + +import gov.hhs.aspr.ms.gcm.simulation.plugins.reports.support.SimpleReportLabel; +import gov.hhs.aspr.ms.gcm.simulation.plugins.stochastics.support.SimpleRandomNumberGeneratorId; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.support.input.SimpleReportLabelInput; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.stochastics.support.input.SimpleRandomNumberGeneratorIdInput; +import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationSpec; + +/** + * TranslationSpec that defines how to convert between + * {@linkplain SimpleReportLabelInput} and {@linkplain SimpleReportLabel} + */ +public class SimpleRandomNumberGeneratorIdTranslationSpec + extends ProtobufTranslationSpec { + + @Override + protected SimpleRandomNumberGeneratorId convertInputObject(SimpleRandomNumberGeneratorIdInput inputObject) { + return new SimpleRandomNumberGeneratorId(this.translationEngine.getObjectFromAny(inputObject.getValue())); + } + + @Override + protected SimpleRandomNumberGeneratorIdInput convertAppObject(SimpleRandomNumberGeneratorId appObject) { + return SimpleRandomNumberGeneratorIdInput.newBuilder() + .setValue(this.translationEngine.getAnyFromObject(appObject.getValue())) + .build(); + } + + @Override + public Class getAppObjectClass() { + return SimpleRandomNumberGeneratorId.class; + } + + @Override + public Class getInputObjectClass() { + return SimpleRandomNumberGeneratorIdInput.class; + } + +} diff --git a/protobuf/src/main/proto/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/stochastics/support.proto b/protobuf/src/main/proto/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/stochastics/support.proto index 29ecfa0..aaaaa9c 100644 --- a/protobuf/src/main/proto/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/stochastics/support.proto +++ b/protobuf/src/main/proto/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/stochastics/support.proto @@ -11,6 +11,11 @@ message RandomNumberGeneratorIdInput { google.protobuf.Any id = 1; } +message SimpleRandomNumberGeneratorIdInput { + google.protobuf.Any value = 1; +} + + message WellStateInput { int64 seed = 1; optional int32 index = 2; diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/stochastics/translationSpecs/AT_SimpleRandomNumberGeneratorIdTranslationSpec.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/stochastics/translationSpecs/AT_SimpleRandomNumberGeneratorIdTranslationSpec.java new file mode 100644 index 0000000..2a28d3d --- /dev/null +++ b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/stochastics/translationSpecs/AT_SimpleRandomNumberGeneratorIdTranslationSpec.java @@ -0,0 +1,58 @@ +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.stochastics.translationSpecs; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; + +import org.junit.jupiter.api.Test; + +import gov.hhs.aspr.ms.gcm.simulation.plugins.stochastics.support.SimpleRandomNumberGeneratorId; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.ReportsTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.stochastics.support.input.SimpleRandomNumberGeneratorIdInput; +import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationEngine; +import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; +import gov.hhs.aspr.ms.util.annotations.UnitTestForCoverage; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; + +public class AT_SimpleRandomNumberGeneratorIdTranslationSpec { + + @Test + @UnitTestConstructor(target = SimpleRandomNumberGeneratorIdTranslationSpec.class, args = {}) + public void testConstructor() { + assertNotNull(new SimpleRandomNumberGeneratorIdTranslationSpec()); + } + + @Test + @UnitTestForCoverage + public void testConvertObject() { + ProtobufTranslationEngine protobufTranslationEngine = ProtobufTranslationEngine.builder() + .addTranslator(ReportsTranslator.getTranslator()) + .build(); + + SimpleRandomNumberGeneratorIdTranslationSpec translationSpec = new SimpleRandomNumberGeneratorIdTranslationSpec(); + translationSpec.init(protobufTranslationEngine); + + SimpleRandomNumberGeneratorId expectedAppValue = new SimpleRandomNumberGeneratorId("report label"); + + SimpleRandomNumberGeneratorIdInput inputValue = translationSpec.convertAppObject(expectedAppValue); + + SimpleRandomNumberGeneratorId actualAppValue = translationSpec.convertInputObject(inputValue); + + assertEquals(expectedAppValue, actualAppValue); + } + + @Test + @UnitTestMethod(target = SimpleRandomNumberGeneratorIdTranslationSpec.class, name = "getAppObjectClass", args = {}) + public void testGetAppObjectClass() { + SimpleRandomNumberGeneratorIdTranslationSpec translationSpec = new SimpleRandomNumberGeneratorIdTranslationSpec(); + + assertEquals(SimpleRandomNumberGeneratorId.class, translationSpec.getAppObjectClass()); + } + + @Test + @UnitTestMethod(target = SimpleRandomNumberGeneratorIdTranslationSpec.class, name = "getInputObjectClass", args = {}) + public void testGetInputObjectClass() { + SimpleRandomNumberGeneratorIdTranslationSpec translationSpec = new SimpleRandomNumberGeneratorIdTranslationSpec(); + + assertEquals(SimpleRandomNumberGeneratorIdInput.class, translationSpec.getInputObjectClass()); + } +} From f4cd8078f6a6ed7819a2418a84128202e9df2e3f Mon Sep 17 00:00:00 2001 From: shawnhatch Date: Wed, 12 Jun 2024 16:36:06 -0400 Subject: [PATCH 09/12] prints defalut values for experiment parameter data --- .../taskit/protobuf/nucleus/NucleusTranslator.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/nucleus/NucleusTranslator.java b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/nucleus/NucleusTranslator.java index 9004199..c6c0c35 100644 --- a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/nucleus/NucleusTranslator.java +++ b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/nucleus/NucleusTranslator.java @@ -3,6 +3,7 @@ import java.util.ArrayList; import java.util.List; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.nucleus.input.ExperimentParameterDataInput; import gov.hhs.aspr.ms.gcm.taskit.protobuf.nucleus.input.SimulationStateInput; import gov.hhs.aspr.ms.gcm.taskit.protobuf.nucleus.testsupport.translationSpecs.ExampleDimensionTranslationSpec; import gov.hhs.aspr.ms.gcm.taskit.protobuf.nucleus.translationSpecs.DimensionTranslationSpec; @@ -51,6 +52,19 @@ private static Translator.Builder builder() { translationEngineBuilder.addFieldToIncludeDefaultValue( SimulationStateInput.getDescriptor().findFieldByName("startTime")); + + translationEngineBuilder.addFieldToIncludeDefaultValue( + ExperimentParameterDataInput.getDescriptor().findFieldByName("threadCount")) + .addFieldToIncludeDefaultValue( + ExperimentParameterDataInput.getDescriptor().findFieldByName("startRecordingIsScheduled")) + .addFieldToIncludeDefaultValue( + ExperimentParameterDataInput.getDescriptor().findFieldByName("simulationHaltTime")) + .addFieldToIncludeDefaultValue( + ExperimentParameterDataInput.getDescriptor().findFieldByName("haltOnException")) + .addFieldToIncludeDefaultValue( + ExperimentParameterDataInput.getDescriptor().findFieldByName("experimentProgressLogPath")) + .addFieldToIncludeDefaultValue( + ExperimentParameterDataInput.getDescriptor().findFieldByName("continueFromProgressLog")); }); return builder; From 96561a2f8fb33c9869828138ef4e6cab85fe3213 Mon Sep 17 00:00:00 2001 From: bischoffz Date: Thu, 13 Jun 2024 21:57:57 -0400 Subject: [PATCH 10/12] update gcm version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f9bcfca..5ac253a 100644 --- a/pom.xml +++ b/pom.xml @@ -70,7 +70,7 @@ 4.1.0-SNAPSHOT - 4.2.1-SNAPSHOT + 4.3.0-SNAPSHOT 0.8.12 5.10.2 From ffa729ce257031c92f3f6d5442eb7ad5c79aa6dd Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 14 Jun 2024 02:18:41 +0000 Subject: [PATCH 11/12] Update gcm to 4.2.1 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index afacee2..1a226b2 100644 --- a/pom.xml +++ b/pom.xml @@ -50,7 +50,7 @@ - 2.8.1 + ..1 UTF-8 @@ -70,7 +70,7 @@ 4.0.2 - 4.2.0 + 4.2.1 0.8.12 5.10.2 From 9f15f1ff5718b1a9352a196072d692b08101b7e5 Mon Sep 17 00:00:00 2001 From: Zachary Bischoff <116595361+bischoffz@users.noreply.github.com> Date: Thu, 13 Jun 2024 22:20:17 -0400 Subject: [PATCH 12/12] Update pom.xml --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 1a226b2..62cedf8 100644 --- a/pom.xml +++ b/pom.xml @@ -50,7 +50,7 @@ - ..1 + 2.8.2 UTF-8 @@ -411,4 +411,4 @@ - \ No newline at end of file +