Merge branch 'main' into main-dev

648540858

2023-04-03 786c76ba714321c2d481b32afbb619a33f7c11a9

 pom.xml

@@ -6,7 +6,7 @@
   <parent>
      <groupId>org.springframework.boot</groupId>
      <artifactId>spring-boot-starter-parent</artifactId>
      <version>2.7.2</version>
      <version>2.7.9</version>
   </parent>

   <groupId>com.genersoft</groupId>
@@ -79,7 +79,7 @@
               <exclusions>
                  <exclusion>
                     <groupId>org.springframework.boot</groupId>
                     <artifactId>spring-boot-starter-tomcat</artifactId>
                     <artifactId>spring-boot-starter-jetty</artifactId>
                  </exclusion>
               </exclusions>
            </dependency>
@@ -314,7 +314,6 @@
               <dateFormat>yyyyMMdd</dateFormat>
            </configuration>
         </plugin>

         <plugin>
            <groupId>org.apache.maven.plugins</groupId>
            <artifactId>maven-surefire-plugin</artifactId>
@@ -323,7 +322,6 @@
               <skipTests>true</skipTests>
            </configuration>
         </plugin>

      </plugins>
      <resources>
         <resource>