Skip to content

Commit 6df7e4f

Browse files
authored
[FLINK-20832][docs] Deliver bootstrap css and js ourselves
This closes apache#14590
1 parent 87739e3 commit 6df7e4f

13 files changed

+363
-4
lines changed

NOTICE

+9-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,15 @@ See bundled license files for details.
99

1010
- jQuery v3.5.1 | (c) JS Foundation and other contributors
1111
-> in "docs/page/js/jquery.min.js"
12+
- AnchorJS v3.1.0 (https://github.com/bryanbraun/anchorjs) Copyright (c) 2016 Bryan Braun
13+
-> in "docs/page/js/anchor.min.js"
14+
- Bootstrap v3.3.4 (http://getbootstrap.com) Copyright 2011-2015 Twitter, Inc.
15+
-> css in "docs/page/css/bootstrap.min.css"
16+
-> js in "docs/page/js/bootstrap.min.js"
17+
-> fonts in "docs/page/fonts"
18+
19+
Note: The "docs/page/fonts/glyphicons-halflings*" fonts are included in Bootstrap, and licensed under the same license as Boostrap.
20+
See https://glyphicons.com/old/license.html#old-halflings-bootstrap for more information.
1221

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

4150
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
42-

docs/_layouts/base.html

+3-3
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<link rel="canonical" href="{{ site.stable_baseurl }}{{ page.url | replace:'index.html',''}}">
3030

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

9898
<!-- Google Analytics -->

docs/page/css/bootstrap.min.css

+5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
19.7 KB
Binary file not shown.

docs/page/fonts/glyphicons-halflings-regular.svg

+288
Loading
44.3 KB
Binary file not shown.
Binary file not shown.
Binary file not shown.

docs/page/js/anchor.min.js

+6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/page/js/bootstrap.min.js

+7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

licenses/LICENSE.anchorjs

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
MIT License
2+
3+
Copyright (c) 2020 Bryan Braun
4+
5+
Permission is hereby granted, free of charge, to any person obtaining a copy
6+
of this software and associated documentation files (the "Software"), to deal
7+
in the Software without restriction, including without limitation the rights
8+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9+
copies of the Software, and to permit persons to whom the Software is
10+
furnished to do so, subject to the following conditions:
11+
12+
The above copyright notice and this permission notice shall be included in all
13+
copies or substantial portions of the Software.
14+
15+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21+
SOFTWARE.

licenses/LICENSE.bootstrap

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
The MIT License (MIT)
2+
3+
Copyright (c) 2011-2021 Twitter, Inc.
4+
Copyright (c) 2011-2021 The Bootstrap Authors
5+
6+
Permission is hereby granted, free of charge, to any person obtaining a copy
7+
of this software and associated documentation files (the "Software"), to deal
8+
in the Software without restriction, including without limitation the rights
9+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
10+
copies of the Software, and to permit persons to whom the Software is
11+
furnished to do so, subject to the following conditions:
12+
13+
The above copyright notice and this permission notice shall be included in
14+
all copies or substantial portions of the Software.
15+
16+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
17+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
18+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
19+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
20+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
21+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
22+
THE SOFTWARE.

pom.xml

+2
Original file line numberDiff line numberDiff line change
@@ -1408,9 +1408,11 @@ under the License.
14081408
<!-- External web libraries. -->
14091409
<exclude>docs/**/jquery*</exclude>
14101410
<exclude>docs/**/bootstrap*</exclude>
1411+
<exclude>docs/**/anchor*</exclude>
14111412
<exclude>docs/Gemfile.lock</exclude>
14121413
<exclude>docs/ruby2/Gemfile.lock</exclude>
14131414
<exclude>docs/img/*.svg</exclude>
1415+
<exclude>**/docs/page/fonts/**</exclude>
14141416
<exclude>**/docs/page/font-awesome/**</exclude>
14151417
<exclude>**/resources/**/font-awesome/**</exclude>
14161418
<exclude>**/resources/**/jquery*</exclude>

0 commit comments

Comments
 (0)