diff --git a/.bowerrc b/.bowerrc new file mode 100644 index 000000000..dca141d8f --- /dev/null +++ b/.bowerrc @@ -0,0 +1,3 @@ +{ + "directory": "src/main/webapp/bower_components" +} diff --git a/bower.json b/bower.json new file mode 100644 index 000000000..65f2293e6 --- /dev/null +++ b/bower.json @@ -0,0 +1,11 @@ +{ + "name": "spring-petclinic", + "authors": [ + "ihabritane.faycal@gmail.com" + ], + "dependencies": { + "bootstrap": "~2.3.0", + "jquery": "~2.0.3", + "jquery-ui": "~1.10.3" + } +} diff --git a/pom.xml b/pom.xml index 431193a4e..c07501e45 100644 --- a/pom.xml +++ b/pom.xml @@ -36,9 +36,6 @@ 5.1.36 - 2.3.0 - 1.10.3 - 2.0.3-1 1.1.1 1.1.0 @@ -223,23 +220,7 @@ - - - org.webjars - bootstrap - ${webjars-bootstrap.version} - - - org.webjars - jquery-ui - ${webjars-jquery-ui.version} - - - org.webjars - jquery - ${webjars-jquery.version} - - + org.springframework @@ -408,6 +389,34 @@ + + + bower-install + + + + org.codehaus.mojo + exec-maven-plugin + + + generate-sources + + exec + + + + + bower + + install + + ${basedir} + + + + + + demopetclinic diff --git a/src/main/resources/spring/mvc-core-config.xml b/src/main/resources/spring/mvc-core-config.xml index 641ea4408..aa4fcca58 100644 --- a/src/main/resources/spring/mvc-core-config.xml +++ b/src/main/resources/spring/mvc-core-config.xml @@ -28,9 +28,6 @@ (see header.jsp for more details) --> - - - - + - + - + - - diff --git a/src/test/jmeter/petclinic_test_plan.jmx b/src/test/jmeter/petclinic_test_plan.jmx index cd36ba08c..c62077024 100644 --- a/src/test/jmeter/petclinic_test_plan.jmx +++ b/src/test/jmeter/petclinic_test_plan.jmx @@ -135,7 +135,7 @@ - ${CONTEXT_WEB}/webjars/jquery/2.0.3/jquery.js + ${CONTEXT_WEB}/bower_components/jquery/jquery.js GET true false