Skip to content

Commit e2cbed4

Browse files
randymorandymo
authored
march 2022 update (#112)
* upgrade git actions from v2 to v3 upgrade spotbugs-annotations from 4.0.3 to 4.6.0 upgrade maven-compiler-plugin from 3.8.1 to 3.10.1 upgrade nexus-staging-maven-plugin from 1.6.8 to 1.6.12 * add upgrade maven-javadoc-plugin from 3.3.1 to 3.3.2 * sync with amphtml
1 parent 2fdbbb1 commit e2cbed4

File tree

5 files changed

+134
-48
lines changed

5 files changed

+134
-48
lines changed

‎.github/workflows/publish-maven-package.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ jobs:
1010
runs-on: ubuntu-latest
1111
environment: deploy
1212
steps:
13-
- uses: actions/checkout@v2
13+
- uses: actions/checkout@v3
1414
- name: Set up Maven Central Respository
15-
uses: actions/setup-java@v2
15+
uses: actions/setup-java@v3
1616
with:
1717
distribution: temurin
1818
java-version: 11

‎.github/workflows/test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ jobs:
88
test:
99
runs-on: ubuntu-latest
1010
steps:
11-
- uses: actions/checkout@v2
12-
- uses: actions/setup-java@v2
11+
- uses: actions/checkout@v3
12+
- uses: actions/setup-java@v3
1313
with:
1414
distribution: temurin
1515
java-version: 11

‎Changelog.md

Lines changed: 29 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,38 @@
11
# Changelog
22

3+
## AMP HTML Validator 1.0.28
4+
- upgrade git actions from v2 to v3
5+
- upgrade spotbugs-annotations from 4.0.3 to 4.6.0
6+
- upgrade maven-compiler-plugin from 3.8.1 to 3.10.1
7+
- upgrade nexus-staging-maven-plugin from 1.6.8 to 1.6.12
8+
- upgrade maven-javadoc-plugin from 3.3.1 to 3.3.2
9+
- sync validator-all.protoascii with amphtml (2022.05.03)
10+
311
## AMP HTML Validator 1.0.27
4-
upgrade cssparser from 0.9.27 to 0.9.29
12+
- upgrade cssparser from 0.9.27 to 0.9.29
513

614
## AMP HTML Validator 1.0.26
7-
8-
upgrade build-helper-maven-plugin from 3.1.0 to 3.3.0
9-
upgrade maven-dependency-plugin from 3.1.2 to 3.2.0
10-
upgrade maven-javadoc-plugin from 3.1.1 to 3.3.1
11-
upgrade os-maven-plugin from 1.6.2 to 1.7.0
12-
upgrade protobuf from 3.12.2 to 3.16.1
13-
upgrade maven-surefire-plugin from 3.0.0-M4 to 3.0.0-M5
14-
upgrade fasterxml.jackson from 2.11.0 to 2.13.1
15-
upgrade maven-resources-plugin from 3.1.0 to 3.2.0
16-
upgrade maven-scm-plugin from 1.11.2 to 1.12.2
17-
upgrade maven-enforcer-plugin from 3.0.0-M3 to 3.0.0
18-
upgrade maven-checkstyle-plugin from 3.1.1 to 3.1.2
19-
upgrade testng from 7.1.0 to 7.5
20-
upgrade junit from 4.13.1 to 4.13.2
21-
upgrade commons-lang3 from 3.10 to 3.12.0
22-
upgrade commons-text from 1.8 to 1.9
23-
24-
sync validator-all.protoascii with amphtml
25-
Use SACParserCSS3Constants enum values for all tests
26-
27-
disable testCSSSyntaxDisallowedPropertyValue due to change in amp4email position allowing any value now
15+
- upgrade build-helper-maven-plugin from 3.1.0 to 3.3.0
16+
- upgrade maven-dependency-plugin from 3.1.2 to 3.2.0
17+
- upgrade maven-javadoc-plugin from 3.1.1 to 3.3.1
18+
- upgrade os-maven-plugin from 1.6.2 to 1.7.0
19+
- upgrade protobuf from 3.12.2 to 3.16.1
20+
- upgrade maven-surefire-plugin from 3.0.0-M4 to 3.0.0-M5
21+
- upgrade fasterxml.jackson from 2.11.0 to 2.13.1
22+
- upgrade maven-resources-plugin from 3.1.0 to 3.2.0
23+
- upgrade maven-scm-plugin from 1.11.2 to 1.12.2
24+
- upgrade maven-enforcer-plugin from 3.0.0-M3 to 3.0.0
25+
- upgrade maven-checkstyle-plugin from 3.1.1 to 3.1.2
26+
- upgrade testng from 7.1.0 to 7.5
27+
- upgrade junit from 4.13.1 to 4.13.2
28+
- upgrade commons-lang3 from 3.10 to 3.12.0
29+
- upgrade commons-text from 1.8 to 1.9
30+
- sync validator-all.protoascii with amphtml
31+
- Use SACParserCSS3Constants enum values for all tests
32+
- disable testCSSSyntaxDisallowedPropertyValue due to change in amp4email position allowing any value now
2833

2934
## AMP HTML Validator 1.0.25
30-
31-
Upgrade tagchowder to 2.0.23 to fix void tag parsing error that returned '_' for ending /> if there was a space preceding the '/'
35+
- Upgrade tagchowder to 2.0.23 to fix void tag parsing error that returned '_' for ending /> if there was a space preceding the '/'
3236

3337
## AMP HTML Validator 1.0.0 released
34-
35-
AMP HTML Validator 1.0.0 is an initial release. The goal of this project is to keep updating the code with small fixes and features. This project requires unit tests and code coverage by default, and uses github and a automated pipe-line to publish new versions in a automated fashion for every commit that is merged, without humans need for each release.
38+
- AMP HTML Validator 1.0.0 is an initial release. The goal of this project is to keep updating the code with small fixes and features. This project requires unit tests and code coverage by default, and uses github and a automated pipe-line to publish new versions in a automated fashion for every commit that is merged, without humans need for each release.

‎pom.xml

Lines changed: 5 additions & 5 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.27</version>
10+
<version>1.0.28</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>
@@ -63,7 +63,7 @@
6363
<maven-antrun-plugin.version>3.0.0</maven-antrun-plugin.version>
6464
<maven-dependency-plugin.version>3.2.0</maven-dependency-plugin.version>
6565
<maven-shade-plugin.version>2.4.2</maven-shade-plugin.version>
66-
<maven-javadoc-plugin.version>3.3.1</maven-javadoc-plugin.version>
66+
<maven-javadoc-plugin.version>3.3.2</maven-javadoc-plugin.version>
6767
<maven-source-plugin.version>3.2.1</maven-source-plugin.version>
6868

6969
<os-maven-plugin.version>1.7.0</os-maven-plugin.version>
@@ -335,7 +335,7 @@
335335
<dependency>
336336
<groupId>com.github.spotbugs</groupId>
337337
<artifactId>spotbugs-annotations</artifactId>
338-
<version>4.0.3</version>
338+
<version>4.6.0</version>
339339
</dependency>
340340
<dependency>
341341
<groupId>org.dom4j</groupId>
@@ -490,7 +490,7 @@
490490
<plugin>
491491
<groupId>org.apache.maven.plugins</groupId>
492492
<artifactId>maven-compiler-plugin</artifactId>
493-
<version>3.8.1</version>
493+
<version>3.10.1</version>
494494
<configuration>
495495
<fork>true</fork>
496496
<meminitial>128m</meminitial>
@@ -583,7 +583,7 @@
583583
<plugin>
584584
<groupId>org.sonatype.plugins</groupId>
585585
<artifactId>nexus-staging-maven-plugin</artifactId>
586-
<version>1.6.8</version>
586+
<version>1.6.12</version>
587587
<extensions>true</extensions>
588588
<configuration>
589589
<serverId>ossrh</serverId>

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

Lines changed: 96 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2026,7 +2026,7 @@ tags: {
20262026
spec_url: "https://amp.dev/documentation/components/amp-video/"
20272027
}
20282028
# 4.7.7 The audio element
2029-
# Only allowed in noscript tags. Otherwise use amp-audio.
2029+
# Allowed in noscript tags and inside amp-audio for server side rendering.
20302030
tags: {
20312031
html_format: AMP # Disallowed in AMP4ADS because <noscript> is disallowed.
20322032
tag_name: "AUDIO"
@@ -2048,6 +2048,14 @@ tags: {
20482048
}
20492049
spec_url: "https://amp.dev/documentation/components/amp-audio/"
20502050
}
2051+
tags: {
2052+
html_format: AMP # Disallowed in AMP4ADS because <noscript> is disallowed.
2053+
tag_name: "AUDIO"
2054+
mandatory_ancestor: "AMP-AUDIO"
2055+
spec_name: "amp-audio > audio"
2056+
attrs: { name: "controls" }
2057+
spec_url: "https://amp.dev/documentation/components/amp-audio/"
2058+
}
20512059
# 4.7.7 The picture element
20522060
# Only allowed in noscript tags which support img tags.
20532061
tags: {
@@ -14686,6 +14694,7 @@ tags: { # <amp-story-page>
1468614694
child_tag_name_oneof: "AMP-STORY-GRID-LAYER"
1468714695
child_tag_name_oneof: "AMP-STORY-PAGE-ATTACHMENT"
1468814696
child_tag_name_oneof: "AMP-STORY-PAGE-OUTLINK"
14697+
child_tag_name_oneof: "AMP-STORY-SHOPPING-ATTACHMENT"
1468914698
mandatory_min_num_child_tags: 1
1469014699
}
1469114700
}
@@ -14816,6 +14825,12 @@ tags: {
1481614825
name: "translate-y"
1481714826
value_regex_casei: "[0-9]+px"
1481814827
}
14828+
attrs: {
14829+
name: "pan-scaling-factor"
14830+
# Allow float number such as "12.3", ".1", or "5."
14831+
# Note that string with only decimal point such as "." is not allowed.
14832+
value_regex_casei: "^([0-9]*[.]?[0-9]+)|([0-9]+[.]?[0-9]*)$"
14833+
}
1481914834
attrs: {
1482014835
name: "justify-content"
1482114836
value: "center"
@@ -14911,6 +14926,12 @@ tags: {
1491114926
name: "translate-y"
1491214927
value_regex_casei: "[0-9]+px"
1491314928
}
14929+
attrs: {
14930+
name: "pan-scaling-factor"
14931+
# Allow float number such as "12.3", ".1", or "5."
14932+
# Note that string with only decimal point such as "." is not allowed.
14933+
value_regex_casei: "^([0-9]*[.]?[0-9]+)|([0-9]+[.]?[0-9]*)$"
14934+
}
1491414935
reference_points: {
1491514936
tag_spec_name: "AMP-STORY-GRID-LAYER animate-in"
1491614937
}
@@ -15115,6 +15136,12 @@ tags: {
1511515136
name: "translate-y"
1511615137
value_regex_casei: "[0-9]+px"
1511715138
}
15139+
attrs: {
15140+
name: "pan-scaling-factor"
15141+
# Allow float number such as "12.3", ".1", or "5."
15142+
# Note that string with only decimal point such as "." is not allowed.
15143+
value_regex_casei: "^([0-9]*[.]?[0-9]+)|([0-9]+[.]?[0-9]*)$"
15144+
}
1511815145
reference_points: {
1511915146
tag_spec_name: "AMP-STORY-CTA-LAYER animate-in"
1512015147
}
@@ -15264,6 +15291,7 @@ descendant_tag_list: {
1526415291
tag: "AMP-STORY-INTERACTIVE-QUIZ"
1526515292
tag: "AMP-STORY-INTERACTIVE-RESULTS"
1526615293
tag: "AMP-STORY-PANNING-MEDIA"
15294+
tag: "AMP-STORY-SHOPPING-TAG"
1526715295
tag: "AMP-TIMEAGO"
1526815296
tag: "AMP-TWITTER"
1526915297
tag: "AMP-VIDEO"
@@ -16117,31 +16145,64 @@ html_format: AMP
1611716145
tag_name: "AMP-STORY-SHOPPING-TAG"
1611816146
requires_extension: "amp-story-shopping"
1611916147
mandatory_ancestor: "AMP-STORY-GRID-LAYER"
16120-
attr_lists: "extended-amp-global"
1612116148
spec_url: "https://amp.dev/documentation/components/amp-story-shopping/"
1612216149
amp_layout: {
1612316150
supported_layouts: CONTAINER
1612416151
}
16152+
attrs: {
16153+
name: "data-product-id"
16154+
mandatory: true
16155+
}
1612516156
}
16126-
tags: { # <amp-story-shopping-config>
16157+
tags: { # <amp-story-shopping-attachment>
1612716158
html_format: AMP
16128-
tag_name: "AMP-STORY-SHOPPING-CONFIG"
16159+
tag_name: "AMP-STORY-SHOPPING-ATTACHMENT"
1612916160
requires_extension: "amp-story-shopping"
16130-
attr_lists: "extended-amp-global"
16161+
mandatory_last_child: true
1613116162
spec_url: "https://amp.dev/documentation/components/amp-story-shopping/"
16163+
attrs: {
16164+
name: "src"
16165+
value_url: {
16166+
protocol: "https"
16167+
allow_relative: true
16168+
}
16169+
}
16170+
attrs: {
16171+
name: "theme"
16172+
value: "dark"
16173+
value: "light"
16174+
}
16175+
attrs: {
16176+
name: "cta-text"
16177+
}
16178+
child_tags: {
16179+
child_tag_name_oneof: "SCRIPT"
16180+
mandatory_min_num_child_tags: 1
16181+
}
1613216182
amp_layout: {
16133-
supported_layouts: NODISPLAY
16183+
supported_layouts: CONTAINER
1613416184
}
1613516185
}
16136-
tags: { # <amp-story-shopping-attachment>
16186+
tags: { # amp-story-shopping-attachment
1613716187
html_format: AMP
16138-
tag_name: "AMP-STORY-SHOPPING-ATTACHMENT"
16188+
tag_name: "SCRIPT"
16189+
spec_name: "amp-story-shopping-attachment config script"
16190+
mandatory_parent: "AMP-STORY-SHOPPING-ATTACHMENT"
1613916191
requires_extension: "amp-story-shopping"
16140-
attr_lists: "extended-amp-global"
16141-
spec_url: "https://amp.dev/documentation/components/amp-story-shopping/"
16142-
amp_layout: {
16143-
supported_layouts: NODISPLAY
16192+
attrs: {
16193+
name: "type"
16194+
mandatory: true
16195+
value_casei: "application/json"
16196+
dispatch_key: NAME_VALUE_PARENT_DISPATCH
16197+
}
16198+
attr_lists: "nonce-attr"
16199+
cdata: {
16200+
disallowed_cdata_regex: {
16201+
regex: "<!--"
16202+
error_message: "html comments"
16203+
}
1614416204
}
16205+
spec_url: "https://amp.dev/documentation/components/amp-story-shopping/"
1614516206
}
1614616207
tags: { # amp-story-subscriptions
1614716208
html_format: AMP
@@ -16969,6 +17030,11 @@ tags: { # <amp-story-captions>
1696917030
child_tags: {
1697017031
mandatory_num_child_tags: 0
1697117032
}
17033+
attrs: {
17034+
name: "style-preset"
17035+
value: "default"
17036+
value: "appear"
17037+
}
1697217038
}
1697317039
tags: { # amp-jwplayer
1697417040
html_format: AMP
@@ -18628,12 +18694,28 @@ tags: { # <amp-facebook-comments>
1862818694
supported_layouts: RESPONSIVE
1862918695
}
1863018696
}
18631-
tags: { # amp-audio
18697+
tags: { # amp-audio 1.0
18698+
html_format: AMP
18699+
tag_name: "SCRIPT"
18700+
satisfies: "amp-audio 1.0"
18701+
excludes: "amp-audio 0.1"
18702+
extension_spec: {
18703+
name: "amp-audio"
18704+
version_name: "v1.0"
18705+
version: "1.0"
18706+
bento_supported_version: "1.0"
18707+
}
18708+
attr_lists: "common-extension-attrs"
18709+
}
18710+
tags: { # amp-audio 0.1
1863218711
html_format: AMP
1863318712
html_format: AMP4ADS
1863418713
tag_name: "SCRIPT"
18714+
satisfies: "amp-audio 0.1"
18715+
excludes: "amp-audio 1.0"
1863518716
extension_spec: {
1863618717
name: "amp-audio"
18718+
version_name: "v0.1"
1863718719
version: "0.1"
1863818720
version: "latest"
1863918721
deprecated_allow_duplicates: true
@@ -18694,6 +18776,7 @@ tags: { # <amp-audio> for AMP (autoplay attribute allowed)
1869418776
defines_default_width: true
1869518777
supported_layouts: FIXED
1869618778
supported_layouts: FIXED_HEIGHT
18779+
supported_layouts: CONTAINER
1869718780
supported_layouts: NODISPLAY
1869818781
}
1869918782
}

0 commit comments

Comments
 (0)