Release v4.0.4 upgrade Java and Spring versions

Author: ecovaci

pom.xml

@@ -13,27 +13,27 @@
   -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.6.4</version>
+        <version>3.5.4</version>
         <relativePath/>
     </parent>
     <groupId>org.kpax</groupId>
     <artifactId>winfoom</artifactId>
-    <version>4.0.3</version>
+    <version>4.0.4</version>
 
     <name>winfoom</name>
     <url>https://github.com/ecovaci/winfoom</url>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <java.version>11</java.version>
-        <httpclient.version>4.5.13</httpclient.version>
-        <commons-configuration2.version>2.7</commons-configuration2.version>
-        <commons-io.version>2.11.0</commons-io.version>
+        <java.version>17</java.version>
+        <httpclient.version>4.5.14</httpclient.version>
+        <commons-configuration2.version>2.12.0</commons-configuration2.version>
+        <commons-io.version>2.14.0</commons-io.version>
         <commons-beanutils.version>1.9.4</commons-beanutils.version>
         <ipaddress.version>5.3.3</ipaddress.version>
         <cache2k.version>2.6.1.Final</cache2k.version>
@@ -42,8 +42,7 @@
         <mock-server.version>5.9.0</mock-server.version>
         <littleproxy.version>1.1.2</littleproxy.version>
         <mockserver-netty.version>5.10.0</mockserver-netty.version>
-        <lombok.version>1.18.20</lombok.version>
-        <assertj.version>3.20.2</assertj.version>
+        <lombok.version>1.18.30</lombok.version>
         <log4j-jcl.version>2.17.2</log4j-jcl.version>
     </properties>
 
@@ -151,11 +150,9 @@
             <scope>test</scope>
         </dependency>
 
-        <!-- https://mvnrepository.com/artifact/org.assertj/assertj-core -->
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
-            <version>${assertj.version}</version>
             <scope>test</scope>
         </dependency>
 
@@ -185,9 +182,29 @@
     <build>
         <finalName>winfoom</finalName>
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>org.projectlombok</groupId>
+                            <artifactId>lombok</artifactId>
+                        </path>
+                    </annotationProcessorPaths>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
+                <configuration>
+                    <excludes>
+                        <exclude>
+                            <groupId>org.projectlombok</groupId>
+                            <artifactId>lombok</artifactId>
+                        </exclude>
+                    </excludes>
+                </configuration>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>

src/main/java/org/kpax/winfoom/api/ApiController.java

@@ -15,6 +15,7 @@
 
 import com.fasterxml.jackson.databind.MapperFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import jakarta.annotation.PostConstruct;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.io.IOUtils;
@@ -43,7 +44,6 @@
 import org.springframework.context.annotation.Profile;
 import org.springframework.stereotype.Component;
 
-import javax.annotation.PostConstruct;
 import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
 import java.nio.charset.StandardCharsets;

src/main/java/org/kpax/winfoom/config/ProxyConfig.java

@@ -14,6 +14,8 @@
 
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import com.fasterxml.jackson.annotation.JsonView;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
 import lombok.ToString;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.configuration2.Configuration;
@@ -34,8 +36,6 @@
 import org.springframework.context.annotation.PropertySource;
 import org.springframework.stereotype.Component;
 
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
 import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.IOException;

src/main/java/org/kpax/winfoom/config/SystemConfig.java

@@ -12,6 +12,7 @@
 
 package org.kpax.winfoom.config;
 
+import jakarta.annotation.PostConstruct;
 import lombok.Getter;
 import lombok.ToString;
 import lombok.extern.slf4j.Slf4j;
@@ -20,7 +21,6 @@
 import org.springframework.context.annotation.PropertySource;
 import org.springframework.stereotype.Component;
 
-import javax.annotation.PostConstruct;
 import java.net.Socket;
 import java.net.SocketException;
 import java.util.List;

src/main/java/org/kpax/winfoom/proxy/TunnelConnection.java

@@ -12,6 +12,7 @@
 
 package org.kpax.winfoom.proxy;
 
+import jakarta.annotation.PostConstruct;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.http.*;
@@ -45,7 +46,6 @@
 import org.kpax.winfoom.util.functional.ProxySingletonSupplier;
 import org.springframework.stereotype.Component;
 
-import javax.annotation.PostConstruct;
 import java.io.IOException;
 import java.net.Socket;
 

src/main/java/org/kpax/winfoom/view/AppFrame.java

@@ -12,6 +12,7 @@
 
 package org.kpax.winfoom.view;
 
+import jakarta.annotation.PostConstruct;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
@@ -26,7 +27,6 @@
 import org.springframework.context.annotation.Profile;
 import org.springframework.stereotype.Component;
 
-import javax.annotation.PostConstruct;
 import javax.swing.*;
 import javax.swing.border.EmptyBorder;
 import javax.swing.event.DocumentEvent;