From 7df79e638b40ef2ec7972beca76db0d6d5359f79 Mon Sep 17 00:00:00 2001 From: Bhavana Ramaram Date: Mon, 27 Nov 2023 23:30:56 +0530 Subject: [PATCH] Backport multiple PRs to 2.x from main (#1662) * add triaging doc (#1250) Signed-off-by: Yaliang Wu Signed-off-by: Bhavana Ramaram * Fix missing lombok version compilation failure issue (#1278) * Fix missing lombok version compilation failure issue Signed-off-by: zane-neo Signed-off-by: Bhavana Ramaram * Updated developer guide to include links for getting started with git (#1409) Signed-off-by: Divit Rawal Signed-off-by: Bhavana Ramaram * add Austin and Henry as maintainer (#1579) Signed-off-by: Yaliang Wu Signed-off-by: Bhavana Ramaram * Apply spotless to ml-algorithms package (#1610) Signed-off-by: Tyler Ohlsen Signed-off-by: Bhavana Ramaram * fix format violations Signed-off-by: Bhavana Ramaram --------- Signed-off-by: Yaliang Wu Signed-off-by: Bhavana Ramaram Signed-off-by: zane-neo Signed-off-by: Divit Rawal Signed-off-by: Tyler Ohlsen Co-authored-by: Yaliang Wu Co-authored-by: zane-neo Co-authored-by: Divit Rawal <58348184+divitr@users.noreply.github.com> Co-authored-by: Tyler Ohlsen --- ml-algorithms/build.gradle | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ml-algorithms/build.gradle b/ml-algorithms/build.gradle index bc695a291b..ecb56212a6 100644 --- a/ml-algorithms/build.gradle +++ b/ml-algorithms/build.gradle @@ -106,7 +106,10 @@ jacocoTestCoverageVerification { dependsOn jacocoTestReport } check.dependsOn jacocoTestCoverageVerification +<<<<<<< HEAD compileJava.dependsOn(':opensearch-ml-common:shadowJar') +======= +>>>>>>> 5be107b7 (Backport multiple PRs to 2.x from main (#1662)) spotless { java {