Skip to content

Commit 2ae7f44

Browse files
adoroszlaibharatviswa504
authored andcommitted
HDDS-1999. Basic acceptance test and SCM/OM web UI broken by Bootstrap upgrade (#1327)
1 parent 217e748 commit 2ae7f44

File tree

5 files changed

+12
-12
lines changed

5 files changed

+12
-12
lines changed

hadoop-hdds/server-scm/src/main/resources/webapps/scm/index.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626

2727
<title>HDFS Storage Container Manager</title>
2828

29-
<link href="static/bootstrap-3.3.7/css/bootstrap.min.css" rel="stylesheet">
29+
<link href="static/bootstrap-3.4.1/css/bootstrap.min.css" rel="stylesheet">
3030
<link href="static/hadoop.css" rel="stylesheet">
3131
<link href="static/nvd3-1.8.5.min.css" rel="stylesheet">
3232

@@ -63,14 +63,14 @@
6363

6464
</div><!-- /.container -->
6565

66-
<script src="static/jquery-3.3.1.min.js"></script>
66+
<script src="static/jquery-3.4.1.min.js"></script>
6767
<script src="static/angular-1.6.4.min.js"></script>
6868
<script src="static/angular-route-1.6.4.min.js"></script>
6969
<script src="static/d3-3.5.17.min.js"></script>
7070
<script src="static/nvd3-1.8.5.min.js"></script>
7171
<script src="static/angular-nvd3-1.0.9.min.js"></script>
7272
<script src="static/ozone.js"></script>
7373
<script src="scm.js"></script>
74-
<script src="static/bootstrap-3.3.7/js/bootstrap.min.js"></script>
74+
<script src="static/bootstrap-3.4.1/js/bootstrap.min.js"></script>
7575
</body>
7676
</html>

hadoop-ozone/dist/src/main/smoketest/basic/basic.robot

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ ${DATANODE_HOST} datanode
2626

2727
Check webui static resources
2828
Run Keyword if '${SECURITY_ENABLED}' == 'true' Kinit HTTP user
29-
${result} = Execute curl --negotiate -u : -s -I http://scm:9876/static/bootstrap-3.3.7/js/bootstrap.min.js
29+
${result} = Execute curl --negotiate -u : -s -I http://scm:9876/static/bootstrap-3.4.1/js/bootstrap.min.js
3030
Should contain ${result} 200
3131

3232
Start freon testing

hadoop-ozone/ozone-manager/src/main/resources/webapps/ozoneManager/index.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626

2727
<title>Ozone Manager</title>
2828

29-
<link href="static/bootstrap-3.3.7/css/bootstrap.min.css" rel="stylesheet">
29+
<link href="static/bootstrap-3.4.1/css/bootstrap.min.css" rel="stylesheet">
3030
<link href="static/hadoop.css" rel="stylesheet">
3131
<link href="static/nvd3-1.8.5.min.css" rel="stylesheet">
3232

@@ -57,14 +57,14 @@
5757
<ng-view></ng-view>
5858
</div><!-- /.container -->
5959

60-
<script src="static/jquery-3.3.1.min.js"></script>
60+
<script src="static/jquery-3.4.1.min.js"></script>
6161
<script src="static/angular-1.6.4.min.js"></script>
6262
<script src="static/angular-route-1.6.4.min.js"></script>
6363
<script src="static/d3-3.5.17.min.js"></script>
6464
<script src="static/nvd3-1.8.5.min.js"></script>
6565
<script src="static/angular-nvd3-1.0.9.min.js"></script>
6666
<script src="static/ozone.js"></script>
6767
<script src="ozoneManager.js"></script>
68-
<script src="static/bootstrap-3.3.7/js/bootstrap.min.js"></script>
68+
<script src="static/bootstrap-3.4.1/js/bootstrap.min.js"></script>
6969
</body>
7070
</html>

hadoop-ozone/s3gateway/src/main/resources/browser.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<meta name="viewport" content="width=device-width, initial-scale=1.0">
2525
<link rel="shortcut icon" href="static/images/ozone.ico">
2626
<link rel="stylesheet"
27-
href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css">
27+
href="https://maxcdn.bootstrapcdn.com/bootstrap/3.4.1/css/bootstrap.min.css">
2828
<link rel="stylesheet"
2929
href="https://use.fontawesome.com/releases/v5.2.0/css/all.css">
3030
<link rel="stylesheet"
@@ -138,8 +138,8 @@
138138

139139
</html>
140140

141-
<script src="https://code.jquery.com/jquery-3.3.1.min.js"></script>
142-
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
141+
<script src="https://code.jquery.com/jquery-3.4.1.min.js"></script>
142+
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.4.1/js/bootstrap.min.js"></script>
143143
<script src="https://cdnjs.cloudflare.com/ajax/libs/bootbox.js/4.4.0/bootbox.min.js"></script>
144144
<script src="https://sdk.amazonaws.com/js/aws-sdk-2.207.0.min.js"></script>
145145
<script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.22.0/moment.min.js"></script>

hadoop-ozone/s3gateway/src/main/resources/webapps/static/index.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626

2727
<title>S3 gateway -- Apache Hadoop Ozone</title>
2828

29-
<link href="bootstrap-3.3.7/css/bootstrap.min.css" rel="stylesheet">
29+
<link href="bootstrap-3.4.1/css/bootstrap.min.css" rel="stylesheet">
3030
<link href="hadoop.css" rel="stylesheet">
3131
<link href="ozone.css" rel="stylesheet">
3232

@@ -74,6 +74,6 @@ <h1>S3 gateway</h1>
7474
</p>
7575
</div><!-- /.container -->
7676

77-
<script src="static/bootstrap-3.3.7/js/bootstrap.min.js"></script>
77+
<script src="static/bootstrap-3.4.1/js/bootstrap.min.js"></script>
7878
</body>
7979
</html>

0 commit comments

Comments
 (0)