Merge pull request #23 from e-gov/log4j-patch

Log4j patch
e-gov · Jan 7, 2022 · 8aed8ba · 8aed8ba
2 parents 187f155 + b674fc0
commit 8aed8ba
Show file tree

Hide file tree

Showing 10 changed files with 69 additions and 15 deletions.
diff --git a/common/build.gradle b/common/build.gradle
@@ -1,4 +1,4 @@
-version '1.0.0'
+version '1.0.3'
 
 apply plugin: 'java'
 apply plugin: 'checkstyle'
@@ -13,8 +13,8 @@ dependencies {
     compileOnly 'javax.servlet:javax.servlet-api:3.0.1'
 
     compile 'org.slf4j:slf4j-api:1.7.18'
-    compile 'org.apache.logging.log4j:log4j-slf4j-impl:2.3'
-    compile 'org.apache.logging.log4j:log4j-core:2.3'
+    compile 'org.apache.logging.log4j:log4j-slf4j-impl:2.17.1'
+    compile 'org.apache.logging.log4j:log4j-core:2.17.1'
     compile 'com.google.code.gson:gson:2.6.2'
 }
 

diff --git a/filter/build.gradle b/filter/build.gradle
@@ -1,4 +1,4 @@
-version '1.0.0'
+version '1.0.3'
 
 apply plugin: 'java'
 apply plugin: 'checkstyle'
@@ -15,8 +15,8 @@ dependencies {
     providedCompile 'javax.servlet:javax.servlet-api:3.0.1'
 
     compile 'org.slf4j:slf4j-api:1.7.18'
-    compile 'org.apache.logging.log4j:log4j-slf4j-impl:2.3'
-    compile 'org.apache.logging.log4j:log4j-core:2.3'
+    compile 'org.apache.logging.log4j:log4j-slf4j-impl:2.17.1'
+    compile 'org.apache.logging.log4j:log4j-core:2.17.1'
     compile 'com.sun.xml.messaging.saaj:saaj-impl:1.3.25'
     compile 'com.google.code.gson:gson:2.6.2'
 

diff --git a/filter/buildDeb.sh b/filter/buildDeb.sh
@@ -16,7 +16,7 @@ if [ ! -f "build/libs/$projectName.war" ]; then
 fi
 
 # Uuendame debian-i kirjeldusfailides versiooninumbri info:
-perl -pi -e 's{^('"$projectName"'\s+)\([^)]+\)(\s+unstable;)}{$1('"$version"'-1)$2}' etc/debian/changelog
+#perl -pi -e 's{^('"$projectName"'\s+)\([^)]+\)(\s+unstable;)}{$1('"$version"'-1)$2}' etc/debian/changelog
 
 
 (cd etc ; debuild --no-tgz-check -us -uc || exit $?)

diff --git a/filter/etc/debian/changelog b/filter/etc/debian/changelog
@@ -1,3 +1,21 @@
+dumonitor-filter (1.0.3-1) unstable; urgency=low
+
+  * Upgrading Log4J to version 2.17.1
+
+ -- Vitali Stupin <vitali.stupin@ria.ee>  Fri, 14 Dec 2021 14:05:00 +0200
+
+dumonitor-filter (1.0.2-1) unstable; urgency=low
+
+  * Upgrading Log4J to version 2.17.0
+
+ -- Vitali Stupin <vitali.stupin@ria.ee>  Sun, 14 Dec 2021 09:40:00 +0200
+
+dumonitor-filter (1.0.1-1) unstable; urgency=low
+
+  * Upgrading Log4J to version 2.16.0
+
+ -- Vitali Stupin <vitali.stupin@ria.ee>  Tue, 14 Dec 2021 12:00:00 +0200
+
 dumonitor-filter (1.0.0-1) unstable; urgency=low
 
   * Initial release

diff --git a/query/build.gradle b/query/build.gradle
@@ -1,4 +1,4 @@
-version '1.0.0'
+version '1.0.3'
 
 apply plugin: 'java'
 apply plugin: 'checkstyle'
@@ -14,8 +14,8 @@ checkstyle {
 dependencies {
 	providedCompile 'javax.servlet:javax.servlet-api:3.0.1'
 
-	compile 'org.apache.logging.log4j:log4j-api:2.3'
-	compile 'org.apache.logging.log4j:log4j-core:2.3'
+	compile 'org.apache.logging.log4j:log4j-api:2.17.1'
+	compile 'org.apache.logging.log4j:log4j-core:2.17.1'
 	compile project(':dumonitor-common')
 	compile 'org.eclipse.jetty:jetty-servlets:8.0.4.v20111024'
 

diff --git a/query/buildDeb.sh b/query/buildDeb.sh
@@ -16,7 +16,7 @@ if [ ! -f "build/libs/$projectName.war" ]; then
 fi
 
 # Uuendame debian-i kirjeldusfailides versiooninumbri info:
-perl -pi -e 's{^('"$projectName"'\s+)\([^)]+\)(\s+unstable;)}{$1('"$version"'-1)$2}' etc/debian/changelog
+#perl -pi -e 's{^('"$projectName"'\s+)\([^)]+\)(\s+unstable;)}{$1('"$version"'-1)$2}' etc/debian/changelog
 
 
 (cd etc ; debuild --no-tgz-check -us -uc || exit $?)

diff --git a/query/etc/debian/changelog b/query/etc/debian/changelog
@@ -1,3 +1,21 @@
+dumonitor-query (1.0.3-1) unstable; urgency=low
+
+  * Upgrading Log4J to version 2.17.1
+
+ -- Vitali Stupin <vitali.stupin@ria.ee>  Fri, 14 Dec 2021 14:05:00 +0200
+
+dumonitor-query (1.0.2-1) unstable; urgency=low
+
+  * Upgrading Log4J to version 2.17.0
+
+ -- Vitali Stupin <vitali.stupin@ria.ee>  Sun, 14 Dec 2021 09:40:00 +0200
+
+dumonitor-query (1.0.1-1) unstable; urgency=low
+
+  * Upgrading Log4J to version 2.16.0
+
+ -- Vitali Stupin <vitali.stupin@ria.ee>  Tue, 14 Dec 2021 12:00:00 +0200
+
 dumonitor-query (1.0.0-1) unstable; urgency=low
 
   * Initial release

diff --git a/storage/build.gradle b/storage/build.gradle
@@ -1,4 +1,4 @@
-version '1.0.0'
+version '1.0.3'
 
 apply plugin: 'java'
 apply plugin: 'checkstyle'
@@ -15,8 +15,8 @@ dependencies {
     providedCompile 'javax.servlet:javax.servlet-api:3.0.1'
 
     compile 'org.slf4j:slf4j-api:1.7.18'
-    compile 'org.apache.logging.log4j:log4j-slf4j-impl:2.3'
-    compile 'org.apache.logging.log4j:log4j-core:2.3'
+    compile 'org.apache.logging.log4j:log4j-slf4j-impl:2.17.1'
+    compile 'org.apache.logging.log4j:log4j-core:2.17.1'
 	compile 'org.json:json:20160212'
 	compile 'org.postgresql:postgresql:9.4.1208.jre6'
 

diff --git a/storage/buildDeb.sh b/storage/buildDeb.sh
@@ -16,7 +16,7 @@ if [ ! -f "build/libs/$projectName.war" ]; then
 fi
 
 # Uuendame debian-i kirjeldusfailides versiooninumbri info:
-perl -pi -e 's{^('"$projectName"'\s+)\([^)]+\)(\s+unstable;)}{$1('"$version"'-1)$2}' etc/debian/changelog
+#perl -pi -e 's{^('"$projectName"'\s+)\([^)]+\)(\s+unstable;)}{$1('"$version"'-1)$2}' etc/debian/changelog
 
 
 (cd etc ; debuild --no-tgz-check -us -uc || exit $?)

diff --git a/storage/etc/debian/changelog b/storage/etc/debian/changelog
@@ -1,3 +1,21 @@
+dumonitor-storage (1.0.3-1) unstable; urgency=low
+
+  * Upgrading Log4J to version 2.17.1
+
+ -- Vitali Stupin <vitali.stupin@ria.ee>  Fri, 14 Dec 2021 14:05:00 +0200
+
+dumonitor-storage (1.0.2-1) unstable; urgency=low
+
+  * Upgrading Log4J to version 2.17.0
+
+ -- Vitali Stupin <vitali.stupin@ria.ee>  Sun, 19 Dec 2021 09:40:00 +0200
+
+dumonitor-storage (1.0.1-1) unstable; urgency=low
+
+  * Upgrading Log4J to version 2.16.0
+
+ -- Vitali Stupin <vitali.stupin@ria.ee>  Tue, 14 Dec 2021 12:00:00 +0200
+
 dumonitor-storage (1.0.0-1) unstable; urgency=low
 
   * Initial release