diff --git a/goofy-server/pom.xml b/goofy-server/pom.xml index 7f1290702752cf10a6f682240dbdf56586011e72..c0c373ce63fdaf3df13c72dcdeccbdf0ed87f00e 100644 --- a/goofy-server/pom.xml +++ b/goofy-server/pom.xml @@ -27,65 +27,12 @@ <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter</artifactId> - <exclusions> - <exclusion> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-to-slf4j</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-log4j2</artifactId> - <exclusions> - <exclusion> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-core</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-slf4j-impl</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-jul</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-to-slf4j</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-core</artifactId> - <version>2.16.0</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-slf4j-impl</artifactId> - <version>2.16.0</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-jul</artifactId> - <version>2.16.0</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-api</artifactId> - <version>2.16.0</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-to-slf4j</artifactId> - <version>2.16.0</version> - <scope>compile</scope> </dependency> + <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-web</artifactId> @@ -127,6 +74,33 @@ <artifactId>keycloak-admin-client</artifactId> </dependency> + <!-- log4j --> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-slf4j-impl</artifactId> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-jul</artifactId> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-api</artifactId> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-to-slf4j</artifactId> + <scope>compile</scope> + </dependency> + <!-- jwt --> <dependency> <groupId>com.auth0</groupId> diff --git a/pom.xml b/pom.xml index 7bc6cb8f200dbc7fc8775dcce6942f8912ec992c..24af4341d4c59c86b91ab66b824a5777392ba45d 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ <lombok.version>edge-SNAPSHOT</lombok.version> <lorem.version>2.1</lorem.version> - + <java-jwt.version>3.18.2</java-jwt.version> <jjwt.version>0.9.1</jjwt.version> @@ -45,6 +45,8 @@ <git-comit-id.plugin.version>4.0.3</git-comit-id.plugin.version> <sonarqube.version>3.8.2</sonarqube.version> <jacoco.plugin.version>0.8.7</jacoco.plugin.version> + + <log4j2.version>2.16.0</log4j2.version> </properties> <dependencyManagement> @@ -58,6 +60,7 @@ <scope>import</scope> </dependency> + <!-- keycloak --> <dependency> <groupId>org.keycloak.bom</groupId> @@ -90,6 +93,72 @@ <version>${commons-beanutils.version}</version> </dependency> + <!-- log4j --> + <dependency> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter</artifactId> + <version>${spring.boot.version}</version> + <exclusions> + <exclusion> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-to-slf4j</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter-log4j2</artifactId> + <version>${spring.boot.version}</version> + <exclusions> + <exclusion> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-slf4j-impl</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-jul</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-to-slf4j</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> + <version>${log4j2.version}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-slf4j-impl</artifactId> + <version>${log4j2.version}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-jul</artifactId> + <version>${log4j2.version}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-api</artifactId> + <version>${log4j2.version}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-to-slf4j</artifactId> + <version>${log4j2.version}</version> + <scope>compile</scope> + </dependency> + <!-- tools --> <dependency> <groupId>org.mapstruct</groupId> @@ -115,17 +184,18 @@ <!-- <scope>test</scope> --> </dependency> + <dependency> <groupId>org.projectlombok</groupId> <artifactId>lombok</artifactId> <version>${lombok.version}</version> </dependency> - + <!-- jwt --> <dependency> - <groupId>com.auth0</groupId> - <artifactId>java-jwt</artifactId> - <version>${java-jwt.version}</version> + <groupId>com.auth0</groupId> + <artifactId>java-jwt</artifactId> + <version>${java-jwt.version}</version> </dependency> <dependency> <groupId>io.jsonwebtoken</groupId>