Merge branch 'release/c3.11' into release/c4.0

Ericsson · Oct 31, 2023 · 18b834b · 18b834b
2 parents 1fc3f00 + 57a3431
commit 18b834b
Show file tree

Hide file tree

Showing 13 changed files with 16 additions and 11 deletions.
diff --git a/.gitignore b/.gitignore
@@ -5,4 +5,5 @@ target/
 .idea
 *.iml
 dependency-reduced-pom.xml
+.idea/
 
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,9 +1,11 @@
 # Changes
 
-## Version 2.12.0
+## Version 3.1.0 (unreleased)
 
+* Add Audit Prepare statements - #226
 * Test with java11 (only flavor ecaudit_c4.0) - #214
-* Audit Prepare statements
+
+## Version 3.0.0 (only flavor ecaudit_c4.1)
 
 ## Version 2.11.0
 

diff --git a/common/pom.xml b/common/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.ericsson.bss.cassandra.ecaudit</groupId>
         <artifactId>parent_c4.0</artifactId>
-        <version>2.12.0-SNAPSHOT</version>
+        <version>3.1.0-SNAPSHOT</version>
     </parent>
     <artifactId>common_c4.0</artifactId>
     <packaging>jar</packaging>

diff --git a/ecaudit/pom.xml b/ecaudit/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.ericsson.bss.cassandra.ecaudit</groupId>
         <artifactId>parent_c4.0</artifactId>
-        <version>2.12.0-SNAPSHOT</version>
+        <version>3.1.0-SNAPSHOT</version>
     </parent>
     <artifactId>ecaudit_c4.0</artifactId>
     <packaging>jar</packaging>

diff --git a/ecaudit/src/main/java/com/ericsson/bss/cassandra/ecaudit/AuditAdapter.java b/ecaudit/src/main/java/com/ericsson/bss/cassandra/ecaudit/AuditAdapter.java
@@ -133,6 +133,7 @@ public void auditPrepare(String operation, ClientState state, Status status, lon
             auditor.audit(logEntry);
         }
     }
+
     /**
      * Audit a prepared statement.
      *

diff --git a/...in/java/com/ericsson/bss/cassandra/ecaudit/filter/yamlandrole/YamlAndRoleAuditFilter.java b/...in/java/com/ericsson/bss/cassandra/ecaudit/filter/yamlandrole/YamlAndRoleAuditFilter.java
@@ -57,6 +57,7 @@ public void setup()
         yamlFilter.setup();
         roleFilter.setup();
     }
+
     @Override
     public boolean shouldLogPrepareStatements()
     {

diff --git a/eclog/pom.xml b/eclog/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.ericsson.bss.cassandra.ecaudit</groupId>
         <artifactId>parent_c4.0</artifactId>
-        <version>2.12.0-SNAPSHOT</version>
+        <version>3.1.0-SNAPSHOT</version>
     </parent>
     <artifactId>eclog_c4.0</artifactId>
     <packaging>jar</packaging>

diff --git a/integration-test-allow-all-authorizer/pom.xml b/integration-test-allow-all-authorizer/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.ericsson.bss.cassandra.ecaudit</groupId>
         <artifactId>parent_c4.0</artifactId>
-        <version>2.12.0-SNAPSHOT</version>
+        <version>3.1.0-SNAPSHOT</version>
     </parent>
     <artifactId>integration-test-allow-all-authorizer_c4.0</artifactId>
 

diff --git a/integration-test-query-logger/pom.xml b/integration-test-query-logger/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.ericsson.bss.cassandra.ecaudit</groupId>
         <artifactId>parent_c4.0</artifactId>
-        <version>2.12.0-SNAPSHOT</version>
+        <version>3.1.0-SNAPSHOT</version>
     </parent>
     <artifactId>integration-test-query-logger_c4.0</artifactId>
 

diff --git a/integration-test-standard/pom.xml b/integration-test-standard/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.ericsson.bss.cassandra.ecaudit</groupId>
         <artifactId>parent_c4.0</artifactId>
-        <version>2.12.0-SNAPSHOT</version>
+        <version>3.1.0-SNAPSHOT</version>
     </parent>
     <artifactId>integration-test-standard_c4.0</artifactId>
 

diff --git a/pom.xml b/pom.xml
@@ -19,7 +19,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.ericsson.bss.cassandra.ecaudit</groupId>
     <artifactId>parent_c4.0</artifactId>
-    <version>2.12.0-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>Ericsson Cassandra Audit</name>

diff --git a/test-utils/pom.xml b/test-utils/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.ericsson.bss.cassandra.ecaudit</groupId>
         <artifactId>parent_c4.0</artifactId>
-        <version>2.12.0-SNAPSHOT</version>
+        <version>3.1.0-SNAPSHOT</version>
     </parent>
     <artifactId>test-utils_c4.0</artifactId>
     <packaging>jar</packaging>
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,4 +5,5 @@ target/ @@
     .idea
     *.iml
     dependency-reduced-pom.xml
+    .idea/