Update the Junit5 and Mockito dependency to latest version

google · Oct 26, 2024 · 30956b9 · 30956b9
1 parent 939dad7
commit 30956b9
Show file tree

Hide file tree

Showing 6 changed files with 44 additions and 16 deletions.
diff --git a/pipelines/batch/src/main/java/com/google/fhir/analytics/FhirEtl.java b/pipelines/batch/src/main/java/com/google/fhir/analytics/FhirEtl.java
@@ -514,8 +514,12 @@ static List<Pipeline> setupAndBuildPipelines(
   }
 
   public static void main(String[] args)
-      throws IOException, SQLException, ViewDefinitionException, ProfileException,
-          ExecutionException, InterruptedException {
+      throws IOException,
+          SQLException,
+          ViewDefinitionException,
+          ProfileException,
+          ExecutionException,
+          InterruptedException {
 
     AvroConversionUtil.initializeAvroConverters();
 

diff --git a/pipelines/batch/src/test/java/com/google/fhir/analytics/ConvertResourceFnTest.java b/pipelines/batch/src/test/java/com/google/fhir/analytics/ConvertResourceFnTest.java
@@ -71,8 +71,12 @@ public void setup() throws SQLException, ProfileException {
 
   @Test
   public void testProcessPatientResource_withoutForcedId()
-      throws IOException, java.text.ParseException, SQLException, PropertyVetoException,
-          ViewApplicationException, ProfileException {
+      throws IOException,
+          java.text.ParseException,
+          SQLException,
+          PropertyVetoException,
+          ViewApplicationException,
+          ProfileException {
     String[] args = {"--outputParquetPath=SOME_PATH"};
     setUp(args);
     String patientResourceStr =
@@ -96,8 +100,12 @@ public void testProcessPatientResource_withoutForcedId()
 
   @Test
   public void testProcessPatientResource_withForcedId()
-      throws IOException, java.text.ParseException, SQLException, PropertyVetoException,
-          ViewApplicationException, ProfileException {
+      throws IOException,
+          java.text.ParseException,
+          SQLException,
+          PropertyVetoException,
+          ViewApplicationException,
+          ProfileException {
     String[] args = {"--outputParquetPath=SOME_PATH"};
     setUp(args);
     String patientResourceStr =
@@ -127,8 +135,12 @@ public void testProcessPatientResource_withForcedId()
 
   @Test
   public void testProcessDeletedPatientResourceFullMode()
-      throws SQLException, IOException, ParseException, PropertyVetoException,
-          ViewApplicationException, ProfileException {
+      throws SQLException,
+          IOException,
+          ParseException,
+          PropertyVetoException,
+          ViewApplicationException,
+          ProfileException {
     String[] args = {"--outputParquetPath=SOME_PATH", "--since="};
     setUp(args);
     // Deleted Patient resource
@@ -142,8 +154,12 @@ public void testProcessDeletedPatientResourceFullMode()
 
   @Test
   public void testProcessDeletedPatientResourceIncrementalMode()
-      throws SQLException, IOException, ParseException, PropertyVetoException,
-          ViewApplicationException, ProfileException {
+      throws SQLException,
+          IOException,
+          ParseException,
+          PropertyVetoException,
+          ViewApplicationException,
+          ProfileException {
     String[] args = {"--outputParquetPath=SOME_PATH", "--since=NON-EMPTY"};
     setUp(args);
     // Deleted Patient resource
@@ -170,8 +186,12 @@ public void testProcessDeletedPatientResourceIncrementalMode()
 
   @Test
   public void testResourceMetaTags()
-      throws IOException, java.text.ParseException, SQLException, PropertyVetoException,
-          ViewApplicationException, ProfileException {
+      throws IOException,
+          java.text.ParseException,
+          SQLException,
+          PropertyVetoException,
+          ViewApplicationException,
+          ProfileException {
     String[] args = {"--outputParquetPath=SOME_PATH", "--since="};
     setUp(args);
     String patientResourceStr =

diff --git a/pipelines/common/pom.xml b/pipelines/common/pom.xml
@@ -254,13 +254,13 @@
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-api</artifactId>
-      <version>5.10.1</version>
+      <version>5.11.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-junit-jupiter</artifactId>
-      <version>5.7.0</version>
+      <version>5.13.0</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

diff --git a/pipelines/common/src/test/java/com/google/fhir/analytics/GZipUtilTest.java b/pipelines/common/src/test/java/com/google/fhir/analytics/GZipUtilTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2023 Google LLC
+ * Copyright 2020-2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/pipelines/controller/.java-version b/pipelines/controller/.java-version
@@ -0,0 +1 @@
+17.0.12
diff --git a/pipelines/controller/src/main/java/com/google/fhir/analytics/PipelineManager.java b/pipelines/controller/src/main/java/com/google/fhir/analytics/PipelineManager.java
@@ -369,7 +369,10 @@ DwhRunDetails getLastRunDetails() {
   // Every 30 seconds, check for pipeline status and incremental pipeline schedule.
   @Scheduled(fixedDelay = 30000)
   private void checkSchedule()
-      throws IOException, PropertyVetoException, SQLException, ViewDefinitionException,
+      throws IOException,
+          PropertyVetoException,
+          SQLException,
+          ViewDefinitionException,
           ProfileException {
     LocalDateTime next = getNextIncrementalTime();
     if (next == null) {