Merge pull request #1628 from krgauraw/release-4.4.0

Issue #000 fix: upgraded log4j version
Sunbird-Knowlg · Dec 15, 2021 · 3963098 · 3963098
2 parents aa3b2fc + ce8791e
commit 3963098
Show file tree

Hide file tree

Showing 13 changed files with 21 additions and 19 deletions.
diff --git a/platform-core/graph-engine/pom.xml b/platform-core/graph-engine/pom.xml
@@ -60,7 +60,7 @@
 		<dependency>
 		    <groupId>org.apache.logging.log4j</groupId>
 		    <artifactId>log4j-1.2-api</artifactId>
-		    <version>2.15.0</version>
+		    <version>${log4j.version}</version>
 		</dependency>
 	</dependencies>
 

diff --git a/platform-core/platform-common/pom.xml b/platform-core/platform-common/pom.xml
@@ -23,12 +23,12 @@
 		<dependency>
 		    <groupId>org.apache.logging.log4j</groupId>
 		    <artifactId>log4j-api</artifactId>
-		    <version>2.15.0</version>
+		    <version>${log4j.version}</version>
 		</dependency>
 		<dependency>
 		    <groupId>org.apache.logging.log4j</groupId>
 		    <artifactId>log4j-core</artifactId>
-		    <version>2.15.0</version>
+		    <version>${log4j.version}</version>
 		</dependency>
 		<dependency>
 		    <groupId>com.fasterxml.jackson.core</groupId>

diff --git a/platform-jobs/samza/auto-creator/pom.xml b/platform-jobs/samza/auto-creator/pom.xml
@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>auto-creator</artifactId>
-    <version>0.0.37</version>
+    <version>0.0.38</version>
 
     <dependencies>
         <dependency>

diff --git a/platform-jobs/samza/distribution/pom.xml b/platform-jobs/samza/distribution/pom.xml
@@ -12,35 +12,35 @@
 		<dependency>
 			<groupId>org.sunbird</groupId>
 			<artifactId>qrcode-image-generator</artifactId>
-			<version>0.0.29</version>
+			<version>0.0.30</version>
 			<type>tar.gz</type>
 			<classifier>distribution</classifier>
 		</dependency>
 		<dependency>
 			<groupId>org.sunbird</groupId>
 			<artifactId>publish-pipeline</artifactId>
-            <version>0.0.383</version>
+            <version>0.0.384</version>
 			<type>tar.gz</type>
 			<classifier>distribution</classifier>
 		</dependency>
 		<dependency>
 			<groupId>org.sunbird</groupId>
 			<artifactId>merge-user-courses</artifactId>
-			<version>0.0.17</version>
+			<version>0.0.18</version>
 			<type>tar.gz</type>
 			<classifier>distribution</classifier>
 		</dependency>
 		<dependency>
 			<groupId>org.sunbird</groupId>
 			<artifactId>auto-creator</artifactId>
-			<version>0.0.37</version>
+			<version>0.0.38</version>
 			<type>tar.gz</type>
 			<classifier>distribution</classifier>
 		</dependency>
 		<dependency>
 			<groupId>org.sunbird</groupId>
 			<artifactId>mvc-processor-indexer</artifactId>
-			<version>1.3.5</version>
+			<version>1.3.6</version>
 			<type>tar.gz</type>
 			<classifier>distribution</classifier>
 		</dependency>

diff --git a/platform-jobs/samza/merge-user-courses/pom.xml b/platform-jobs/samza/merge-user-courses/pom.xml
@@ -16,7 +16,7 @@
         <scala.version>2.11</scala.version>
         <hadoop.version>2.6.2</hadoop.version>
     </properties>
-    <version>0.0.17</version>
+    <version>0.0.18</version>
     <dependencies>
         <dependency>
             <groupId>org.sunbird</groupId>

diff --git a/platform-jobs/samza/mvc-processor-indexer/pom.xml b/platform-jobs/samza/mvc-processor-indexer/pom.xml
@@ -8,7 +8,7 @@
         <artifactId>samza</artifactId>
         <version>1.1-SNAPSHOT</version>
     </parent>
-    <version>1.3.5</version>
+    <version>1.3.6</version>
     <artifactId>mvc-processor-indexer</artifactId>
     <dependencies>
 

diff --git a/platform-jobs/samza/publish-pipeline/pom.xml b/platform-jobs/samza/publish-pipeline/pom.xml
@@ -7,7 +7,7 @@
 	  <version>1.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>publish-pipeline</artifactId>
-	<version>0.0.383</version>
+	<version>0.0.384</version>
 	<dependencies>
 		<dependency>
 			<groupId>org.sunbird</groupId>

diff --git a/platform-jobs/samza/qrcode-image-generator/pom.xml b/platform-jobs/samza/qrcode-image-generator/pom.xml
@@ -10,7 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>qrcode-image-generator</artifactId>
-    <version>0.0.29</version>
+    <version>0.0.30</version>
     <dependencies>
         <dependency>
             <groupId>com.google.zxing</groupId>

diff --git a/platform-modules/actors/pom.xml b/platform-modules/actors/pom.xml
@@ -58,7 +58,7 @@
 		<dependency>
 			<groupId>org.apache.logging.log4j</groupId>
 			<artifactId>log4j-api</artifactId>
-			<version>2.15.0</version>
+			<version>${log4j.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.sunbird</groupId>

diff --git a/platform-tests/pom.xml b/platform-tests/pom.xml
@@ -55,7 +55,7 @@
 		<dependency>
 		    <groupId>org.apache.logging.log4j</groupId>
 		    <artifactId>log4j-1.2-api</artifactId>
-		    <version>2.15.0</version>
+		    <version>${log4j.version}</version>
 		    <scope>test</scope>
 		</dependency>
 	</dependencies>

diff --git a/platform-tools/spikes/sync-tool/pom.xml b/platform-tools/spikes/sync-tool/pom.xml
@@ -13,6 +13,7 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<maven.compiler.source>1.8</maven.compiler.source>
 		<maven.compiler.target>1.8</maven.compiler.target>
+		<log4j.version>2.16.0</log4j.version>
 	</properties>
 
 	<dependencies>
@@ -135,12 +136,12 @@
 		<dependency>
 			<groupId>org.apache.logging.log4j</groupId>
 			<artifactId>log4j-api</artifactId>
-			<version>2.15.0</version>
+			<version>${log4j.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.logging.log4j</groupId>
 			<artifactId>log4j-core</artifactId>
-			<version>2.15.0</version>
+			<version>${log4j.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.powermock</groupId>

diff --git a/pom.xml b/pom.xml
@@ -15,6 +15,7 @@
 		<version.compiler.plugin>2.3.1</version.compiler.plugin>
 		<maven.compiler.target>1.8</maven.compiler.target>
 		<maven.compiler.source>1.8</maven.compiler.source>
+		<log4j.version>2.16.0</log4j.version>
 	</properties>
 
 	<profiles>

diff --git a/searchIndex-platform/module/mvcsearchindex-elasticsearch/pom.xml b/searchIndex-platform/module/mvcsearchindex-elasticsearch/pom.xml
@@ -67,12 +67,12 @@
 		<dependency>
 			<groupId>org.apache.logging.log4j</groupId>
 			<artifactId>log4j-api</artifactId>
-			<version>2.15.0</version>
+			<version>${log4j.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.logging.log4j</groupId>
 			<artifactId>log4j-core</artifactId>
-			<version>2.15.0</version>
+			<version>${log4j.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.powermock</groupId>