Skip to content

Commit

Permalink
[FLINK-20832][docs] Deliver bootstrap css and js ourselves
Browse files Browse the repository at this point in the history
This closes apache#14583
  • Loading branch information
wuchong committed Jan 8, 2021
1 parent 24f33e7 commit af36844
Show file tree
Hide file tree
Showing 13 changed files with 363 additions and 4 deletions.
10 changes: 9 additions & 1 deletion NOTICE
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,15 @@ See bundled license files for details.

- jQuery v3.5.1 | (c) JS Foundation and other contributors
-> in "docs/page/js/jquery.min.js"
- AnchorJS v3.1.0 (https://github.com/bryanbraun/anchorjs) Copyright (c) 2016 Bryan Braun
-> in "docs/page/js/anchor.min.js"
- Bootstrap v3.3.4 (http:https://getbootstrap.com) Copyright 2011-2015 Twitter, Inc.
-> css in "docs/page/css/bootstrap.min.css"
-> js in "docs/page/js/bootstrap.min.js"
-> fonts in "docs/page/fonts"

Note: The "docs/page/fonts/glyphicons-halflings*" fonts are included in Bootstrap, and licensed under the same license as Boostrap.
See https://glyphicons.com/old/license.html#old-halflings-bootstrap for more information.

This project bundles the following dependencies under the BSD license.
See bundled license files for details.
Expand Down Expand Up @@ -39,4 +48,3 @@ The Apache Flink project contains or reuses code that is licensed under the Apac
- Google Cloud Client Library for Java (https://github.com/googleapis/google-cloud-java) Copyright 2017 Google LLC

See: flink-end-to-end-tests/flink-connector-gcp-pubsub-emulator-tests/src/test/java/org/apache/flink/streaming/connectors/gcp/pubsub/emulator/PubsubHelper.java

6 changes: 3 additions & 3 deletions docs/_layouts/base.html
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<link rel="canonical" href="{{ site.stable_baseurl }}{{ page.url | replace:'index.html',''}}">

<!-- Bootstrap -->
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.4/css/bootstrap.min.css">
<link rel="stylesheet" href="{% link page/css/bootstrap.min.css %}">
<link rel="stylesheet" href="{% link page/css/flink.css %}">
<link rel="stylesheet" href="{% link page/css/syntax.css %}">
<link rel="stylesheet" href="{% link page/css/codetabs.css %}">
Expand Down Expand Up @@ -91,8 +91,8 @@
<!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
<script src="{% link page/js/jquery.min.js %}"></script>
<!-- Include all compiled plugins (below), or include individual files as needed -->
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.4/js/bootstrap.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/anchor-js/3.1.0/anchor.min.js"></script>
<script src="{% link page/js/bootstrap.min.js %}"></script>
<script src="{% link page/js/anchor.min.js %}"></script>
<script src="{% link page/js/flink.js %}"></script>

<!-- Google Analytics -->
Expand Down
5 changes: 5 additions & 0 deletions docs/page/css/bootstrap.min.css

Large diffs are not rendered by default.

Binary file added docs/page/fonts/glyphicons-halflings-regular.eot
Binary file not shown.
288 changes: 288 additions & 0 deletions docs/page/fonts/glyphicons-halflings-regular.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/page/fonts/glyphicons-halflings-regular.ttf
Binary file not shown.
Binary file added docs/page/fonts/glyphicons-halflings-regular.woff
Binary file not shown.
Binary file not shown.
6 changes: 6 additions & 0 deletions docs/page/js/anchor.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions docs/page/js/bootstrap.min.js

Large diffs are not rendered by default.

21 changes: 21 additions & 0 deletions licenses/LICENSE.anchorjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
MIT License

Copyright (c) 2020 Bryan Braun

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
22 changes: 22 additions & 0 deletions licenses/LICENSE.bootstrap
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
The MIT License (MIT)

Copyright (c) 2011-2021 Twitter, Inc.
Copyright (c) 2011-2021 The Bootstrap Authors

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
2 changes: 2 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1408,9 +1408,11 @@ under the License.
<!-- External web libraries. -->
<exclude>docs/**/jquery*</exclude>
<exclude>docs/**/bootstrap*</exclude>
<exclude>docs/**/anchor*</exclude>
<exclude>docs/Gemfile.lock</exclude>
<exclude>docs/ruby2/Gemfile.lock</exclude>
<exclude>docs/img/*.svg</exclude>
<exclude>**/docs/page/fonts/**</exclude>
<exclude>**/docs/page/font-awesome/**</exclude>
<exclude>**/resources/**/font-awesome/**</exclude>
<exclude>**/resources/**/jquery*</exclude>
Expand Down

0 comments on commit af36844

Please sign in to comment.