Changing jboss-logging version (new version uses apache license)

diff --git a/archiva-modules/plugins/metadata-store-cassandra/pom.xml b/archiva-modules/plugins/metadata-store-cassandra/pom.xml
index 8fae8f1d12fe139850b32ad174ee7c75ae8416d8..8f4021cc4b8327cecc01ad4b6d6ca7904857cecc 100644 (file)
--- a/archiva-modules/plugins/metadata-store-cassandra/pom.xml
+++ b/archiva-modules/plugins/metadata-store-cassandra/pom.xml
@@ -103,6 +103,10 @@
           <groupId>ch.qos.logback</groupId>
           <artifactId>logback-classic</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>org.jboss.logging</groupId>
+          <artifactId>jboss-logging</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
 
@@ -142,6 +146,12 @@
       </exclusions>
     </dependency>
 
+    <!-- Is a dependency of cassandra -> hibernate-validator and replaced by new version -->
+    <dependency>
+      <groupId>org.jboss.logging</groupId>
+      <artifactId>jboss-logging</artifactId>
+    </dependency>
+
 
     <dependency>
       <groupId>org.springframework</groupId>

diff --git a/pom.xml b/pom.xml
index 934c4d1fc503155de41ea9208002b09077db36b8..a748f385a447b11542081a6ea84ccb3007f5d699 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -1635,6 +1635,12 @@
         <version>${jsoup.version}</version>
       </dependency>
 
+      <dependency>
+        <groupId>org.jboss.logging</groupId>
+        <artifactId>jboss-logging</artifactId>
+        <version>3.2.1.Final</version>
+      </dependency>
+
       <!-- Dependencies for JDK >=9 update -->
       <dependency>
         <groupId>javax.annotation</groupId>