Merge "Up version of jQuery, Angular & Bootstrap Fixed vulnerability in Bootstrap 3.3.7 (twbs/bootstrap#20184)"

Author: tomas-langer

etc/config/copyright-exclude

@@ -72,3 +72,4 @@ build.readme
 /core-server/src/main/java/org/glassfish/jersey/server/internal/monitoring/UniformTimeValuesSnapshot.java
 /core-server/src/main/java/jersey/repackaged
 /media/json-jackson/src/main/java/org/glassfish/jersey/jackson/internal/jackson
+/examples/bean-validation-webapp/src/main/webapp/fonts

examples/bean-validation-webapp/README.MD

@@ -128,6 +128,5 @@ This examples is using following (3-rd party) front-end frameworks:
 -   [Developer guide](http://docs.angularjs.org/guide)
 
 **Bootstrap** by Twitter - front-end HTML/CSS/JS framework
--   [Homepage](http://twitter.github.com/bootstrap)
--   [Getting
-    started](http://twitter.github.com/bootstrap/getting-started.html)
+-   [Homepage](https://getbootstrap.com/)
+-   [Getting started](https://getbootstrap.com/docs/4.0/getting-started/introduction/)

examples/bean-validation-webapp/pom.xml

@@ -78,7 +78,23 @@
             <!-- Run the application using "mvn jetty:run" -->
             <plugin>
                 <groupId>org.mortbay.jetty</groupId>
-                <artifactId>maven-jetty-plugin</artifactId>
+                <artifactId>jetty-maven-plugin</artifactId>
+                <configuration>
+                    <scanIntervalSeconds>5</scanIntervalSeconds>
+                    <stopPort>9999</stopPort>
+                    <stopKey>STOP</stopKey>
+                    <webApp>
+                        <contextPath>/bean-validation-webapp</contextPath>
+                        <webInfIncludeJarPattern>.*/.*jersey-[^/]\.jar$</webInfIncludeJarPattern>
+                    </webApp>
+                    <war>${project.build.directory}/${project.build.finalName}.war</war>
+                    <connectors>
+                        <connector implementation="org.eclipse.jetty.server.nio.SelectChannelConnector">
+                            <port>8080</port>
+                            <maxIdleTime>60000</maxIdleTime>
+                        </connector>
+                    </connectors>
+                </configuration>
             </plugin>
         </plugins>
     </build>

examples/bean-validation-webapp/src/main/webapp/app.js

@@ -42,13 +42,13 @@
 
 /* App Module */
 
-var contact = angular.module('contact', ['contactServices', 'ngResource']).
+var contact = angular.module('contact', ['contactServices', 'ngRoute']).
     config(
-        ['$routeProvider', function($routeProvider) {
+         function($routeProvider) {
             $routeProvider.
                 when('/contact', {templateUrl: 'contact.html', controller: ContactController}).
                 /*when('/contact/:contactId', {templateUrl: 'contact-detail.html', controller: ContactController}).*/
 
                 otherwise({redirectTo: '/contact'});
-        }]
+        }
     );

examples/bean-validation-webapp/src/main/webapp/contact.html

@@ -46,38 +46,38 @@
             <div class="page-header">
                 <h1>Contact List <small>Bean Validation Example</small></h1>
             </div>
-            <div class="span3">
+            <div class="col-md-3">
                 <form>
                     <fieldset>
                         <legend>Search</legend>
-                        <div class="input-prepend input-append">
-                            <div class="btn-group" ng-class="{open: !searchCollapse}">
-                                <button class="btn dropdown-toggle" ng-click="searchCollapse=!searchCollapse"><i class="icon-{{searchIcon}}"></i> <span class="caret"></span></button>
+                        <div class="btn-group btn-group btn-group-sm" role="group">
+                            <div class="btn-group btn-group-sm" ng-class="{open: !searchCollapse}">
+                                <button class="btn dropdown-toggle" ng-click="searchCollapse=!searchCollapse"><i class="glyphicon glyphicon-{{searchIcon}}"></i> <span class="caret"></span></button>
                                 <ul class="dropdown-menu">
-                                    <li><a ng-click="changeSearchType('name')"><i class="icon-user"></i> Name</a></li>
-                                    <li><a ng-click="changeSearchType('email')"><i class="icon-envelope"></i> Email</a></li>
-                                    <li><a ng-click="changeSearchType('phone')"><i class="icon-home"></i> Phone</a></li>
-                                    <li><a ng-click="changeSearchType('unknown')"><i class="icon-question-sign"></i> Invalid</a></li>
+                                    <li><a ng-click="changeSearchType('name')"><i class="glyphicon glyphicon-user"></i> Name</a></li>
+                                    <li><a ng-click="changeSearchType('email')"><i class="glyphicon glyphicon-envelope"></i> Email</a></li>
+                                    <li><a ng-click="changeSearchType('phone')"><i class="glyphicon glyphicon-home"></i> Phone</a></li>
+                                    <li><a ng-click="changeSearchType('unknown')"><i class="glyphicon glyphicon-question-sign"></i> Invalid</a></li>
                                 </ul>
                             </div>
-                            <input class="span2" type="text" ng-model="searchValue" />
-                            <button class="btn" type="button" ng-click="search()"><i class="icon-search"></i></button>
+                            <input class="col-md-7" type="text" ng-model="searchValue" />
+                            <button class="btn" type="button" ng-click="search()"><i class="glyphicon glyphicon-search"></i></button>
                         </div>
                     </fieldset>
                 </form>
                 <form>
                     <fieldset>
                         <legend>Add Contact</legend>
-                        <div class="input-prepend">
-                            <span class="add-on"><i class="icon-user"></i></span>
+                        <div class="input-group">
+                            <span class="input-group-addon"><i class="glyphicon glyphicon-user"></i></span>
                             <input type="text" placeholder="Name" ng-model="contact.fullName" null-if-empty />
                         </div>
-                        <div class="input-prepend">
-                            <span class="add-on"><i class="icon-envelope"></i></span>
+                        <div class="input-group">
+                            <span class="input-group-addon"><i class="glyphicon glyphicon-envelope"></i></span>
                             <input type="text" placeholder="Email" ng-model="contact.email" null-if-empty />
                         </div>
-                        <div class="input-prepend">
-                            <span class="add-on"><i class="icon-home"></i></span>
+                        <div class="input-group">
+                            <span class="input-group-addon"><i class="glyphicon glyphicon-home"></i></span>
                             <input type="text" placeholder="Phone" ng-model="contact.phone" null-if-empty />
                         </div>
                         <button class="btn" type="submit" ng-click="addContact()">Add</button>
@@ -86,16 +86,16 @@ <h1>Contact List <small>Bean Validation Example</small></h1>
                 <form>
                     <fieldset>
                         <legend>Refresh</legend>
-                        <button class="btn" type="submit" ng-click="refresh()"><i class="icon-refresh"></i> Refresh</button>
+                        <button class="btn" type="submit" ng-click="refresh()"><i class="glyphicon glyphicon-refresh"></i> Refresh</button>
                     </fieldset>
                 </form>
             </div>
-            <div class="span9">
-                <div ng-show="errors[0]" class="alert alert-error">
+            <div class="col-md-9">
+                <div ng-show="errors[0]" class="alert alert-danger">
                     <button type="button" class="close" ng-click="clearErrors()">&times;</button>
                     <h4>Errors! (HTTP {{httpStatus}})</h4>
                     <br/>
-                    <ul class="unstyled">
+                    <ul class="list-unstyled">
                         <li ng-repeat="error in errors">{{error.path}} - {{error.message}}</li>
                     </ul>
                 </div>
@@ -118,7 +118,7 @@ <h4>Errors! (HTTP {{httpStatus}})</h4>
                             <td>{{contact.fullName}}</td>
                             <td>{{contact.email}}</td>
                             <td>{{contact.phone}}</td>
-                            <td><a ng-click="removeContact(contact.id)"><i class="icon-trash"></i></a></td>
+                            <td><a ng-click="removeContact(contact.id)"><i class="glyphicon glyphicon-trash"></i></a></td>
                         </tr>
                     </tbody>
                 </table>