Skip to content

Commit 8c8f00d

Browse files
Bernardo-MGBernardo-MG
authored
Merge pull request #214 from Bernardo-MG/develop
Develop
2 parents 7e46317 + f510631 commit 8c8f00d

File tree

39 files changed

+64
-597
lines changed

39 files changed

+64
-597
lines changed

‎package-lock.json

Lines changed: 23 additions & 34 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,10 @@
44
"minify-css": "cleancss -o ./target/classes/css/style.min.css ./src/main/resources/css/*.css"
55
},
66
"dependencies": {
7-
"@fortawesome/fontawesome-free": "~6.0.0",
7+
"@fortawesome/fontawesome-free": "~6.1.1",
88
"bootstrap": "~5.1.3",
99
"bootswatch": "~5.1.3",
10-
"clean-css-cli": "~5.5.2",
11-
"csslint": "~1.0.5",
12-
"html5shiv": "~3.7.3"
10+
"clean-css-cli": "~5.6.0",
11+
"csslint": "~1.0.5"
1312
}
1413
}

‎pom.xml

Lines changed: 11 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<parent>
1212
<groupId>com.bernardomg.maven</groupId>
1313
<artifactId>base-pom</artifactId>
14-
<version>1.4.4</version>
14+
<version>1.5.1</version>
1515
</parent>
1616

1717
<!-- ********************************************** -->
@@ -20,7 +20,7 @@
2020

2121
<groupId>com.bernardomg.maven.skins</groupId>
2222
<artifactId>docs-maven-skin</artifactId>
23-
<version>2.2.6</version>
23+
<version>2.2.7</version>
2424

2525
<name>Docs Maven Skin</name>
2626
<description>A Maven skin for using Maven Site as a documentation site</description>
@@ -197,6 +197,10 @@
197197
<!-- ********************************************** -->
198198

199199
<properties>
200+
<!-- ============================================== -->
201+
<!-- =============== MAVEN VERSION ================ -->
202+
<!-- ============================================== -->
203+
<maven.version>3.6.0</maven.version>
200204
<!-- ============================================== -->
201205
<!-- =============== MANIFEST DATA ================ -->
202206
<!-- ============================================== -->
@@ -205,23 +209,21 @@
205209
<!-- =========== DEPENDENCIES VERSIONS ============ -->
206210
<!-- ============================================== -->
207211
<hamcrest.version>1.3</hamcrest.version>
208-
<jcabi.matchers.version>1.5.3</jcabi.matchers.version>
209-
<jcabi.w3c.version>1.3</jcabi.w3c.version>
210-
<jsoup.version>1.13.1</jsoup.version>
211-
<siteFixer.version>1.2.11</siteFixer.version>
212-
<velocity.configTool.version>1.2.2</velocity.configTool.version>
212+
<jsoup.version>1.15.2</jsoup.version>
213+
<siteFixer.version>1.2.12</siteFixer.version>
214+
<velocity.configTool.version>1.2.5</velocity.configTool.version>
213215
<!-- ============================================== -->
214216
<!-- ============== PLUGINS VERSIONS ============== -->
215217
<!-- ============================================== -->
216218
<plugin.frontend.node.version>v16.14.0</plugin.frontend.node.version>
217219
<plugin.frontend.npm.version>8.3.1</plugin.frontend.npm.version>
218220
<plugin.frontend.version>1.12.0</plugin.frontend.version>
219-
<plugin.invoker.version>3.2.2</plugin.invoker.version>
221+
<plugin.invoker.version>3.3.0</plugin.invoker.version>
220222
<plugin.minify.version>1.7.6</plugin.minify.version>
221223
<!-- ============================================== -->
222224
<!-- ================= MAVEN SITE ================= -->
223225
<!-- ============================================== -->
224-
<site.skin.version>2.2.5</site.skin.version>
226+
<site.skin.version>2.2.6</site.skin.version>
225227
<mavenURL>https://mvnrepository.com/artifact/${project.groupId}/${project.artifactId}</mavenURL>
226228
<githubArtifactURL><![CDATA[https://github.com/Bernardo-MG?tab=packages&amp;repo_name=docs-maven-skin]]></githubArtifactURL>
227229
</properties>
@@ -371,7 +373,6 @@
371373
<includes>
372374
<include>bootstrap/dist/js/bootstrap.min.js</include>
373375
<include>bootswatch/dist/*/bootstrap.min.css</include>
374-
<include>html5shiv/dist/html5shiv.min.js</include>
375376
</includes>
376377
</resource>
377378
<resource>
@@ -410,18 +411,6 @@
410411
<artifactId>hamcrest-all</artifactId>
411412
<version>${hamcrest.version}</version>
412413
</dependency>
413-
<dependency>
414-
<!-- jcabi matchers -->
415-
<groupId>com.jcabi</groupId>
416-
<artifactId>jcabi-matchers</artifactId>
417-
<version>${jcabi.matchers.version}</version>
418-
</dependency>
419-
<dependency>
420-
<!-- jcabi W3C -->
421-
<groupId>com.jcabi</groupId>
422-
<artifactId>jcabi-w3c</artifactId>
423-
<version>${jcabi.w3c.version}</version>
424-
</dependency>
425414
<dependency>
426415
<!-- JSoup -->
427416
<groupId>org.jsoup</groupId>

‎src/changes/changes.xml

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@
231231
</release>
232232
<release version="2.2.4" date="2021-07-17" description="Dark theme image support">
233233
<action dev="bmg" type="fix">
234-
Additional corretion to images on dark shine.
234+
Additional correction to images on dark shine.
235235
</action>
236236
</release>
237237
<release version="2.2.5" date="2021-10-17" description="Title anchors">
@@ -244,5 +244,16 @@
244244
Ids keep caps when processed.
245245
</action>
246246
</release>
247+
<release version="2.2.7" date="2022-07-08" description="Updated dependencies">
248+
<action dev="bmg" type="update">
249+
Updated dependencies.
250+
</action>
251+
<action dev="bmg" type="remove">
252+
Removed html5shiv.
253+
</action>
254+
<action dev="bmg" type="fix">
255+
Corrected self closing heading tag.
256+
</action>
257+
</release>
247258
</body>
248259
</document>

‎src/main/resources/META-INF/maven/site.vm

Lines changed: 12 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -46,13 +46,13 @@
4646
<head>
4747
<meta charset="${outputEncoding}">
4848

49-
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
49+
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
5050

5151
<!-- IE Compatibility tag -->
5252
<meta http-equiv="X-UA-Compatible" content="IE=edge">
5353

5454
<title>$title</title>
55-
<link href="./favicon.ico" rel="shortcut icon" type="image/x-icon" />
55+
<link href="./favicon.ico" rel="shortcut icon" type="image/x-icon">
5656

5757
<!-- Metadata -->
5858
#if($config.descriptionUrl)
@@ -62,28 +62,28 @@
6262
<meta name="keywords" content="$config.keywords.getValue()">
6363
#end
6464
#foreach( $author in $project.developers )
65-
<meta name="author" content="$author.name" />
65+
<meta name="author" content="$author.name">
6666
#end
6767

6868
<!-- Facebook Open Graph -->
69-
<meta property="og:type" content="website"/>
69+
<meta property="og:type" content="website">
7070
#if($config.canonicalLink)
71-
<meta property="og:url" content="$config.canonicalLink.getValue()"/>
71+
<meta property="og:url" content="$config.canonicalLink.getValue()">
7272
#end
73-
<meta property="og:site_name" content="$title"/>
74-
<meta property="og:title" content="$title"/>
73+
<meta property="og:site_name" content="$title">
74+
<meta property="og:title" content="$title">
7575
#if($config.descriptionUrl)
76-
<meta property="og:description" content="$config.descriptionUrl.getValue()"/>
76+
<meta property="og:description" content="$config.descriptionUrl.getValue()">
7777
#end
7878

7979
<!-- Twitter Card -->
80-
<meta name="twitter:card" content="summary"/>
80+
<meta name="twitter:card" content="summary">
8181
#if($config.twitterSite)
82-
<meta name="twitter:creator" content="$config.twitterSite.getValue()"/>
82+
<meta name="twitter:creator" content="$config.twitterSite.getValue()">
8383
#end
84-
<meta name="twitter:title" content="$title"/>
84+
<meta name="twitter:title" content="$title">
8585
#if($config.descriptionUrl)
86-
<meta name="twitter:description" content="$config.descriptionUrl.getValue()"/>
86+
<meta name="twitter:description" content="$config.descriptionUrl.getValue()">
8787
#end
8888

8989
<!-- CSS -->
@@ -112,11 +112,6 @@
112112
#* *#$render.eval( $decoration.body.head )
113113
#**##end
114114

115-
<!-- HTML5 Shiv. For IE6-8 support of HTML5 elements -->
116-
<!--[if lt IE 9]>
117-
<script src="./lib/html5shiv/dist/html5shiv.min.js"></script>
118-
<![endif]-->
119-
120115
</head>
121116
<body class="d-flex flex-column">
122117
<header>

‎src/site/markdown/tests.md

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,10 @@ Each test consists on two parts. First the site is built, and then the verify.gr
1111
Usually the minimum validations applied are:
1212

1313
* The expected HTML files are created
14-
* The index page conforms HTML5 rules
15-
* The expected elements are created
16-
17-
The [jcabi W3C validator][jcabi-w3c] is used for testing the HTML 5 rules .
14+
* HTML file follow the expected structure
1815

1916
HTML elements are validated with [jsoup][jsoup] and CSS selectors.
2017

2118
[maven-invoker]: http://maven.apache.org/plugins/maven-invoker-plugin/
2219

23-
[jcabi-w3c]: http://w3c.jcabi.com/
2420
[jsoup]: https://jsoup.org/

‎src/site/markdown/theme.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ By default images will receive the white background, or the dark one for dark th
5959
<bootswatchStyle>darkly</bootswatchStyle>
6060
<shine>dark</shine>
6161
<bgshine>primary</bgshine>
62-
<bgshine>white</bgshine>
62+
<figshine>white</figshine>
6363
</skinConfig>
6464
</custom>
6565
```

‎src/test/resources/it/bottom_nav/verify.groovy

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,11 @@
11
// This script verifies that a site contains the bottom navigation.
22

3-
import com.jcabi.w3c.ValidatorBuilder
4-
import org.hamcrest.MatcherAssert
5-
import org.hamcrest.Matchers
63
import org.jsoup.Jsoup
74
import java.util.logging.Logger
85

96
// Acquires the sample HTML content
107
def html = new File(basedir, 'target/site/index.html').text
118

12-
// Validates HTML 5
13-
def htmlResponse = new ValidatorBuilder().html().validate(html)
14-
15-
MatcherAssert.assertThat(
16-
'There are errors',
17-
htmlResponse.errors(),
18-
Matchers.describedAs(htmlResponse.toString(), Matchers.hasSize(0))
19-
)
20-
21-
Logger logger = Logger.getLogger("")
22-
htmlResponse.warnings().each{ value ->
23-
logger.warning( value.toString() )
24-
}
25-
269
// Parses HTML
2710
def body = Jsoup.parse(html).body()
2811

‎src/test/resources/it/bottom_nav_max/verify.groovy

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,11 @@
11
// This script verifies that a site contains the bottom navigation.
22

3-
import com.jcabi.w3c.ValidatorBuilder
4-
import org.hamcrest.MatcherAssert
5-
import org.hamcrest.Matchers
63
import org.jsoup.Jsoup
74
import java.util.logging.Logger
85

96
// Acquires the sample HTML content
107
def html = new File(basedir, 'target/site/index.html').text
118

12-
// Validates HTML 5
13-
def htmlResponse = new ValidatorBuilder().html().validate(html)
14-
15-
MatcherAssert.assertThat(
16-
'There are errors',
17-
htmlResponse.errors(),
18-
Matchers.describedAs(htmlResponse.toString(), Matchers.hasSize(0))
19-
)
20-
21-
Logger logger = Logger.getLogger("")
22-
htmlResponse.warnings().each{ value ->
23-
logger.warning( value.toString() )
24-
}
25-
269
// Parses HTML
2710
def body = Jsoup.parse(html).body()
2811

0 commit comments

Comments
 (0)