From 5b76e6d74f1decf5233f7bb72b0c1568b4a18508 Mon Sep 17 00:00:00 2001
From: Martin Stockhammer <martin_s@apache.org>
Date: Sat, 28 Aug 2021 23:58:22 +0200
Subject: [PATCH] Adding fix for jdk11

---
 .../metadata-store-provider/metadata-store-cassandra/pom.xml  | 1 +
 .../repository/cassandra/DefaultCassandraArchivaManager.java  | 4 +---
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/archiva-modules/metadata/metadata-store-provider/metadata-store-cassandra/pom.xml b/archiva-modules/metadata/metadata-store-provider/metadata-store-cassandra/pom.xml
index bb9ae94fa..e0f592a7a 100644
--- a/archiva-modules/metadata/metadata-store-provider/metadata-store-cassandra/pom.xml
+++ b/archiva-modules/metadata/metadata-store-provider/metadata-store-cassandra/pom.xml
@@ -457,6 +457,7 @@
           </systemPropertyVariables>
           <trimStackTrace>false</trimStackTrace>
           <skip>false</skip>
+          <classesDirectory>${project.build.outputDirectory}</classesDirectory>
         </configuration>
         <dependencies>
           <dependency>
diff --git a/archiva-modules/metadata/metadata-store-provider/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/DefaultCassandraArchivaManager.java b/archiva-modules/metadata/metadata-store-provider/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/DefaultCassandraArchivaManager.java
index fb1180b60..7678031ef 100644
--- a/archiva-modules/metadata/metadata-store-provider/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/DefaultCassandraArchivaManager.java
+++ b/archiva-modules/metadata/metadata-store-provider/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/DefaultCassandraArchivaManager.java
@@ -40,10 +40,8 @@ import javax.annotation.PreDestroy;
 import javax.inject.Inject;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Comparator;
 import java.util.List;
 
-import static com.datastax.oss.driver.api.querybuilder.QueryBuilder.literal;
 import static com.datastax.oss.driver.api.querybuilder.SchemaBuilder.*;
 import static org.apache.archiva.metadata.repository.cassandra.model.ColumnNames.*;
 
@@ -58,7 +56,7 @@ public class DefaultCassandraArchivaManager
     implements CassandraArchivaManager
 {
 
-    private Logger logger = LoggerFactory.getLogger( getClass( ) );
+    private static final Logger logger = LoggerFactory.getLogger( DefaultCassandraArchivaManager.class );
 
     @Inject
     private ApplicationContext applicationContext;