Jan 2024 Update (#226)

* Jan 2024 Update * update pom * more pom updates
ampproject · Jan 31, 2024 · 39783e1 · 39783e1
1 parent 1befeda
commit 39783e1
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 21 deletions.
diff --git a/Changelog.md b/Changelog.md
@@ -1,5 +1,25 @@
 # Changelog
 
+## AMP HTML Validator 1.0.42
+- upgrade build-helper-maven-plugin from 3.4.0 to 3.5.0
+- upgrade commons-text from 1.10.0 to 1.11.0
+- upgrade commons-lang3 from 3.13.0 to 3.14.0
+- upgrade com.fasterxml.jackson from 2.15.3 to 2.16.1
+- upgrade exec-maven-plugin from 3.1.0 to 3.1.1
+- upgrade maven-checkstyle-plugin from 3.3.0 to 3.3.1
+- upgrade maven-clean-plugin from 3.3.1 to 3.3.2
+- upgrade maven-dependency-plugin from 3.6.0 to 3.6.1
+- upgrade maven-javadoc-plugin from 3.6.2 to 3.6.3
+- upgrade maven-pmd-plugin from 3.21.0 to 3.21.2
+- upgrade maven-surefire-plugin from 3.2.2 to 3.2.5 
+- upgrade mockito-core from 5.7.0 to 5.10.0
+- upgrade protobuf-java from 3.25.1 to 3.25.2
+- upgrade puppycrawl.tools.checkstyle from 10.12.5 to 10.12.7 
+- upgrade spotbugs-maven-plugin from 4.8.1.0 to 4.8.3.0
+- upgrade spotbugs from 4.8.1 to 4.8.3
+- upgrade testng from 7.8.0 to 7.9.0
+- sync validator-all.protoascii with amphtml (2024.01.31)
+
 ## AMP HTML Validator 1.0.41
 - update actions/checkout action from v3 to v4
 - upgrade com.fasterxml.jackson from 2.15.2 to 2.15.3

diff --git a/pom.xml b/pom.xml
@@ -7,7 +7,7 @@
     <groupId>dev.amp</groupId>
     <artifactId>validator-java</artifactId>
     <name>AMP validator Java API</name>
-    <version>1.0.41</version>
+    <version>1.0.42</version>
     <description>A Java validator for the AMP Html format.</description>
     <packaging>jar</packaging>
     <url>https://github.com/ampproject/validator-java</url>
@@ -58,37 +58,36 @@
         <validator.proto.directory>${project.basedir}/src/main/proto</validator.proto.directory>
 
         <!-- library versions -->
-        <build-helper-maven-plugin.version>3.4.0</build-helper-maven-plugin.version>
+        <build-helper-maven-plugin.version>3.5.0</build-helper-maven-plugin.version>
         <jacoco-maven-plugin.version>0.8.11</jacoco-maven-plugin.version>
         <maven-antrun-plugin.version>3.1.0</maven-antrun-plugin.version>
-        <maven-checkstyle-plugin.version>3.3.0</maven-checkstyle-plugin.version>
-        <maven-clean-plugin.version>3.3.1</maven-clean-plugin.version>
-        <maven-dependency-plugin.version>3.6.0</maven-dependency-plugin.version>
+        <maven-checkstyle-plugin.version>3.3.1</maven-checkstyle-plugin.version>
+        <maven-clean-plugin.version>3.3.2</maven-clean-plugin.version>
+        <maven-dependency-plugin.version>3.6.1</maven-dependency-plugin.version>
         <maven-enforcer-plugin.version>3.4.1</maven-enforcer-plugin.version>
         <maven-gpg-plugin.version>3.1.0</maven-gpg-plugin.version>
-        <maven-javadoc-plugin.version>3.6.2</maven-javadoc-plugin.version>
-        <maven-shade-plugin.version>2.4.2</maven-shade-plugin.version>
+        <maven-javadoc-plugin.version>3.6.3</maven-javadoc-plugin.version>
         <maven-source-plugin.version>3.3.0</maven-source-plugin.version>
-        <spotbugs-maven-plugin.version>4.8.1.0</spotbugs-maven-plugin.version>
-        <com.github.spotbugs.version>4.8.1</com.github.spotbugs.version>
+        <spotbugs-maven-plugin.version>4.8.3.0</spotbugs-maven-plugin.version>
+        <com.github.spotbugs.version>4.8.3</com.github.spotbugs.version>
 
         <os-maven-plugin.version>1.7.1</os-maven-plugin.version>
-        <protobuf.version>3.25.1</protobuf.version>
-        <maven-surefire-plugin.version>3.2.2</maven-surefire-plugin.version>
+        <protobuf.version>3.25.2</protobuf.version>
+        <maven-surefire-plugin.version>3.2.5</maven-surefire-plugin.version>
         <jdk.version>11</jdk.version>
         <encoding>UTF-8</encoding>
         <main.basedir>${project.basedir}</main.basedir>
 
         <checkstyle.maxAllowedViolations>10</checkstyle.maxAllowedViolations>
 
-        <com.puppycrawl.checkstyle.version>10.12.5</com.puppycrawl.checkstyle.version>
-        <fasterxml.jackson.version>2.15.3</fasterxml.jackson.version>
+        <com.puppycrawl.checkstyle.version>10.12.7</com.puppycrawl.checkstyle.version>
+        <fasterxml.jackson.version>2.16.1</fasterxml.jackson.version>
         <tagchowder.version>2.0.27</tagchowder.version>
 
         <!-- test dependencies -->
         <org.junit.version>5.10.1</org.junit.version>
-        <org.mockito.version>5.7.0</org.mockito.version>
-        <org.testng.version>7.8.0</org.testng.version>
+        <org.mockito.version>5.10.0</org.mockito.version>
+        <org.testng.version>7.9.0</org.testng.version>
     </properties>
 
     <repositories>
@@ -153,7 +152,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>exec-maven-plugin</artifactId>
-                <version>3.1.0</version>
+                <version>3.1.1</version>
                 <executions>
                     <execution>
                         <id>Fetching AMP resources</id>
@@ -391,7 +390,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-pmd-plugin</artifactId>
-                <version>3.21.0</version>
+                <version>3.21.2</version>
                 <configuration>
                     <skip>false</skip>
                     <failOnViolation>true</failOnViolation>
@@ -670,12 +669,12 @@
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
-            <version>3.13.0</version>
+            <version>3.14.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-text</artifactId>
-            <version>1.10.0</version>
+            <version>1.11.0</version>
         </dependency>
 
         <!-- test -->

diff --git a/src/main/resources/validator-all.protoascii b/src/main/resources/validator-all.protoascii
@@ -9528,7 +9528,7 @@ tags: {  # <amp-story-audio-sticker>
   html_format: AMP
   tag_name: "AMP-STORY-AUDIO-STICKER"
   requires_extension: "amp-story-audio-sticker"
-  mandatory_parent: "AMP-STORY-GRID-LAYER"
+  mandatory_ancestor: "AMP-STORY-GRID-LAYER"
   attr_lists: "extended-amp-global"
   amp_layout: {
     supported_layouts: CONTAINER
@@ -9579,7 +9579,8 @@ descendant_tag_list: {
   tag: "AMP-IMG"
   tag: "DIV"
   tag: "SPAN"
-}tags: {  # amp-mowplayer
+}
+tags: {  # amp-mowplayer
   html_format: AMP
   tag_name: "SCRIPT"
   extension_spec: {