Skip to content

Commit 7befc9c

Browse files
committed
HBASE-29659 Use webjar for bootswatch
instead of downloading it from a URL. We prefer maven resource as it can be cached locally.
1 parent 55e209c commit 7befc9c

File tree

1 file changed

+13
-19
lines changed

1 file changed

+13
-19
lines changed

pom.xml

Lines changed: 13 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2862,6 +2862,12 @@
28622862
<version>${site.bootstrap.version}</version>
28632863
<includes>**/js/bootstrap.min.js</includes>
28642864
</artifactItem>
2865+
<artifactItem>
2866+
<groupId>org.webjars.npm</groupId>
2867+
<artifactId>bootswatch</artifactId>
2868+
<version>${site.bootswatch.version}</version>
2869+
<includes>**/litera/bootstrap.min.css</includes>
2870+
</artifactItem>
28652871
<artifactItem>
28662872
<groupId>org.webjars</groupId>
28672873
<artifactId>popper.js</artifactId>
@@ -2892,25 +2898,6 @@
28922898
</execution>
28932899
</executions>
28942900
</plugin>
2895-
<plugin>
2896-
<groupId>com.googlecode.maven-download-plugin</groupId>
2897-
<artifactId>download-maven-plugin</artifactId>
2898-
<version>${maven-download-plugin.version}</version>
2899-
<executions>
2900-
<execution>
2901-
<id>download-litera-bootstrap-theme</id>
2902-
<goals>
2903-
<goal>wget</goal>
2904-
</goals>
2905-
<phase>pre-site</phase>
2906-
<configuration>
2907-
<url>https://stackpath.bootstrapcdn.com/bootswatch/${site.bootswatch.version}/litera/bootstrap.min.css</url>
2908-
<outputDirectory>${project.build.directory}/site/css/themes/litera</outputDirectory>
2909-
<outputFileName>bootstrap.min.css</outputFileName>
2910-
</configuration>
2911-
</execution>
2912-
</executions>
2913-
</plugin>
29142901
<!-- Special configuration for spotbugs just in the parent so
29152902
the filter file location can be more general (see definition in pluginManagement) -->
29162903
<plugin>
@@ -3073,6 +3060,13 @@
30733060
<include>bootstrap.min.js</include>
30743061
</includes>
30753062
</resource>
3063+
<resource>
3064+
<directory>${project.build.directory}/META-INF/resources/webjars/bootswatch/${site.bootswatch.version}/dist/litera</directory>
3065+
<targetPath>${project.build.directory}/site/css/themes/litera</targetPath>
3066+
<includes>
3067+
<include>bootstrap.min.css</include>
3068+
</includes>
3069+
</resource>
30763070
<resource>
30773071
<directory>${project.build.directory}/META-INF/resources/webjars/popper.js/${site.popperjs.version}/umd</directory>
30783072
<targetPath>${project.build.directory}/site/js</targetPath>

0 commit comments

Comments
 (0)