yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #11167 from terry-xiaoyu/bump_app_vsn 

fix: bump app vsns
This commit is contained in:
Xinyu Liu 2023-06-30 15:54:21 +08:00 committed by GitHub
parent e92eb22c13 504b20d4bc
commit 12c5595381
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.ci/docker-compose-file/http-service/Dockerfile
View File

@ -1,9 +1,9 @@
FROM tomcat:10.0.5 FROM tomcat:10.0.5
RUN wget https://downloads.apache.org/maven/maven-3/3.6.3/binaries/apache-maven-3.6.3-bin.zip \ RUN wget https://downloads.apache.org/maven/maven-3/3.9.3/binaries/apache-maven-3.9.3-bin.zip \
&& unzip -q apache-maven-3.6.3-bin.zip \ && unzip -q apache-maven-3.9.3-bin.zip \
&& mv apache-maven-3.6.3 /opt/apache-maven-3.6.3/ \ && mv apache-maven-3.9.3 /opt/apache-maven-3.9.3/ \
&& ln -s /opt/apache-maven-3.6.3/ /opt/maven && ln -s /opt/apache-maven-3.9.3/ /opt/maven
ENV M2_HOME=/opt/maven ENV M2_HOME=/opt/maven
ENV M2=$M2_HOME/bin ENV M2=$M2_HOME/bin
ENV PATH=$M2:$PATH ENV PATH=$M2:$PATH

10
.github/workflows/run_automate_tests.yaml vendored
View File

@ -20,7 +20,7 @@ jobs:
id: dload_jmeter id: dload_jmeter
timeout-minutes: 1 timeout-minutes: 1
env: env:
JMETER_VERSION: 5.4.3 JMETER_VERSION: 5.6
run: | run: |
wget --no-verbose --no-check-certificate -O /tmp/apache-jmeter.tgz https://downloads.apache.org/jmeter/binaries/apache-jmeter-$JMETER_VERSION.tgz wget --no-verbose --no-check-certificate -O /tmp/apache-jmeter.tgz https://downloads.apache.org/jmeter/binaries/apache-jmeter-$JMETER_VERSION.tgz
- uses: actions/upload-artifact@v3 - uses: actions/upload-artifact@v3
@ -124,7 +124,7 @@ jobs:
- name: install jmeter - name: install jmeter
timeout-minutes: 10 timeout-minutes: 10
env: env:
JMETER_VERSION: 5.4.3 JMETER_VERSION: 5.6
run: | run: |
cd /tmp && tar -xvf apache-jmeter.tgz cd /tmp && tar -xvf apache-jmeter.tgz
echo "jmeter.save.saveservice.output_format=xml" >> /tmp/apache-jmeter-$JMETER_VERSION/user.properties echo "jmeter.save.saveservice.output_format=xml" >> /tmp/apache-jmeter-$JMETER_VERSION/user.properties
@ -222,7 +222,7 @@ jobs:
- name: install jmeter - name: install jmeter
timeout-minutes: 10 timeout-minutes: 10
env: env:
JMETER_VERSION: 5.4.3 JMETER_VERSION: 5.6
run: | run: |
cd /tmp && tar -xvf apache-jmeter.tgz cd /tmp && tar -xvf apache-jmeter.tgz
echo "jmeter.save.saveservice.output_format=xml" >> /tmp/apache-jmeter-$JMETER_VERSION/user.properties echo "jmeter.save.saveservice.output_format=xml" >> /tmp/apache-jmeter-$JMETER_VERSION/user.properties
@ -331,7 +331,7 @@ jobs:
- name: install jmeter - name: install jmeter
timeout-minutes: 10 timeout-minutes: 10
env: env:
JMETER_VERSION: 5.4.3 JMETER_VERSION: 5.6
run: | run: |
cd /tmp && tar -xvf apache-jmeter.tgz cd /tmp && tar -xvf apache-jmeter.tgz
echo "jmeter.save.saveservice.output_format=xml" >> /tmp/apache-jmeter-$JMETER_VERSION/user.properties echo "jmeter.save.saveservice.output_format=xml" >> /tmp/apache-jmeter-$JMETER_VERSION/user.properties
@ -434,7 +434,7 @@ jobs:
- name: install jmeter - name: install jmeter
timeout-minutes: 10 timeout-minutes: 10
env: env:
JMETER_VERSION: 5.4.3 JMETER_VERSION: 5.6
run: | run: |
cd /tmp && tar -xvf apache-jmeter.tgz cd /tmp && tar -xvf apache-jmeter.tgz
echo "jmeter.save.saveservice.output_format=xml" >> /tmp/apache-jmeter-$JMETER_VERSION/user.properties echo "jmeter.save.saveservice.output_format=xml" >> /tmp/apache-jmeter-$JMETER_VERSION/user.properties

2
apps/emqx_rule_engine/src/emqx_rule_engine.app.src
View File

@ -1,6 +1,6 @@
{application, emqx_rule_engine, {application, emqx_rule_engine,
[{description, "EMQX Rule Engine"}, [{description, "EMQX Rule Engine"},
{vsn, "4.4.19"}, % strict semver, bump manually! {vsn, "4.4.20"}, % strict semver, bump manually!
{modules, []}, {modules, []},
{registered, [emqx_rule_engine_sup, emqx_rule_registry, emqx_rule_engine_jwt_sup]}, {registered, [emqx_rule_engine_sup, emqx_rule_registry, emqx_rule_engine_jwt_sup]},
{applications, [kernel,stdlib,rulesql,getopt,jose,uuid]}, {applications, [kernel,stdlib,rulesql,getopt,jose,uuid]},

6
apps/emqx_rule_engine/src/emqx_rule_engine.appup.src
View File

@ -1,7 +1,8 @@
%% -*- mode: erlang -*- %% -*- mode: erlang -*-
%% Unless you know what you are doing, DO NOT edit manually!! %% Unless you know what you are doing, DO NOT edit manually!!
{VSN, {VSN,
[{"4.4.18", [{"4.4.19",[{load_module,emqx_rule_runtime,brutal_purge,soft_purge,[]}]},
{"4.4.18",
[{load_module,emqx_rule_validator,brutal_purge,soft_purge,[]}, [{load_module,emqx_rule_validator,brutal_purge,soft_purge,[]},
{load_module,emqx_rule_utils,brutal_purge,soft_purge,[]}, {load_module,emqx_rule_utils,brutal_purge,soft_purge,[]},
{load_module,emqx_rule_sqltester,brutal_purge,soft_purge,[]}, {load_module,emqx_rule_sqltester,brutal_purge,soft_purge,[]},
@ -357,7 +358,8 @@
{load_module,emqx_rule_engine,brutal_purge,soft_purge,[]}, {load_module,emqx_rule_engine,brutal_purge,soft_purge,[]},
{load_module,emqx_rule_runtime,brutal_purge,soft_purge,[]}]}, {load_module,emqx_rule_runtime,brutal_purge,soft_purge,[]}]},
{<<".*">>,[]}], {<<".*">>,[]}],
[{"4.4.18", [{"4.4.19",[{load_module,emqx_rule_runtime,brutal_purge,soft_purge,[]}]},
{"4.4.18",
[{load_module,emqx_rule_validator,brutal_purge,soft_purge,[]}, [{load_module,emqx_rule_validator,brutal_purge,soft_purge,[]},
{load_module,emqx_rule_utils,brutal_purge,soft_purge,[]}, {load_module,emqx_rule_utils,brutal_purge,soft_purge,[]},
{load_module,emqx_rule_sqltester,brutal_purge,soft_purge,[]}, {load_module,emqx_rule_sqltester,brutal_purge,soft_purge,[]},

2
lib-ce/emqx_dashboard/src/emqx_dashboard.app.src
View File

@ -1,6 +1,6 @@
{application, emqx_dashboard, {application, emqx_dashboard,
[{description, "EMQX Web Dashboard"}, [{description, "EMQX Web Dashboard"},
{vsn, "4.4.18"}, % strict semver, bump manually! {vsn, "4.4.19"}, % strict semver, bump manually!
{modules, []}, {modules, []},
{registered, [emqx_dashboard_sup]}, {registered, [emqx_dashboard_sup]},
{applications, [kernel,stdlib,mnesia,minirest]}, {applications, [kernel,stdlib,mnesia,minirest]},

2
src/emqx.app.src
View File

@ -6,7 +6,7 @@
%% the emqx `release' version, which in turn is comprised of several %% the emqx `release' version, which in turn is comprised of several
%% apps, one of which is this. See `emqx_release.hrl' for more %% apps, one of which is this. See `emqx_release.hrl' for more
%% info. %% info.
{vsn, "4.4.19"}, % strict semver, bump manually! {vsn, "4.4.20"}, % strict semver, bump manually!
{modules, []}, {modules, []},
{registered, []}, {registered, []},
{applications, [ kernel {applications, [ kernel

10
src/emqx.appup.src
View File

@ -1,7 +1,10 @@
%% -*- mode: erlang -*- %% -*- mode: erlang -*-
%% Unless you know what you are doing, DO NOT edit manually!! %% Unless you know what you are doing, DO NOT edit manually!!
{VSN, {VSN,
[{"4.4.18", [{"4.4.19",
[{load_module,emqx_relup,brutal_purge,soft_purge,[]},
{load_module,emqx_app,brutal_purge,soft_purge,[]}]},
{"4.4.18",
[{load_module,emqx_plugins,brutal_purge,soft_purge,[]}, [{load_module,emqx_plugins,brutal_purge,soft_purge,[]},
{load_module,emqx_hooks,brutal_purge,soft_purge,[]}, {load_module,emqx_hooks,brutal_purge,soft_purge,[]},
{load_module,emqx_zone,brutal_purge,soft_purge,[]}, {load_module,emqx_zone,brutal_purge,soft_purge,[]},
@ -646,7 +649,10 @@
{apply,{application,set_env, {apply,{application,set_env,
[gen_rpc,insecure_auth_fallback_allowed,true]}}]}, [gen_rpc,insecure_auth_fallback_allowed,true]}}]},
{<<".*">>,[]}], {<<".*">>,[]}],
[{"4.4.18", [{"4.4.19",
[{load_module,emqx_relup,brutal_purge,soft_purge,[]},
{load_module,emqx_app,brutal_purge,soft_purge,[]}]},
{"4.4.18",
[{load_module,emqx_plugins,brutal_purge,soft_purge,[]}, [{load_module,emqx_plugins,brutal_purge,soft_purge,[]},
{load_module,emqx_hooks,brutal_purge,soft_purge,[]}, {load_module,emqx_hooks,brutal_purge,soft_purge,[]},
{load_module,emqx_zone,brutal_purge,soft_purge,[]}, {load_module,emqx_zone,brutal_purge,soft_purge,[]},