Skip to content

Commit 1befeda

Browse files
randymorandymo
authored
Nov2023 update (#217)
* Nov 2023 Update * Nov 2023 Update
1 parent d63605f commit 1befeda

File tree

6 files changed

+81
-27
lines changed

6 files changed

+81
-27
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
runs-on: ubuntu-latest
1111
environment: deploy
1212
steps:
13-
- uses: actions/checkout@v3
13+
- uses: actions/checkout@v4
1414
- name: Set up Maven Central Respository
1515
uses: actions/setup-java@v3
1616
with:

‎.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
test:
99
runs-on: ubuntu-latest
1010
steps:
11-
- uses: actions/checkout@v3
11+
- uses: actions/checkout@v4
1212
- uses: actions/setup-java@v3
1313
with:
1414
distribution: temurin

‎Changelog.md

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

3+
## AMP HTML Validator 1.0.41
4+
- update actions/checkout action from v3 to v4
5+
- upgrade com.fasterxml.jackson from 2.15.2 to 2.15.3
6+
- upgrade jacoco-maven-plugin from 0.8.10 to 0.8.11
7+
- upgrade junit-jupiter-api from 5.9.3 to 5.10.1
8+
- upgrade maven-enforcer-plugin from 3.4.0 to 3.4.1
9+
- upgrade maven-javadoc-plugin from 3.5.0 to 3.6.2
10+
- upgrade maven-surefire-plugin from 3.0.0 to 3.2.2
11+
- upgrade mockito-core from 5.4.0 to 5.7.0
12+
- upgrade protobuf-java from 3.22.2 to 3.25.1
13+
- upgrade puppycrawl.tools.checkstyle from 10.12.3 to 10.12.5
14+
- upgrade spotbugs-maven-plugin from 4.7.3.5 to 4.8.1.0
15+
- upgrade spotbugs from 4.7.3 to 4.8.1
16+
- upgrade testng from 7.7.1 to 7.8.0
17+
- sync validator.proto with amphtml (2023.11.29)
18+
- sync validator-all.protoascii with amphtml (2023.11.29)
19+
320
## AMP HTML Validator 1.0.40
421
- upgrade build-helper-maven-plugin from 3.3.0 to 3.4.0
522
- upgrade commons-lang3 from 3.12.0 to 3.13.0

‎pom.xml

Lines changed: 19 additions & 13 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.40</version>
10+
<version>1.0.41</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>
@@ -59,30 +59,36 @@
5959

6060
<!-- library versions -->
6161
<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>
62+
<jacoco-maven-plugin.version>0.8.11</jacoco-maven-plugin.version>
6363
<maven-antrun-plugin.version>3.1.0</maven-antrun-plugin.version>
6464
<maven-checkstyle-plugin.version>3.3.0</maven-checkstyle-plugin.version>
6565
<maven-clean-plugin.version>3.3.1</maven-clean-plugin.version>
6666
<maven-dependency-plugin.version>3.6.0</maven-dependency-plugin.version>
67+
<maven-enforcer-plugin.version>3.4.1</maven-enforcer-plugin.version>
6768
<maven-gpg-plugin.version>3.1.0</maven-gpg-plugin.version>
68-
<maven-javadoc-plugin.version>3.5.0</maven-javadoc-plugin.version>
69+
<maven-javadoc-plugin.version>3.6.2</maven-javadoc-plugin.version>
6970
<maven-shade-plugin.version>2.4.2</maven-shade-plugin.version>
7071
<maven-source-plugin.version>3.3.0</maven-source-plugin.version>
71-
<spotbugs-maven-plugin.version>4.7.3.5</spotbugs-maven-plugin.version>
72-
<com.github.spotbugs.version>4.7.3</com.github.spotbugs.version>
72+
<spotbugs-maven-plugin.version>4.8.1.0</spotbugs-maven-plugin.version>
73+
<com.github.spotbugs.version>4.8.1</com.github.spotbugs.version>
7374

7475
<os-maven-plugin.version>1.7.1</os-maven-plugin.version>
75-
<protobuf.version>3.22.2</protobuf.version>
76-
<maven-surefire-plugin.version>3.0.0</maven-surefire-plugin.version>
76+
<protobuf.version>3.25.1</protobuf.version>
77+
<maven-surefire-plugin.version>3.2.2</maven-surefire-plugin.version>
7778
<jdk.version>11</jdk.version>
7879
<encoding>UTF-8</encoding>
7980
<main.basedir>${project.basedir}</main.basedir>
8081

8182
<checkstyle.maxAllowedViolations>10</checkstyle.maxAllowedViolations>
8283

83-
<com.puppycrawl.checkstyle.version>10.12.3</com.puppycrawl.checkstyle.version>
84-
<fasterxml.jackson.version>2.15.2</fasterxml.jackson.version>
84+
<com.puppycrawl.checkstyle.version>10.12.5</com.puppycrawl.checkstyle.version>
85+
<fasterxml.jackson.version>2.15.3</fasterxml.jackson.version>
8586
<tagchowder.version>2.0.27</tagchowder.version>
87+
88+
<!-- test dependencies -->
89+
<org.junit.version>5.10.1</org.junit.version>
90+
<org.mockito.version>5.7.0</org.mockito.version>
91+
<org.testng.version>7.8.0</org.testng.version>
8692
</properties>
8793

8894
<repositories>
@@ -309,7 +315,7 @@
309315
<plugin>
310316
<groupId>org.apache.maven.plugins</groupId>
311317
<artifactId>maven-enforcer-plugin</artifactId>
312-
<version>3.4.0</version>
318+
<version>${maven-enforcer-plugin.version}</version>
313319
<executions>
314320
<execution>
315321
<id>enforce</id>
@@ -682,19 +688,19 @@
682688
<dependency>
683689
<groupId>org.testng</groupId>
684690
<artifactId>testng</artifactId>
685-
<version>7.7.1</version>
691+
<version>${org.testng.version}</version>
686692
<scope>test</scope>
687693
</dependency>
688694
<dependency>
689695
<groupId>org.junit.jupiter</groupId>
690696
<artifactId>junit-jupiter-api</artifactId>
691-
<version>5.9.3</version>
697+
<version>${org.junit.version}</version>
692698
<scope>test</scope>
693699
</dependency>
694700
<dependency>
695701
<groupId>org.mockito</groupId>
696702
<artifactId>mockito-core</artifactId>
697-
<version>5.4.0</version>
703+
<version>${org.mockito.version}</version>
698704
<scope>test</scope>
699705
</dependency>
700706
</dependencies>

‎src/main/proto/validator.proto

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ message UrlSpec {
5959
// Whether the empty string '' is allowed for this URL value.
6060
optional bool allow_empty = 3 [default = false];
6161

62-
// Deprecated fields, do not resuse.
62+
// Deprecated fields, do not reuse.
6363
// reserved 4;
6464
}
6565

@@ -291,7 +291,7 @@ message CssSpec {
291291
// Any declaration listed here are allowed.
292292
repeated string declaration = 7;
293293

294-
// If fase, declarations tagged with `!important` are considered errors.
294+
// If false, declarations tagged with `!important` are considered errors.
295295
// Most AMP stylesheets disallow `!important` to reserve this override
296296
// for AMP's own styles.
297297
optional bool allow_important = 8 [default = false];

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

Lines changed: 41 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,12 @@ attr_lists: {
160160
attrs: { name: "charset" value_casei: "utf-8" }
161161
attrs: { name: "color" }
162162
attrs: { name: "crossorigin" }
163+
attrs: {
164+
name: "fetchpriority"
165+
value_casei: "high"
166+
value_casei: "low"
167+
value_casei: "auto"
168+
}
163169
attrs: { name: "hreflang" }
164170
attrs: { name: "media" }
165171
attrs: { name: "sizes" }
@@ -379,7 +385,10 @@ tags: {
379385
"https://(use|pro|kit)\\.fontawesome\\.com/releases/v([0-9]+\\.?)+"
380386
"/css/[0-9a-zA-Z-]+\\.css|"
381387
"https://(use|pro|kit)\\.fontawesome\\.com/[0-9a-zA-Z-]+\\.css|"
382-
"https://use\\.typekit\\.net/[\\w\\p{L}\\p{N}_]+\\.css"
388+
"https://use\\.typekit\\.net/[\\w\\p{L}\\p{N}_]+\\.css|"
389+
"https://cdnjs\\.cloudflare\\.com/ajax/libs/font-awesome/"
390+
"([0-9]+\\.?)+/css/[0-9a-zA-Z-]+\\.min\\.css"
391+
383392
}
384393
attrs: { name: "integrity" } # SRI attribute (https://www.w3.org/TR/SRI/)
385394
attrs: { name: "media" }
@@ -1482,14 +1491,14 @@ tags: {
14821491
protocol: "tel"
14831492
allow_relative: false
14841493
}
1485-
# Openning doubly curly brackets {{ (these are mustache delimiters) can only
1486-
# appear at the beginnig of the attribute's value. Likewise closing doubly
1494+
# Opening doubly curly brackets {{ (these are mustache delimiters) can only
1495+
# appear at the beginning of the attribute's value. Likewise closing doubly
14871496
# curly brackets }} can only appear at the end of the attribute's value.
14881497
# Furthermore unbalanced delimiters are not allowed.
14891498
# Additionally section mustache delimiters, i.e., {{#, {{^, {{/ are
14901499
# disallowed.
14911500
disallowed_value_regex: "__amp_source_origin|"
1492-
"(.|\\s){{|" # Openning delimiter can only appear at the beginning.
1501+
"(.|\\s){{|" # Opening delimiter can only appear at the beginning.
14931502
"}}(.|\\s)|" # Closing delimiter can only appear at the end.
14941503
"^{{.*[^}][^}]$|" # Delimiters must be balanced.
14951504
"^[^{][^{].*}}$|" # Delimiters must be balanced.
@@ -1801,6 +1810,12 @@ attr_lists: {
18011810
value_casei: "anonymous"
18021811
value_casei: "use-credentials"
18031812
}
1813+
attrs: {
1814+
name: "fetchpriority"
1815+
value_casei: "high"
1816+
value_casei: "low"
1817+
value_casei: "auto"
1818+
}
18041819
attrs: { name: "height" }
18051820
attrs: { name: "hspace" }
18061821
# https://developers.google.com/web/updates/2019/02/priority-hints
@@ -3851,14 +3866,14 @@ attr_lists: {
38513866
protocol: "https"
38523867
allow_relative: false
38533868
}
3854-
# Openning doubly curly brackets {{ (these are mustache delimiters) can only
3855-
# appear at the beginnig of the attribute's value. Likewise closing doubly
3869+
# Opening doubly curly brackets {{ (these are mustache delimiters) can only
3870+
# appear at the beginning of the attribute's value. Likewise closing doubly
38563871
# curly brackets }} can only appear at the end of the attribute's value.
38573872
# Furthermore unbalanced delimiters are not allowed.
38583873
# Additionally section mustache delimiters, i.e., {{#, {{^, {{/ are
38593874
# disallowed.
38603875
disallowed_value_regex: "__amp_source_origin|"
3861-
"(.|\\s){{|" # Openning delimiter can only appear at the beginning.
3876+
"(.|\\s){{|" # Opening delimiter can only appear at the beginning.
38623877
"}}(.|\\s)|" # Closing delimiter can only appear at the end.
38633878
"^{{.*[^}][^}]$|" # Delimiters must be balanced.
38643879
"^[^{][^{].*}}$|" # Delimiters must be balanced.
@@ -3878,14 +3893,14 @@ attr_lists: {
38783893
protocol: "https"
38793894
allow_relative: false
38803895
}
3881-
# Openning doubly curly brackets {{ (these are mustache delimiters) can only
3882-
# appear at the beginnig of the attribute's value. Likewise closing doubly
3896+
# Opening doubly curly brackets {{ (these are mustache delimiters) can only
3897+
# appear at the beginning of the attribute's value. Likewise closing doubly
38833898
# curly brackets }} can only appear at the end of the attribute's value.
38843899
# Furthermore unbalanced delimiters are not allowed.
38853900
# Additionally section mustache delimiters, i.e., {{#, {{^, {{/ are
38863901
# disallowed.
38873902
disallowed_value_regex: "__amp_source_origin|"
3888-
"(.|\\s){{|" # Openning delimiter can only appear at the beginning.
3903+
"(.|\\s){{|" # Opening delimiter can only appear at the beginning.
38893904
"}}(.|\\s)|" # Closing delimiter can only appear at the end.
38903905
"^{{.*[^}][^}]$|" # Delimiters must be balanced.
38913906
"^[^{][^{].*}}$|" # Delimiters must be balanced.
@@ -3982,6 +3997,12 @@ tags: { # <amp-img i-amphtml-ssr>
39823997
value_casei: "low"
39833998
value_casei: "auto"
39843999
}
4000+
attrs: {
4001+
name: "fetchpriority",
4002+
value_casei: "high"
4003+
value_casei: "low"
4004+
value_casei: "auto"
4005+
}
39854006
attrs: { name: "object-fit" }
39864007
attrs: { name: "object-position" }
39874008
attrs: { name: "placeholder" }
@@ -4190,6 +4211,12 @@ tags: {
41904211
attrs: { name: "attribution" }
41914212
attrs: { name: "height" }
41924213
# https://developers.google.com/web/updates/2019/02/priority-hints
4214+
attrs: {
4215+
name: "fetchpriority"
4216+
value_casei: "high"
4217+
value_casei: "low"
4218+
value_casei: "auto"
4219+
}
41934220
attrs: {
41944221
name: "importance"
41954222
value_casei: "high"
@@ -16038,6 +16065,10 @@ tags: { # <amp-connatix-player>
1603816065
name: "data-player-id"
1603916066
mandatory: true
1604016067
}
16068+
attrs: {
16069+
name: "dock"
16070+
requires_extension: "amp-video-docking"
16071+
}
1604116072
spec_url: "https://amp.dev/documentation/components/amp-connatix-player/"
1604216073
amp_layout: {
1604316074
supported_layouts: FILL

0 commit comments

Comments
 (0)