diff options
| author | Nick Vatamaniuc <vatamane@gmail.com> | 2021-09-27 16:41:08 -0400 |
|---|---|---|
| committer | Nick Vatamaniuc <nickva@users.noreply.github.com> | 2021-09-27 18:42:30 -0400 |
| commit | f7dae6827e9907a53fb9cbfe95c891926177a6b7 (patch) | |
| tree | 87b5a6387067e31342559ef85a23637c628e488b | |
| parent | dd7c26bdedb2ab3ec5ac731336b69a6e5cd64c24 (diff) | |
| download | couchdb-f7dae6827e9907a53fb9cbfe95c891926177a6b7.tar.gz | |
Bump version to 3.2.0 and update dependencies3.2.0-RC1
Fauxton was failing so we backported the fix from main
https://github.com/apache/couchdb/commit/f85cff669f20cee0a54da7bb8c645dfc4d2de5c9
for it.
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | rebar.config.script | 8 | ||||
| -rw-r--r-- | rel/reltool.config | 2 | ||||
| -rw-r--r-- | version.mk | 4 |
4 files changed, 8 insertions, 8 deletions
@@ -486,7 +486,7 @@ endif share/www: ifeq ($(with_fauxton), 1) @echo "Building Fauxton" - @cd src/fauxton && npm install --production && ./node_modules/grunt-cli/bin/grunt couchdb + @cd src/fauxton && npm install && ./node_modules/grunt-cli/bin/grunt couchdb endif diff --git a/rebar.config.script b/rebar.config.script index cbf87e708..7b67a9cf2 100644 --- a/rebar.config.script +++ b/rebar.config.script @@ -154,9 +154,9 @@ DepDescs = [ %% Non-Erlang deps {docs, {url, "https://github.com/apache/couchdb-documentation"}, - {tag, "3.1.1-RC2"}, [raw]}, + {tag, "3.2.0-RC1"}, [raw]}, {fauxton, {url, "https://github.com/apache/couchdb-fauxton"}, - {tag, "v1.2.6"}, [raw]}, + {tag, "v1.2.7"}, [raw]}, %% Third party deps {folsom, "folsom", {tag, "CouchDB-0.8.4"}}, {hyper, "hyper", {tag, "CouchDB-2.2.0-7"}}, @@ -164,14 +164,14 @@ DepDescs = [ {jiffy, "jiffy", {tag, "CouchDB-1.0.5-1"}}, {mochiweb, "mochiweb", {tag, "CouchDB-v2.21.0-1"}}, {meck, "meck", {tag, "0.9.2"}}, -{recon, "recon", {tag, "2.5.0"}} +{recon, "recon", {tag, "2.5.2"}} ]. WithProper = lists:keyfind(with_proper, 1, CouchConfig) == {with_proper, true}. OptionalDeps = case WithProper of true -> - [{proper, {url, "https://github.com/proper-testing/proper"}, {tag, "v1.3"}}]; + [{proper, {url, "https://github.com/proper-testing/proper"}, {tag, "v1.4"}}]; false -> [] end. diff --git a/rel/reltool.config b/rel/reltool.config index ed7ef7801..950504141 100644 --- a/rel/reltool.config +++ b/rel/reltool.config @@ -12,7 +12,7 @@ {sys, [ {lib_dirs, ["../src"]}, - {rel, "couchdb", "3.1.1", [ + {rel, "couchdb", "3.2.0", [ %% stdlib asn1, compiler, diff --git a/version.mk b/version.mk index 6fceb107a..5bdd8a224 100644 --- a/version.mk +++ b/version.mk @@ -1,3 +1,3 @@ vsn_major=3 -vsn_minor=1 -vsn_patch=1 +vsn_minor=2 +vsn_patch=0 |