Resolving dependency convergence issues

finos · Feb 11, 2022 · 815f1fc · 815f1fc
1 parent 954570c
commit 815f1fc
Show file tree

Hide file tree

Showing 6 changed files with 41 additions and 1 deletion.
diff --git a/legend-sdlc-entity-maven-plugin/pom.xml b/legend-sdlc-entity-maven-plugin/pom.xml
@@ -87,5 +87,10 @@
             <artifactId>maven-core</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>com.google.inject</groupId>
+            <artifactId>guice</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 </project>
diff --git a/legend-sdlc-generation-file-maven-plugin/pom.xml b/legend-sdlc-generation-file-maven-plugin/pom.xml
@@ -121,6 +121,12 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>com.google.inject</groupId>
+            <artifactId>guice</artifactId>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>org.finos.legend.engine</groupId>
             <artifactId>legend-engine-external-format-protobuf</artifactId>
@@ -138,6 +144,7 @@
             <artifactId>legend-engine-external-format-rosetta</artifactId>
             <scope>test</scope>
         </dependency>
+
         <dependency>
             <groupId>org.finos.legend.engine</groupId>
             <artifactId>legend-engine-external-format-jsonSchema</artifactId>

diff --git a/legend-sdlc-generation-model-maven-plugin/pom.xml b/legend-sdlc-generation-model-maven-plugin/pom.xml
@@ -117,6 +117,11 @@
             <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>com.google.inject</groupId>
+            <artifactId>guice</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.apache.maven.plugin-testing</groupId>
             <artifactId>maven-plugin-testing-harness</artifactId>

diff --git a/legend-sdlc-generation-service-maven-plugin/pom.xml b/legend-sdlc-generation-service-maven-plugin/pom.xml
@@ -128,6 +128,11 @@
             <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>com.google.inject</groupId>
+            <artifactId>guice</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>io.github.classgraph</groupId>
             <artifactId>classgraph</artifactId>

diff --git a/legend-sdlc-version-package-maven-plugin/pom.xml b/legend-sdlc-version-package-maven-plugin/pom.xml
@@ -105,6 +105,11 @@
             <artifactId>maven-compat</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>com.google.inject</groupId>
+            <artifactId>guice</artifactId>
+            <scope>test</scope>
+        </dependency>
         <!-- TEST -->
     </dependencies>
 </project>
diff --git a/pom.xml b/pom.xml
@@ -98,8 +98,9 @@
         <json-smart.version>2.4.7</json-smart.version>
         <javassist.version>3.28.0-GA</javassist.version>
         <junit.version>4.13.1</junit.version>
-        <apache.maven.version>3.6.2</apache.maven.version>
+        <apache.maven.version>3.8.4</apache.maven.version>
         <pac4j.version>3.9.0</pac4j.version>
+        <pac4j.jax-rs.version>3.0.3</pac4j.jax-rs.version>
         <slf4j.version>1.7.25</slf4j.version>
         <snakeyaml.version>1.27</snakeyaml.version>
         <freemarker.version>2.3.30</freemarker.version>
@@ -1125,6 +1126,12 @@
                 <groupId>org.apache.maven</groupId>
                 <artifactId>maven-core</artifactId>
                 <version>${apache.maven.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>com.google.inject</groupId>
+                        <artifactId>guice</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
             <dependency>
                 <groupId>org.apache.maven</groupId>
@@ -1290,6 +1297,12 @@
                 <version>${pac4j.version}</version>
             </dependency>
 
+            <dependency>
+                <groupId>org.pac4j.jax-rs</groupId>
+                <artifactId>core</artifactId>
+                <version>${pac4j.jax-rs.version}</version>
+            </dependency>
+
             <dependency>
                 <groupId>org.slf4j</groupId>
                 <artifactId>jcl-over-slf4j</artifactId>