From 88fe866e1e8cd3d42142d623d831384991b8d7c3 Mon Sep 17 00:00:00 2001
From: Sandro Weber <webers@in.tum.de>
Date: Mon, 14 Dec 2015 17:19:35 +0100
Subject: [PATCH] [NRRPLT-2942] changing deps to devDeps (ExDFrontend conflicts
with jquery-mobile)
Change-Id: I8ced1b6e8153c0d9d1a4ed7589ad4c4d4cdb2a2e
---
bower.json | 8 +++++---
bower_components/jquery-mobile-bower/.bower.json | 2 +-
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/bower.json b/bower.json
index fb6f989..555aec8 100644
--- a/bower.json
+++ b/bower.json
@@ -11,11 +11,13 @@
"gz3d/build/gz3d.js"
],
"dependencies": {
+ "threejs": "r71"
+ },
+ "devDependencies": {
"angular": "^1.4.6",
- "jquery": "latest",
- "jquery-mobile-bower": "latest",
+ "jquery": "^1.9.1",
+ "jquery-mobile-bower": "1.4.5",
"roslibjs": "~0.17.0",
- "threejs": "r71",
"xml2json": "latest"
},
"keywords": [
diff --git a/bower_components/jquery-mobile-bower/.bower.json b/bower_components/jquery-mobile-bower/.bower.json
index 0f24e1c..6118fa7 100644
--- a/bower_components/jquery-mobile-bower/.bower.json
+++ b/bower_components/jquery-mobile-bower/.bower.json
@@ -20,6 +20,6 @@
"commit": "cc8562583b1fef79c1f8a389f9f5c52a86ff4354"
},
"_source": "git://github.com/jobrapido/jquery-mobile-bower.git",
- "_target": "*",
+ "_target": "1.4.5",
"_originalSource": "jquery-mobile-bower"
}
\ No newline at end of file
--
GitLab