Skip to content

Commit 74e0953

Browse files
randymorandymo
authored
Dependabot security updates (#183)
* Dependabot security updates * sync validator-all.protoascii with amphtml * update com.puppycrawl.tools to latest
1 parent 97e5348 commit 74e0953

3 files changed

Lines changed: 41 additions & 12 deletions

File tree

‎Changelog.md‎

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

3+
## AMP HTML Validator 1.0.38
4+
- upgrade cssparser from 0.9.29 to 0.9.30
5+
- upgrade com.fasterxml.jackson from 2.14.1 to 2.14.2
6+
- upgrade maven-checkstyle-plugin from 3.2.0 to 3.2.1
7+
- upgrade maven-dependency-plugin from 3.4.0 to 3.5.0
8+
- upgrade maven-surefire-plugin from 3.0.0-M7 to 3.0.0
9+
- upgrade protobuf from 3.21.12 to 3.22.2
10+
- upgrade puppycrawl.tools.checkstyle from 10.5.0 to 10.9.3
11+
- upgrade spotbugs-maven-plugin from 4.7.3.0 to 4.7.3.3
12+
- upgrade tagchowder from 2.0.24 to 2.0.25
13+
- sync validator-all.protoascii with amphtml (2023.03.24)
14+
315
## AMP HTML Validator 1.0.37
416
- upgrade fasterxml.jackson from 2.13.4 to 2.14.1
517
- upgrade jackson-databind from 2.13.4.2 to 2.14.1

‎pom.xml‎

Lines changed: 11 additions & 12 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.37</version>
10+
<version>1.0.38</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>
@@ -60,25 +60,24 @@
6060
<!-- library versions -->
6161
<build-helper-maven-plugin.version>3.3.0</build-helper-maven-plugin.version>
6262
<maven-antrun-plugin.version>3.1.0</maven-antrun-plugin.version>
63-
<maven-dependency-plugin.version>3.4.0</maven-dependency-plugin.version>
63+
<maven-dependency-plugin.version>3.5.0</maven-dependency-plugin.version>
6464
<maven-shade-plugin.version>2.4.2</maven-shade-plugin.version>
6565
<maven-javadoc-plugin.version>3.4.1</maven-javadoc-plugin.version>
6666
<maven-source-plugin.version>3.2.1</maven-source-plugin.version>
67-
<spotbugs-maven-plugin.version>4.7.3.0</spotbugs-maven-plugin.version>
67+
<spotbugs-maven-plugin.version>4.7.3.3</spotbugs-maven-plugin.version>
6868
<com.github.spotbugs.version>4.7.3</com.github.spotbugs.version>
6969

7070
<os-maven-plugin.version>1.7.1</os-maven-plugin.version>
71-
<protobuf.version>3.21.12</protobuf.version>
72-
<maven-surefire-plugin.version>3.0.0-M7</maven-surefire-plugin.version>
71+
<protobuf.version>3.22.2</protobuf.version>
72+
<maven-surefire-plugin.version>3.0.0</maven-surefire-plugin.version>
7373
<jdk.version>11</jdk.version>
7474
<encoding>UTF-8</encoding>
7575
<main.basedir>${project.basedir}</main.basedir>
7676

7777
<checkstyle.maxAllowedViolations>10</checkstyle.maxAllowedViolations>
7878

79-
<com.puppycrawl.checkstyle.version>10.5.0</com.puppycrawl.checkstyle.version>
80-
<fasterxml.jackson.version>2.14.1</fasterxml.jackson.version>
81-
<fasterxml.jackson.databind.version>2.14.1</fasterxml.jackson.databind.version>
79+
<com.puppycrawl.checkstyle.version>10.9.3</com.puppycrawl.checkstyle.version>
80+
<fasterxml.jackson.version>2.14.2</fasterxml.jackson.version>
8281
</properties>
8382

8483
<repositories>
@@ -426,7 +425,7 @@
426425
<plugin>
427426
<groupId>org.apache.maven.plugins</groupId>
428427
<artifactId>maven-checkstyle-plugin</artifactId>
429-
<version>3.2.0</version>
428+
<version>3.2.1</version>
430429
<dependencies>
431430
<dependency>
432431
<groupId>com.puppycrawl.tools</groupId>
@@ -625,7 +624,7 @@
625624
<dependency>
626625
<groupId>com.fasterxml.jackson.core</groupId>
627626
<artifactId>jackson-databind</artifactId>
628-
<version>${fasterxml.jackson.databind.version}</version>
627+
<version>${fasterxml.jackson.version}</version>
629628
</dependency>
630629
<dependency>
631630
<groupId>com.fasterxml.jackson.jaxrs</groupId>
@@ -640,7 +639,7 @@
640639
<dependency>
641640
<groupId>net.sourceforge.cssparser</groupId>
642641
<artifactId>cssparser</artifactId>
643-
<version>0.9.29</version>
642+
<version>0.9.30</version>
644643
</dependency>
645644
<dependency>
646645
<groupId>com.google.protobuf</groupId>
@@ -650,7 +649,7 @@
650649
<dependency>
651650
<groupId>com.yahoo.tagchowder</groupId>
652651
<artifactId>tagchowder.core</artifactId>
653-
<version>2.0.24</version>
652+
<version>2.0.25</version>
654653
</dependency>
655654
<dependency>
656655
<groupId>com.google.code.findbugs</groupId>

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

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1347,6 +1347,13 @@ tags: {
13471347
html_format: AMP
13481348
html_format: AMP4ADS
13491349
tag_name: "A"
1350+
attrs: {
1351+
name: "attributionsrc"
1352+
value_url: {
1353+
protocol: "https"
1354+
allow_empty: true
1355+
}
1356+
}
13501357
attrs: { name: "border" } # Not valid html5 but commonly used and supported.
13511358
attrs: { name: "download" }
13521359
attrs: {
@@ -4064,6 +4071,13 @@ tags: { # <amp-pixel>
40644071
}
40654072
disallowed_value_regex: "__amp_source_origin"
40664073
}
4074+
attrs: {
4075+
name: "attributionsrc"
4076+
value_url: {
4077+
protocol: "https"
4078+
allow_empty: true
4079+
}
4080+
}
40674081
attr_lists: "extended-amp-global"
40684082
spec_url: "https://amp.dev/documentation/components/amp-pixel/"
40694083
amp_layout {
@@ -14676,6 +14690,10 @@ tags: { # <amp-story>
1467614690
name: "live-story-disabled"
1467714691
value: ""
1467814692
}
14693+
attrs: {
14694+
name: "desktop-aspect-ratio"
14695+
value_regex: "\\d+:\\d+"
14696+
}
1467914697
siblings_disallowed: true
1468014698
child_tags: {
1468114699
mandatory_min_num_child_tags: 1

0 commit comments

Comments
 (0)