From 2c92aca5844f04a874e83544319152e1276e8cd1 Mon Sep 17 00:00:00 2001 From: Max Thanachai Thongkum Date: Mon, 13 Dec 2021 23:05:18 +0700 Subject: [PATCH 1/4] fix lib --- build.gradle | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index 48f4d7dd..0dc68da4 100644 --- a/build.gradle +++ b/build.gradle @@ -29,7 +29,7 @@ repositories { mavenCentral() jcenter() maven { url 'https://jitpack.io' } - maven { url "https://dl.bintray.com/blazei/maven" } + //maven { url "https://dl.bintray.com/blazei/maven" } // ไม่มีไฟล์ maven { url "https://maven.google.com" } } @@ -50,15 +50,16 @@ dependencies { compile "org.glassfish.jersey.containers:jersey-container-servlet-core:$jerseyVersion" compile "org.glassfish.jersey.containers:jersey-container-jetty-servlet:$jerseyVersion" compile "org.glassfish.jersey.media:jersey-media-json-jackson:$jerseyVersion" - compile 'org.apache.logging.log4j:log4j-core:2.11.1' - compile 'org.apache.logging.log4j:log4j-slf4j-impl:2.11.1' + compile 'org.apache.logging.log4j:log4j-core:2.15.0' + compile 'org.apache.logging.log4j:log4j-slf4j-impl:2.15.0' compile "org.mongodb:mongo-java-driver:3.6.3" compile "args4j:args4j:2.33" compile "com.google.code.gson:gson:2.8.1" compile 'com.google.firebase:firebase-admin:5.11.0' compile "com.github.ffc-nectec:entities:$entitiesVersion" compile 'com.github.ffc-nectec.genogram:genogram:1.0.0-alpha4' - compile 'com.github.piruin:jbcrypt:0.4' + //compile 'com.github.piruin:jbcrypt:0.4' // ไม่มีไฟล์ + compile 'org.mindrot:jbcrypt:0.4' compile "joda-time:joda-time:2.9.9" compile 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.1.1' compile 'com.marcelkliemannel:kotlin-onetimepassword:1.0.0' From 5a4818a07e1ab45dd4b3d6473e6496f9c9d7ae49 Mon Sep 17 00:00:00 2001 From: Max Thanachai Thongkum Date: Tue, 21 Dec 2021 20:44:29 +0700 Subject: [PATCH 2/4] fix lib 17 --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 0dc68da4..b18af1a2 100644 --- a/build.gradle +++ b/build.gradle @@ -50,8 +50,8 @@ dependencies { compile "org.glassfish.jersey.containers:jersey-container-servlet-core:$jerseyVersion" compile "org.glassfish.jersey.containers:jersey-container-jetty-servlet:$jerseyVersion" compile "org.glassfish.jersey.media:jersey-media-json-jackson:$jerseyVersion" - compile 'org.apache.logging.log4j:log4j-core:2.15.0' - compile 'org.apache.logging.log4j:log4j-slf4j-impl:2.15.0' + compile 'org.apache.logging.log4j:log4j-core:2.17.0' + compile 'org.apache.logging.log4j:log4j-slf4j-impl:2.17.0' compile "org.mongodb:mongo-java-driver:3.6.3" compile "args4j:args4j:2.33" compile "com.google.code.gson:gson:2.8.1" From 37fe9bc11850f3b1cdf1135e9515abd6bd1ee1a2 Mon Sep 17 00:00:00 2001 From: Max Thanachai Thongkum Date: Thu, 12 Jan 2023 12:17:34 +0700 Subject: [PATCH 3/4] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B8=8A=E0=B8=AD?= =?UTF-8?q?=E0=B8=87=E0=B9=82=E0=B8=AB=E0=B8=A7=E0=B8=87=20log4j?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index b18af1a2..5baf1d51 100644 --- a/build.gradle +++ b/build.gradle @@ -50,8 +50,8 @@ dependencies { compile "org.glassfish.jersey.containers:jersey-container-servlet-core:$jerseyVersion" compile "org.glassfish.jersey.containers:jersey-container-jetty-servlet:$jerseyVersion" compile "org.glassfish.jersey.media:jersey-media-json-jackson:$jerseyVersion" - compile 'org.apache.logging.log4j:log4j-core:2.17.0' - compile 'org.apache.logging.log4j:log4j-slf4j-impl:2.17.0' + compile 'org.apache.logging.log4j:log4j-core:2.19.0' + compile 'org.apache.logging.log4j:log4j-slf4j-impl:2.19.0' compile "org.mongodb:mongo-java-driver:3.6.3" compile "args4j:args4j:2.33" compile "com.google.code.gson:gson:2.8.1" From 438667869c5e04620ca95b74dc0915f36c708c25 Mon Sep 17 00:00:00 2001 From: Max Thanachai Thongkum Date: Thu, 12 Jan 2023 12:20:03 +0700 Subject: [PATCH 4/4] =?UTF-8?q?=E0=B9=80=E0=B8=AD=E0=B8=B2=20bintray=20?= =?UTF-8?q?=E0=B8=AD=E0=B8=AD=E0=B8=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 2 -- 1 file changed, 2 deletions(-) diff --git a/build.gradle b/build.gradle index 5baf1d51..26703c3e 100644 --- a/build.gradle +++ b/build.gradle @@ -29,7 +29,6 @@ repositories { mavenCentral() jcenter() maven { url 'https://jitpack.io' } - //maven { url "https://dl.bintray.com/blazei/maven" } // ไม่มีไฟล์ maven { url "https://maven.google.com" } } @@ -58,7 +57,6 @@ dependencies { compile 'com.google.firebase:firebase-admin:5.11.0' compile "com.github.ffc-nectec:entities:$entitiesVersion" compile 'com.github.ffc-nectec.genogram:genogram:1.0.0-alpha4' - //compile 'com.github.piruin:jbcrypt:0.4' // ไม่มีไฟล์ compile 'org.mindrot:jbcrypt:0.4' compile "joda-time:joda-time:2.9.9" compile 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.1.1'