From 0497f1da3dd4f7a2bc94cd9418ea6fe896615f97 Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton.tananaev@gmail.com>
Date: Sat, 15 Jun 2019 15:23:22 -0700
Subject: Match gradle and maven dependencies

---
 build.gradle |  4 +++-
 pom.xml      | 28 ++++++++++++++++++++++++++++
 2 files changed, 31 insertions(+), 1 deletion(-)

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"
diff --git a/pom.xml b/pom.xml
index fb3e3e59c..589bff4e4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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>
@@ -287,6 +304,17 @@
                 <artifactId>maven-enforcer-plugin</artifactId>
                 <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>
-- 
cgit v1.2.3