Merge branch 'master' into 'feature/add-openapi-spe'

# Conflicts:
#   src/main/java/dev/amatos/restcountries/controller/CountryControllerV2.java
#   src/main/java/dev/amatos/restcountries/controller/CountryControllerV31.java
This commit is contained in:
Alejandro Matos
2022-03-14 14:47:35 +00:00
9 changed files with 607 additions and 596 deletions
+1 -1
View File
@@ -89,7 +89,7 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.15.0</version>
<version>2.17.0</version>
</dependency>
<dependency>
<groupId>org.jboss.spec.javax.ws.rs</groupId>