Skip to content

Commit

Permalink
Release/3.5.9 (#1002)
Browse files Browse the repository at this point in the history
* Fix test

* Update version

* Update docker base image to jre 11
  • Loading branch information
imbyungjun authored Feb 26, 2024
1 parent add38d8 commit 2d9ae33
Show file tree
Hide file tree
Showing 13 changed files with 38 additions and 16 deletions.
12 changes: 12 additions & 0 deletions NOTICE
Original file line number Diff line number Diff line change
Expand Up @@ -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.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
6 changes: 6 additions & 0 deletions RELEASE-NOTE.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ allprojects {
apply plugin: "idea"

group = "org.ngrinder"
version = "3.5.8"
version = "3.5.9"

idea {
module {
Expand Down
10 changes: 5 additions & 5 deletions docker/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
===========================
Expand All @@ -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 .
Expand All @@ -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
```
2 changes: 1 addition & 1 deletion docker/agent/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM jeanblanchard/java:serverjre-8
FROM azul/zulu-openjdk-alpine:11.0.22-jre
MAINTAINER JunHo Yoon "[email protected]"

RUN apk update; apk add curl bash udev
Expand Down
4 changes: 2 additions & 2 deletions docker/controller/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
FROM jeanblanchard/java:serverjre-8
FROM azul/zulu-openjdk-alpine:11.0.22-jre
MAINTAINER JunHo Yoon "[email protected]"

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
Expand Down
2 changes: 1 addition & 1 deletion ngrinder-controller/src/main/resources/application.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ngrinder:
version: 3.5.8
version: 3.5.9

server:
default-encoding: UTF-8
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ repositories {
}

ext {
ngrinder_version = "3.5.8"
ngrinder_version = "3.5.9"
}

dependencies {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,4 +57,8 @@ public String getCurrentIP() {
return "127.0.0.1";
}

@Override
public boolean isMonitorEnabled() {
return true;
}
}
4 changes: 2 additions & 2 deletions ngrinder-frontend/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion ngrinder-frontend/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ngrinder",
"version": "3.5.8",
"version": "3.5.9",
"description": "ngrinder GUI",
"private": true,
"repository": {
Expand Down
2 changes: 1 addition & 1 deletion ngrinder-frontend/webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down

0 comments on commit 2d9ae33

Please sign in to comment.