- Update MX version to 21.8.0

- Update MT version to `21.27.1`
- Update Swift Translator version to `3.6.0`
- Make application to run as jar with embedded tomcat

Author: johnmara-pc14

Dockerfile

@@ -1,6 +1,8 @@
-FROM tomcat:9-jre8-alpine
-RUN ["rm", "-fr", "/usr/local/tomcat/webapps/ROOT"]
+FROM eclipse-temurin:8-jre-focal
 
-ADD ./target/*.war  /usr/local/tomcat/webapps/ROOT.war
+COPY ./target/*.jar /work/app.jar
+WORKDIR /work
 
-EXPOSE 8080
+EXPOSE 8080
+
+ENTRYPOINT ["java","-jar","app.jar"]

README.md

@@ -12,15 +12,7 @@ you can run it inside a docker container using the following instructions:
 
 1. Create a folder named `rest-sdk-wrapper`
 2. Copy the jar inside this folder
-3. Create a file named `Dockerfile` or use [this one](Dockerfile) and paste in it the following content
-```Dockerfile
-FROM tomcat:9-jre8-alpine
-RUN ["rm", "-fr", "/usr/local/tomcat/webapps/ROOT"]
-
-ADD ./target/*.war  /usr/local/tomcat/webapps/ROOT.war
-
-EXPOSE 8080
-```
+3. Create a file named `Dockerfile` or use [this one](Dockerfile)
 4. Run the following command to build the docker container `docker build -t paymentcomponents/rest-sdk-wrapper .`
 5. Run the following command to run the docker
    container `docker run -p 8089:8080 -n rest-sdk-wrapper paymentcomponents/rest-sdk-wrapper`

pom.xml

@@ -10,17 +10,16 @@
     </parent>
     <groupId>com.paymentcomponents.libraries</groupId>
     <artifactId>rest-sdk-wrapper</artifactId>
-    <version>1.7.5</version>
+    <version>1.8.0</version>
     <name>rest-sdk-wrapper</name>
     <description>Wrapper for Payment Components Financial Messaging Libraries</description>
-    <packaging>war</packaging>
 
     <properties>
         <java.version>1.8</java.version>
-        <smv.version>21.27.0</smv.version>
-        <mx.version>21.7.0</mx.version>
+        <smv.version>21.27.1</smv.version>
+        <mx.version>21.8.0</mx.version>
         <sepa.version>21.6.0</sepa.version>
-        <swift.translator.version>3.5.1</swift.translator.version>
+        <swift.translator.version>3.6.0</swift.translator.version>
     </properties>
 
     <repositories>
@@ -35,11 +34,6 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-tomcat</artifactId>
-            <scope>provided</scope>
-        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
@@ -91,12 +85,6 @@
             </version> <!--For 2.12.X, advice https://cowtowncoder.medium.com/jackson-2-12-most-wanted-4-5-cbc91c00bcd2-->
         </dependency>
 
-        <dependency>
-            <groupId>org.reflections</groupId>
-            <artifactId>reflections</artifactId>
-            <version>0.9.12</version>
-        </dependency>
-
         <dependency>
             <groupId>org.springdoc</groupId>
             <artifactId>springdoc-openapi-ui</artifactId>

src/main/java/com/paymentcomponents/libraries/rest/sdk/wrapper/RestSdkWrapperApplication.java

@@ -2,16 +2,9 @@
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.builder.SpringApplicationBuilder;
-import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
 
 @SpringBootApplication
-public class RestSdkWrapperApplication extends SpringBootServletInitializer {
-
-    @Override
-    protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
-        return application.sources(RestSdkWrapperApplication.class);
-    }
+public class RestSdkWrapperApplication {
 
     public static void main(String[] args) {
         SpringApplication.run(RestSdkWrapperApplication.class, args);

src/main/java/com/paymentcomponents/libraries/rest/sdk/wrapper/RestSdkWrapperConfiguration.java

@@ -17,7 +17,7 @@ public OpenAPI openApiInfo() {
                 .info(new Info()
                         .title("Payment Components")
                         .description("Financial Messaging APIs")
-                        .version("1.1.0")); //should be the same as maven
+                        .version("1.8.0")); //should be the same as maven
     }
 
     @Bean

src/main/java/com/paymentcomponents/libraries/rest/sdk/wrapper/filter/RequestLogIdFilter.java

@@ -10,7 +10,6 @@
 import java.io.IOException;
 import java.util.UUID;
 
-//@Component
 public class RequestLogIdFilter implements Filter {
 
     private final static Logger LOG = LoggerFactory.getLogger(RequestLogIdFilter.class);