Skip to content

HDDS-3937. Update jquery to v3.5.1 #1177

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
adoroszlai merged 4 commits into from
Jul 13, 2020
Merged

HDDS-3937. Update jquery to v3.5.1 #1177

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c1aa8fa
HDDS-3937. Update jquery to v3.5.1
vivekratnavel Jul 8, 2020
21c8833
revert proto.lock changes
vivekratnavel Jul 8, 2020
13f1446
revert proto.lock changes
vivekratnavel Jul 12, 2020
d04d74d
trigger new CI check
adoroszlai Jul 12, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions LICENSE.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,5 +235,5 @@ hadoop-hdds/framework/src/main/resources/webapps/static/angular-route-1.7.9.min.
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.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
hadoop-hdds/framework/src/main/resources/webapps/static/jquery-3.5.1.min.js
hadoop-hdds/docs/themes/ozonedoc/static/js/jquery-3.5.1.min.js
2 changes: 1 addition & 1 deletion hadoop-hdds/docs/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
<excludes>
<exclude>static/slides/*</exclude>
<exclude>themes/ozonedoc/static/js/bootstrap.min.js</exclude>
<exclude>themes/ozonedoc/static/js/jquery-3.4.1.min.js</exclude>
<exclude>themes/ozonedoc/static/js/jquery-3.5.1.min.js</exclude>
<exclude>themes/ozonedoc/static/css/bootstrap-theme.min.css
</exclude>
<exclude>themes/ozonedoc/static/css/bootstrap.min.css.map</exclude>
Expand Down
2 changes: 1 addition & 1 deletion hadoop-hdds/docs/themes/ozonedoc/layouts/partials/footer.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@
<!-- Bootstrap core JavaScript
================================================== -->
<!-- Placed at the end of the document so the pages load faster -->
<script src="{{ "js/jquery-3.4.1.min.js" | relURL}}"></script>
<script src="{{ "js/jquery-3.5.1.min.js" | relURL}}"></script>
<script src="{{ "js/ozonedoc.js" | relURL}}"></script>
<script src="{{ "js/bootstrap.min.js" | relURL}}"></script>
2 changes: 0 additions & 2 deletions hadoop-hdds/docs/themes/ozonedoc/static/js/jquery-3.4.1.min.js
View file
Open in desktop

This file was deleted.

2 changes: 2 additions & 0 deletions hadoop-hdds/docs/themes/ozonedoc/static/js/jquery-3.5.1.min.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 0 additions & 2 deletions hadoop-hdds/framework/src/main/resources/webapps/static/jquery-3.4.1.min.js
View file
Open in desktop

This file was deleted.

2 changes: 2 additions & 0 deletions hadoop-hdds/framework/src/main/resources/webapps/static/jquery-3.5.1.min.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion hadoop-hdds/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
<exclude>src/main/resources/webapps/static/nvd3-1.8.5.min.css</exclude>
<exclude>src/main/resources/webapps/static/nvd3-1.8.5.min.js.map</exclude>
<exclude>src/main/resources/webapps/static/nvd3-1.8.5.min.js</exclude>
<exclude>src/main/resources/webapps/static/jquery-3.4.1.min.js</exclude>
<exclude>src/main/resources/webapps/static/jquery-3.5.1.min.js</exclude>
<exclude>src/main/resources/webapps/static/bootstrap-3.4.1/**</exclude>
<exclude>src/test/resources/additionalfields.container</exclude>
<exclude>src/test/resources/incorrect.checksum.container</exclude>
Expand Down
2 changes: 1 addition & 1 deletion hadoop-hdds/server-scm/src/main/resources/webapps/scm/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@

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

<script src="static/jquery-3.4.1.min.js"></script>
<script src="static/jquery-3.5.1.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>
Expand Down
2 changes: 1 addition & 1 deletion hadoop-ozone/dist/src/main/license/bin/LICENSE.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -424,7 +424,7 @@ bootstrap.min.js
angular-route-1.7.9.min.js
angular-nvd3-1.0.9.min.js
angular-1.7.9.min.js
jquery-3.4.1.min.js
jquery-3.5.1.min.js

--------------------------------------------------------------------------------
recon server uses a huge number of javascript and css dependencies. See the
Expand Down
2 changes: 1 addition & 1 deletion hadoop-ozone/ozone-manager/src/main/resources/webapps/ozoneManager/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
<ng-view></ng-view>
</div><!-- /.container -->

<script src="static/jquery-3.4.1.min.js"></script>
<script src="static/jquery-3.5.1.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>
Expand Down
2 changes: 1 addition & 1 deletion hadoop-ozone/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,7 @@
<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>
<exclude>webapps/static/jquery-3.5.1.min.js</exclude>
<exclude>webapps/static/jquery.dataTables.min.js</exclude>
<exclude>webapps/static/nvd3-1.8.5.min.css.map</exclude>
<exclude>webapps/static/nvd3-1.8.5.min.css</exclude>
Expand Down
2 changes: 1 addition & 1 deletion hadoop-ozone/s3gateway/src/main/resources/browser.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@

</html>

<script src="https://code.jquery.com/jquery-3.4.1.min.js"></script>
<script src="https://code.jquery.com/jquery-3.5.1.min.js"></script>
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.4.1/js/bootstrap.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/bootbox.js/4.4.0/bootbox.min.js"></script>
<script src="https://sdk.amazonaws.com/js/aws-sdk-2.207.0.min.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion hadoop-ozone/s3gateway/src/main/resources/webapps/static/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ <h1>S3 gateway</h1>
</p>
</div><!-- /.container -->

<script src="jquery-3.4.1.min.js"></script>
<script src="jquery-3.5.1.min.js"></script>
<script src="bootstrap-3.4.1/js/bootstrap.min.js"></script>
<script src="s3g.js"></script>

Expand Down