Fixed antlr conflicts

statisticsnorway · Dec 15, 2023 · 8b5fcfc · 8b5fcfc
1 parent b320975
commit 8b5fcfc
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 2 deletions.
diff --git a/klass-api/pom.xml b/klass-api/pom.xml
@@ -31,6 +31,12 @@
             <groupId>no.ssb.klass</groupId>
             <artifactId>klass-solr</artifactId>
             <version>${project.parent.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.antlr</groupId>
+                    <artifactId>antlr4-runtime</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <!--Spring-->
@@ -62,7 +68,7 @@
         <dependency>
             <groupId>jakarta.xml.bind</groupId>
             <artifactId>jakarta.xml.bind-api</artifactId>
-            <version>2.3.3</version>
+            <version>4.0.1</version>
             <scope>provided</scope>
         </dependency>
 

diff --git a/klass-api/src/main/java/no/ssb/klass/api/dto/KlassResources.java b/klass-api/src/main/java/no/ssb/klass/api/dto/KlassResources.java
@@ -2,7 +2,6 @@
 
 import java.util.Arrays;
 import java.util.Collection;
-import java.util.List;
 
 import jakarta.xml.bind.annotation.XmlAnyElement;
 import jakarta.xml.bind.annotation.XmlElement;

diff --git a/klass-shared/pom.xml b/klass-shared/pom.xml
@@ -144,6 +144,12 @@
             <groupId>org.apache.directory.server</groupId>
             <artifactId>apacheds-server-jndi</artifactId>
             <version>${apacheds-server-jndi-version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>antlr</groupId>
+                    <artifactId>antlr</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.dataformat</groupId>

diff --git a/klass-solr/pom.xml b/klass-solr/pom.xml
@@ -61,6 +61,10 @@
                     <groupId>org.codehaus.woodstox</groupId>
                     <artifactId>wstx-asl</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>org.antlr</groupId>
+                    <artifactId>antlr4-runtime</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>