From b572ed8c70c629292d5c51723055ff667938f7a2 Mon Sep 17 00:00:00 2001 From: Marek Libra Date: Mar 26 2018 06:53:47 +0000 Subject: Merge pull request #536 from oVirt/release-1.3.7o Bump v1.3.7-2 --- diff --git a/configure.ac b/configure.ac index 763fee1..3fb3c98 100644 --- a/configure.ac +++ b/configure.ac @@ -20,7 +20,7 @@ define([VERSION_MAJOR], [1]) define([VERSION_MINOR], [3]) define([VERSION_FIX], [7]) define([VERSION_NUMBER], VERSION_MAJOR[.]VERSION_MINOR[.]VERSION_FIX) -define([VERSION_RELEASE], [1]) +define([VERSION_RELEASE], [2]) AC_INIT([ovirt-web-ui], VERSION_NUMBER, [mlibra@redhat.com]) PACKAGE_RPM_VERSION="VERSION_NUMBER" diff --git a/ovirt-web-ui.spec.in b/ovirt-web-ui.spec.in index f424b73..1389981 100644 --- a/ovirt-web-ui.spec.in +++ b/ovirt-web-ui.spec.in @@ -24,7 +24,7 @@ BuildArch: noarch BuildRequires: ovirt-engine-nodejs = 8.0.0 BuildRequires: ovirt-engine-yarn = 0.24.4 -BuildRequires: ovirt-engine-nodejs-modules >= 1.5.2 +BuildRequires: ovirt-engine-nodejs-modules >= 1.5.3 %description This package provides new VM Portal for %{product}, so far as technical preview. @@ -55,7 +55,7 @@ make install DESTDIR=%{buildroot} %{_sysconfdir}/ovirt-web-ui/branding/00-ovirt.brand %changelog -* Thu Mar 22 2018 Marek Libra - 1.3.7 +* Mon Mar 26 2018 Marek Libra - 1.3.7-2 - VM networks editation - https://github.com/oVirt/ovirt-web-ui/pull/517 - VM disks editation - https://github.com/oVirt/ovirt-web-ui/pull/523 - ssh dialog UI fix - https://github.com/oVirt/ovirt-web-ui/pull/519 diff --git a/package.json b/package.json index 3a5acc9..1aacc50 100644 --- a/package.json +++ b/package.json @@ -56,7 +56,7 @@ "path-exists": "3.0.0", "postcss-loader": "0.13.0", "promise": "7.1.1", - "react-intl": "2.3.0", + "react-intl": "2.4.0", "readline-sync": "~1.4.5", "recursive-readdir": "2.0.0", "request": "~2.79.0", @@ -78,17 +78,18 @@ "patternfly": "3.26.6", "patternfly-bootstrap-combobox": "1.1.7", "patternfly-react": "1.10.1", - "prop-types": "15.5.10", - "react": "15.6.1", + "prop-types": "15.6.1", + "react": "16.2.0", "react-bootstrap": "0.31.2", - "react-bootstrap-switch": "15.5.0", - "react-dom": "15.6.1", - "react-infinite-scroller": "1.0.15", + "react-bootstrap-switch": "15.5.3", + "react-dom": "16.2.0", + "react-infinite-scroller": "1.1.3", "react-intl-po": "2.1.1", "react-redux": "5.0.6", - "react-router-config": "1.0.0-beta.3", - "react-router-dom": "4.1.2", - "react-test-renderer": "15.6.1", + "react-router": "4.2.0", + "react-router-config": "1.0.0-beta.4", + "react-router-dom": "4.2.2", + "react-test-renderer": "16.2.0", "redux": "3.7.2", "redux-devtools-extension": "2.13.2", "redux-saga": "0.15.6" diff --git a/yarn.lock b/yarn.lock index c762305..ade0fd7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1631,14 +1631,6 @@ core-util-is@~1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" -create-react-class@^15.6.0: - version "15.6.0" - resolved "https://registry.yarnpkg.com/create-react-class/-/create-react-class-15.6.0.tgz#ab448497c26566e1e29413e883207d57cfe7bed4" - dependencies: - fbjs "^0.8.9" - loose-envify "^1.3.1" - object-assign "^4.1.1" - cross-spawn@4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-4.0.0.tgz#8254774ab4786b8c5b3cf4dfba66ce563932c252" @@ -2411,9 +2403,9 @@ fb-watchman@^2.0.0: dependencies: bser "^2.0.0" -fbjs@^0.8.1, fbjs@^0.8.9: - version "0.8.9" - resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-0.8.9.tgz#180247fbd347dcc9004517b904f865400a0c8f14" +fbjs@^0.8.1, fbjs@^0.8.16: + version "0.8.16" + resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-0.8.16.tgz#5e67432f550dc41b572bf55847b8aca64e5337db" dependencies: core-js "^1.0.0" isomorphic-fetch "^2.1.1" @@ -2799,29 +2791,25 @@ header-case@^1.0.0: no-case "^2.2.0" upper-case "^1.1.3" -history@^4.5.1, history@^4.6.0: - version "4.6.1" - resolved "https://registry.yarnpkg.com/history/-/history-4.6.1.tgz#911cf8eb65728555a94f2b12780a0c531a14d2fd" +history@^4.7.2: + version "4.7.2" + resolved "https://registry.yarnpkg.com/history/-/history-4.7.2.tgz#22b5c7f31633c5b8021c7f4a8a954ac139ee8d5b" dependencies: invariant "^2.2.1" loose-envify "^1.2.0" - resolve-pathname "^2.0.0" - value-equal "^0.2.0" + resolve-pathname "^2.2.0" + value-equal "^0.4.0" warning "^3.0.0" hoek@2.x.x: version "2.16.3" resolved "https://registry.yarnpkg.com/hoek/-/hoek-2.16.3.tgz#20bb7403d3cea398e91dc4710a8ff1b8274a25ed" -hoist-non-react-statics@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-1.2.0.tgz#aa448cf0986d55cc40773b17174b7dd066cb7cfb" - hoist-non-react-statics@^2.2.1: version "2.2.2" resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-2.2.2.tgz#c0eca5a7d5a28c5ada3107eb763b01da6bfa81fb" -hoist-non-react-statics@^2.3.1: +hoist-non-react-statics@^2.3.0, hoist-non-react-statics@^2.3.1: version "2.5.0" resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-2.5.0.tgz#d2ca2dfc19c5a91c5a6615ce8e564ef0347e2a40" @@ -3029,11 +3017,9 @@ intl-messageformat-parser@1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/intl-messageformat-parser/-/intl-messageformat-parser-1.2.0.tgz#5906b7f953ab7470e0dc8549097b648b991892ff" -intl-messageformat@1.3.0, intl-messageformat@^1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/intl-messageformat/-/intl-messageformat-1.3.0.tgz#f7d926aded7a3ab19b2dc601efd54e99a4bd4eae" - dependencies: - intl-messageformat-parser "1.2.0" +intl-messageformat-parser@1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/intl-messageformat-parser/-/intl-messageformat-parser-1.4.0.tgz#b43d45a97468cadbe44331d74bb1e8dea44fc075" intl-messageformat@2.0.0: version "2.0.0" @@ -3041,11 +3027,17 @@ intl-messageformat@2.0.0: dependencies: intl-messageformat-parser "1.2.0" -intl-relativeformat@^1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/intl-relativeformat/-/intl-relativeformat-1.3.0.tgz#893dc7076fccd380cf091a2300c380fa57ace45b" +intl-messageformat@^2.0.0, intl-messageformat@^2.1.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/intl-messageformat/-/intl-messageformat-2.2.0.tgz#345bcd46de630b7683330c2e52177ff5eab484fc" dependencies: - intl-messageformat "1.3.0" + intl-messageformat-parser "1.4.0" + +intl-relativeformat@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/intl-relativeformat/-/intl-relativeformat-2.1.0.tgz#010f1105802251f40ac47d0e3e1a201348a255df" + dependencies: + intl-messageformat "^2.0.0" invariant@^2.0.0, invariant@^2.1.0, invariant@^2.1.1, invariant@^2.2.0, invariant@^2.2.1, invariant@^2.2.2: version "2.2.2" @@ -4126,11 +4118,11 @@ oauth-sign@~0.8.1: version "0.8.2" resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.8.2.tgz#46a6ab7f0aead8deae9ec0565780b7d4efeb9d43" -object-assign@4.1.0, object-assign@^4.0.1, object-assign@^4.1.0: +object-assign@4.1.0, object-assign@^4.0.1: version "4.1.0" resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.0.tgz#7a3b3d0e98063d43f4c03f2e8ae6cd51a86883a0" -object-assign@^4.1.1: +object-assign@^4.1.0, object-assign@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" @@ -4341,7 +4333,7 @@ path-to-regexp@0.1.7: version "0.1.7" resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c" -path-to-regexp@^1.5.3: +path-to-regexp@^1.7.0: version "1.7.0" resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-1.7.0.tgz#59fde0f435badacba103a84e9d3bc64e96b9937d" dependencies: @@ -4780,12 +4772,13 @@ prop-types-extra@^1.0.1: dependencies: warning "^3.0.0" -prop-types@15.5.10, prop-types@^15.5.10, prop-types@^15.5.4, prop-types@^15.5.6, prop-types@^15.5.8: - version "15.5.10" - resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.5.10.tgz#2797dfc3126182e3a95e3dfbb2e893ddd7456154" +prop-types@15.6.1, prop-types@^15.5.10, prop-types@^15.5.4, prop-types@^15.5.6, prop-types@^15.5.8, prop-types@^15.6.0: + version "15.6.1" + resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.6.1.tgz#36644453564255ddda391191fb3a125cbdf654ca" dependencies: - fbjs "^0.8.9" + fbjs "^0.8.16" loose-envify "^1.3.1" + object-assign "^4.1.1" proxy-addr@~1.1.3: version "1.1.3" @@ -4865,11 +4858,7 @@ rc@~1.1.6: minimist "^1.2.0" strip-json-comments "~2.0.1" -react-bootstrap-switch@15.5.0: - version "15.5.0" - resolved "https://registry.yarnpkg.com/react-bootstrap-switch/-/react-bootstrap-switch-15.5.0.tgz#225152e339ab586c0991be14e5229c04eaac998b" - -react-bootstrap-switch@^15.5.3: +react-bootstrap-switch@15.5.3, react-bootstrap-switch@^15.5.3: version "15.5.3" resolved "https://registry.yarnpkg.com/react-bootstrap-switch/-/react-bootstrap-switch-15.5.3.tgz#97287791d4ec0d1892d142542e7e5248002b1251" @@ -4910,14 +4899,14 @@ react-c3js@^0.1.20: dependencies: c3 "^0.4.11" -react-dom@15.6.1: - version "15.6.1" - resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-15.6.1.tgz#2cb0ed4191038e53c209eb3a79a23e2a4cf99470" +react-dom@16.2.0: + version "16.2.0" + resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.2.0.tgz#69003178601c0ca19b709b33a83369fe6124c044" dependencies: - fbjs "^0.8.9" + fbjs "^0.8.16" loose-envify "^1.1.0" - object-assign "^4.1.0" - prop-types "^15.5.10" + object-assign "^4.1.1" + prop-types "^15.6.0" react-fontawesome@^1.6.1: version "1.6.1" @@ -4925,9 +4914,9 @@ react-fontawesome@^1.6.1: dependencies: prop-types "^15.5.6" -react-infinite-scroller@1.0.15: - version "1.0.15" - resolved "https://registry.yarnpkg.com/react-infinite-scroller/-/react-infinite-scroller-1.0.15.tgz#9fad0127be540cb327ea6b0ecb98d164e1a1d3fb" +react-infinite-scroller@1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/react-infinite-scroller/-/react-infinite-scroller-1.1.3.tgz#c4230024bc237ce876c76b2e38d77dc1f6aabb26" dependencies: prop-types "^15.5.8" @@ -4942,13 +4931,13 @@ react-intl-po@2.1.1: po2json "^0.4.5" ramda "^0.24.1" -react-intl@2.3.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/react-intl/-/react-intl-2.3.0.tgz#e1df6af5667fdf01cbe4aab20e137251e2ae5142" +react-intl@2.4.0: + version "2.4.0" + resolved "https://registry.yarnpkg.com/react-intl/-/react-intl-2.4.0.tgz#66c14dc9df9a73b2fbbfbd6021726e80a613eb15" dependencies: intl-format-cache "^2.0.5" - intl-messageformat "^1.3.0" - intl-relativeformat "^1.3.0" + intl-messageformat "^2.1.0" + intl-relativeformat "^2.0.0" invariant "^2.1.1" react-overlays@^0.7.0: @@ -4988,47 +4977,49 @@ react-redux@5.0.6: loose-envify "^1.1.0" prop-types "^15.5.10" -react-router-config@1.0.0-beta.3: - version "1.0.0-beta.3" - resolved "https://registry.yarnpkg.com/react-router-config/-/react-router-config-1.0.0-beta.3.tgz#b16d38d6f210960434d929c78cc358f684a6c11e" +react-router-config@1.0.0-beta.4: + version "1.0.0-beta.4" + resolved "https://registry.yarnpkg.com/react-router-config/-/react-router-config-1.0.0-beta.4.tgz#d202496dd0eabdf06cf24eb0793031f6891eef01" -react-router-dom@4.1.2: - version "4.1.2" - resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-4.1.2.tgz#7f8a7ca868d32acadd19ca09543b40d26df8ec37" +react-router-dom@4.2.2: + version "4.2.2" + resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-4.2.2.tgz#c8a81df3adc58bba8a76782e946cbd4eae649b8d" dependencies: - history "^4.5.1" + history "^4.7.2" + invariant "^2.2.2" loose-envify "^1.3.1" prop-types "^15.5.4" - react-router "^4.1.1" + react-router "^4.2.0" + warning "^3.0.0" -react-router@^4.1.1: - version "4.1.1" - resolved "https://registry.yarnpkg.com/react-router/-/react-router-4.1.1.tgz#d448f3b7c1b429a6fbb03395099949c606b1fe95" +react-router@4.2.0, react-router@^4.2.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/react-router/-/react-router-4.2.0.tgz#61f7b3e3770daeb24062dae3eedef1b054155986" dependencies: - history "^4.6.0" - hoist-non-react-statics "^1.2.0" + history "^4.7.2" + hoist-non-react-statics "^2.3.0" invariant "^2.2.2" loose-envify "^1.3.1" - path-to-regexp "^1.5.3" + path-to-regexp "^1.7.0" prop-types "^15.5.4" warning "^3.0.0" -react-test-renderer@15.6.1: - version "15.6.1" - resolved "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-15.6.1.tgz#026f4a5bb5552661fd2cc4bbcd0d4bc8a35ebf7e" +react-test-renderer@16.2.0: + version "16.2.0" + resolved "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-16.2.0.tgz#bddf259a6b8fcd8555f012afc8eacc238872a211" dependencies: - fbjs "^0.8.9" - object-assign "^4.1.0" + fbjs "^0.8.16" + object-assign "^4.1.1" + prop-types "^15.6.0" -react@15.6.1: - version "15.6.1" - resolved "https://registry.yarnpkg.com/react/-/react-15.6.1.tgz#baa8434ec6780bde997cdc380b79cd33b96393df" +react@16.2.0: + version "16.2.0" + resolved "https://registry.yarnpkg.com/react/-/react-16.2.0.tgz#a31bd2dab89bff65d42134fa187f24d054c273ba" dependencies: - create-react-class "^15.6.0" - fbjs "^0.8.9" + fbjs "^0.8.16" loose-envify "^1.1.0" - object-assign "^4.1.0" - prop-types "^15.5.10" + object-assign "^4.1.1" + prop-types "^15.6.0" reactabular-table@^8.12.0: version "8.12.1" @@ -5324,9 +5315,9 @@ resolve-from@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-1.0.1.tgz#26cbfe935d1aeeeabb29bc3fe5aeb01e93d44226" -resolve-pathname@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/resolve-pathname/-/resolve-pathname-2.1.0.tgz#e8358801b86b83b17560d4e3c382d7aef2100944" +resolve-pathname@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/resolve-pathname/-/resolve-pathname-2.2.0.tgz#7e9ae21ed815fd63ab189adeee64dc831eefa879" resolve@1.1.7: version "1.1.7" @@ -6012,9 +6003,9 @@ validate-npm-package-license@^3.0.1: spdx-correct "~1.0.0" spdx-expression-parse "~1.0.0" -value-equal@^0.2.0: - version "0.2.1" - resolved "https://registry.yarnpkg.com/value-equal/-/value-equal-0.2.1.tgz#c220a304361fce6994dbbedaa3c7e1a1b895871d" +value-equal@^0.4.0: + version "0.4.0" + resolved "https://registry.yarnpkg.com/value-equal/-/value-equal-0.4.0.tgz#c5bdd2f54ee093c04839d71ce2e4758a6890abc7" vary@~1.1.0: version "1.1.0"