This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository coselmar. See http://git.codelutin.com/coselmar.git commit cd3b50c07577385ba09cba659be433bcd23d29a9 Author: Yannick Martel <martel@©odelutin.com> Date: Thu Dec 11 16:26:40 2014 +0100 use cdn for webjars, time to understand why it does no work with bundle --- coselmar-bundle/pom.xml | 12 ++++++++++++ coselmar-ui/pom.xml | 1 - coselmar-ui/src/main/webapp/index.html | 8 ++++---- pom.xml | 8 ++++++++ 4 files changed, 24 insertions(+), 5 deletions(-) diff --git a/coselmar-bundle/pom.xml b/coselmar-bundle/pom.xml index 068ce00..4f2aab8 100644 --- a/coselmar-bundle/pom.xml +++ b/coselmar-bundle/pom.xml @@ -76,6 +76,18 @@ <scope>runtime</scope> </dependency> + <dependency> + <groupId>org.webjars</groupId> + <artifactId>angular-ui-select</artifactId> + <scope>runtime</scope> + </dependency> + + <dependency> + <groupId>org.webjars</groupId> + <artifactId>angular-ui-bootstrap</artifactId> + <scope>runtime</scope> + </dependency> + </dependencies> diff --git a/coselmar-ui/pom.xml b/coselmar-ui/pom.xml index 23aae44..d19fcbb 100644 --- a/coselmar-ui/pom.xml +++ b/coselmar-ui/pom.xml @@ -89,7 +89,6 @@ <dependency> <groupId>org.webjars</groupId> <artifactId>angular-ui-bootstrap</artifactId> - <version>0.12.0</version> <scope>runtime</scope> </dependency> diff --git a/coselmar-ui/src/main/webapp/index.html b/coselmar-ui/src/main/webapp/index.html index 7a9a43e..12c329f 100644 --- a/coselmar-ui/src/main/webapp/index.html +++ b/coselmar-ui/src/main/webapp/index.html @@ -37,10 +37,10 @@ <script src="nuiton-js/bootstrap.js"></script> <!--TODO ymartel 20141203 : extract version, or use wro --> - <script src="webjars/angular-ui-select/0.9.0/select.js"></script> - <link rel="stylesheet" href="webjars/angular-ui-select/0.9.0/select.css"> - <script src="webjars/angular-ui-bootstrap/0.12.0/ui-bootstrap.js"></script> - <script src="webjars/angular-ui-bootstrap/0.12.0/ui-bootstrap-tpls.js"></script> + <script src="http://cdn.jsdelivr.net/webjars/angular-ui-select/0.9.0/select.js"></script> + <link rel="stylesheet" href="http://cdn.jsdelivr.net/webjars/angular-ui-select/0.9.0/select.css"> + <script src="http://cdn.jsdelivr.net/webjars/angular-ui-bootstrap/0.12.0/ui-bootstrap.js"></script> + <script src="http://cdn.jsdelivr.net/webjars/angular-ui-bootstrap/0.12.0/ui-bootstrap-tpls.js"></script> <script src="js/angular-jwt.js"></script> <script src="js/coselmar.js"></script> diff --git a/pom.xml b/pom.xml index 7f6febc..5674c00 100644 --- a/pom.xml +++ b/pom.xml @@ -143,6 +143,7 @@ <tomcatEmbedVersion>7.0.50</tomcatEmbedVersion> <angularUiSelectVersion>0.9.0</angularUiSelectVersion> + <angularUiBootstrapVersion>0.12.0</angularUiBootstrapVersion> </properties> @@ -345,6 +346,13 @@ <version>${angularUiSelectVersion}</version> </dependency> + <dependency> + <groupId>org.webjars</groupId> + <artifactId>angular-ui-bootstrap</artifactId> + <version>${angularUiBootstrapVersion}</version> + <scope>runtime</scope> + </dependency> + <!-- Others --> <dependency> <groupId>com.github.spullara.mustache.java</groupId> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.