Merge pull request #45 from admin-ch/renovate/dependencies

admin-ch · Feb 22, 2023 · 77b66da · 77b66da
2 parents 95d906a + cd55648
commit 77b66da
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 14 deletions.
diff --git a/ch-covidcertificate-backend-delivery/ch-covidcertificate-backend-delivery-data/pom.xml b/ch-covidcertificate-backend-delivery/ch-covidcertificate-backend-delivery-data/pom.xml
@@ -36,7 +36,7 @@
         <dependency>
             <groupId>org.postgresql</groupId>
             <artifactId>postgresql</artifactId>
-            <version>42.5.0</version>
+            <version>42.5.1</version>
         </dependency>
         <dependency>
             <groupId>org.flywaydb</groupId>

diff --git a/ch-covidcertificate-backend-delivery/ch-covidcertificate-backend-delivery-ws/pom.xml b/ch-covidcertificate-backend-delivery/ch-covidcertificate-backend-delivery-ws/pom.xml
@@ -100,7 +100,7 @@
         <dependency>
             <groupId>com.eatthepath</groupId>
             <artifactId>pushy</artifactId>
-            <version>0.15.1</version>
+            <version>0.15.2</version>
         </dependency>
 
         <!--    shedlock    -->

diff --git a/...-ws/src/main/java/ch/admin/bag/covidcertificate/backend/delivery/ws/config/JwtConfig.java b/...-ws/src/main/java/ch/admin/bag/covidcertificate/backend/delivery/ws/config/JwtConfig.java
@@ -38,13 +38,13 @@ public class JwtConfig extends WebSecurityConfigurerAdapter {
     @Value("${ws.jwt.openid-configuration-url}")
     private String url;
 
-    @Value("${ws.jwt.jwks-json-key:jwks_uri}")
+    @Value("${ws.jwt.jwks-json-key}")
     private String jwksUriJsonKey;
-    @Value("${ws.jwt.verification.resource-access-path:resource_access}")
+    @Value("${ws.jwt.verification.resource-access-path}")
     private String resourceAccessPath;
-    @Value("${ws.jwt.verification.certificate-creator-role:certificatecreator}")
-    private String certificateCreatorRole;
-    @Value("${ws.jwt.verification.role-path:/ch-covidcertificate-backend-delivery-ws/roles}")
+    @Value("${ws.jwt.verification.certificate-delivery-role}")
+    private String certificateDeliveryRole;
+    @Value("${ws.jwt.verification.role-path}")
     private String rolePath;
 
     @Override
@@ -69,7 +69,7 @@ protected void configure(HttpSecurity http) throws Exception {
 
     @Bean
     public DeliveryJWTValidator jwtValidator() {
-        return new DeliveryJWTValidator(resourceAccessPath, rolePath, certificateCreatorRole);
+        return new DeliveryJWTValidator(resourceAccessPath, rolePath, certificateDeliveryRole);
     }
 
     @Bean

diff --git a/ch-covidcertificate-backend-delivery/pom.xml b/ch-covidcertificate-backend-delivery/pom.xml
@@ -16,12 +16,12 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
-        <spring-boot-version>2.7.5</spring-boot-version>
+        <spring-boot-version>2.7.8</spring-boot-version>
         <jackson-version>2.11.1</jackson-version>
         <jsonwebtoken-version>0.11.5</jsonwebtoken-version>
         <testcontainers-version>1.17.6</testcontainers-version>
-        <shedlock.version>4.42.0</shedlock.version>
-        <spring-cloud-sleuth-version>3.1.5</spring-cloud-sleuth-version>
+        <shedlock.version>4.44.0</shedlock.version>
+        <spring-cloud-sleuth-version>3.1.6</spring-cloud-sleuth-version>
 
         <itCoverageAgent/>
 
@@ -65,13 +65,13 @@
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-api</artifactId>
-            <version>5.9.1</version>
+            <version>5.9.2</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-engine</artifactId>
-            <version>5.9.1</version>
+            <version>5.9.2</version>
             <scope>test</scope>
         </dependency>
         <!--    testcontainers -->
@@ -102,7 +102,7 @@
         <dependency>
             <groupId>ch.admin.bag.covidcertificate</groupId>
             <artifactId>cc-backend-logging</artifactId>
-            <version>1.0.4</version>
+            <version>1.0.6</version>
         </dependency>
 
         <!-- LogBack dependencies -->