Skip to content

Commit d63605f

Browse files
randymorandymo
authored
August 2023 update (#205)
1 parent c9df2ef commit d63605f

File tree

3 files changed

+139
-45
lines changed

3 files changed

+139
-45
lines changed

‎Changelog.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,20 @@
11
# Changelog
22

3+
## AMP HTML Validator 1.0.40
4+
- upgrade build-helper-maven-plugin from 3.3.0 to 3.4.0
5+
- upgrade commons-lang3 from 3.12.0 to 3.13.0
6+
- upgrade jacoco-maven-plugin from 0.8.8 to 0.8.10
7+
- upgrade maven-checkstyle-plugin from 3.2.1 to 3.3.0
8+
- upgrade maven-clean-plugin from 3.2.0 to 3.3.1
9+
- upgrade maven-dependency-plugin from 3.5.0 to 3.6.0
10+
- upgrade maven-enforcer-plugin from 3.3.0 to 3.4.0
11+
- upgrade maven-gpg-plugin from 3.0.1 to 3.1.0
12+
- upgrade maven-source-plugin from 3.2.1 to 3.3.0
13+
- upgrade puppycrawl.tools.checkstyle from 10.9.3 to 10.12.3
14+
- upgrade spotbugs-maven-plugin from 4.7.3.3 to 4.7.3.5
15+
- upgrade tagchowder from 2.0.25 to 2.0.27
16+
- sync validator-all.protoascii with amphtml (2023.08.30)
17+
318
## AMP HTML Validator 1.0.39
419
- upgrade com.fasterxml.jackson from 2.14.2 to 2.15.2
520
- upgrade dom4j from 2.1.3 to 2.1.4

‎pom.xml

Lines changed: 20 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<groupId>dev.amp</groupId>
88
<artifactId>validator-java</artifactId>
99
<name>AMP validator Java API</name>
10-
<version>1.0.39</version>
10+
<version>1.0.40</version>
1111
<description>A Java validator for the AMP Html format.</description>
1212
<packaging>jar</packaging>
1313
<url>https://github.com/ampproject/validator-java</url>
@@ -58,13 +58,17 @@
5858
<validator.proto.directory>${project.basedir}/src/main/proto</validator.proto.directory>
5959

6060
<!-- library versions -->
61-
<build-helper-maven-plugin.version>3.3.0</build-helper-maven-plugin.version>
61+
<build-helper-maven-plugin.version>3.4.0</build-helper-maven-plugin.version>
62+
<jacoco-maven-plugin.version>0.8.10</jacoco-maven-plugin.version>
6263
<maven-antrun-plugin.version>3.1.0</maven-antrun-plugin.version>
63-
<maven-dependency-plugin.version>3.5.0</maven-dependency-plugin.version>
64-
<maven-shade-plugin.version>2.4.2</maven-shade-plugin.version>
64+
<maven-checkstyle-plugin.version>3.3.0</maven-checkstyle-plugin.version>
65+
<maven-clean-plugin.version>3.3.1</maven-clean-plugin.version>
66+
<maven-dependency-plugin.version>3.6.0</maven-dependency-plugin.version>
67+
<maven-gpg-plugin.version>3.1.0</maven-gpg-plugin.version>
6568
<maven-javadoc-plugin.version>3.5.0</maven-javadoc-plugin.version>
66-
<maven-source-plugin.version>3.2.1</maven-source-plugin.version>
67-
<spotbugs-maven-plugin.version>4.7.3.3</spotbugs-maven-plugin.version>
69+
<maven-shade-plugin.version>2.4.2</maven-shade-plugin.version>
70+
<maven-source-plugin.version>3.3.0</maven-source-plugin.version>
71+
<spotbugs-maven-plugin.version>4.7.3.5</spotbugs-maven-plugin.version>
6872
<com.github.spotbugs.version>4.7.3</com.github.spotbugs.version>
6973

7074
<os-maven-plugin.version>1.7.1</os-maven-plugin.version>
@@ -76,8 +80,9 @@
7680

7781
<checkstyle.maxAllowedViolations>10</checkstyle.maxAllowedViolations>
7882

79-
<com.puppycrawl.checkstyle.version>10.9.3</com.puppycrawl.checkstyle.version>
83+
<com.puppycrawl.checkstyle.version>10.12.3</com.puppycrawl.checkstyle.version>
8084
<fasterxml.jackson.version>2.15.2</fasterxml.jackson.version>
85+
<tagchowder.version>2.0.27</tagchowder.version>
8186
</properties>
8287

8388
<repositories>
@@ -111,7 +116,7 @@
111116
<plugin>
112117
<groupId>org.apache.maven.plugins</groupId>
113118
<artifactId>maven-clean-plugin</artifactId>
114-
<version>3.2.0</version>
119+
<version>${maven-clean-plugin.version}</version>
115120
<executions>
116121
<execution>
117122
<id>Deleting generated Validator class</id>
@@ -304,7 +309,7 @@
304309
<plugin>
305310
<groupId>org.apache.maven.plugins</groupId>
306311
<artifactId>maven-enforcer-plugin</artifactId>
307-
<version>3.3.0</version>
312+
<version>3.4.0</version>
308313
<executions>
309314
<execution>
310315
<id>enforce</id>
@@ -425,7 +430,7 @@
425430
<plugin>
426431
<groupId>org.apache.maven.plugins</groupId>
427432
<artifactId>maven-checkstyle-plugin</artifactId>
428-
<version>3.2.1</version>
433+
<version>${maven-checkstyle-plugin.version}</version>
429434
<dependencies>
430435
<dependency>
431436
<groupId>com.puppycrawl.tools</groupId>
@@ -456,7 +461,7 @@
456461
<plugin>
457462
<groupId>org.jacoco</groupId>
458463
<artifactId>jacoco-maven-plugin</artifactId>
459-
<version>0.8.8</version>
464+
<version>${jacoco-maven-plugin.version}</version>
460465
<configuration>
461466
<includes>
462467
<include>**/amp/validator/**</include>
@@ -529,7 +534,7 @@
529534
<plugin>
530535
<groupId>org.apache.maven.plugins</groupId>
531536
<artifactId>maven-source-plugin</artifactId>
532-
<version>3.2.1</version>
537+
<version>${maven-source-plugin.version}</version>
533538
<executions>
534539
<execution>
535540
<id>attach-sources</id>
@@ -562,7 +567,7 @@
562567
<plugin>
563568
<groupId>org.apache.maven.plugins</groupId>
564569
<artifactId>maven-gpg-plugin</artifactId>
565-
<version>3.0.1</version>
570+
<version>${maven-gpg-plugin.version}</version>
566571
<executions>
567572
<execution>
568573
<id>sign-artifacts</id>
@@ -649,7 +654,7 @@
649654
<dependency>
650655
<groupId>com.yahoo.tagchowder</groupId>
651656
<artifactId>tagchowder.core</artifactId>
652-
<version>2.0.25</version>
657+
<version>${tagchowder.version}</version>
653658
</dependency>
654659
<dependency>
655660
<groupId>com.google.code.findbugs</groupId>
@@ -659,7 +664,7 @@
659664
<dependency>
660665
<groupId>org.apache.commons</groupId>
661666
<artifactId>commons-lang3</artifactId>
662-
<version>3.12.0</version>
667+
<version>3.13.0</version>
663668
</dependency>
664669
<dependency>
665670
<groupId>org.apache.commons</groupId>

‎src/main/resources/validator-all.protoascii

Lines changed: 104 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -9083,11 +9083,14 @@ descendant_tag_list {
90839083
tag: "H5"
90849084
tag: "H6"
90859085
tag: "I"
9086+
tag: "I-AMPHTML-SIZER" # For transformed documents.
9087+
tag: "IMG" # For SSR'ed hero images on transformed documents and native images.
90869088
tag: "INPUT"
90879089
tag: "LABEL"
90889090
tag: "LI"
90899091
tag: "MARK"
90909092
tag: "NAV"
9093+
tag: "NOSCRIPT" # For amp-img fallbacks.
90919094
tag: "OL"
90929095
tag: "OPTION"
90939096
tag: "P"
@@ -9485,7 +9488,71 @@ tags: {
94859488
value_regex_casei: "^[a-z][a-z\\d_-]*"
94869489
}
94879490
}
9488-
tags: { # amp-mowplayer
9491+
tags: { # amp-story-audio-sticker
9492+
html_format: AMP
9493+
tag_name: "SCRIPT"
9494+
extension_spec: {
9495+
name: "amp-story-audio-sticker"
9496+
version: "0.1"
9497+
}
9498+
attr_lists: "common-extension-attrs"
9499+
}
9500+
tags: { # <amp-story-audio-sticker>
9501+
html_format: AMP
9502+
tag_name: "AMP-STORY-AUDIO-STICKER"
9503+
requires_extension: "amp-story-audio-sticker"
9504+
mandatory_parent: "AMP-STORY-GRID-LAYER"
9505+
attr_lists: "extended-amp-global"
9506+
amp_layout: {
9507+
supported_layouts: CONTAINER
9508+
}
9509+
attrs: {
9510+
name: "size"
9511+
value: "small"
9512+
value: "large"
9513+
}
9514+
attrs: {
9515+
name: "sticker"
9516+
value: "headphone-cat"
9517+
value: "tape-player"
9518+
value: "loud-speaker"
9519+
value: "audio-cloud"
9520+
}
9521+
attrs: {
9522+
name: "sticker-style"
9523+
value: "outline"
9524+
value: "dropshadow"
9525+
}
9526+
}
9527+
9528+
tags: { # <amp-story-audio-sticker-pretap>
9529+
html_format: AMP
9530+
tag_name: "AMP-STORY-AUDIO-STICKER-PRETAP"
9531+
requires_extension: "amp-story-audio-sticker"
9532+
mandatory_parent: "AMP-STORY-AUDIO-STICKER"
9533+
descendant_tag_list: "amp-story-audio-sticker-allowed-descendants"
9534+
amp_layout: {
9535+
supported_layouts: CONTAINER
9536+
}
9537+
}
9538+
9539+
tags: { # <amp-story-audio-sticker-posttap>
9540+
html_format: AMP
9541+
tag_name: "AMP-STORY-AUDIO-STICKER-POSTTAP"
9542+
requires_extension: "amp-story-audio-sticker"
9543+
mandatory_parent: "AMP-STORY-AUDIO-STICKER"
9544+
descendant_tag_list: "amp-story-audio-sticker-allowed-descendants"
9545+
amp_layout: {
9546+
supported_layouts: CONTAINER
9547+
}
9548+
}
9549+
9550+
descendant_tag_list: {
9551+
name: "amp-story-audio-sticker-allowed-descendants"
9552+
tag: "AMP-IMG"
9553+
tag: "DIV"
9554+
tag: "SPAN"
9555+
}tags: { # amp-mowplayer
94899556
html_format: AMP
94909557
tag_name: "SCRIPT"
94919558
extension_spec: {
@@ -11690,35 +11757,6 @@ tags: { # <amp-brid-player>
1169011757
supported_layouts: RESPONSIVE
1169111758
}
1169211759
}
11693-
tags: { # amp-redbull-player
11694-
html_format: AMP
11695-
tag_name: "SCRIPT"
11696-
extension_spec: {
11697-
name: "amp-redbull-player"
11698-
version: "0.1"
11699-
version: "latest"
11700-
}
11701-
attr_lists: "common-extension-attrs"
11702-
}
11703-
tags: { # <amp-redbull-player>
11704-
html_format: AMP
11705-
tag_name: "AMP-REDBULL-PLAYER"
11706-
requires_extension: "amp-redbull-player"
11707-
attrs: {
11708-
name: "data-param-videoid"
11709-
mandatory: true
11710-
}
11711-
attr_lists: "extended-amp-global"
11712-
amp_layout: {
11713-
supported_layouts: FIXED
11714-
supported_layouts: FIXED_HEIGHT
11715-
supported_layouts: RESPONSIVE
11716-
supported_layouts: FILL
11717-
supported_layouts: FLEX_ITEM
11718-
supported_layouts: FLUID
11719-
supported_layouts: INTRINSIC
11720-
}
11721-
}
1172211760
tags: { # amp-list
1172311761
html_format: AMP
1172411762
tag_name: "SCRIPT"
@@ -15330,6 +15368,9 @@ descendant_tag_list: {
1533015368
tag: "AMP-RENDER"
1533115369
tag: "AMP-STATE"
1533215370
tag: "AMP-STORY-360"
15371+
tag: "AMP-STORY-AUDIO-STICKER"
15372+
tag: "AMP-STORY-AUDIO-STICKER-PRETAP"
15373+
tag: "AMP-STORY-AUDIO-STICKER-POSTTAP"
1533315374
tag: "AMP-STORY-AUTO-ANALYTICS"
1533415375
tag: "AMP-STORY-CAPTIONS"
1533515376
tag: "AMP-STORY-INTERACTIVE-BINARY-POLL"
@@ -19458,6 +19499,39 @@ tags: {
1945819499
}
1945919500
spec_url: "https://amp.dev/documentation/components/amp-image-slider/"
1946019501
}
19502+
tags: { # amp-slikeplayer
19503+
html_format: AMP
19504+
tag_name: "SCRIPT"
19505+
extension_spec: {
19506+
name: "amp-slikeplayer"
19507+
version: "0.1"
19508+
version: "latest"
19509+
requires_usage: EXEMPTED
19510+
deprecated_allow_duplicates: true
19511+
}
19512+
attr_lists: "common-extension-attrs"
19513+
}
19514+
tags: { # <amp-slikeplayer>
19515+
html_format: AMP
19516+
tag_name: "AMP-SLIKEPLAYER"
19517+
requires_extension: "amp-slikeplayer"
19518+
attrs: {
19519+
name: "data-apikey"
19520+
mandatory: true
19521+
}
19522+
attrs: {
19523+
name: "data-videoid"
19524+
mandatory: true
19525+
}
19526+
spec_url: "https://developers.slike.in/html5/"
19527+
amp_layout: {
19528+
supported_layouts: CONTAINER
19529+
supported_layouts: FILL
19530+
supported_layouts: FIXED
19531+
supported_layouts: FIXED_HEIGHT
19532+
supported_layouts: RESPONSIVE
19533+
}
19534+
}
1946119535
tags: { # amp-3d-gltf
1946219536
html_format: AMP
1946319537
tag_name: "SCRIPT"

0 commit comments

Comments
 (0)