diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2019-06-15 15:23:22 -0700 |
|---|---|---|
| committer | Anton Tananaev <anton.tananaev@gmail.com> | 2019-06-15 15:23:22 -0700 |
| commit | 0497f1da3dd4f7a2bc94cd9418ea6fe896615f97 (patch) | |
| tree | f8048a659d259294f117f97b050fd6e067e47e97 | |
| parent | 3238451470e97ae1a9107cdb8792ebd2692423dc (diff) | |
| download | traccar-server-0497f1da3dd4f7a2bc94cd9418ea6fe896615f97.tar.gz traccar-server-0497f1da3dd4f7a2bc94cd9418ea6fe896615f97.tar.bz2 traccar-server-0497f1da3dd4f7a2bc94cd9418ea6fe896615f97.zip | |
Match gradle and maven dependencies
| -rw-r--r-- | build.gradle | 4 | ||||
| -rw-r--r-- | pom.xml | 28 |
2 files changed, 31 insertions, 1 deletions
diff --git a/build.gradle b/build.gradle index c9e8719b6..6d14aeb4e 100644 --- a/build.gradle +++ b/build.gradle @@ -46,7 +46,9 @@ dependencies { implementation "org.glassfish.jersey.inject:jersey-hk2:$jerseyVersion" implementation "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:$jacksonVersion" implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr353:$jacksonVersion" - implementation "org.liquibase:liquibase-core:3.6.3" + implementation "org.liquibase:liquibase-core:3.6.3", { + exclude group: "ch.qos.logback", module: "logback-classic" + } implementation "com.sun.mail:javax.mail:1.6.2" implementation "org.jxls:jxls:2.4.7" implementation "org.jxls:jxls-poi:1.0.16" @@ -220,6 +220,23 @@ <artifactId>activation</artifactId> <version>1.1.1</version> </dependency> + + <!-- override dependencies to match gradle --> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>1.1.1</version> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <version>1.7.26</version> + </dependency> + <dependency> + <groupId>com.github.jnr</groupId> + <artifactId>jffi</artifactId> + <version>1.2.17</version> + </dependency> </dependencies> <build> @@ -288,6 +305,17 @@ <version>1.4.1</version> <executions> <execution> + <id>enforce</id> + <configuration> + <rules> + <requireUpperBoundDeps /> + </rules> + </configuration> + <goals> + <goal>enforce</goal> + </goals> + </execution> + <execution> <id>enforce-bytecode-version</id> <goals> <goal>enforce</goal> |