HDDS-3940. Update angular to v1.7.9 (apache#1180)

amaliujia · Jul 9, 2020 · 25d3e52 · 25d3e52
1 parent 0408dd6
commit 25d3e52
Show file tree

Hide file tree

Showing 10 changed files with 379 additions and 361 deletions.
diff --git a/LICENSE.txt b/LICENSE.txt
@@ -231,9 +231,9 @@ MIT License
 hadoop-hdds/framework/src/main/resources/webapps/static/bootstrap-3.4.1
 hadoop-hdds/docs/themes/ozonedoc/static/css/bootstrap-*
 
-hadoop-hdds/framework/src/main/resources/webapps/static/angular-route-1.6.4.min.js
+hadoop-hdds/framework/src/main/resources/webapps/static/angular-route-1.7.9.min.js
 hadoop-hdds/framework/src/main/resources/webapps/static/angular-nvd3-1.0.9.min.js
-hadoop-hdds/framework/src/main/resources/webapps/static/angular-1.6.4.min.js
+hadoop-hdds/framework/src/main/resources/webapps/static/angular-1.7.9.min.js
 
 hadoop-hdds/framework/src/main/resources/webapps/static/jquery-3.4.1.min.js
 hadoop-hdds/docs/themes/ozonedoc/static/js/jquery-3.4.1.min.js
diff --git a/hadoop-hdds/framework/src/main/resources/webapps/static/angular-1.6.4.min.js b/hadoop-hdds/framework/src/main/resources/webapps/static/angular-1.6.4.min.js
diff --git a/hadoop-hdds/framework/src/main/resources/webapps/static/angular-1.7.9.min.js b/hadoop-hdds/framework/src/main/resources/webapps/static/angular-1.7.9.min.js
diff --git a/hadoop-hdds/framework/src/main/resources/webapps/static/angular-route-1.6.4.min.js b/hadoop-hdds/framework/src/main/resources/webapps/static/angular-route-1.6.4.min.js
diff --git a/hadoop-hdds/framework/src/main/resources/webapps/static/angular-route-1.7.9.min.js b/hadoop-hdds/framework/src/main/resources/webapps/static/angular-route-1.7.9.min.js
diff --git a/hadoop-hdds/pom.xml b/hadoop-hdds/pom.xml
@@ -255,9 +255,9 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
             <exclude>**/target/**</exclude>
             <exclude>.gitattributes</exclude>
             <exclude>.idea/**</exclude>
-            <exclude>src/main/resources/webapps/static/angular-1.6.4.min.js</exclude>
+            <exclude>src/main/resources/webapps/static/angular-1.7.9.min.js</exclude>
             <exclude>src/main/resources/webapps/static/angular-nvd3-1.0.9.min.js</exclude>
-            <exclude>src/main/resources/webapps/static/angular-route-1.6.4.min.js</exclude>
+            <exclude>src/main/resources/webapps/static/angular-route-1.7.9.min.js</exclude>
             <exclude>src/main/resources/webapps/static/d3-3.5.17.min.js</exclude>
             <exclude>src/main/resources/webapps/static/nvd3-1.8.5.min.css.map</exclude>
             <exclude>src/main/resources/webapps/static/nvd3-1.8.5.min.css</exclude>

diff --git a/hadoop-hdds/server-scm/src/main/resources/webapps/scm/index.html b/hadoop-hdds/server-scm/src/main/resources/webapps/scm/index.html
@@ -64,8 +64,8 @@
 </div><!-- /.container -->
 
 <script src="static/jquery-3.4.1.min.js"></script>
-<script src="static/angular-1.6.4.min.js"></script>
-<script src="static/angular-route-1.6.4.min.js"></script>
+<script src="static/angular-1.7.9.min.js"></script>
+<script src="static/angular-route-1.7.9.min.js"></script>
 <script src="static/d3-3.5.17.min.js"></script>
 <script src="static/nvd3-1.8.5.min.js"></script>
 <script src="static/angular-nvd3-1.0.9.min.js"></script>

diff --git a/hadoop-ozone/dist/src/main/license/bin/LICENSE.txt b/hadoop-ozone/dist/src/main/license/bin/LICENSE.txt
@@ -421,9 +421,9 @@ MIT License
 bootstrap-3.4.1
 css/bootstrap-*
 bootstrap.min.js
-angular-route-1.6.4.min.js
+angular-route-1.7.9.min.js
 angular-nvd3-1.0.9.min.js
-angular-1.6.4.min.js
+angular-1.7.9.min.js
 jquery-3.4.1.min.js
 
 --------------------------------------------------------------------------------

diff --git a/hadoop-ozone/ozone-manager/src/main/resources/webapps/ozoneManager/index.html b/hadoop-ozone/ozone-manager/src/main/resources/webapps/ozoneManager/index.html
@@ -58,8 +58,8 @@
 </div><!-- /.container -->
 
 <script src="static/jquery-3.4.1.min.js"></script>
-<script src="static/angular-1.6.4.min.js"></script>
-<script src="static/angular-route-1.6.4.min.js"></script>
+<script src="static/angular-1.7.9.min.js"></script>
+<script src="static/angular-route-1.7.9.min.js"></script>
 <script src="static/d3-3.5.17.min.js"></script>
 <script src="static/nvd3-1.8.5.min.js"></script>
 <script src="static/angular-nvd3-1.0.9.min.js"></script>

diff --git a/hadoop-ozone/pom.xml b/hadoop-ozone/pom.xml
@@ -286,9 +286,9 @@
             <exclude>src/test/resources/ssl/*</exclude>
             <exclude>src/main/compose/ozonesecure/docker-image/runner/build/apache-rat-0.12/README-CLI.txt</exclude>
             <exclude>src/main/compose/ozonesecure/docker-image/runner/build/apache-rat-0.12/README-ANT.txt</exclude>
-            <exclude>webapps/static/angular-1.6.4.min.js</exclude>
+            <exclude>webapps/static/angular-1.7.9.min.js</exclude>
             <exclude>webapps/static/angular-nvd3-1.0.9.min.js</exclude>
-            <exclude>webapps/static/angular-route-1.6.4.min.js</exclude>
+            <exclude>webapps/static/angular-route-1.7.9.min.js</exclude>
             <exclude>webapps/static/bootstrap-3.4.1/**</exclude>
             <exclude>webapps/static/d3-3.5.17.min.js</exclude>
             <exclude>webapps/static/jquery-3.4.1.min.js</exclude>