Skip to content

Commit

Permalink
Merge branch 'main' of github.com:opensearch-project/sql into powerbi…
Browse files Browse the repository at this point in the history
…-main
  • Loading branch information
Guian Gumpac committed Jan 5, 2022
2 parents c89a86c + 7af51d3 commit 21997d1
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 3 deletions.
6 changes: 6 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,8 @@ The following projects have been merged into this repository as separate folders
| [![features open][feature-badge]][feature-link] |
| [![enhancements open][enhancement-badge]][enhancement-link] |
| [![bugs open][bug-badge]][bug-link] |
| [![untriaged open][untriaged-badge]][untriaged-link] |
| [![nolabel open][nolabel-badge]][nolabel-link] |

[dco-badge]: https://github.com/opensearch-project/sql/actions/workflows/dco.yml/badge.svg
[dco-badge-link]: https://github.com/opensearch-project/sql/actions/workflows/dco.yml
Expand All @@ -97,6 +99,10 @@ The following projects have been merged into this repository as separate folders
[bug-link]: https://github.com/opensearch-project/sql/issues?q=is%3Aopen+is%3Aissue+label%3Abug+
[enhancement-badge]: https://img.shields.io/github/issues/opensearch-project/sql/enhancement.svg
[enhancement-link]: https://github.com/opensearch-project/sql/issues?q=is%3Aopen+is%3Aissue+label%3Aenhancement+
[untriaged-badge]: https://img.shields.io/github/issues/opensearch-project/sql/untriaged.svg
[untriaged-link]: https://github.com/opensearch-project/sql/issues?q=is%3Aopen+is%3Aissue+label%3Auntriaged+
[nolabel-badge]: https://img.shields.io/github/issues-search/opensearch-project/sql?color=yellow&label=no%20label%20issues&query=is%3Aopen%20is%3Aissue%20no%3Alabel
[nolabel-link]: https://github.com/opensearch-project/sql/issues?q=is%3Aopen+is%3Aissue+no%3Alabel+
[workbench-build-badge]: https://github.com/opensearch-project/sql/actions/workflows/sql-workbench-test-and-build-workflow.yml/badge.svg
[workbench-build-link]: https://github.com/opensearch-project/sql/actions/workflows/sql-workbench-test-and-build-workflow.yml
[cypress-test-badge]: https://img.shields.io/badge/Cypress%20tests-in%20progress-yellow
Expand Down
2 changes: 1 addition & 1 deletion common/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ dependencies {
compile "org.antlr:antlr4-runtime:4.7.1"
// https://github.com/google/guava/wiki/CVE-2018-10237
compile group: 'com.google.guava', name: 'guava', version: '29.0-jre'
compile group: 'org.apache.logging.log4j', name: 'log4j-core', version:'2.17.0'
compile group: 'org.apache.logging.log4j', name: 'log4j-core', version:'2.17.1'

testCompile group: 'junit', name: 'junit', version: '4.12'
}
2 changes: 1 addition & 1 deletion integ-test/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ dependencies {
testCompile group: 'org.opensearch.client', name: 'opensearch-rest-high-level-client', version: "${opensearch_version}"
testCompile group: 'org.opensearch.client', name: 'opensearch-rest-client', version: "${opensearch_version}"
testCompile group: 'org.hamcrest', name: 'hamcrest', version: '2.1'
testCompile group: 'org.apache.logging.log4j', name: 'log4j-core', version:'2.17.0'
testCompile group: 'org.apache.logging.log4j', name: 'log4j-core', version:'2.17.1'
testCompile project(':plugin')
testCompile project(':legacy')
testImplementation('org.junit.jupiter:junit-jupiter-api:5.6.2')
Expand Down
2 changes: 1 addition & 1 deletion ppl/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ dependencies {
compile group: 'org.json', name: 'json', version: '20180813'
compile group: 'org.springframework', name: 'spring-context', version: '5.2.5.RELEASE'
compile group: 'org.springframework', name: 'spring-beans', version: '5.2.5.RELEASE'
compile group: 'org.apache.logging.log4j', name: 'log4j-core', version:'2.17.0'
compile group: 'org.apache.logging.log4j', name: 'log4j-core', version:'2.17.1'
compile project(':common')
compile project(':core')
compile project(':protocol')
Expand Down

0 comments on commit 21997d1

Please sign in to comment.