From 2d9ae336a8aca69096a25b2b39c05d21e92885ad Mon Sep 17 00:00:00 2001 From: Imbyungjun Date: Mon, 26 Feb 2024 11:12:32 +0900 Subject: [PATCH] Release/3.5.9 (#1002) * Fix test * Update version * Update docker base image to jre 11 --- NOTICE | 12 ++++++++++++ README.md | 2 +- RELEASE-NOTE.md | 6 ++++++ build.gradle | 2 +- docker/README.md | 10 +++++----- docker/agent/Dockerfile | 2 +- docker/controller/Dockerfile | 4 ++-- .../src/main/resources/application.yml | 2 +- .../script_template/groovy_gradle/build.gradle | 2 +- .../java/org/ngrinder/infra/config/MockConfig.java | 4 ++++ ngrinder-frontend/package-lock.json | 4 ++-- ngrinder-frontend/package.json | 2 +- ngrinder-frontend/webpack.config.js | 2 +- 13 files changed, 38 insertions(+), 16 deletions(-) diff --git a/NOTICE b/NOTICE index 478f00e6f4..93ddfd9dc7 100644 --- a/NOTICE +++ b/NOTICE @@ -581,3 +581,15 @@ See the License for the specific language governing permissions and limitations under the License. ===== + +Copyright (c) 2008, SnakeYAML + +Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except +in compliance with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software distributed under the License +is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express +or implied. See the License for the specific language governing permissions and limitations under +the License. diff --git a/README.md b/README.md index c768a1c122..c172f740bd 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ * Please post questions in [Discussions](https://github.com/naver/ngrinder/discussions) not Issues. -* nGrinder 3.5.8 has been released. See https://github.com/naver/ngrinder/releases +* nGrinder 3.5.9 has been released. See https://github.com/naver/ngrinder/releases * Currently, we are working on the internal project not ngrinder. We will resume ngrinder dev from July, 2022. nGrinder diff --git a/RELEASE-NOTE.md b/RELEASE-NOTE.md index 210f4360bd..a85d165adf 100644 --- a/RELEASE-NOTE.md +++ b/RELEASE-NOTE.md @@ -1,3 +1,9 @@ +3.5.9 (2023.02.28) +================= +- Changes + - Fix security vulnerabilities + - Bump base JDK version up to 11 + 3.5.8 (2022.12.30) ================= - Changes diff --git a/build.gradle b/build.gradle index 183c2bf169..bcf5ab7603 100644 --- a/build.gradle +++ b/build.gradle @@ -2,7 +2,7 @@ allprojects { apply plugin: "idea" group = "org.ngrinder" - version = "3.5.8" + version = "3.5.9" idea { module { diff --git a/docker/README.md b/docker/README.md index 035c2336a6..5ee7b78d6b 100644 --- a/docker/README.md +++ b/docker/README.md @@ -16,7 +16,7 @@ nGrinder consists of two major components. Version --------- -Current Version: 3.4 +Current Version: 3.5.9 How to run nGrinder with dockers =========================== @@ -27,13 +27,13 @@ Install docker 1.5.0 or above on your host. Pull the ngrinder/controller image. ``` -$ docker pull ngrinder/controller:3.5.8 +$ docker pull ngrinder/controller:3.5.9 ``` Start controller. ``` -docker run -d -v ~/ngrinder-controller:/opt/ngrinder-controller -p 80:80 -p 16001:16001 -p 12000-12009:12000-12009 ngrinder/controller:3.5.8 +docker run -d -v ~/ngrinder-controller:/opt/ngrinder-controller -p 80:80 -p 16001:16001 -p 12000-12009:12000-12009 ngrinder/controller:3.5.9 ``` The controller creates a data folder under /opt/ngrinder-controller to maintain test history and configuration data. In order to keep the data persistently, you should map the folder /opt/ngrinder-controller on the container to a folder on your host . @@ -56,11 +56,11 @@ Install docker 1.5.0 or above on your another host. You should run your agent on Pull the ngrinder/agent image. ``` -$ docker pull ngrinder/agent:3.5.8 +$ docker pull ngrinder/agent:3.5.9 ``` Start agent. ``` -docker run -v ~/ngrinder-agent:/opt/ngrinder-agent -d ngrinder/agent:3.5.8 controller_ip:controller_web_port +docker run -v ~/ngrinder-agent:/opt/ngrinder-agent -d ngrinder/agent:3.5.9 controller_ip:controller_web_port ``` diff --git a/docker/agent/Dockerfile b/docker/agent/Dockerfile index 6967eca4fa..6ce2c84f4d 100644 --- a/docker/agent/Dockerfile +++ b/docker/agent/Dockerfile @@ -1,4 +1,4 @@ -FROM jeanblanchard/java:serverjre-8 +FROM azul/zulu-openjdk-alpine:11.0.22-jre MAINTAINER JunHo Yoon "junoyoon@gmail.com" RUN apk update; apk add curl bash udev diff --git a/docker/controller/Dockerfile b/docker/controller/Dockerfile index b5aecce49c..9446a455b8 100644 --- a/docker/controller/Dockerfile +++ b/docker/controller/Dockerfile @@ -1,9 +1,9 @@ -FROM jeanblanchard/java:serverjre-8 +FROM azul/zulu-openjdk-alpine:11.0.22-jre MAINTAINER JunHo Yoon "junoyoon@gmail.com" RUN apk update; apk add curl bash tar -ARG MAVEN_VERSION=3.6.3 +ARG MAVEN_VERSION=3.9.6 ARG MAVEN_DOWNLOAD_BASE_URL=https://apache.osuosl.org/maven/maven-3/${MAVEN_VERSION}/binaries ARG GRADLE_VERSION=6.7.1 diff --git a/ngrinder-controller/src/main/resources/application.yml b/ngrinder-controller/src/main/resources/application.yml index 2561e2ba53..c7c4927f53 100644 --- a/ngrinder-controller/src/main/resources/application.yml +++ b/ngrinder-controller/src/main/resources/application.yml @@ -1,5 +1,5 @@ ngrinder: - version: 3.5.8 + version: 3.5.9 server: default-encoding: UTF-8 diff --git a/ngrinder-controller/src/main/resources/script_template/groovy_gradle/build.gradle b/ngrinder-controller/src/main/resources/script_template/groovy_gradle/build.gradle index 5d936d11e2..219b732861 100644 --- a/ngrinder-controller/src/main/resources/script_template/groovy_gradle/build.gradle +++ b/ngrinder-controller/src/main/resources/script_template/groovy_gradle/build.gradle @@ -15,7 +15,7 @@ repositories { } ext { - ngrinder_version = "3.5.8" + ngrinder_version = "3.5.9" } dependencies { diff --git a/ngrinder-controller/src/test/java/org/ngrinder/infra/config/MockConfig.java b/ngrinder-controller/src/test/java/org/ngrinder/infra/config/MockConfig.java index 0e71da807c..5fd4999d9d 100644 --- a/ngrinder-controller/src/test/java/org/ngrinder/infra/config/MockConfig.java +++ b/ngrinder-controller/src/test/java/org/ngrinder/infra/config/MockConfig.java @@ -57,4 +57,8 @@ public String getCurrentIP() { return "127.0.0.1"; } + @Override + public boolean isMonitorEnabled() { + return true; + } } diff --git a/ngrinder-frontend/package-lock.json b/ngrinder-frontend/package-lock.json index 6c9a0242c7..bf399aec9e 100644 --- a/ngrinder-frontend/package-lock.json +++ b/ngrinder-frontend/package-lock.json @@ -1,12 +1,12 @@ { "name": "ngrinder", - "version": "3.5.8", + "version": "3.5.9", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "ngrinder", - "version": "3.5.8", + "version": "3.5.9", "license": "ISC", "dependencies": { "axios": "^0.21.1", diff --git a/ngrinder-frontend/package.json b/ngrinder-frontend/package.json index 999b828d97..e44159ec5a 100644 --- a/ngrinder-frontend/package.json +++ b/ngrinder-frontend/package.json @@ -1,6 +1,6 @@ { "name": "ngrinder", - "version": "3.5.8", + "version": "3.5.9", "description": "ngrinder GUI", "private": true, "repository": { diff --git a/ngrinder-frontend/webpack.config.js b/ngrinder-frontend/webpack.config.js index dd318b50b3..f69c7cc76c 100644 --- a/ngrinder-frontend/webpack.config.js +++ b/ngrinder-frontend/webpack.config.js @@ -35,7 +35,7 @@ var lessLoader = { }; module.exports = function (env) { - var ngrinderVersion = '3.5.8'; + var ngrinderVersion = '3.5.9'; if (env !== undefined && env.ngrinderVersion !== undefined) { ngrinderVersion = env.ngrinderVersion; }