bower.json - always use ~ to set dependency, update to current state

[himdel]

Given the recent codemirror breakage (#12077), I'm updating our bower.json to always use ~ for dependencies (~1.2.3 is >= 1.2.3 && < 1.3.0, whereas ^1.2.3 is >= 1.2.3).

But since evererthing else is working at the current versions, also updated to the newest being used (except for codemirror).

That way, we'll have to manually update the dependencies more often, but we'll get random breakage much less often (hopefully :)).

[mtho11]

Because of the transitive dependencies in Bower, you don't ever really know what you are pulling in (unless the version number is fixed, actually fixed versions don't even work because transitive dependencies change over time).

[Npm shrinkwrap and yarn solve this issue with .lock files just like gems.]

[miq-bot]

<pr_mergeability_checker />This pull request is not mergeable. Please rebase and repush.

[himdel]

@mtho11 agreed, this should help, but the real fix is to move to npm .. I'm hoping I can get that done next week - we'll see :) - depends if we can actaully do the bower->npm move separately from the asset_pipeline->webpack-rails move or not.

[miq-bot]

Checked commit https://github.com/himdel/manageiq/commit/70d422c6d7a1e1b862b9668c3bf85c4355b5249c with ruby 2.2.5, rubocop 0.37.2, and haml-lint 0.16.1
0 files checked, 0 offenses detected
Everything looks good. 🏆

[chessbyte]

@mzazrivec @himdel euwe/yes or euwe/no?

[himdel]

Adding euwe/yes, should make euwe a bit more resilient to random breaking updates.

[chessbyte]

Euwe Backport conflict:

$ git cherry-pick -e -x -m 1 8e34fd5                      
error: could not apply 8e34fd5... Merge pull request #12078 from himdel/bower-deps
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
hint: and commit the result with 'git commit'

$ git status
On branch euwe
Your branch is up-to-date with 'upstream/euwe'.
You are currently cherry-picking commit 8e34fd5.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)

    both modified:   bower.json

$ git diff

diff --cc bower.json
index 82e343a,5d35c17..0000000
--- a/bower.json
+++ b/bower.json
@@@ -17,50 -17,46 +17,76 @@@
      "tests"
    ],
    "dependencies": {
++<<<<<<< HEAD
 +    "angular": "^1.5.3",
 +    "angular-animate": "^1.5.3",
 +    "angular-mocks": "^1.5.3",
 +    "angular-patternfly-sass": "~3.12.0",
 +    "angular-sanitize": "^1.5.3",
 +    "angular.validators": "^4.4.2",
 +    "bootstrap-filestyle": "^1.2.1",
 +    "bootstrap-hover-dropdown": "^2.0.11",
 +    "jquery.observe_field": "himdel/jquery.observe_field#^0.1.0",
 +    "jasmine-jquery": "^2.1.1",
 +    "jquery-1.8": "^1.8.3",
 +    "jquery-ujs": "^1.1.0",
 +    "jquery-ui": "jqueryui#^1.9.2",
 +    "bootstrap-switch": "^3.3.2",
 +    "angular-bootstrap-switch": "^0.5.0",
 +    "kubernetes-topology-graph": "0.0.23",
 +    "moment-timezone": "^0.4.0",
 +    "moment-strftime": "himdel/moment-strftime#^0.1.7",
 +    "numeral": "^1.5.3",
 +    "spin.js": "^2.3.2",
 +    "sprintf": "^1.0.3",
 +    "tota11y": "^0.1.3",
 +    "xml_display": "^0.1.1",
 +    "spice-html5-bower": "himdel/spice-html5-bower#^0.1.5",
 +    "es6-shim": "^0.35.0",
 +    "phantomjs-polyfill": "^0.0.2",
 +    "fetch": "^1.0.0",
++=======
+     "angular": "~1.5.8",
+     "angular-animate": "~1.5.8",
+     "angular-bootstrap-switch": "~0.5.1",
+     "angular-mocks": "~1.5.8",
+     "angular-patternfly-sass": "~3.11.0",
+     "angular-sanitize": "~1.5.8",
+     "angular.validators": "~4.4.2",
+     "array-includes": "~1.0.0",
+     "bootstrap-filestyle": "~1.2.1",
+     "bootstrap-hover-dropdown": "~2.2.1",
+     "bootstrap-switch": "~3.3.2",
++>>>>>>> 8e34fd5... Merge pull request #12078 from himdel/bower-deps
      "codemirror": "~5.19.0",
-     "array-includes": "^1.0.0",
-     "qs": "^0.3.10",
-     "rxjs": "^4.1.0",
-     "rx-angular": "rx.angular#^1.1.3",
-     "manageiq-ui-components": "~0.0.7",
-     "patternfly-timeline": "~1.0.2",
+     "es6-shim": "~0.35.1",
+     "fetch": "~1.0.0",
+     "jasmine-jquery": "~2.1.1",
+     "jquery": "~2.1.4",
+     "jquery-1.8": "~1.8.3",
+     "jquery-ui": "jqueryui#~1.12.1",
+     "jquery-ujs": "~1.2.2",
+     "jquery.observe_field": "himdel/jquery.observe_field#~0.1.0",
+     "kubernetes-topology-graph": "~0.0.23",
+     "manageiq-ui-components": "~0.0.8",
+     "moment-strftime": "himdel/moment-strftime#~0.1.7",
+     "moment-timezone": "~0.4.1",
+     "numeral": "~1.5.3",
      "patternfly-bootstrap-treeview": "~2.1.1",
-     "jquery": "~2.1.4"
+     "patternfly-timeline": "~1.0.2",
+     "phantomjs-polyfill": "~0.0.2",
+     "qs": "~0.3.10",
+     "rx-angular": "rx.angular#~1.1.3",
+     "rxjs": "~4.1.0",
+     "spice-html5-bower": "himdel/spice-html5-bower#~0.1.6",
+     "spin.js": "~2.3.2",
+     "sprintf": "~1.0.3",
+     "tota11y": "~0.1.6",
+     "xml_display": "~0.1.1"
    },
    "resolutions": {
-     "moment": ">=2.9.0",
-     "d3": "~3.5.0",
      "patternfly-bootstrap-treeview": "~2.1.1",
-     "bootstrap-select": "~1.10.0",
-     "bootstrap-touchspin": "~3.1.1",
-     "bootstrap-datepicker": "~1.6.4",
-     "datatables-colreorder": "~1.3.2"
+     "moment": ">=2.10.5",
+     "d3": "~3.5.0"
    }
  }

[chessbyte]

@himdel please make Euwe-only PR. /cc @dclarizio @mzazrivec

[himdel]

euwe-only PR created.. #12121

[chessbyte]

Backported to Euwe via #12121

[himdel]

Darga-version in #13143

[chessbyte]

Backported to Darga via #13143