diff --git a/core-bc/composites/db-migration-svc/pom.xml b/core-bc/composites/db-migration-svc/pom.xml index 384829a2..071152d8 100755 --- a/core-bc/composites/db-migration-svc/pom.xml +++ b/core-bc/composites/db-migration-svc/pom.xml @@ -40,23 +40,17 @@ org.postgresql postgresql - 42.2.8 junit junit - 4.7 test com.fasterxml.jackson.core jackson-databind - 2.13.3 - - - diff --git a/core-bc/composites/svc/pom.xml b/core-bc/composites/svc/pom.xml index b1f1faf7..d8e8c294 100755 --- a/core-bc/composites/svc/pom.xml +++ b/core-bc/composites/svc/pom.xml @@ -22,7 +22,7 @@ javax.mail javax.mail-api - 1.6.2 + @@ -40,92 +40,81 @@ org.springframework spring-core - ${spring.fw.version} org.springframework spring-context - ${spring.fw.version} org.springframework spring-orm - ${spring.fw.version} org.springframework spring-context-support - ${spring.fw.version} org.springframework spring-test - ${spring.fw.version} test org.springframework.security spring-security-config - 5.5.2 org.springframework.security spring-security-web - 5.5.2 org.springframework.data spring-data-jpa - 2.5.5 org.postgresql postgresql - 42.2.8 com.auth0 java-jwt - 3.1.0 + 3.10.2 org.apache.poi poi - 3.9 + 5.2.2 org.apache.poi poi-ooxml - 3.9 + 5.2.2 net.sf.ehcache ehcache - 2.10.2 com.mchange c3p0 - 0.9.5.2 + 0.9.5.5 org.quartz-scheduler quartz - 2.2.1 c3p0 @@ -143,31 +132,27 @@ com.h2database h2 - 1.4.190 junit junit - 4.12 test eu.agno3.jcifs jcifs-ng - 2.0.5 + 2.1.7 javax.xml.bind jaxb-api - 2.3.1 javax.annotation javax.annotation-api - 1.3.2 diff --git a/core-bc/modules/intsvc/src/main/resources/log4j.properties b/core-bc/modules/intsvc/src/main/resources/log4j.properties deleted file mode 100755 index fef201ba..00000000 --- a/core-bc/modules/intsvc/src/main/resources/log4j.properties +++ /dev/null @@ -1,20 +0,0 @@ -# Logging to file... -log4j.rootCategory=INFO, ROLLINGFILE, CONSOLE - -# Define rolling file appender -log4j.appender.ROLLINGFILE=org.apache.log4j.RollingFileAppender -log4j.appender.ROLLINGFILE.File=${catalina.base}/logs/arbetsplatskoder.log -# Roll on max size -log4j.appender.ROLLINGFILE.MaxFileSize=10000KB -# Keep ten backup files -log4j.appender.ROLLINGFILE.MaxBackupIndex=10 -# Set pattern -log4j.appender.ROLLINGFILE.layout=org.apache.log4j.PatternLayout -log4j.appender.ROLLINGFILE.layout.ConversionPattern=%d{yyyy-MM-dd@HH:mm:ss.SSS} %-5p [%c] - %m%n - -log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender -# Set pattern -log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout -log4j.appender.CONSOLE.layout.ConversionPattern=%d{yyyy-MM-dd@HH:mm:ss:SSS} %-5p [%c] - %m%n - -log4j.category.se.vgregion=DEBUG \ No newline at end of file diff --git a/core-bc/modules/intsvc/src/main/resources/log4j2.xml b/core-bc/modules/intsvc/src/main/resources/log4j2.xml new file mode 100644 index 00000000..c52aaeaf --- /dev/null +++ b/core-bc/modules/intsvc/src/main/resources/log4j2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/core-bc/pom.xml b/core-bc/pom.xml index d1e7dee2..da279563 100755 --- a/core-bc/pom.xml +++ b/core-bc/pom.xml @@ -33,21 +33,19 @@ Generation time : 2015-01-14 09:02:50 CET junit junit - 4.12 test org.mockito mockito-core - 2.28.2 + test org.springframework spring-test - ${spring.fw.version} test diff --git a/pom.xml b/pom.xml index 9a196c07..b49f1919 100755 --- a/pom.xml +++ b/pom.xml @@ -8,9 +8,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - se.vgregion.common - profile-open - 2.15 + org.springframework.boot + spring-boot-dependencies + 2.7.0 se.vgregion.arbetsplatskoder @@ -23,6 +23,16 @@ core-bc + - 3.1.8 - 4.8.1 - 1.2.16 + + UTF-8 - 1.6.1 - 5.3.10 - ${spring.fw.version} + + +