Merge pull request #94 from netceteragroup/no-issue/update-spring-boo…

…t-3-2-x

[no-issue] upgrade spring boot to 3.2.1

girders-demos/girders-demo-showcase/pom.xml

@@ -156,8 +156,8 @@
       <artifactId>spring-boot-admin-starter-client</artifactId>
     </dependency>
     <dependency>
-      <groupId>commons-collections</groupId>
-      <artifactId>commons-collections</artifactId>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-collections4</artifactId>
     </dependency>
 
     <!-- other dependencies -->

girders-demos/girders-demo-showcase/src/main/java/com/netcetera/girders/demo/showcase/pdf/PdfboxView.java

@@ -7,6 +7,7 @@
 import org.apache.pdfbox.pdmodel.PDPage;
 import org.apache.pdfbox.pdmodel.PDPageContentStream;
 import org.apache.pdfbox.pdmodel.font.PDType1Font;
+import org.apache.pdfbox.pdmodel.font.Standard14Fonts.FontName;
 import org.springframework.stereotype.Component;
 import org.springframework.web.servlet.view.AbstractView;
 import java.awt.Color;
@@ -93,9 +94,9 @@ private void drawTable(PDPage page, PDPageContentStream contentStream, float y,
     float textY = y - 15.0F;
     for (int i = 0; i < content.length; i++) {
       if (i == 0) {
-        contentStream.setFont(PDType1Font.HELVETICA_BOLD, 12.0F);
+        contentStream.setFont(new PDType1Font(FontName.HELVETICA_BOLD), 12.0F);
       } else {
-        contentStream.setFont(PDType1Font.HELVETICA, 12.0F);
+        contentStream.setFont(new PDType1Font(FontName.HELVETICA), 12.0F);
       }
       for (int j = 0; j < content[i].length; j++) {
         String text = content[i][j];

girders-demos/girders-demo-showcase/src/main/java/com/netcetera/girders/demo/showcase/resttemplatelogging/RestTemplateLoggingConfiguration.java

@@ -1,5 +1,6 @@
 package com.netcetera.girders.demo.showcase.resttemplatelogging;
 
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.boot.web.client.RestTemplateBuilder;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -18,6 +19,7 @@ public class RestTemplateLoggingConfiguration {
    * @return Constructed REST template
    */
   @Bean
+  @Qualifier("loggingRestTemplate")
   public RestTemplate restTemplate(RestTemplateBuilder restTemplateBuilder) {
     return restTemplateBuilder.build();
   }

girders-demos/girders-demo-showcase/src/main/java/com/netcetera/girders/demo/showcase/resttemplatelogging/RestTemplateLoggingController.java

@@ -3,6 +3,7 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import net.jperf.aop.Profiled;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.lang.NonNull;
 import org.springframework.stereotype.Controller;
@@ -34,7 +35,9 @@ public class RestTemplateLoggingController {
    * @param objectMapper    Mapper for input and output objects
    * @param wikipediaApiUrl URL for the Wikipedia resource
    */
-  public RestTemplateLoggingController(@NonNull RestTemplate restTemplate, @NonNull ObjectMapper objectMapper,
+  public RestTemplateLoggingController(
+      @NonNull @Qualifier("loggingRestTemplate") RestTemplate restTemplate,
+      @NonNull ObjectMapper objectMapper,
       @Value("${showcase.rest-template-logging.wikipedia-api-url}") String wikipediaApiUrl) {
     this.restTemplate = restTemplate;
     this.objectMapper = objectMapper;

girders-demos/girders-demo-test/pom.xml

@@ -146,8 +146,8 @@
       <artifactId>bootstrap</artifactId>
     </dependency>
     <dependency>
-      <groupId>commons-collections</groupId>
-      <artifactId>commons-collections</artifactId>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-collections4</artifactId>
     </dependency>
     <dependency>
       <groupId>org.projectlombok</groupId>

girders-platform-bom/pom.xml

@@ -26,29 +26,29 @@
           divergence of transitive dependencies in girders-demo-showcase; remove explicit management once dependencies
           converge again -->
     <classgraph.version>4.8.161</classgraph.version>
-    <commons-collections.version>3.2.2</commons-collections.version>
+    <commons-collections.version>4.4</commons-collections.version>
     <!-- TODO gbachmei 2021-09-01: manually managing version of transitive dependency
           org.apache.commons:commons-compress because the version currently used by our direct dependencies (1.20) has
           known security issues; you can remove this version and the dependency declaration where it's used once all
           our dependencies have migrated to a version of commons-compress that has no security issues -->
-    <commons-compress.version>1.21</commons-compress.version>
-    <commons-io.version>2.12.0</commons-io.version>
+    <commons-compress.version>1.25.0</commons-compress.version>
+    <commons-io.version>2.15.1</commons-io.version>
     <commons-jexl.version>1.1</commons-jexl.version>
     <dbunit.version>2.7.3</dbunit.version>
-    <fontbox.version>2.0.26</fontbox.version>
-    <fop.version>2.8</fop.version>
+    <fontbox.version>3.0.1</fontbox.version>
+    <fop.version>2.9</fop.version>
     <guava.version>32.1.1-jre</guava.version>
     <jasypt-spring-boot.version>3.0.2</jasypt-spring-boot.version>
     <jperf.version>1.0.3</jperf.version>
-    <pdfbox.version>2.0.29</pdfbox.version>
+    <pdfbox.version>3.0.1</pdfbox.version>
     <poi.version>5.2.3</poi.version>
-    <spring-boot.version>3.1.4</spring-boot.version>
-    <spring-boot-admin.version>3.1.7</spring-boot-admin.version>
-    <spring-cloud.version>2022.0.3</spring-cloud.version>
+    <spring-boot.version>3.2.1</spring-boot.version>
+    <spring-boot-admin.version>3.2.0</spring-boot-admin.version>
+    <spring-cloud.version>2023.0.0</spring-cloud.version>
     <spring-web-flow.version>3.0.0</spring-web-flow.version>
-    <openapi.version>2.0.2</openapi.version>
+    <openapi.version>2.3.0</openapi.version>
     <token-bucket.version>1.7</token-bucket.version>
-    <xmlgraphics-commons.version>2.8</xmlgraphics-commons.version>
+    <xmlgraphics-commons.version>2.9</xmlgraphics-commons.version>
   </properties>
 
   <dependencyManagement>
@@ -362,7 +362,7 @@
       <dependency>
         <groupId>org.springdoc</groupId>
         <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
-        <version>2.0.2</version>
+        <version>${openapi.version}</version>
       </dependency>
 
 
@@ -434,8 +434,8 @@
         <version>${commons-io.version}</version>
       </dependency>
       <dependency>
-        <groupId>commons-collections</groupId>
-        <artifactId>commons-collections</artifactId>
+        <groupId>org.apache.commons</groupId>
+        <artifactId>commons-collections4</artifactId>
         <version>${commons-collections.version}</version>
       </dependency>
       <dependency>

pom.xml

@@ -343,6 +343,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-project-info-reports-plugin</artifactId>
+        <version>3.5.0</version>
         <configuration>
           <dependencyDetailsEnabled>true</dependencyDetailsEnabled>
           <skipEmptyReport>false</skipEmptyReport>