Update dependencies

.github/workflows/build.yml

@@ -13,7 +13,7 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@v1
         with:
-          java-version: 8
+          java-version: 17
 
       - name: Set up Node
         uses: actions/setup-node@v1

build.gradle

@@ -1,13 +1,16 @@
 plugins {
-	id 'org.springframework.boot' version '2.6.2'
-	id 'io.spring.dependency-management' version '1.0.11.RELEASE'
-	id 'java'
+  id 'java'
+  id 'org.springframework.boot' version '3.1.5'
+  id 'io.spring.dependency-management' version '1.1.3'
 	id 'jacoco'
 }
 
 group = 'uk.gov.beis'
 version = 'SNAPSHOT'
-sourceCompatibility = 1.8
+
+java {
+  sourceCompatibility = '17'
+}
 
 repositories {
   mavenCentral()
@@ -17,21 +20,24 @@ dependencies {
   implementation 'org.springframework.boot:spring-boot-starter-freemarker'
   implementation 'org.springframework.boot:spring-boot-starter-web'
   implementation 'org.springframework.boot:spring-boot-starter-validation'
-  implementation 'org.springdoc:springdoc-openapi-ui:1.6.4'
+  implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0'
   implementation 'com.github.librepdf:openpdf:1.2.10'
-  implementation 'org.apache.pdfbox:pdfbox:2.0.13'
+  implementation 'org.apache.pdfbox:pdfbox:2.0.30'
   implementation 'com.openhtmltopdf:openhtmltopdf-core:0.0.1-RC17'
   implementation 'com.openhtmltopdf:openhtmltopdf-pdfbox:0.0.1-RC17'
   implementation 'com.openhtmltopdf:openhtmltopdf-svg-support:0.0.1-RC17'
+  implementation 'org.apache.xmlgraphics:batik-transcoder:1.17' // shade older 1.10 provided by openhtmltopdf-svg-support to fix CVEs
   implementation 'org.apache.commons:commons-lang3:3.7'
-  implementation 'commons-io:commons-io:2.6'
-  implementation 'org.jsoup:jsoup:1.11.3'
-  implementation 'com.google.guava:guava:27.1-jre'
+  implementation 'commons-io:commons-io:2.7'
+  implementation 'org.jsoup:jsoup:1.16.2'
+  implementation 'com.google.guava:guava:32.1.3-jre'
   implementation 'io.nayuki:qrcodegen:1.6.0'
   implementation 'io.pivotal.cfenv:java-cfenv:2.4.2'
+  implementation 'org.yaml:snakeyaml:2.2' // shade older 1.33 provided by Spring Boot 3.1 to fix CVEs. Can be removed when going to Spring Boot 3.2
+  implementation 'org.slf4j:slf4j-api:2.0.7'
 
   //Bucket4j dependencies
-  implementation 'com.giffing.bucket4j.spring.boot.starter:bucket4j-spring-boot-starter:0.5.2'
+  implementation 'com.giffing.bucket4j.spring.boot.starter:bucket4j-spring-boot-starter:0.9.1'
   implementation 'org.springframework.boot:spring-boot-starter-cache'
   implementation 'javax.cache:cache-api'
   implementation 'com.github.ben-manes.caffeine:caffeine:2.8.2'

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip

src/main/java/uk/gov/beis/els/api/categories/airconditioners/AirConditionersApiController.java

@@ -2,7 +2,7 @@
 
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
-import javax.validation.Valid;
+import jakarta.validation.Valid;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -21,7 +21,7 @@
 
 @RestController
 @RequestMapping("${api.v1.base_path}/air-conditioners")
-@Tag(name = "Air conditioners")
+@Tag(name = "Air conditioners", description = "Generate labels for air conditioners")
 public class AirConditionersApiController {
 
   private final AirConditionersService airConditionersService;

src/main/java/uk/gov/beis/els/api/categories/airconditioners/AirConditionersInternetLabelApiForm.java

@@ -1,7 +1,7 @@
 package uk.gov.beis.els.api.categories.airconditioners;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 import uk.gov.beis.els.api.common.ApiValuesFromLegislationCategory;
 import uk.gov.beis.els.api.common.BaseInternetLabelApiForm;
 import uk.gov.beis.els.categories.airconditioners.service.AirConditionersService;

src/main/java/uk/gov/beis/els/api/categories/dishwashers/DishwashersApiController.java

@@ -2,7 +2,7 @@
 
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
-import javax.validation.Valid;
+import jakarta.validation.Valid;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -16,7 +16,7 @@
 
 @RestController
 @RequestMapping("${api.v1.base_path}/dishwasher")
-@Tag(name = "Dishwashers")
+@Tag(name = "Dishwashers", description = "Generate labels for dishwashers")
 public class DishwashersApiController {
 
   private final DishwashersService dishwashersService;

src/main/java/uk/gov/beis/els/api/categories/dishwashers/DishwashersInternetLabelApiForm.java

@@ -1,7 +1,7 @@
 package uk.gov.beis.els.api.categories.dishwashers;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 import uk.gov.beis.els.api.common.ApiValuesFromLegislationCategory;
 import uk.gov.beis.els.api.common.RescaledInternetLabelApiForm;
 import uk.gov.beis.els.categories.dishwashers.service.DishwashersService;

src/main/java/uk/gov/beis/els/api/categories/domesticovens/DomesticOvenInternetLabelApiForm.java

@@ -1,7 +1,7 @@
 package uk.gov.beis.els.api.categories.domesticovens;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotBlank;
 import uk.gov.beis.els.api.common.ApiValuesFromLegislationCategory;
 import uk.gov.beis.els.api.common.BaseInternetLabelApiForm;
 import uk.gov.beis.els.categories.domesticovens.service.DomesticOvensService;

src/main/java/uk/gov/beis/els/api/categories/domesticovens/DomesticOvensApiController.java

@@ -2,7 +2,7 @@
 
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
-import javax.validation.Valid;
+import jakarta.validation.Valid;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -16,7 +16,7 @@
 
 @RestController
 @RequestMapping("${api.v1.base_path}/domestic-ovens")
-@Tag(name = "Domestic ovens")
+@Tag(name = "Domestic ovens", description = "Generate labels for domestic ovens")
 public class DomesticOvensApiController {
 
   private final DomesticOvensService domesticOvensService;

src/main/java/uk/gov/beis/els/api/categories/lamps/LampsApiController.java

@@ -2,7 +2,7 @@
 
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
-import javax.validation.Valid;
+import jakarta.validation.Valid;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -18,7 +18,7 @@
 
 @RestController
 @RequestMapping("${api.v1.base_path}/lamps")
-@Tag(name = "Lamps and light sources")
+@Tag(name = "Lamps and light sources", description = "Generate labels for lamps and light sources")
 public class LampsApiController {
 
   private final LampsService lampsService;

src/main/java/uk/gov/beis/els/api/categories/lamps/LampsNewStyleInternetLabelApiForm.java

@@ -1,7 +1,7 @@
 package uk.gov.beis.els.api.categories.lamps;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotBlank;
 import uk.gov.beis.els.api.common.ApiValuesFromLegislationCategory;
 import uk.gov.beis.els.api.common.RescaledInternetLabelApiForm;
 import uk.gov.beis.els.categories.lamps.service.LampsService;

src/main/java/uk/gov/beis/els/api/categories/lamps/LampsOldStyleInternetLabelApiForm.java

@@ -1,7 +1,7 @@
 package uk.gov.beis.els.api.categories.lamps;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotBlank;
 import uk.gov.beis.els.api.common.ApiValuesFromLegislationCategory;
 import uk.gov.beis.els.api.common.BaseInternetLabelApiForm;
 import uk.gov.beis.els.categories.lamps.service.LampsService;

src/main/java/uk/gov/beis/els/api/categories/lamps/LampsPostSeptember2021ApiForm.java

@@ -1,10 +1,10 @@
 package uk.gov.beis.els.api.categories.lamps;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import javax.validation.constraints.Digits;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Pattern;
+import jakarta.validation.constraints.Digits;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Pattern;
 import uk.gov.beis.els.api.common.ApiValuesFromEnum;
 import uk.gov.beis.els.api.common.ApiValuesFromLegislationCategory;
 import uk.gov.beis.els.categories.common.StandardTemplateForm50Char;

src/main/java/uk/gov/beis/els/api/categories/lamps/LampsPreSeptember2021ApiForm.java

@@ -1,9 +1,9 @@
 package uk.gov.beis.els.api.categories.lamps;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import javax.validation.constraints.Digits;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.Digits;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
 import uk.gov.beis.els.api.common.ApiValuesFromLegislationCategory;
 import uk.gov.beis.els.categories.common.StandardTemplateForm50Char;
 import uk.gov.beis.els.categories.lamps.service.LampsService;

src/main/java/uk/gov/beis/els/api/categories/localspaceheaters/LocalSpaceHeatersApiController.java

@@ -2,7 +2,7 @@
 
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
-import javax.validation.Valid;
+import jakarta.validation.Valid;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -16,7 +16,7 @@
 
 @RestController
 @RequestMapping("${api.v1.base_path}/local-space-heaters")
-@Tag(name = "Local space heaters")
+@Tag(name = "Local space heaters", description = "Generate labels for local space heaters")
 public class LocalSpaceHeatersApiController {
 
   private final LocalSpaceHeatersService localSpaceHeatersService;

src/main/java/uk/gov/beis/els/api/categories/localspaceheaters/LocalSpaceHeatersInternetLabelApiForm.java

@@ -1,7 +1,7 @@
 package uk.gov.beis.els.api.categories.localspaceheaters;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 import uk.gov.beis.els.api.common.ApiValuesFromLegislationCategory;
 import uk.gov.beis.els.api.common.BaseInternetLabelApiForm;
 import uk.gov.beis.els.categories.localspaceheaters.service.LocalSpaceHeatersService;

src/main/java/uk/gov/beis/els/api/categories/prorefrigeratedcabinets/ProRefrigeratedCabinetsApiController.java

@@ -2,7 +2,7 @@
 
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
-import javax.validation.Valid;
+import jakarta.validation.Valid;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -16,7 +16,7 @@
 
 @RestController
 @RequestMapping("${api.v1.base_path}/professional-refrigerated-storage-cabinets")
-@Tag(name = "Professional refrigerated storage cabinets")
+@Tag(name = "Professional refrigerated storage cabinets", description = "Generate labels for professional refrigerated storage cabinets")
 public class ProRefrigeratedCabinetsApiController {
 
   private final ProRefrigeratedCabinetsService proRefrigeratedCabinetsService;

src/main/java/uk/gov/beis/els/api/categories/prorefrigeratedcabinets/ProRefrigeratedCabinetsInternetLabelApiForm.java

@@ -1,7 +1,7 @@
 package uk.gov.beis.els.api.categories.prorefrigeratedcabinets;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 import uk.gov.beis.els.api.common.ApiValuesFromLegislationCategory;
 import uk.gov.beis.els.api.common.BaseInternetLabelApiForm;
 import uk.gov.beis.els.categories.prorefrigeratedcabinets.service.ProRefrigeratedCabinetsService;

src/main/java/uk/gov/beis/els/api/categories/rangehoods/RangeHoodsApiController.java

@@ -2,7 +2,7 @@
 
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
-import javax.validation.Valid;
+import jakarta.validation.Valid;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -16,7 +16,7 @@
 
 @RestController
 @RequestMapping("${api.v1.base_path}/range-hoods")
-@Tag(name = "Range hoods")
+@Tag(name = "Range hoods", description = "Generate labels for range hoods")
 public class RangeHoodsApiController {
 
   private final RangeHoodsService rangeHoodsService;

src/main/java/uk/gov/beis/els/api/categories/rangehoods/RangeHoodsInternetLabelApiForm.java

@@ -1,7 +1,7 @@
 package uk.gov.beis.els.api.categories.rangehoods;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotBlank;
 import uk.gov.beis.els.api.common.ApiValuesFromLegislationCategory;
 import uk.gov.beis.els.api.common.BaseInternetLabelApiForm;
 import uk.gov.beis.els.categories.rangehoods.service.RangeHoodsService;

src/main/java/uk/gov/beis/els/api/categories/refrigeratingappliances/RefrigeratingAppliancesApiController.java

@@ -2,7 +2,7 @@
 
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
-import javax.validation.Valid;
+import jakarta.validation.Valid;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -17,7 +17,7 @@
 
 @RestController
 @RequestMapping("${api.v1.base_path}/household-refrigerating-appliances")
-@Tag(name = "Household refrigerating appliances")
+@Tag(name = "Household refrigerating appliances", description = "Generate labels for household refrigerating appliances")
 public class RefrigeratingAppliancesApiController {
 
   private final RefrigeratingAppliancesService refrigeratingAppliancesService;

src/main/java/uk/gov/beis/els/api/categories/refrigeratingappliances/RefrigeratingAppliancesInternetLapelApiForm.java

@@ -1,7 +1,7 @@
 package uk.gov.beis.els.api.categories.refrigeratingappliances;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 import uk.gov.beis.els.api.common.ApiValuesFromLegislationCategory;
 import uk.gov.beis.els.api.common.RescaledInternetLabelApiForm;
 import uk.gov.beis.els.categories.refrigeratingappliances.service.RefrigeratingAppliancesService;

src/main/java/uk/gov/beis/els/api/categories/refrigeratordirectsales/BeverageCoolersInternetLabelApiForm.java

@@ -1,7 +1,7 @@
 package uk.gov.beis.els.api.categories.refrigeratordirectsales;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotBlank;
 import uk.gov.beis.els.api.common.ApiValuesFromLegislationCategory;
 import uk.gov.beis.els.api.common.RescaledInternetLabelApiForm;
 import uk.gov.beis.els.categories.refrigeratorsdirectsales.service.RefrigeratorsDirectSalesService;

src/main/java/uk/gov/beis/els/api/categories/refrigeratordirectsales/DisplayCabinetsInternetLabelApiForm.java

@@ -1,7 +1,7 @@
 package uk.gov.beis.els.api.categories.refrigeratordirectsales;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotBlank;
 import uk.gov.beis.els.api.common.ApiValuesFromLegislationCategory;
 import uk.gov.beis.els.api.common.RescaledInternetLabelApiForm;
 import uk.gov.beis.els.categories.refrigeratorsdirectsales.service.RefrigeratorsDirectSalesService;

src/main/java/uk/gov/beis/els/api/categories/refrigeratordirectsales/IceCreamFreezersInternetLabelApiForm.java

@@ -1,7 +1,7 @@
 package uk.gov.beis.els.api.categories.refrigeratordirectsales;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotBlank;
 import uk.gov.beis.els.api.common.ApiValuesFromLegislationCategory;
 import uk.gov.beis.els.api.common.RescaledInternetLabelApiForm;
 import uk.gov.beis.els.categories.refrigeratorsdirectsales.service.RefrigeratorsDirectSalesService;

src/main/java/uk/gov/beis/els/api/categories/refrigeratordirectsales/RefrigeratorsDirectSalesApiController.java

@@ -2,7 +2,7 @@
 
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
-import javax.validation.Valid;
+import jakarta.validation.Valid;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -19,7 +19,7 @@
 
 @RestController
 @RequestMapping("${api.v1.base_path}/refrigerators-direct-sales")
-@Tag(name = "Refrigerators with a direct sales function")
+@Tag(name = "Refrigerators with a direct sales function", description = "Generate labels for refrigerators with a direct sales function")
 public class RefrigeratorsDirectSalesApiController {
 
   private final RefrigeratorsDirectSalesService refrigeratorsDirectSalesService;

src/main/java/uk/gov/beis/els/api/categories/refrigeratordirectsales/RefrigeratorsDirectSalesInternetLabelApiForm.java

@@ -1,7 +1,7 @@
 package uk.gov.beis.els.api.categories.refrigeratordirectsales;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 import uk.gov.beis.els.api.common.ApiValuesFromLegislationCategory;
 import uk.gov.beis.els.api.common.RescaledInternetLabelApiForm;
 import uk.gov.beis.els.categories.refrigeratorsdirectsales.service.RefrigeratorsDirectSalesService;

src/main/java/uk/gov/beis/els/api/categories/refrigeratordirectsales/VendingMachinesInternetLabelApiForm.java

@@ -1,7 +1,7 @@
 package uk.gov.beis.els.api.categories.refrigeratordirectsales;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotBlank;
 import uk.gov.beis.els.api.common.ApiValuesFromLegislationCategory;
 import uk.gov.beis.els.api.common.RescaledInternetLabelApiForm;
 import uk.gov.beis.els.categories.refrigeratorsdirectsales.service.RefrigeratorsDirectSalesService;