Updated libraries

HLTech · Aug 5, 2021 · b54f80c · b54f80c
1 parent 16ccd1f
commit b54f80c
Show file tree

Hide file tree

Showing 10 changed files with 76 additions and 87 deletions.
diff --git a/judge-d-agent/pom.xml b/judge-d-agent/pom.xml
@@ -14,8 +14,11 @@
     <name>Judge-D-Agent</name>
 
     <properties>
-        <swaggerVersion>2.7.0</swaggerVersion>
-        <pactGenVersion>1.3.7</pactGenVersion>
+        <pactGenVersion>1.4.0</pactGenVersion>
+        <httpclientVersion>4.5.13</httpclientVersion>
+        <consulApiVersion>1.4.5</consulApiVersion>
+        <cglibVersion>3.3.0</cglibVersion>
+        <kubernetesApiVersion>3.1.10</kubernetesApiVersion>
     </properties>
 
     <dependencies>
@@ -34,32 +37,32 @@
         <dependency>
             <groupId>io.github.openfeign</groupId>
             <artifactId>feign-core</artifactId>
-            <version>9.6.0</version>
+            <version>${feignVersion}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-openfeign-core</artifactId>
-            <version>2.0.1.RELEASE</version>
+            <version>${springCloudVersion}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-netflix-hystrix</artifactId>
-            <version>2.1.0.RELEASE</version>
+            <version>${hystrixVersion}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-context</artifactId>
-            <version>2.1.0.RELEASE</version>
+            <version>${springCloudVersion}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-commons</artifactId>
-            <version>2.1.0.RELEASE</version>
+            <version>${springCloudVersion}</version>
         </dependency>
         <dependency>
             <groupId>io.fabric8</groupId>
             <artifactId>kubernetes-client</artifactId>
-            <version>3.1.10</version>
+            <version>${kubernetesApiVersion}</version>
         </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>
@@ -68,12 +71,12 @@
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
-            <version>4.5.7</version>
+            <version>${httpclientVersion}</version>
         </dependency>
         <dependency>
             <groupId>com.ecwid.consul</groupId>
             <artifactId>consul-api</artifactId>
-            <version>1.4.5</version>
+            <version>${consulApiVersion}</version>
         </dependency>
 
         <!--TEST-->
@@ -102,13 +105,13 @@
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-contract-wiremock</artifactId>
-            <version>1.2.4.RELEASE</version>
+            <version>${springCloudVersion}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>cglib</groupId>
             <artifactId>cglib-nodep</artifactId>
-            <version>3.2.10</version>
+            <version>${cglibVersion}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -120,7 +123,7 @@
         <dependency>
             <groupId>io.fabric8</groupId>
             <artifactId>kubernetes-server-mock</artifactId>
-            <version>3.1.10</version>
+            <version>${kubernetesApiVersion}</version>
             <exclusions>
                 <exclusion>
                     <groupId>com.sun</groupId>
@@ -132,7 +135,7 @@
         <dependency>
             <groupId>org.awaitility</groupId>
             <artifactId>awaitility</artifactId>
-            <version>3.0.0</version>
+            <version>${awaitilityVersion}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

diff --git a/judge-d-agent/src/test/resources/application-test.properties b/judge-d-agent/src/test/resources/application-test.properties
@@ -11,4 +11,4 @@ hltech.contracts.judge-d.included-namespaces=
 hltech.contracts.judge-d.updateServices.fixedDelay=2000
 hltech.contracts.judge-d.updateServices.initialDelay=4000
 
-hltech.contracts.judge-d.consul-host=http://localhost
+hltech.contracts.judge-d.consul-host=localhost:8500
diff --git a/judge-d-core/pom.xml b/judge-d-core/pom.xml
@@ -28,7 +28,7 @@
         <dependency>
             <groupId>io.github.openfeign</groupId>
             <artifactId>feign-core</artifactId>
-            <version>9.6.0</version>
+            <version>${feignVersion}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

diff --git a/judge-d-server/pom.xml b/judge-d-server/pom.xml
@@ -17,22 +17,10 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.springframework.boot</groupId>
-                    <artifactId>spring-boot-starter-logging</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.springframework.boot</groupId>
-                    <artifactId>spring-boot-starter-logging</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -45,38 +33,33 @@
         <dependency>
             <groupId>io.github.openfeign</groupId>
             <artifactId>feign-core</artifactId>
-            <version>9.6.0</version>
+            <version>${feignVersion}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-netflix-hystrix</artifactId>
-            <version>2.1.0.RELEASE</version>
+            <version>${hystrixVersion}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-context</artifactId>
-            <version>2.1.0.RELEASE</version>
-        </dependency>
-        <dependency>
-            <groupId>io.fabric8</groupId>
-            <artifactId>kubernetes-client</artifactId>
-            <version>3.1.10</version>
+            <version>${springCloudVersion}</version>
         </dependency>
         <dependency>
             <groupId>org.liquibase</groupId>
             <artifactId>liquibase-core</artifactId>
-            <version>3.6.2</version>
+            <version>4.4.1</version>
         </dependency>
 
         <dependency>
             <groupId>org.springdoc</groupId>
             <artifactId>springdoc-openapi-ui</artifactId>
-            <version>1.3.9</version>
+            <version>1.5.9</version>
         </dependency>
         <dependency>
             <groupId>com.atlassian.oai</groupId>
             <artifactId>swagger-request-validator-pact</artifactId>
-            <version>2.10.2</version>
+            <version>2.18.1</version>
         </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>
@@ -85,37 +68,29 @@
         <dependency>
             <groupId>org.postgresql</groupId>
             <artifactId>postgresql</artifactId>
-            <version>42.2.20</version>
+            <version>42.2.23</version>
         </dependency>
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
             <version>1.4.200</version>
         </dependency>
-        <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-            <version>8.0.25</version>
-        </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-jdbc</artifactId>
-            <version>5.1.3.RELEASE</version>
+            <version>5.3.9</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.module</groupId>
             <artifactId>jackson-module-jsonSchema</artifactId>
-            <version>2.10.3</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-core</artifactId>
-            <version>2.10.3</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.dataformat</groupId>
             <artifactId>jackson-dataformat-yaml</artifactId>
-            <version>2.10.3</version>
         </dependency>
 
         <!--TEST-->
@@ -144,47 +119,47 @@
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-contract-wiremock</artifactId>
-            <version>1.2.4.RELEASE</version>
+            <version>${springCloudVersion}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>com.tngtech.archunit</groupId>
             <artifactId>archunit</artifactId>
-            <version>0.14.1</version>
+            <version>${archunitVersion}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>com.tngtech.archunit</groupId>
-            <artifactId>archunit-junit</artifactId>
-            <version>0.8.3</version>
+            <artifactId>archunit-junit5</artifactId>
+            <version>${archunitVersion}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>com.hltech</groupId>
             <artifactId>vaunt-validator</artifactId>
-            <version>1.0.28</version>
+            <version>${vauntVersion}</version>
         </dependency>
         <dependency>
             <groupId>com.hltech</groupId>
             <artifactId>vaunt-core</artifactId>
-            <version>1.0.28</version>
+            <version>${vauntVersion}</version>
         </dependency>
         <dependency>
             <groupId>org.testcontainers</groupId>
             <artifactId>postgresql</artifactId>
-            <version>1.15.3</version>
+            <version>1.16.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>io.rest-assured</groupId>
             <artifactId>rest-assured</artifactId>
-            <version>3.2.0</version>
+            <version>4.4.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.awaitility</groupId>
             <artifactId>awaitility</artifactId>
-            <version>3.0.0</version>
+            <version>${awaitilityVersion}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

diff --git a/judge-d-server/src/main/java/com/hltech/judged/server/config/BeanFactory.java b/judge-d-server/src/main/java/com/hltech/judged/server/config/BeanFactory.java
@@ -3,17 +3,25 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
+import io.swagger.util.Json;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder;
 
 @Configuration
 public class BeanFactory {
 
     @Bean
-    ObjectMapper objectMapper() {
-        JavaTimeModule javaTimeSerializer = new JavaTimeModule();
-        ObjectMapper objectMapper = new ObjectMapper();
-        objectMapper.registerModule(javaTimeSerializer);
+    ObjectMapper objectMapper(Jackson2ObjectMapperBuilder mapperBuilder) {
+        JavaTimeModule javaTimeModule = new JavaTimeModule();
+
+        //According to issue https://bitbucket.org/atlassian/swagger-request-validator/issues/331/timestamp-iso8601-format-issue
+        Json.mapper().registerModule(javaTimeModule);
+
+        ObjectMapper objectMapper = mapperBuilder
+            .modules(javaTimeModule)
+            .build();
+
         objectMapper.configure(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS, false);
         return objectMapper;
     }

diff --git a/.../src/main/java/com/hltech/judged/server/domain/validation/rest/RestContractValidator.java b/.../src/main/java/com/hltech/judged/server/domain/validation/rest/RestContractValidator.java
@@ -19,7 +19,7 @@
 
 public class RestContractValidator extends InterfaceContractValidator<String, RequestResponsePact> {
 
-    public static final String COMMUNICATION_INTERFACE = "rest";
+    private static final String COMMUNICATION_INTERFACE = "rest";
 
     public RestContractValidator() {
         super(COMMUNICATION_INTERFACE);
@@ -36,25 +36,23 @@ public List<InteractionValidationResult> validate(RequestResponsePact pact, Stri
                 interaction -> swaggerValidator.validate(of(interaction.getRequest()), PactResponse.of(interaction.getResponse()))
             ));
 
-        List<InteractionValidationResult> collect = validationReports
+        return validationReports
             .entrySet()
             .stream()
             .map(e -> {
                 ValidationReport validationReport = e.getValue();
                 if (validationReport.hasErrors()) {
                     return fail(
                         e.getKey().getDescription(),
-                        validationReport.getMessages().stream().map(
-                            message -> message.getMessage()
-                        ).collect(Collectors.toList())
+                        validationReport.getMessages().stream()
+                            .map(ValidationReport.Message::getMessage)
+                            .collect(Collectors.toList())
                     );
                 } else {
                     return success(e.getKey().getDescription());
                 }
             })
             .collect(Collectors.toList());
-
-        return collect;
     }
 
     @Override

diff --git a/judge-d-server/src/test/resources/application-test.properties b/judge-d-server/src/test/resources/application-test.properties
@@ -1,3 +1,5 @@
+server.port=0
+
 pactbroker.url=https://localhost:${wiremock.server.https-port}/
 
 spring.datasource.url=jdbc:h2:mem:example-app;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE