Merge pull request #106 from dma-ais/log4j-guava-updates

log4j and guava updates
dma-ais · Jan 4, 2024 · b283943 · b283943
2 parents d3d187f + 6d6616f
commit b283943
Show file tree

Hide file tree

Showing 6 changed files with 120 additions and 15 deletions.
diff --git a/ais-lib-cli/pom.xml b/ais-lib-cli/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>dk.dma.ais.lib</groupId>
     <artifactId>ais-parent</artifactId>
-    <version>2.8.3</version>
+    <version>2.8.4</version>
   </parent>
 
 
@@ -50,7 +50,7 @@
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-log4j12</artifactId>
-      <version>${dependencies.slf4j.version}</version>
+      <version>2.0.5</version>
     </dependency>
     <dependency>
       <groupId>dk.dma.commons</groupId>

diff --git a/ais-lib-communication/pom.xml b/ais-lib-communication/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>dk.dma.ais.lib</groupId>
     <artifactId>ais-parent</artifactId>
-    <version>2.8.3</version>
+    <version>2.8.4</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
@@ -67,6 +67,17 @@
       <groupId>dk.dma.commons</groupId>
       <artifactId>dma-commons-util</artifactId>
       <version>${dependencies.dma.commons.version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>com.google.guava</groupId>
+          <artifactId>guava</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava</artifactId>
+      <version>32.0.1-jre</version>
     </dependency>
     <dependency>
       <groupId>dk.dma.enav</groupId>

diff --git a/ais-lib-json/pom.xml b/ais-lib-json/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>dk.dma.ais.lib</groupId>
         <artifactId>ais-parent</artifactId>
-        <version>2.8.3</version>
+        <version>2.8.4</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -14,6 +14,34 @@
     <name>AIS JSON Decoders</name>
 
     <dependencies>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>1.7.32</version>
+        </dependency>
+
+        <!-- Log4j 2 API -->
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-api</artifactId>
+            <version>2.20.0</version>
+        </dependency>
+
+        <!-- Log4j 2 Core -->
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-core</artifactId>
+            <version>2.20.0</version>
+        </dependency>
+
+        <!-- SLF4J Binding for Log4j 2 -->
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-slf4j-impl</artifactId>
+            <version>2.20.0</version>
+        </dependency>
+
+
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>ais-lib-messages</artifactId>

diff --git a/ais-lib-messages/pom.xml b/ais-lib-messages/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>dk.dma.ais.lib</groupId>
 		<artifactId>ais-parent</artifactId>
-		<version>2.8.3</version>
+		<version>2.8.4</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
@@ -23,6 +23,17 @@
 			<groupId>dk.dma.commons</groupId>
 			<artifactId>dma-commons-util</artifactId>
 			<version>${dependencies.dma.commons.version}</version>
+			<exclusions>
+				<exclusion>
+					<groupId>com.google.guava</groupId>
+					<artifactId>guava</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>com.google.guava</groupId>
+			<artifactId>guava</artifactId>
+			<version>32.0.1-jre</version>
 		</dependency>
 	</dependencies>
 

diff --git a/ais-lib-utils/pom.xml b/ais-lib-utils/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>dk.dma.ais.lib</groupId>
 		<artifactId>ais-parent</artifactId>
-		<version>2.8.3</version>
+		<version>2.8.4</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
@@ -29,10 +29,25 @@
 			<artifactId>dma-commons-app</artifactId>
 			<version>${dependencies.dma.commons.version}</version>
 		</dependency>
+		<!-- Log4j 2 API -->
 		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-log4j12</artifactId>
-      		<version>${dependencies.slf4j.version}</version>
+			<groupId>org.apache.logging.log4j</groupId>
+			<artifactId>log4j-api</artifactId>
+			<version>2.20.0</version>
+		</dependency>
+
+		<!-- Log4j 2 Core -->
+		<dependency>
+			<groupId>org.apache.logging.log4j</groupId>
+			<artifactId>log4j-core</artifactId>
+			<version>2.20.0</version>
+		</dependency>
+
+		<!-- SLF4J Binding for Log4j 2 -->
+		<dependency>
+			<groupId>org.apache.logging.log4j</groupId>
+			<artifactId>log4j-slf4j-impl</artifactId>
+			<version>2.20.0</version>
 		</dependency>
 	</dependencies>
 

diff --git a/pom.xml b/pom.xml
@@ -10,7 +10,7 @@
 
 	<groupId>dk.dma.ais.lib</groupId>
 	<artifactId>ais-parent</artifactId>
-	<version>2.8.3</version>
+	<version>2.8.4</version>
 	<name>AIS Parent</name>
 	<packaging>pom</packaging>
 	<description>This parent pom for AIS</description>
@@ -80,6 +80,19 @@
                         <artifactId>maven-gpg-plugin</artifactId>
                         <version>3.1.0</version>
                     </plugin>
+					<!-- This plugin is used to check the vulnerabilities of the project -->
+<!--					<plugin>-->
+<!--						<groupId>org.owasp</groupId>-->
+<!--						<artifactId>dependency-check-maven</artifactId>-->
+<!--						<version>8.3.1</version>-->
+<!--						<executions>-->
+<!--							<execution>-->
+<!--								<goals>-->
+<!--									<goal>check</goal>-->
+<!--								</goals>-->
+<!--							</execution>-->
+<!--						</executions>-->
+<!--					</plugin>-->
 				</plugins>
 			</build>
 		</profile>
@@ -89,14 +102,30 @@
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-api</artifactId>
-			<version>${dependencies.slf4j.version}</version>
+			<version>1.7.32</version>
 		</dependency>
+
+		<!-- Log4j 2 API -->
 		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-log4j12</artifactId>
-			<version>${dependencies.slf4j.version}</version>
-			<scope>test</scope>
+			<groupId>org.apache.logging.log4j</groupId>
+			<artifactId>log4j-api</artifactId>
+			<version>2.20.0</version>
+		</dependency>
+
+		<!-- Log4j 2 Core -->
+		<dependency>
+			<groupId>org.apache.logging.log4j</groupId>
+			<artifactId>log4j-core</artifactId>
+			<version>2.20.0</version>
 		</dependency>
+
+		<!-- SLF4J Binding for Log4j 2 -->
+		<dependency>
+			<groupId>org.apache.logging.log4j</groupId>
+			<artifactId>log4j-slf4j-impl</artifactId>
+			<version>2.20.0</version>
+		</dependency>
+
 		<dependency>
 			<groupId>net.jcip</groupId>
 			<artifactId>jcip-annotations</artifactId>
@@ -111,6 +140,17 @@
 			<groupId>dk.dma.commons</groupId>
 			<artifactId>dma-commons-util</artifactId>
 			<version>${dependencies.dma.commons.version}</version>
+			<exclusions>
+				<exclusion>
+					<groupId>com.google.guava</groupId>
+					<artifactId>guava</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>com.google.guava</groupId>
+			<artifactId>guava</artifactId>
+			<version>32.0.1-jre</version>
 		</dependency>
 	</dependencies>