From 3cfb0fede1129a41b67321886a377cf0dff2fa3a Mon Sep 17 00:00:00 2001 From: "FOLIO3PK\\muhammadnoman" Date: Thu, 10 Sep 2020 10:55:17 +0500 Subject: [PATCH 01/11] testing sourceclear --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index f53c61158..c648dfb8b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -74,7 +74,6 @@ jobs: FULLSTACK_TEST_REPO=ProdTesting - stage: 'Source Clear' - if: type = cron addons: srcclr: true before_install: skip From 9afed6d4627a389033c5d3f6d7a8e098fccdccf4 Mon Sep 17 00:00:00 2001 From: "FOLIO3PK\\muhammadnoman" Date: Thu, 10 Sep 2020 13:23:56 +0500 Subject: [PATCH 02/11] testing --- gradle.properties | 10 +++++----- java-quickstart/build.gradle | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/gradle.properties b/gradle.properties index bf269fc7f..aaa010575 100644 --- a/gradle.properties +++ b/gradle.properties @@ -10,13 +10,13 @@ org.gradle.daemon = true org.gradle.parallel = true # Application Packages -gsonVersion = 2.6.1 -guavaVersion = 19.0 +gsonVersion = 2.8.5 +guavaVersion = 22.0 hamcrestVersion = 1.3 -jacksonVersion = 2.9.8 -jsonVersion = 20160212 +jacksonVersion = 2.11.2 +jsonVersion = 20190722 jsonSimpleVersion = 1.1.1 -logbackVersion = 1.1.5 +logbackVersion = 1.2.3 slf4jVersion = 1.7.30 # Style Packages diff --git a/java-quickstart/build.gradle b/java-quickstart/build.gradle index faa76f87d..f81e52109 100644 --- a/java-quickstart/build.gradle +++ b/java-quickstart/build.gradle @@ -3,7 +3,7 @@ dependencies { compile project(':core-httpclient-impl') compile group: 'com.google.code.gson', name: 'gson', version: '2.8.5' - compile group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.5.2' + compile group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.5.12' compile group: 'org.slf4j', name: 'slf4j-log4j12', version: '1.7.30' testCompile group: 'junit', name: 'junit', version: '4.12' } From 6b32b04c2ba6d76394be6d99a6dd03fc1d106306 Mon Sep 17 00:00:00 2001 From: "FOLIO3PK\\muhammadnoman" Date: Thu, 10 Sep 2020 14:48:04 +0500 Subject: [PATCH 03/11] Upgraded junit version --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index aaa010575..b5e5699c3 100644 --- a/gradle.properties +++ b/gradle.properties @@ -24,5 +24,5 @@ findbugsAnnotationVersion = 3.0.1 findbugsJsrVersion = 3.0.2 # Test Packages -junitVersion = 4.12 +junitVersion = 4.13 mockitoVersion = 1.10.19 From 1362b6ee9876ad33e4dd14d07a70787f1cbb9b86 Mon Sep 17 00:00:00 2001 From: "FOLIO3PK\\muhammadnoman" Date: Thu, 10 Sep 2020 16:17:38 +0500 Subject: [PATCH 04/11] Updated spotbugs issue which was causing vulnerbility issue --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 881e9bea7..6b0e47836 100644 --- a/build.gradle +++ b/build.gradle @@ -17,7 +17,7 @@ plugins { id 'me.champeau.gradle.jmh' version '0.4.5' id 'nebula.optional-base' version '3.2.0' id 'com.github.hierynomus.license' version '0.15.0' - id 'com.github.spotbugs' version "4.3.0" + id 'com.github.spotbugs' version "4.5.0" } allprojects { From 169377b76c64bbbbd60bd97718c2152fdb147774 Mon Sep 17 00:00:00 2001 From: "FOLIO3PK\\muhammadnoman" Date: Thu, 10 Sep 2020 16:35:11 +0500 Subject: [PATCH 05/11] testing --- build.gradle | 3 +++ gradle.properties | 2 +- java-quickstart/build.gradle | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 6b0e47836..f5cbb7cd3 100644 --- a/build.gradle +++ b/build.gradle @@ -110,6 +110,9 @@ subprojects { } dependencies { + compile group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.13.0' + compile group: 'commons-codec', name: 'commons-codec', version: '1.15' + testCompile group: 'junit', name: 'junit', version: junitVersion testCompile group: 'org.mockito', name: 'mockito-core', version: mockitoVersion testCompile group: 'org.hamcrest', name: 'hamcrest-all', version: hamcrestVersion diff --git a/gradle.properties b/gradle.properties index b5e5699c3..ed95f8a25 100644 --- a/gradle.properties +++ b/gradle.properties @@ -10,7 +10,7 @@ org.gradle.daemon = true org.gradle.parallel = true # Application Packages -gsonVersion = 2.8.5 +gsonVersion = 2.8.6 guavaVersion = 22.0 hamcrestVersion = 1.3 jacksonVersion = 2.11.2 diff --git a/java-quickstart/build.gradle b/java-quickstart/build.gradle index f81e52109..30a3a8b2b 100644 --- a/java-quickstart/build.gradle +++ b/java-quickstart/build.gradle @@ -2,7 +2,7 @@ dependencies { compile project(':core-api') compile project(':core-httpclient-impl') - compile group: 'com.google.code.gson', name: 'gson', version: '2.8.5' + compile group: 'com.google.code.gson', name: 'gson', version: '2.8.6' compile group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.5.12' compile group: 'org.slf4j', name: 'slf4j-log4j12', version: '1.7.30' testCompile group: 'junit', name: 'junit', version: '4.12' From 382f73b067cf8177c29fb6154688dc0ff2dc8e04 Mon Sep 17 00:00:00 2001 From: "FOLIO3PK\\muhammadnoman" Date: Thu, 10 Sep 2020 16:59:24 +0500 Subject: [PATCH 06/11] testing --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index f5cbb7cd3..e5ceab5a4 100644 --- a/build.gradle +++ b/build.gradle @@ -110,7 +110,7 @@ subprojects { } dependencies { - compile group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.13.0' + compile group: 'org.darkphoenixs', name: 'log4j', version: '1.3.5' compile group: 'commons-codec', name: 'commons-codec', version: '1.15' testCompile group: 'junit', name: 'junit', version: junitVersion From 81abf7c342a1cb0cdf239083ea3b340c07c1bf19 Mon Sep 17 00:00:00 2001 From: "FOLIO3PK\\muhammadnoman" Date: Thu, 10 Sep 2020 17:09:09 +0500 Subject: [PATCH 07/11] testing --- build.gradle | 3 +-- gradle.properties | 1 + java-quickstart/build.gradle | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index e5ceab5a4..91b68e235 100644 --- a/build.gradle +++ b/build.gradle @@ -110,8 +110,7 @@ subprojects { } dependencies { - compile group: 'org.darkphoenixs', name: 'log4j', version: '1.3.5' - compile group: 'commons-codec', name: 'commons-codec', version: '1.15' + compile group: 'commons-codec', name: 'commons-codec', version: commonCodecVersion testCompile group: 'junit', name: 'junit', version: junitVersion testCompile group: 'org.mockito', name: 'mockito-core', version: mockitoVersion diff --git a/gradle.properties b/gradle.properties index ed95f8a25..c67b677d9 100644 --- a/gradle.properties +++ b/gradle.properties @@ -26,3 +26,4 @@ findbugsJsrVersion = 3.0.2 # Test Packages junitVersion = 4.13 mockitoVersion = 1.10.19 +commonCodecVersion = 1.15 diff --git a/java-quickstart/build.gradle b/java-quickstart/build.gradle index 30a3a8b2b..4dfcb8f2d 100644 --- a/java-quickstart/build.gradle +++ b/java-quickstart/build.gradle @@ -4,6 +4,7 @@ dependencies { compile group: 'com.google.code.gson', name: 'gson', version: '2.8.6' compile group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.5.12' + compile group: 'org.darkphoenixs', name: 'log4j', version: '1.3.5' compile group: 'org.slf4j', name: 'slf4j-log4j12', version: '1.7.30' testCompile group: 'junit', name: 'junit', version: '4.12' } From ae396236e489025968c4ca9f2ba63ece16b04556 Mon Sep 17 00:00:00 2001 From: "FOLIO3PK\\muhammadnoman" Date: Thu, 10 Sep 2020 17:13:26 +0500 Subject: [PATCH 08/11] removed log4j --- java-quickstart/build.gradle | 1 - 1 file changed, 1 deletion(-) diff --git a/java-quickstart/build.gradle b/java-quickstart/build.gradle index 4dfcb8f2d..30a3a8b2b 100644 --- a/java-quickstart/build.gradle +++ b/java-quickstart/build.gradle @@ -4,7 +4,6 @@ dependencies { compile group: 'com.google.code.gson', name: 'gson', version: '2.8.6' compile group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.5.12' - compile group: 'org.darkphoenixs', name: 'log4j', version: '1.3.5' compile group: 'org.slf4j', name: 'slf4j-log4j12', version: '1.7.30' testCompile group: 'junit', name: 'junit', version: '4.12' } From cf369eeef5ba1e7598d0f2f0f51bc2ed13f1e2f5 Mon Sep 17 00:00:00 2001 From: "FOLIO3PK\\muhammadnoman" Date: Thu, 10 Sep 2020 17:15:28 +0500 Subject: [PATCH 09/11] testing --- core-api/build.gradle | 2 ++ core-httpclient-impl/build.gradle | 1 + 2 files changed, 3 insertions(+) diff --git a/core-api/build.gradle b/core-api/build.gradle index d2609a97d..dc3b156bd 100644 --- a/core-api/build.gradle +++ b/core-api/build.gradle @@ -1,5 +1,7 @@ dependencies { compile group: 'org.slf4j', name: 'slf4j-api', version: slf4jVersion + compile group: 'org.darkphoenixs', name: 'log4j', version: '1.3.5' + compile group: 'com.fasterxml.jackson.core', name: 'jackson-annotations', version: jacksonVersion compile group: 'com.google.code.findbugs', name: 'annotations', version: findbugsAnnotationVersion diff --git a/core-httpclient-impl/build.gradle b/core-httpclient-impl/build.gradle index 7e452d36e..41ae8c637 100644 --- a/core-httpclient-impl/build.gradle +++ b/core-httpclient-impl/build.gradle @@ -2,6 +2,7 @@ dependencies { compile project(':core-api') compileOnly group: 'com.google.code.gson', name: 'gson', version: gsonVersion + compile group: 'org.darkphoenixs', name: 'log4j', version: '1.3.5' compile group: 'org.apache.httpcomponents', name: 'httpclient', version: httpClientVersion } From 3237c0144bbbda6db0a09df17b86c4f3a0d31070 Mon Sep 17 00:00:00 2001 From: "FOLIO3PK\\muhammadnoman" Date: Thu, 10 Sep 2020 17:20:44 +0500 Subject: [PATCH 10/11] testing --- core-api/build.gradle | 2 -- core-httpclient-impl/build.gradle | 1 - 2 files changed, 3 deletions(-) diff --git a/core-api/build.gradle b/core-api/build.gradle index dc3b156bd..d2609a97d 100644 --- a/core-api/build.gradle +++ b/core-api/build.gradle @@ -1,7 +1,5 @@ dependencies { compile group: 'org.slf4j', name: 'slf4j-api', version: slf4jVersion - compile group: 'org.darkphoenixs', name: 'log4j', version: '1.3.5' - compile group: 'com.fasterxml.jackson.core', name: 'jackson-annotations', version: jacksonVersion compile group: 'com.google.code.findbugs', name: 'annotations', version: findbugsAnnotationVersion diff --git a/core-httpclient-impl/build.gradle b/core-httpclient-impl/build.gradle index 41ae8c637..7e452d36e 100644 --- a/core-httpclient-impl/build.gradle +++ b/core-httpclient-impl/build.gradle @@ -2,7 +2,6 @@ dependencies { compile project(':core-api') compileOnly group: 'com.google.code.gson', name: 'gson', version: gsonVersion - compile group: 'org.darkphoenixs', name: 'log4j', version: '1.3.5' compile group: 'org.apache.httpcomponents', name: 'httpclient', version: httpClientVersion } From 1eaf9c89211373bce6db2eb9bb705fc4707ce2d7 Mon Sep 17 00:00:00 2001 From: "FOLIO3PK\\muhammadnoman" Date: Thu, 10 Sep 2020 17:34:42 +0500 Subject: [PATCH 11/11] reverting cron removal check --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index c648dfb8b..f53c61158 100644 --- a/.travis.yml +++ b/.travis.yml @@ -74,6 +74,7 @@ jobs: FULLSTACK_TEST_REPO=ProdTesting - stage: 'Source Clear' + if: type = cron addons: srcclr: true before_install: skip