diff --git a/annotation/pom.xml b/annotation/pom.xml index 0925914bc8d2430e1f387975ac2bba613551ab66..5fb41bcf908e9ec818f232d109dfd9f0318779fe 100644 --- a/annotation/pom.xml +++ b/annotation/pom.xml @@ -9,7 +9,8 @@ </parent> <artifactId>annotation</artifactId> <name>Annotation module</name> - <description>Module used for preparing annotations for model and connect to external resources.</description> + <description>Module used for preparing annotations for model and connect to + external resources.</description> <dependencies> @@ -54,7 +55,8 @@ <artifactId>log4j-core</artifactId> <version>${log4j2.version}</version> </dependency> - <!-- Spring uses commons-logging, so: https://stackoverflow.com/a/41475146/1127920 --> + <!-- Spring uses commons-logging, so: + https://stackoverflow.com/a/41475146/1127920 --> <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-jcl</artifactId> @@ -87,7 +89,6 @@ </dependency> - <!-- XML parser --> <dependency> <groupId>xerces</groupId> @@ -113,6 +114,11 @@ <groupId>commons-codec</groupId> <artifactId>commons-codec</artifactId> </exclusion> + <!-- we use higher version of commons-logging in transiect dependency --> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> </exclusions> </dependency> @@ -121,6 +127,13 @@ <artifactId>httpmime</artifactId> <version>${apache.httpcomponents.version}</version> <scope>compile</scope> + <!-- we use higher version of commons-logging in transiect dependency --> + <exclusions> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> @@ -128,6 +141,13 @@ <artifactId>httpcore</artifactId> <version>${apache.httpcomponents-core.version}</version> <scope>compile</scope> + <!-- we use higher version of commons-logging in transiect dependency --> + <exclusions> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> diff --git a/model/pom.xml b/model/pom.xml index 7391f4c9572a91d90e8f9d7e77dcaba3c97af116..b2720bcaca460f3681f85af3d8818b309066395d 100644 --- a/model/pom.xml +++ b/model/pom.xml @@ -17,7 +17,7 @@ <artifactId>commons</artifactId> <version>17.0.0~alpha.0</version> </dependency> - + <!-- Java xml serialization --> <dependency> <groupId>javax.xml.bind</groupId> @@ -109,6 +109,12 @@ <groupId>org.javassist</groupId> <artifactId>javassist</artifactId> </exclusion> + <!-- we use higher version of slf4j --> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </exclusion> + </exclusions> </dependency> diff --git a/persist/pom.xml b/persist/pom.xml index 935c58bf20ec65509491f935a1584c5c9551a591..fcbf83db26f15f17ee16cf92037ba2fafe006400 100644 --- a/persist/pom.xml +++ b/persist/pom.xml @@ -1,7 +1,6 @@ <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 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> @@ -90,7 +89,8 @@ <artifactId>log4j-core</artifactId> <version>${log4j2.version}</version> </dependency> - <!-- Spring uses commons-logging, so: https://stackoverflow.com/a/41475146/1127920 --> + <!-- Spring uses commons-logging, so: + https://stackoverflow.com/a/41475146/1127920 --> <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-jcl</artifactId> @@ -114,8 +114,16 @@ <groupId>org.springframework.data</groupId> <artifactId>spring-data-commons</artifactId> <version>${spring.data.version}</version> + <!-- we use higher version of slf4j --> + <exclusions> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </exclusion> + </exclusions> + </dependency> - + <dependency> <groupId>org.springframework</groupId> <artifactId>spring-web</artifactId> @@ -168,6 +176,13 @@ <groupId>com.zaxxer</groupId> <artifactId>HikariCP</artifactId> <version>${hikari.version}</version> + <!-- we use higher version of slf4j --> + <exclusions> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> @@ -211,7 +226,7 @@ <version>${junit.version}</version> <scope>test</scope> </dependency> - + </dependencies> </project> \ No newline at end of file