Merge branch 'release/1.80'

entur · Jan 14, 2023 · 2585bd9 · 2585bd9
2 parents aa12f26 + 29646be
commit 2585bd9
Show file tree

Hide file tree

Showing 8 changed files with 37 additions and 29 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -3,7 +3,7 @@ version: 2.1
 orbs:
   maven: entur/maven-orb@0.0.12
   owasp: entur/owasp@0.0.18
-  queue: eddiewebb/queue@volatile
+  queue: eddiewebb/queue@1.8.4
 
 executors:
   java:

diff --git a/owasp_supressions.xml b/owasp_supressions.xml
@@ -14,5 +14,13 @@
         <packageUrl regex="true">^pkg:maven/no\.entur/schema2proto\-wire@.*$</packageUrl>
         <cpe>cpe:/a:wire:wire</cpe>
     </suppress>
-
+    <suppress>
+        <!-- excessive memory use -->
+        <cve>CVE-2022-3064</cve>
+    </suppress>
+    <suppress>
+        <!-- parsing untrusted yaml -->
+        <cve>CVE-2022-1471</cve>
+    </suppress>
+
 </suppressions>
diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>no.entur</groupId>
     <artifactId>schema2proto-parent</artifactId>
-    <version>1.79</version>
+    <version>1.80</version>
     <packaging>pom</packaging>
     <name>Schema 2 proto parent pom</name>
     <description>Schema2proto - XSD schema to protobuf.</description>
@@ -15,16 +15,16 @@
         <module>schema2proto-xsom</module>
     </modules>
     <properties>
-        <kotlin.version>1.7.10</kotlin.version>
+        <kotlin.version>1.7.22</kotlin.version>
         <maven-javadoc-plugin.version>3.4.1</maven-javadoc-plugin.version>
         <maven-source-plugin.version>3.2.1</maven-source-plugin.version>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
         <maven.version>3.8.6</maven.version>
-        <owasp-dependency-check.version>7.1.2</owasp-dependency-check.version>
+        <owasp-dependency-check.version>7.3.2</owasp-dependency-check.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <spotless.version>2.25.0</spotless.version>
+        <spotless.version>2.28.0</spotless.version>
     </properties>
     <build>
         <pluginManagement>
@@ -73,19 +73,19 @@
                 </plugin>
                 <plugin>
                     <artifactId>maven-plugin-plugin</artifactId>
-                    <version>3.6.4</version>
+                    <version>3.7.0</version>
                 </plugin>
                 <plugin>
                     <artifactId>maven-surefire-plugin</artifactId>
                     <version>2.22.2</version>
                 </plugin>
                 <plugin>
                     <artifactId>maven-jar-plugin</artifactId>
-                    <version>3.2.2</version>
+                    <version>3.3.0</version>
                 </plugin>
                 <plugin>
                     <artifactId>maven-install-plugin</artifactId>
-                    <version>3.0.1</version>
+                    <version>3.1.0</version>
                 </plugin>
                 <plugin>
                     <artifactId>maven-deploy-plugin</artifactId>
@@ -146,7 +146,7 @@
             <plugin>
                 <groupId>com.amashchenko.maven.plugin</groupId>
                 <artifactId>gitflow-maven-plugin</artifactId>
-                <version>1.18.0</version>
+                <version>1.19.0</version>
                 <configuration>
                     <allowSnapshots>false</allowSnapshots>
                     <verbose>true</verbose>

diff --git a/schema2proto-lib/pom.xml b/schema2proto-lib/pom.xml
@@ -4,13 +4,13 @@
     <parent>
         <groupId>no.entur</groupId>
         <artifactId>schema2proto-parent</artifactId>
-        <version>1.79</version>
+        <version>1.80</version>
     </parent>
     <artifactId>schema2proto-lib</artifactId>
     <packaging>jar</packaging>
     <properties>
-        <junit.jupiter.version>5.9.0</junit.jupiter.version>
-        <protobuf.version>3.21.5</protobuf.version>
+        <junit.jupiter.version>5.9.1</junit.jupiter.version>
+        <protobuf.version>3.21.10</protobuf.version>
     </properties>
     <dependencies>
         <dependency>
@@ -31,17 +31,17 @@
         <dependency>
             <groupId>org.yaml</groupId>
             <artifactId>snakeyaml</artifactId>
-            <version>1.31</version>
+            <version>1.33</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
-            <version>2.0.0</version>
+            <version>2.0.5</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-simple</artifactId>
-            <version>2.0.0</version>
+            <version>2.0.5</version>
         </dependency>
         <dependency>
             <groupId>no.entur</groupId>
@@ -72,12 +72,12 @@
         <dependency>
             <groupId>io.envoyproxy.protoc-gen-validate</groupId>
             <artifactId>pgv-java-stub</artifactId>
-            <version>0.6.7</version>
+            <version>0.6.13</version>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-text</artifactId>
-            <version>1.9</version>
+            <version>1.10.0</version>
         </dependency>
         <dependency>
             <groupId>no.entur</groupId>
@@ -87,7 +87,7 @@
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
-            <version>2.9.1</version>
+            <version>2.10</version>
         </dependency>
         <dependency>
             <groupId>de.slub-dresden</groupId>
@@ -128,7 +128,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.3.0</version>
+                <version>3.4.1</version>
                 <executions>
                     <execution>
                         <goals>

diff --git a/schema2proto-maven-plugin/pom.xml b/schema2proto-maven-plugin/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>no.entur</groupId>
         <artifactId>schema2proto-parent</artifactId>
-        <version>1.79</version>
+        <version>1.80</version>
     </parent>
     <artifactId>schema2proto-maven-plugin</artifactId>
     <packaging>maven-plugin</packaging>
@@ -42,7 +42,7 @@
         <dependency>
             <groupId>org.apache.maven.plugin-tools</groupId>
             <artifactId>maven-plugin-annotations</artifactId>
-            <version>3.6.4</version>
+            <version>3.7.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

diff --git a/schema2proto-wire/pom.xml b/schema2proto-wire/pom.xml
@@ -4,13 +4,13 @@
     <parent>
         <groupId>no.entur</groupId>
         <artifactId>schema2proto-parent</artifactId>
-        <version>1.79</version>
+        <version>1.80</version>
     </parent>
     <artifactId>schema2proto-wire</artifactId>
     <packaging>jar</packaging>
     <properties>
-        <junit.jupiter.version>5.9.0</junit.jupiter.version>
-        <kotlin.version>1.7.10</kotlin.version>
+        <junit.jupiter.version>5.9.1</junit.jupiter.version>
+        <kotlin.version>1.7.22</kotlin.version>
         <wire.version>3.7.1</wire.version>
     </properties>
     <dependencies>

diff --git a/schema2proto-xsdproto/pom.xml b/schema2proto-xsdproto/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>no.entur</groupId>
         <artifactId>schema2proto-parent</artifactId>
-        <version>1.79</version>
+        <version>1.80</version>
     </parent>
     <artifactId>schema2proto-xsdproto</artifactId>
     <packaging>jar</packaging>

diff --git a/schema2proto-xsom/pom.xml b/schema2proto-xsom/pom.xml
@@ -15,7 +15,7 @@
     <parent>
         <groupId>no.entur</groupId>
         <artifactId>schema2proto-parent</artifactId>
-        <version>1.79</version>
+        <version>1.80</version>
     </parent>
     <artifactId>schema2proto-xsom</artifactId>
     <name>schema2proto-XSOM</name>
@@ -26,7 +26,7 @@
         <copyright.exclude.file>${project.basedir}/copyright-exclude</copyright.exclude.file>
         <copyright.template.file>${project.basedir}/copyright.txt</copyright.template.file>
         <findbugs.exclude>${project.basedir}/exclude-xsom.xml</findbugs.exclude>
-        <relaxng.version>4.0.0</relaxng.version>
+        <relaxng.version>4.0.1</relaxng.version>
     </properties>
     <dependencies>
         <dependency>
@@ -89,7 +89,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-dependency-plugin</artifactId>
-                <version>3.3.0</version>
+                <version>3.4.0</version>
                 <executions>
                     <execution>
                         <id>copy-relaxng-to-mp</id>