Skip to content

Commit 97e5348

Browse files
authored
Dependabot security update and Jan 2023 amphtml sync (#179)
1 parent 1fdddcd commit 97e5348

File tree

3 files changed

+45
-11
lines changed

3 files changed

+45
-11
lines changed

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.37
4+
- upgrade fasterxml.jackson from 2.13.4 to 2.14.1
5+
- upgrade jackson-databind from 2.13.4.2 to 2.14.1
6+
- upgrade maven-dependency-plugin from 3.3.0 to 3.4.0
7+
- upgrade mockito-core from 4.8.1 to 4.11.0
8+
- upgrade os-maven-plugin from 1.7.0 to 1.7.1
9+
- upgrade protobuf-java from 3.21.8 to 3.21.12
10+
- upgrade puppycrawl.tools.checkstyle from 10.3.4 to 10.5.0
11+
- upgrade spotbugs-maven-plugin from 4.7.2.1 to 4.7.3.0
12+
- upgrade tagchowder from 2.0.23 to 2.0.24
13+
- upgrade testng from 7.6.1 to 7.7.1
14+
315
## AMP HTML Validator 1.0.36
416
- upgrade commons-text from 1.9 to 1.10.0
517
- upgrade jackson-databind from 2.13.4 to 2.13.4.2

pom.xml

Lines changed: 11 additions & 11 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.36</version>
10+
<version>1.0.37</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,25 @@
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.3.0</maven-dependency-plugin.version>
63+
<maven-dependency-plugin.version>3.4.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.2.1</spotbugs-maven-plugin.version>
67+
<spotbugs-maven-plugin.version>4.7.3.0</spotbugs-maven-plugin.version>
6868
<com.github.spotbugs.version>4.7.3</com.github.spotbugs.version>
6969

70-
<os-maven-plugin.version>1.7.0</os-maven-plugin.version>
71-
<protobuf.version>3.21.8</protobuf.version>
70+
<os-maven-plugin.version>1.7.1</os-maven-plugin.version>
71+
<protobuf.version>3.21.12</protobuf.version>
7272
<maven-surefire-plugin.version>3.0.0-M7</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.3.4</com.puppycrawl.checkstyle.version>
80-
<fasterxml.jackson.version>2.13.4</fasterxml.jackson.version>
81-
<fasterxml.jackson.databind.version>2.13.4.2</fasterxml.jackson.databind.version>
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>
8282
</properties>
8383

8484
<repositories>
@@ -650,7 +650,7 @@
650650
<dependency>
651651
<groupId>com.yahoo.tagchowder</groupId>
652652
<artifactId>tagchowder.core</artifactId>
653-
<version>2.0.23</version>
653+
<version>2.0.24</version>
654654
</dependency>
655655
<dependency>
656656
<groupId>com.google.code.findbugs</groupId>
@@ -678,7 +678,7 @@
678678
<dependency>
679679
<groupId>org.testng</groupId>
680680
<artifactId>testng</artifactId>
681-
<version>7.6.1</version>
681+
<version>7.7.1</version>
682682
<scope>test</scope>
683683
</dependency>
684684
<dependency>
@@ -690,7 +690,7 @@
690690
<dependency>
691691
<groupId>org.mockito</groupId>
692692
<artifactId>mockito-core</artifactId>
693-
<version>4.8.1</version>
693+
<version>4.11.0</version>
694694
<scope>test</scope>
695695
</dependency>
696696
</dependencies>

src/main/resources/validator-all.protoascii

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10180,6 +10180,12 @@ tags: { # <amp-story-auto-ads>
1018010180
mandatory_parent: "AMP-STORY"
1018110181
unique: true
1018210182
spec_url: "https://amp.dev/documentation/components/amp-story-auto-ads/"
10183+
attrs: {
10184+
name: "src"
10185+
value_url: {
10186+
protocol: "https"
10187+
}
10188+
}
1018310189
}
1018410190
tags: { # amp-story-auto-ads (json config)
1018510191
html_format: AMP
@@ -10800,6 +10806,10 @@ tags: { # <amp-vimeo>
1080010806
name: "autoplay"
1080110807
value: ""
1080210808
}
10809+
attrs: {
10810+
name: "do-not-track"
10811+
value: ""
10812+
}
1080310813
attrs: {
1080410814
name: "data-videoid"
1080510815
mandatory: true
@@ -11523,6 +11533,17 @@ attr_lists: {
1152311533
}
1152411534
}
1152511535
}
11536+
tags: { # <amp-story-interactive-slider>
11537+
html_format: AMP
11538+
tag_name: "AMP-STORY-INTERACTIVE-SLIDER"
11539+
requires_extension: "amp-story-interactive"
11540+
mandatory_ancestor: "AMP-STORY-GRID-LAYER"
11541+
attr_lists: "interactive-shared-configs-attrs"
11542+
attrs: {
11543+
name: "option-1-text"
11544+
mandatory: false
11545+
}
11546+
}
1152611547
attr_lists: {
1152711548
name: "interactive-options-img-attrs"
1152811549
attrs: {
@@ -15293,6 +15314,7 @@ descendant_tag_list: {
1529315314
tag: "AMP-STORY-INTERACTIVE-POLL"
1529415315
tag: "AMP-STORY-INTERACTIVE-QUIZ"
1529515316
tag: "AMP-STORY-INTERACTIVE-RESULTS"
15317+
tag: "AMP-STORY-INTERACTIVE-SLIDER"
1529615318
tag: "AMP-STORY-PANNING-MEDIA"
1529715319
tag: "AMP-STORY-SHOPPING-TAG"
1529815320
tag: "AMP-TIMEAGO"

0 commit comments

Comments
 (0)