From 74c6903bd7a9c9c3ed2eba5eb6a8565f21bbad09 Mon Sep 17 00:00:00 2001 From: Heemin Kim Date: Wed, 3 May 2023 11:12:49 -0700 Subject: [PATCH] Sync from main (#280) * Update gradle version to 7.6 (#265) Signed-off-by: Vijayan Balasubramanian * Exclude lombok generated code from jacoco coverage report (#268) Signed-off-by: Heemin Kim * Make jacoco report to be generated faster in local (#267) Signed-off-by: Heemin Kim * Update dependency org.json:json to v20230227 (#273) Co-authored-by: mend-for-github-com[bot] <50673670+mend-for-github-com[bot]@users.noreply.github.com> * Baseline owners and maintainers (#275) Signed-off-by: Vijayan Balasubramanian --------- Signed-off-by: Vijayan Balasubramanian Signed-off-by: Heemin Kim Co-authored-by: Vijayan Balasubramanian Co-authored-by: mend-for-github-com[bot] <50673670+mend-for-github-com[bot]@users.noreply.github.com> --- .github/CODEOWNERS | 2 +- CHANGELOG.md | 2 ++ MAINTAINERS.md | 15 ++++++++++----- build.gradle | 4 ++-- lombok.config | 5 +++++ 5 files changed, 20 insertions(+), 8 deletions(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 855a0949..f1b13fd6 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1,2 +1,2 @@ # This should match the owning team set up in https://github.com/orgs/opensearch-project/teams -* @opensearch-project/geospatial \ No newline at end of file +* @heemin32 @navneet1v @VijayanB @vamshin @jmazanec15 @naveentatikonda @junqiu-lei @martin-gaievski diff --git a/CHANGELOG.md b/CHANGELOG.md index 27dacfa9..0868a2b3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), ### Enhancements ### Bug Fixes ### Infrastructure +* Make jacoco report to be generated faster in local ([#267](https://github.com/opensearch-project/geospatial/pull/267)) +* Exclude lombok generated code from jacoco coverage report ([#268](https://github.com/opensearch-project/geospatial/pull/268)) ### Documentation ### Maintenance ### Refactoring diff --git a/MAINTAINERS.md b/MAINTAINERS.md index f319b09a..f030c04e 100644 --- a/MAINTAINERS.md +++ b/MAINTAINERS.md @@ -4,8 +4,13 @@ This document contains a list of maintainers in this repo. See [opensearch-proje ## Current Maintainers -| Maintainer | GitHub ID | Affiliation | -| ----------------------- | ------------------------------------------- | ----------- | -| Jack Mazanec | [jmazanec15](https://github.com/jmazanec15) | Amazon | -| Vamshi Vijay Nakkirtha | [vamshin](https://github.com/vamshin) | Amazon | -| Vijayan Balasubramanian | [VijayanB](https://github.com/VijayanB) | Amazon | +| Maintainer | GitHub ID | Affiliation | +|-------------------------|-------------------------------------------------------|-------------| +| Heemin Kim | [heemin32](https://github.com/heemin32) | Amazon | +| Jack Mazanec | [jmazanec15](https://github.com/jmazanec15) | Amazon | +| Junqiu Lei | [junqiu-lei](https://github.com/junqiu-lei) | Amazon | +| Martin Gaievski | [martin-gaievski](https://github.com/martin-gaievski) | Amazon | +| Naveen Tatikonda | [naveentatikonda](https://github.com/naveentatikonda) | Amazon | +| Navneet Verma | [navneet1v](https://github.com/navneet1v) | Amazon | +| Vamshi Vijay Nakkirtha | [vamshin](https://github.com/vamshin) | Amazon | +| Vijayan Balasubramanian | [VijayanB](https://github.com/VijayanB) | Amazon | diff --git a/build.gradle b/build.gradle index 5c0a67b0..ca35448a 100644 --- a/build.gradle +++ b/build.gradle @@ -157,7 +157,7 @@ dependencies { api project(":libs:h3") yamlRestTestRuntimeOnly "org.apache.logging.log4j:log4j-core:${versions.log4j}" testImplementation "org.hamcrest:hamcrest:${versions.hamcrest}" - testImplementation 'org.json:json:20211205' + testImplementation 'org.json:json:20230227' implementation "org.apache.commons:commons-lang3:3.12.0" implementation "org.locationtech.spatial4j:spatial4j:${versions.spatial4j}" implementation "org.locationtech.jts:jts-core:${versions.jts}" @@ -312,7 +312,7 @@ spotless { } jacocoTestReport { - dependsOn integTest, test, yamlRestTest + dependsOn test reports { xml.enabled = true html.enabled = true diff --git a/lombok.config b/lombok.config index e69de29b..9745d1ed 100644 --- a/lombok.config +++ b/lombok.config @@ -0,0 +1,5 @@ +# tell lombok this is your root directory +config.stopBubbling = true +# add @lombok.Generated annotations to all generated nodes where possible +# to skip code coverage for auto generated code +lombok.addLombokGeneratedAnnotation = true