Project upgrade

- Upgrade to spring-boot 3.2.5;
- Upgrade to springdoc-openapi 2.5.0;
- Upgrade to spring-cloud 2023.0.1;
- Upgrade to jib-maven-plugin 3.4.2;
- Upgrade to apache-maven 3.9.5;
- Upgrade to amazoncorretto-jdk 17.0.10;
- Upgrade to jquery 3.7.1;
- Upgrade to moment.js 2.30.1;
- Upgrade to mysql docker image 8.3.0;
- Upgrade to confluentinc docker images 7.5.3;
- Upgrade to kafdrop docker image 4.0.1;
- Remove obsolete version field in docker-compose.yml;
- Update README.

Author: Ivan Franchin

.mvn/wrapper/maven-wrapper.properties

@@ -1,2 +1,2 @@
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.4/apache-maven-3.9.4-bin.zip
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.5/apache-maven-3.9.5-bin.zip
 wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar

README.adoc

@@ -36,14 +36,14 @@ image::./documentation/project-diagram.jpeg[]
 
 == Start Environment
 
-* Open a terminal and inside `springboot-kafka-websocket` root folder run
+* Open a terminal and inside `springboot-kafka-websocket` root folder run:
 +
 [source]
 ----
 docker compose up -d
 ----
 
-* Wait for Docker containers to be up and running. To check it, run
+* Wait for Docker containers to be up and running. To check it, run:
 +
 [source]
 ----
@@ -52,7 +52,7 @@ docker compose ps
 
 == Running applications with Maven
 
-Inside `springboot-kafka-websocket` root folder, run the following `Maven` commands in different terminals
+Inside `springboot-kafka-websocket` root folder, run the following `Maven` commands in different terminals:
 
 * *bitcoin-api*
 +
@@ -72,9 +72,9 @@ Inside `springboot-kafka-websocket` root folder, run the following `Maven` comma
 
 === Build Application's Docker Image
 
-* In a terminal, make sure you are in `springboot-kafka-websocket` root folder
+* In a terminal, make sure you are in `springboot-kafka-websocket` root folder;
 
-* In order to build the application docker images, run the following script
+* In order to build the application docker images, run the following script:
 +
 [source]
 ----
@@ -115,9 +115,9 @@ Inside `springboot-kafka-websocket` root folder, run the following `Maven` comma
 
 == Run Application's Docker container
 
-* In a terminal, make sure you are inside `springboot-kafka-websocket` root folder
+* In a terminal, make sure you are inside `springboot-kafka-websocket` root folder;
 
-* Run following script
+* Run following script:
 +
 [source]
 ----
@@ -138,8 +138,7 @@ Inside `springboot-kafka-websocket` root folder, run the following `Maven` comma
 |`user1/123` or `user2/123`
 |===
 
-The gif below shows two users checking real-time the `BTC` price changes. Besides, they are using a chat channel to
-communicate with each other.
+The gif below shows two users checking real-time the `BTC` price changes. Besides, they are using a chat channel to communicate with each other.
 
 image::./documentation/two-users-example.gif[]
 
@@ -160,14 +159,14 @@ select * from prices;
 == Shutdown
 
 * To stop applications
-** If they were started with `Maven`, go to the terminals where they are running and press `Ctrl+C`
-** If they were started as Docker containers, go to a terminal and, inside `springboot-kafka-websocket` root folder, run the script below
+** If they were started with `Maven`, go to the terminals where they are running and press `Ctrl+C`;
+** If they were started as Docker containers, go to a terminal and, inside `springboot-kafka-websocket` root folder, run the script below:
 +
 [source]
 ----
 ./stop-apps.sh
 ----
-* To stop and remove docker compose containers, network and volumes, go to a terminal and, inside `springboot-kafka-websocket` root folder, run the following command
+* To stop and remove docker compose containers, network and volumes, go to a terminal and, inside `springboot-kafka-websocket` root folder, run the following command:
 +
 [source]
 ----
@@ -176,7 +175,7 @@ docker compose down -v
 
 == Cleanup
 
-To remove the Docker images created by this project, go to a terminal and, inside `springboot-kafka-websocket` root folder, run the script below
+To remove the Docker images created by this project, go to a terminal and, inside `springboot-kafka-websocket` root folder, run the script below:
 [source]
 ----
 ./remove-docker-images.sh

bitcoin-api/pom.xml

@@ -14,7 +14,7 @@
     <description>Demo project for Spring Boot</description>
 
     <properties>
-        <springdoc-openapi.version>2.2.0</springdoc-openapi.version>
+        <springdoc-openapi.version>2.5.0</springdoc-openapi.version>
     </properties>
 
     <dependencies>

bitcoin-client/src/main/resources/templates/fragments/footer.html

@@ -3,7 +3,7 @@
 <body>
 <footer class="page-footer grey lighten-1" th:fragment="footer">
     <div class="footer-copyright grey darken-3">
-        <div class="align-center container center-align">© 2023 Copyright</div>
+        <div class="align-center container center-align">© 2024 Copyright</div>
     </div>
 </footer>
 </body>

bitcoin-client/src/main/resources/templates/prices.html

@@ -97,10 +97,10 @@ <h5 class="center-align orange lighten-4">Chat</h5>
 <div th:insert="~{fragments/footer :: footer}"></div>
 
 <!--JavaScript at end of body for optimized loading-->
-<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.7.0/jquery.min.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.7.1/jquery.min.js"></script>
 <script src="https://cdnjs.cloudflare.com/ajax/libs/sockjs-client/1.6.1/sockjs.min.js"></script>
 <script src="https://cdnjs.cloudflare.com/ajax/libs/stomp.js/2.3.3/stomp.min.js"></script>
-<script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.29.4/moment.min.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.30.1/moment.min.js"></script>
 <script src="https://cdnjs.cloudflare.com/ajax/libs/materialize/1.0.0/js/materialize.min.js"></script>
 <script src="/app.js"></script>
 

docker-compose.yml

@@ -1,9 +1,7 @@
-version: "3.8"
-
 services:
 
   mysql:
-    image: mysql:8.1.0
+    image: mysql:8.3.0
     container_name: mysql
     restart: unless-stopped
     ports:
@@ -15,7 +13,7 @@ services:
       test: "mysqladmin ping -u root -p$${MYSQL_ROOT_PASSWORD}"
 
   zookeeper:
-    image: confluentinc/cp-zookeeper:7.4.1
+    image: confluentinc/cp-zookeeper:7.5.3
     container_name: zookeeper
     restart: unless-stopped
     ports:
@@ -26,7 +24,7 @@ services:
       test: "echo stat | nc localhost $$ZOOKEEPER_CLIENT_PORT"
 
   kafka:
-    image: confluentinc/cp-kafka:7.4.1
+    image: confluentinc/cp-kafka:7.5.3
     container_name: kafka
     restart: unless-stopped
     depends_on:
@@ -42,7 +40,7 @@ services:
       test: [ "CMD", "nc", "-z", "localhost", "9092" ]
 
   kafdrop:
-    image: obsidiandynamics/kafdrop:3.31.0
+    image: obsidiandynamics/kafdrop:4.0.1
     container_name: kafdrop
     restart: unless-stopped
     depends_on:

pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.1.3</version>
+        <version>3.2.5</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
 
@@ -18,9 +18,9 @@
 
     <properties>
         <java.version>17</java.version>
-        <spring-cloud.version>2022.0.4</spring-cloud.version>
-        <jib-maven-plugin.version>3.3.2</jib-maven-plugin.version>
-        <jdk-image.version>17.0.8</jdk-image.version>
+        <spring-cloud.version>2023.0.1</spring-cloud.version>
+        <jib-maven-plugin.version>3.4.2</jib-maven-plugin.version>
+        <jdk-image.version>17.0.10</jdk-image.version>
         <docker-image.prefix>ivanfranchin</docker-image.prefix>
     </properties>