Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump to 2.3.0 #513

Merged
merged 3 commits into from
Aug 29, 2022
Merged

Bump to 2.3.0 #513

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4ddaafd
Bump to 2.3.0
qreshi Aug 23, 2022
1985ba5
Make removal of the existing plugins in the security GitHub Action co…
qreshi Aug 27, 2022
e25bd4c
Bump mockito-core to 4.7.0
qreshi Aug 29, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/dashboards-notifications-test-and-build-workflow.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ on: [pull_request, push]
env:
PLUGIN_NAME: notifications-dashboards
OPENSEARCH_DASHBOARDS_VERSION: '2.x'
OPENSEARCH_VERSION: '2.1.0-SNAPSHOT'
OPENSEARCH_VERSION: '2.3.0-SNAPSHOT'

jobs:
tests:
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/security-notifications-test-workflow.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,9 @@ jobs:
if docker pull opensearchstaging/opensearch:$docker_version
then
echo "FROM opensearchstaging/opensearch:$docker_version" >> Dockerfile
echo "RUN /usr/share/opensearch/bin/opensearch-plugin remove opensearch-notifications;" >> Dockerfile
echo "RUN /usr/share/opensearch/bin/opensearch-plugin remove opensearch-notifications-core;" >> Dockerfile
# Making the removal of the existing plugins in the docker image conditional in case this workflow is running before the new version of the plugins are published to the Docker image
echo "RUN if /usr/share/opensearch/bin/opensearch-plugin list | grep -q 'opensearch-notifications$'; then /usr/share/opensearch/bin/opensearch-plugin remove opensearch-notifications; fi" >> Dockerfile
echo "RUN if /usr/share/opensearch/bin/opensearch-plugin list | grep -q 'opensearch-notifications-core$'; then /usr/share/opensearch/bin/opensearch-plugin remove opensearch-notifications-core; fi" >> Dockerfile
echo "ADD notifications/core/build/distributions/$plugin_core /tmp/" >> Dockerfile
echo "RUN /usr/share/opensearch/bin/opensearch-plugin install --batch file:/tmp/$plugin_core" >> Dockerfile
echo "ADD notifications/notifications/build/distributions/$plugin /tmp/" >> Dockerfile
Expand Down
4 changes: 2 additions & 2 deletions dashboards-notifications/opensearch_dashboards.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"id": "notificationsDashboards",
"version": "2.1.0.0",
"opensearchDashboardsVersion": "2.1.0",
"version": "2.3.0.0",
"opensearchDashboardsVersion": "2.3.0",
"requiredPlugins": ["navigation", "data"],
"optionalPlugins": ["share"],
"server": true,
Expand Down
2 changes: 1 addition & 1 deletion dashboards-notifications/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "notifications-dashboards",
"version": "2.1.0.0",
"version": "2.3.0.0",
"description": "OpenSearch Dashboards Notifications Plugin",
"license": "Apache-2.0",
"main": "index.ts",
Expand Down
2 changes: 1 addition & 1 deletion notifications/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

buildscript {
ext {
opensearch_version = System.getProperty("opensearch.version", "2.1.0-SNAPSHOT")
opensearch_version = System.getProperty("opensearch.version", "2.3.0-SNAPSHOT")
isSnapshot = "true" == System.getProperty("build.snapshot", "true")
buildVersionQualifier = System.getProperty("build.version_qualifier", "")
// 2.1.0-SNAPSHOT -> 2.1.0.0-SNAPSHOT
Expand Down
2 changes: 1 addition & 1 deletion notifications/core/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ dependencies {
testRuntimeOnly('org.junit.jupiter:junit-jupiter-engine:5.6.2')
testImplementation "org.jetbrains.kotlin:kotlin-test:${kotlin_version}"
testImplementation "net.bytebuddy:byte-buddy-agent:1.12.7"
testImplementation "org.mockito:mockito-core:4.3.1"
testImplementation "org.mockito:mockito-core:4.7.0"
testImplementation "org.opensearch.test:framework:${opensearch_version}"
testImplementation "org.jetbrains.kotlin:kotlin-reflect:${kotlin_version}" // required by mockk
implementation project(path: ":${rootProject.name}-core-spi", configuration: 'shadow')
Expand Down
2 changes: 1 addition & 1 deletion notifications/notifications/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ dependencies {
testImplementation "org.jetbrains.kotlin:kotlin-test:${kotlin_version}"
testImplementation "org.jetbrains.kotlin:kotlin-reflect:${kotlin_version}" // required by mockk
testImplementation "net.bytebuddy:byte-buddy-agent:1.12.7"
testImplementation "org.mockito:mockito-core:4.3.1"
testImplementation "org.mockito:mockito-core:4.7.0"
testImplementation 'com.google.code.gson:gson:2.8.7'
testImplementation 'org.springframework.integration:spring-integration-mail:5.5.0'
testImplementation 'org.springframework.integration:spring-integration-test-support:5.5.0'
Expand Down