Merge branch 'main' into renovate/spring-boot

rajadilipkolli · Dec 12, 2024 · 59ba09f · 59ba09f
2 parents 46d652e + bdb512b
commit 59ba09f
Show file tree

Hide file tree

Showing 13 changed files with 62 additions and 27 deletions.
diff --git a/.github/workflows/qodana_code_quality.yml b/.github/workflows/qodana_code_quality.yml
@@ -0,0 +1,28 @@
+name: Qodana
+on:
+  workflow_dispatch:
+  pull_request:
+  push:
+    branches: # Specify your branches here
+      - main # The 'main' branch
+      - 'releases/*' # The release branches
+
+jobs:
+  qodana:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+      pull-requests: write
+      checks: write
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          ref: ${{ github.event.pull_request.head.sha }}  # to check out the actual pull request commit, not the merge commit
+          fetch-depth: 0  # a full history is required for pull request analysis
+      - name: 'Qodana Scan'
+        uses: JetBrains/[email protected]
+        with:
+          pr-mode: false
+        env:
+          QODANA_TOKEN: ${{ secrets.QODANA_TOKEN_1577905302 }}
+          QODANA_ENDPOINT: 'https://qodana.cloud'
diff --git a/api-gateway/pom.xml b/api-gateway/pom.xml
@@ -17,10 +17,10 @@
 
     <properties>
         <java.version>21</java.version>
-        <spring-cloud.version>2024.0.0-RC1</spring-cloud.version>
+        <spring-cloud.version>2024.0.0</spring-cloud.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <springdoc-openapi.version>2.7.0-RC1</springdoc-openapi.version>
+        <springdoc-openapi.version>2.7.0</springdoc-openapi.version>
 
         <spotless.version>2.43.0</spotless.version>
         <properties-maven-plugin.version>1.2.1</properties-maven-plugin.version>
@@ -34,7 +34,7 @@
         <jacoco.itReportFile>${jacoco.itReportFolder}/integrationTest.exec</jacoco.itReportFile>
         <junit.utReportFolder>${project.testresult.directory}/test</junit.utReportFolder>
         <junit.itReportFolder>${project.testresult.directory}/integrationTest</junit.itReportFolder>
-        <dependency-check-maven.version>11.1.0</dependency-check-maven.version>
+        <dependency-check-maven.version>11.1.1</dependency-check-maven.version>
 
         <CI_DOCKER_USERNAME/>
         <CI_DOCKER_PASSWORD/>

diff --git a/catalog-service/pom.xml b/catalog-service/pom.xml
@@ -20,8 +20,8 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
         <java.version>21</java.version>
-        <spring-cloud.version>2024.0.0-RC1</spring-cloud.version>
-        <springdoc-openapi.version>2.7.0-RC1</springdoc-openapi.version>
+        <spring-cloud.version>2024.0.0</spring-cloud.version>
+        <springdoc-openapi.version>2.7.0</springdoc-openapi.version>
 
         <org.mapstruct.version>1.6.3</org.mapstruct.version>
 
@@ -30,7 +30,7 @@
         <spotless.version>2.43.0</spotless.version>
         <maven-pmd-plugin.version>3.16.0</maven-pmd-plugin.version>
 
-        <dependency-check-maven.version>11.1.0</dependency-check-maven.version>
+        <dependency-check-maven.version>11.1.1</dependency-check-maven.version>
 
         <properties-maven-plugin.version>1.2.1</properties-maven-plugin.version>
         <sonar-maven-plugin.version>5.0.0.4389</sonar-maven-plugin.version>
@@ -390,7 +390,7 @@
                     <dependency>
                         <groupId>com.puppycrawl.tools</groupId>
                         <artifactId>checkstyle</artifactId>
-                        <version>10.20.1</version>
+                        <version>10.20.2</version>
                     </dependency>
                 </dependencies>
                 <configuration>

diff --git a/config-server/pom.xml b/config-server/pom.xml
@@ -18,7 +18,7 @@
 
     <properties>
         <java.version>21</java.version>
-        <spring-cloud.version>2024.0.0-RC1</spring-cloud.version>
+        <spring-cloud.version>2024.0.0</spring-cloud.version>
         <spotless.version>2.43.0</spotless.version>
         <properties-maven-plugin.version>1.2.1</properties-maven-plugin.version>
         <sonar-maven-plugin.version>5.0.0.4389</sonar-maven-plugin.version>

diff --git a/deployment/docker-compose-tools.yml b/deployment/docker-compose-tools.yml
@@ -111,7 +111,7 @@ services:
       - microservice-network
 
   keycloak:
-    image: quay.io/keycloak/keycloak:26.0.6
+    image: quay.io/keycloak/keycloak:26.0.7
     command: [ 'start-dev', '--import-realm', '--http-port=9191' ]
     container_name: keycloak
     hostname: keycloak
@@ -351,7 +351,7 @@ services:
 
   ## Observability
   grafana:
-    image: grafana/grafana:11.3.1
+    image: grafana/grafana:11.4.0
     container_name: grafana
     extra_hosts: [ 'host.docker.internal:host-gateway' ]
     depends_on:
@@ -371,7 +371,7 @@ services:
       - microservice-network
 
   loki:
-    image: grafana/loki:3.3.0
+    image: grafana/loki:3.3.1
     container_name: loki
     extra_hosts: [ 'host.docker.internal:host-gateway' ]
     command: -config.file=/etc/loki/local-config.yaml
@@ -381,7 +381,7 @@ services:
       - microservice-network
 
   promtail:
-    image: grafana/promtail:3.3.0
+    image: grafana/promtail:3.3.1
     container_name: promtail
     extra_hosts: [ 'host.docker.internal:host-gateway' ]
     volumes:
@@ -395,7 +395,7 @@ services:
       - microservice-network
 
   prometheus:
-    image: prom/prometheus:v3.0.0
+    image: prom/prometheus:v3.0.1
     container_name: prometheus
     extra_hosts: [ 'host.docker.internal:host-gateway' ]
     command:

diff --git a/deployment/docker-compose.yml b/deployment/docker-compose.yml
@@ -95,7 +95,7 @@ services:
       - microservice-network
 
   keycloak:
-    image: quay.io/keycloak/keycloak:26.0.6
+    image: quay.io/keycloak/keycloak:26.0.7
     command: [ 'start-dev', '--import-realm', '--http-port=9191' ]
     container_name: keycloak
     extra_hosts: [ 'host.docker.internal:host-gateway' ]

diff --git a/inventory-service/pom.xml b/inventory-service/pom.xml
@@ -20,16 +20,16 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
         <java.version>21</java.version>
-        <spring-cloud.version>2024.0.0-RC1</spring-cloud.version>
-        <springdoc-openapi.version>2.7.0-RC1</springdoc-openapi.version>
+        <spring-cloud.version>2024.0.0</spring-cloud.version>
+        <springdoc-openapi.version>2.7.0</springdoc-openapi.version>
 
         <org.mapstruct.version>1.6.3</org.mapstruct.version>
         <testcontainers-jooq-codegen-maven-plugin.version>0.0.4</testcontainers-jooq-codegen-maven-plugin.version>
 
         <project.testresult.directory>${project.build.directory}/test-results</project.testresult.directory>
         <spotless.version>2.43.0</spotless.version>
         <maven-checkstyle-plugin.version>3.6.0</maven-checkstyle-plugin.version>
-        <dependency-check-maven.version>11.1.0</dependency-check-maven.version>
+        <dependency-check-maven.version>11.1.1</dependency-check-maven.version>
         <properties-maven-plugin.version>1.2.1</properties-maven-plugin.version>
         <sonar-maven-plugin.version>5.0.0.4389</sonar-maven-plugin.version>
         <jacoco-maven-plugin.version>0.8.12</jacoco-maven-plugin.version>
@@ -193,7 +193,7 @@
         <dependency>
             <groupId>org.instancio</groupId>
             <artifactId>instancio-junit</artifactId>
-            <version>5.0.2</version>
+            <version>5.2.1</version>
             <scope>test</scope>
         </dependency>
 
@@ -408,7 +408,7 @@
                     <dependency>
                         <groupId>com.puppycrawl.tools</groupId>
                         <artifactId>checkstyle</artifactId>
-                        <version>10.20.1</version>
+                        <version>10.20.2</version>
                     </dependency>
                 </dependencies>
                 <configuration>

diff --git a/order-service/pom.xml b/order-service/pom.xml
@@ -20,14 +20,15 @@
 
         <java.version>21</java.version>
         <spring-cloud.version>2024.0.0</spring-cloud.version>
+
         <org-mapstruct.version>1.6.3</org-mapstruct.version>
         <springdoc-openapi.version>2.7.0</springdoc-openapi.version>
 
         <project.testresult.directory>${project.build.directory}/test-results</project.testresult.directory>
         <spotless.version>2.43.0</spotless.version>
         <mockserver-netty.version>5.15.0</mockserver-netty.version>
         <maven-checkstyle-plugin.version>3.6.0</maven-checkstyle-plugin.version>
-        <dependency-check-maven.version>11.1.0</dependency-check-maven.version>
+        <dependency-check-maven.version>11.1.1</dependency-check-maven.version>
         <properties-maven-plugin.version>1.2.1</properties-maven-plugin.version>
         <sonar-maven-plugin.version>5.0.0.4389</sonar-maven-plugin.version>
         <jacoco-maven-plugin.version>0.8.12</jacoco-maven-plugin.version>
@@ -369,7 +370,7 @@
                     <dependency>
                         <groupId>com.puppycrawl.tools</groupId>
                         <artifactId>checkstyle</artifactId>
-                        <version>10.20.1</version>
+                        <version>10.20.2</version>
                     </dependency>
                 </dependencies>
                 <configuration>

diff --git a/payment-service/pom.xml b/payment-service/pom.xml
@@ -19,14 +19,14 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
         <java.version>21</java.version>
-        <spring-cloud.version>2024.0.0-RC1</spring-cloud.version>
-        <springdoc-openapi.version>2.7.0-RC1</springdoc-openapi.version>
+        <spring-cloud.version>2024.0.0</spring-cloud.version>
+        <springdoc-openapi.version>2.7.0</springdoc-openapi.version>
         <problem-spring-web.version>0.29.1</problem-spring-web.version>
         <testcontainers-jooq-codegen-maven-plugin.version>0.0.4</testcontainers-jooq-codegen-maven-plugin.version>
 
         <project.testresult.directory>${project.build.directory}/test-results</project.testresult.directory>
         <spotless.version>2.43.0</spotless.version>
-        <dependency-check-maven.version>11.1.0</dependency-check-maven.version>
+        <dependency-check-maven.version>11.1.1</dependency-check-maven.version>
         <properties-maven-plugin.version>1.2.1</properties-maven-plugin.version>
         <sonar-maven-plugin.version>5.0.0.4389</sonar-maven-plugin.version>
         <jacoco-maven-plugin.version>0.8.12</jacoco-maven-plugin.version>

diff --git a/qodana.yaml b/qodana.yaml
@@ -0,0 +1,6 @@
+version: "1.0"
+linter: jetbrains/qodana-jvm-community:2024.2
+profile:
+  name: qodana.recommended
+include:
+  - name: CheckDependencyLicenses
diff --git a/retail-store-webapp/docker/docker-compose.yml b/retail-store-webapp/docker/docker-compose.yml
@@ -1,7 +1,7 @@
 name: 'spring-boot-microservices-series-v2'
 services:
   keycloak:
-    image: quay.io/keycloak/keycloak:26.0.6
+    image: quay.io/keycloak/keycloak:26.0.7
     command: [ 'start-dev', '--import-realm', '--http-port=9191' ]
     container_name: keycloak
     hostname: keycloak

diff --git a/retail-store-webapp/pom.xml b/retail-store-webapp/pom.xml
@@ -87,7 +87,7 @@
         <dependency>
             <groupId>org.webjars</groupId>
             <artifactId>font-awesome</artifactId>
-            <version>6.6.0</version>
+            <version>6.7.1</version>
         </dependency>
         <dependency>
             <groupId>org.webjars.npm</groupId>

diff --git a/service-registry/pom.xml b/service-registry/pom.xml
@@ -18,7 +18,7 @@
 
 	<properties>
 		<java.version>21</java.version>
-		<spring-cloud.version>2024.0.0-RC1</spring-cloud.version>
+		<spring-cloud.version>2024.0.0</spring-cloud.version>
 		<properties-maven-plugin.version>1.2.1</properties-maven-plugin.version>
 		<sonar-maven-plugin.version>5.0.0.4389</sonar-maven-plugin.version>
 		<spotless.version>2.43.0</spotless.version>