Publisher/Subscriber Enhancement

- Dependencies Upgrade
- README.md Update

Author: lyes-sefiane

README.md

@@ -1,8 +1,6 @@
 # Publisher/Subscriber Microservices
 
-## License
-
-[Creative Commons Attribution-NonCommercial-NoDerivs 4.0 International License][cc-by-nc-nd].
+### © 2024 | Lyes Sefiane <img src="https://raw.githubusercontent.com/wiki/lyes-sefiane/grocery-items-management-application/images/algeria-flag-icon.png" width="2%"> <img src="https://raw.githubusercontent.com/wiki/lyes-sefiane/grocery-items-management-application/images/canada-flag-icon.png" width="2%"> All Rights Reserved | [CC BY-NC-ND 4.0](https://creativecommons.org/licenses/by-nc-nd/4.0/)
 
 [![CC BY-NC-ND 4.0][cc-by-nc-nd-image]][cc-by-nc-nd]
 
@@ -12,75 +10,58 @@
 
 ## GitHub Badges
 
+![License](https://img.shields.io/static/v1?label=License&message=CC-BY-NC-ND-4.0&color=green)
+[![Contributor Covenant](https://img.shields.io/badge/Contributor%20Covenant-2.1-4baaaa.svg)](code_of_conduct.md)
+[![Java CI with Maven](https://github.com/lyes-sefiane/publisher-subscriber-microservices/actions/workflows/maven.yml/badge.svg)](https://github.com/lyes-sefiane/publisher-subscriber-microservices/actions/workflows/maven.yml)
+[![Dependabot Updates](https://github.com/lyes-sefiane/publisher-subscriber-microservices/actions/workflows/dependabot/dependabot-updates/badge.svg)](https://github.com/lyes-sefiane/publisher-subscriber-microservices/actions/workflows/dependabot/dependabot-updates)
+[![CodeQL](https://github.com/lyes-sefiane/publisher-subscriber-microservices/actions/workflows/github-code-scanning/codeql/badge.svg)](https://github.com/lyes-sefiane/publisher-subscriber-microservices/actions/workflows/github-code-scanning/codeql)
+[![Automatic Dependency Submission](https://github.com/lyes-sefiane/publisher-subscriber-microservices/actions/workflows/dependency-graph/auto-submission/badge.svg)](https://github.com/lyes-sefiane/publisher-subscriber-microservices/actions/workflows/dependency-graph/auto-submission)
+
 ![GitHub Repo stars](https://img.shields.io/github/stars/lyes-sefiane/publisher-subscriber-microservices?style=social)
-![GitHub Actions Workflow Status](https://img.shields.io/github/actions/workflow/status/lyes-sefiane/publisher-subscriber-microservices/maven.yml?branch=master)
 ![GitHub top language](https://img.shields.io/github/languages/top/lyes-sefiane/publisher-subscriber-microservices)
-![GitHub commit activity (branch)](https://img.shields.io/github/commit-activity/y/lyes-sefiane/publisher-subscriber-microservices/master)
+![GitHub commit activity (branch)](https://img.shields.io/github/commit-activity/y/lyes-sefiane/publisher-subscriber-microservices/main)
 
-## Wiki
-* [lyes-sefiane/publisher-subscriber-microservices/wiki/event-driven-microservices](https://github.com/lyes-sefiane/publisher-subscriber-microservices/wiki/Event-Driven-Microservices)
+## Documentation
 
-## Technology Stack
-* [lyes-sefiane/publisher-subscriber-microservices/wiki/technology-stack](https://github.com/lyes-sefiane/publisher-subscriber-microservices/wiki/Technology-Stack)
+* [Applied Event Driven Architecture in a Context of Microservices](https://github.com/lyes-sefiane/publisher-subscriber-microservices/wiki/Event-Driven-Microservices)
 
-## Requirements
-```
-1. Java 11.x.y
 
-2. Maven 3.x.y
+## Infrastructure
 
-3. Docker 3.x.y
-```
+![Image](https://raw.githubusercontent.com/wiki/lyes-sefiane/publisher-subscriber-microservices/images/Dev-Mode.PNG)
 
-## Git Clone
-```
-https://github.com/lyes-sefiane/publisher-subscriber-microservices.git
+## Requirements
 ```
+1. Java 17.x.y
 
-## Development Environment
-
-* [lyes-sefiane/publisher-subscriber-microservices/wiki/development-environment](https://github.com/lyes-sefiane/publisher-subscriber-microservices/wiki/Development-Environment)
+2. Maven 3.x.y
 
+3. Docker 3.x.y
 ```
-docker-compose --env-file .env up --build -d
-```
-
-![Image](https://raw.githubusercontent.com/wiki/lyes-sefiane/publisher-subscriber-microservices/images/Dev-Mode.PNG)
-
-## Developmental Test & Evaluation
-* [lyes-sefiane/publisher-subscriber-microservices/wiki/developmental-test-and-evaluation](https://github.com/lyes-sefiane/publisher-subscriber-microservices/wiki/Developmental-Test-&-Evaluation)
 
-## Orchestration with Docker Swarm
+## Deployment to Docker Swarm
 
-* [lyes-sefiane/publisher-subscriber-microservices/wiki/docker-swarm](https://github.com/lyes-sefiane/publisher-subscriber-microservices/wiki/Docker-Swarm)
+* [More Information](https://github.com/lyes-sefiane/publisher-subscriber-microservices/wiki/Docker-Swarm)
 
 ![Image](https://raw.githubusercontent.com/wiki/lyes-sefiane/publisher-subscriber-microservices/images/Orchestration-Swarm.PNG)
 
 ![Image](https://raw.githubusercontent.com/wiki/lyes-sefiane/publisher-subscriber-microservices/images/docker-swarm-visualizer.PNG)
 
-### Deployment
-```
-docker stack deploy -c docker-stack.yml stack
-```
-## Orchestration with Kubernetes
 
-* [lyes-sefiane/publisher-subscriber-microservices/wiki/kubernetes](https://github.com/lyes-sefiane/publisher-subscriber-microservices/wiki/Kubernetes)
+## Deployment to Kubernetes
+
+* [More Information](https://github.com/lyes-sefiane/publisher-subscriber-microservices/wiki/Kubernetes)
 
 ![Image](https://raw.githubusercontent.com/wiki/lyes-sefiane/publisher-subscriber-microservices/images/kubernetes-cluster.PNG)
 
 ![Image](https://raw.githubusercontent.com/wiki/lyes-sefiane/publisher-subscriber-microservices/images/kubernetes-deployment.PNG)
 
-### Deployment
-```
-kubectl apply -f k8s/
-```
-
 ## Enhancements
 
-* OpenApi Implementation 
-* Error Handling Implementation 
-* Database access/storage Implementation
-* Security Implementation
+- [ ] OpenApi Implementation 
+- [ ] Error Handling Implementation 
+- [ ] Database access/storage Implementation
+- [ ] Security Implementation
 
 ## Contributing
 Pull requests are welcome. For major changes, please open an issue first to discuss what you would like to change.

gateway-service/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.5.2</version>
+		<version>3.3.5</version>
 		<relativePath /> <!-- lookup parent from repository -->
 	</parent>
 	<groupId>com.lsefiane</groupId>
@@ -15,8 +15,8 @@
 	<name>gateway-service</name>
 	<description>Spring Cloud Gateway for Pub/Sub Microservices</description>
 	<properties>
-		<java.version>11</java.version>
-		<spring-cloud.version>2020.0.3</spring-cloud.version>
+		<java.version>17</java.version>
+		<spring-cloud.version>2023.0.3</spring-cloud.version>
 	</properties>
 	<dependencies>
 		<dependency>
@@ -42,17 +42,23 @@
 			</exclusions>
 		</dependency>
 		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-starter-sleuth</artifactId>
+			<groupId>io.micrometer</groupId>
+			<artifactId>micrometer-tracing-bridge-brave</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-sleuth-zipkin</artifactId>
+			<groupId>io.zipkin.reporter2</groupId>
+			<artifactId>zipkin-reporter-brave</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-test</artifactId>
 			<scope>test</scope>
+			<exclusions>
+				<exclusion>
+					<groupId>org.xmlunit</groupId>
+					<artifactId>xmlunit-core</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 	</dependencies>
 	<dependencyManagement>
@@ -75,5 +81,4 @@
 			</plugin>
 		</plugins>
 	</build>
-
 </project>

pom.xml

@@ -18,5 +18,4 @@
 		<module>subscriber-service</module>
 		<module>gateway-service</module>
 	</modules>
-
 </project>

publisher-service/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.5.2</version>
+		<version>3.3.5</version>
 		<relativePath /> <!-- lookup parent from repository -->
 	</parent>
 	<groupId>com.lsefiane</groupId>
@@ -15,8 +15,8 @@
 	<name>publisher-service</name>
 	<description>Spring Boot JMS with ActiveMQ Publisher</description>
 	<properties>
-		<java.version>11</java.version>
-		<spring-cloud.version>2020.0.3</spring-cloud.version>
+		<java.version>17</java.version>
+		<spring-cloud.version>2023.0.3</spring-cloud.version>
 	</properties>
 	<dependencies>
 		<dependency>
@@ -55,12 +55,12 @@
 			</exclusions>
 		</dependency>
 		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-starter-sleuth</artifactId>
+			<groupId>io.micrometer</groupId>
+			<artifactId>micrometer-tracing-bridge-brave</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-sleuth-zipkin</artifactId>
+			<groupId>io.zipkin.reporter2</groupId>
+			<artifactId>zipkin-reporter-brave</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
@@ -77,6 +77,12 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-test</artifactId>
 			<scope>test</scope>
+			<exclusions>
+				<exclusion>
+					<groupId>org.xmlunit</groupId>
+					<artifactId>xmlunit-core</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 	</dependencies>
 	<dependencyManagement>

publisher-subscriber-common/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.5.2</version>
+		<version>3.3.5</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 	<groupId>com.lsefiane</groupId>
@@ -14,7 +14,7 @@
 	<name>publisher-subscriber-common</name>
 	<description>Spring Boot JMS with ActiveMQ Publisher/Subscriber Common</description>
 	<properties>
-		<java.version>11</java.version>
+		<java.version>17</java.version>
 	</properties>
 	<dependencies>
 		<dependency>
@@ -37,6 +37,12 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-test</artifactId>
 			<scope>test</scope>
+			<exclusions>
+				<exclusion>
+					<groupId>org.xmlunit</groupId>
+					<artifactId>xmlunit-core</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 	</dependencies>
 </project>

subscriber-service/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.5.2</version>
+		<version>3.3.5</version>
 		<relativePath /> <!-- lookup parent from repository -->
 	</parent>
 	<groupId>com.lsefiane</groupId>
@@ -15,8 +15,8 @@
 	<name>subscriber-service</name>
 	<description>Spring Boot JMS with ActiveMQ Publisher</description>
 	<properties>
-		<java.version>11</java.version>
-		<spring-cloud.version>2020.0.3</spring-cloud.version>
+		<java.version>17</java.version>
+		<spring-cloud.version>2023.0.3</spring-cloud.version>
 	</properties>
 	<dependencies>
 		<dependency>
@@ -51,12 +51,12 @@
 			</exclusions>
 		</dependency>
 		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-starter-sleuth</artifactId>
+			<groupId>io.micrometer</groupId>
+			<artifactId>micrometer-tracing-bridge-brave</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-sleuth-zipkin</artifactId>
+			<groupId>io.zipkin.reporter2</groupId>
+			<artifactId>zipkin-reporter-brave</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
@@ -73,6 +73,12 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-test</artifactId>
 			<scope>test</scope>
+			<exclusions>
+				<exclusion>
+					<groupId>org.xmlunit</groupId>
+					<artifactId>xmlunit-core</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 	</dependencies>
 	<dependencyManagement>
@@ -113,5 +119,4 @@
 			</plugin>
 		</plugins>
 	</build>
-
 </project>