CVE updates for Netty and Logback (#140)

* Updated dependencies on log4j, logback, netty and some others for CVEs.

* Updated dependencies on log4j, logback, netty and some others for CVEs.

core/pom.xml

@@ -22,7 +22,7 @@
         <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty-codec-http</artifactId>
-            <version>4.1.94.Final</version>
+            <version>4.1.117.Final</version>
         </dependency>
 
         <!-- For the example metric consumer -->

log4j2-appender/pom.xml

@@ -23,7 +23,7 @@
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-core</artifactId>
-            <version>2.17.2</version>
+            <version>2.24.3</version>
         </dependency>
 
         <dependency>

logback-appender/pom.xml

@@ -24,7 +24,7 @@
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>
-            <version>1.2.11</version>
+            <version>1.3.15</version>
         </dependency>
 
         <dependency>

logback-appender/src/test/java/ch/qos/logback/core/pattern/EfficientPatternLayoutTest.java

@@ -11,6 +11,7 @@ import ch.qos.logback.classic.testUtil.SampleConverter;
 import ch.qos.logback.core.Context;
 import ch.qos.logback.core.joran.spi.JoranException;
 import ch.qos.logback.core.pattern.parser.AbstractPatternLayoutBaseTest;
+import ch.qos.logback.core.spi.ScanException;
 import ch.qos.logback.core.testUtil.StringListAppender;
 import ch.qos.logback.core.util.OptionHelper;
 import org.junit.Before;
@@ -37,6 +38,8 @@ public class EfficientPatternLayoutTest extends AbstractPatternLayoutBaseTest<IL
     public void setUp() {
         patternLayout = getPatternLayoutBase();
         patternLayout.setContext(loggerContext);
+
+        loggerContext.setMDCAdapter(MDC.getMDCAdapter());
     }
 
     @Override
@@ -191,7 +194,7 @@ public class EfficientPatternLayoutTest extends AbstractPatternLayoutBaseTest<IL
     }
 
     @Test
-    public void mdcWithDefaultValue() {
+    public void mdcWithDefaultValue() throws ScanException {
         // Given
         String pattern = "%msg %mdc{foo} %mdc{bar:-[null]}";
         MDC.put("foo", "foo");
@@ -268,7 +271,7 @@ public class EfficientPatternLayoutTest extends AbstractPatternLayoutBaseTest<IL
     }
 
     @Test
-    public void replaceNewline() {
+    public void replaceNewline() throws ScanException {
         // Given
         String pattern = "%replace(A\nB){'\n', '\n\t'}";
         ILoggingEvent loggingEvent = new LoggingEvent(

loki-protobuf/pom.xml

@@ -1,4 +1,6 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
 
@@ -22,17 +24,17 @@
         <dependency>
             <groupId>io.grpc</groupId>
             <artifactId>grpc-netty-shaded</artifactId>
-            <version>1.32.1</version>
+            <version>1.70.0</version>
         </dependency>
         <dependency>
             <groupId>io.grpc</groupId>
             <artifactId>grpc-protobuf</artifactId>
-            <version>1.32.1</version>
+            <version>1.70.0</version>
         </dependency>
         <dependency>
             <groupId>io.grpc</groupId>
             <artifactId>grpc-stub</artifactId>
-            <version>1.32.1</version>
+            <version>1.70.0</version>
         </dependency>
         <dependency> <!-- necessary for Java 9+ -->
             <groupId>org.apache.tomcat</groupId>
@@ -56,7 +58,8 @@
                         </goals>
                         <configuration>
                             <addProtoSources>all</addProtoSources>
-                            <includeMavenTypes>direct</includeMavenTypes>
+                            <includeMavenTypes>direct
+                            </includeMavenTypes>
                             <includeDirectories>
                                 <include>src/main/resources</include>
                             </includeDirectories>
@@ -70,7 +73,9 @@
                                 </outputTarget>
                                 <outputTarget>
                                     <type>grpc-java</type>
-                                    <pluginArtifact>io.grpc:protoc-gen-grpc-java:1.35.0</pluginArtifact>
+                                    <pluginArtifact>
+                                        io.grpc:protoc-gen-grpc-java:1.35.0
+                                    </pluginArtifact>
                                 </outputTarget>
                             </outputTargets>
                         </configuration>