Merged pom.xml from main

senzing-garage · Dec 7, 2023 · d890734 · d890734
2 parents 89a23dc + d1c05a6
commit d890734
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/pom.xml b/pom.xml
@@ -66,7 +66,7 @@
     <dependency>
       <groupId>com.ibm.icu</groupId>
       <artifactId>icu4j</artifactId>
-      <version>73.2</version>
+      <version>74.1</version>
     </dependency>
     <dependency>
       <groupId>org.junit.jupiter</groupId>
@@ -107,7 +107,11 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
+<<<<<<< HEAD
         <version>3.2.2</version>
+=======
+        <version>3.2.1</version>
+>>>>>>> origin/main
         <configuration>
           <systemPropertyVariables>
             <project.build.directory>${project.build.directory}</project.build.directory>
@@ -139,7 +143,11 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
+<<<<<<< HEAD
         <version>3.6.2</version>
+=======
+        <version>3.6.0</version>
+>>>>>>> origin/main
         <executions>
           <execution>
             <id>attach-javadocs</id>