Merge branch 'release/1.88'

.circleci/config.yml

@@ -2,7 +2,7 @@ version: 2.1
 
 orbs:
   maven: entur/[email protected]
-  owasp: entur/[email protected].18
+  owasp: entur/[email protected].19
   queue: eddiewebb/[email protected]
 
 executors:

.gitignore

@@ -26,3 +26,4 @@ dependency-reduced-pom.xml
 
 .idea/
 local_config/
+target

pom.xml

@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>no.entur</groupId>
     <artifactId>schema2proto-parent</artifactId>
-    <version>1.87</version>
+    <version>1.88</version>
     <packaging>pom</packaging>
     <name>Schema 2 proto parent pom</name>
     <description>Schema2proto - XSD schema to protobuf.</description>
@@ -17,7 +17,7 @@
     <properties>
         <assertj.version>3.24.2</assertj.version>
         <commons-cli.version>1.5.0</commons-cli.version>
-        <commons-io.version>2.13.0</commons-io.version>
+        <commons-io.version>2.14.0</commons-io.version>
         <commons-lang3.version>3.13.0</commons-lang3.version>
         <commons-text.version>1.10.0</commons-text.version>
         <gson.version>2.10.1</gson.version>
@@ -26,24 +26,24 @@
         <jimfs.version>1.3.0</jimfs.version>
         <junit.jupiter.version>5.10.0</junit.jupiter.version>
         <junit.version>4.13.2</junit.version>
-        <kotlin.version>1.9.0</kotlin.version>
-        <maven-javadoc-plugin.version>3.5.0</maven-javadoc-plugin.version>
+        <kotlin.version>1.9.10</kotlin.version>
+        <maven-javadoc-plugin.version>3.6.0</maven-javadoc-plugin.version>
         <maven-plugin-annotations.version>3.9.0</maven-plugin-annotations.version>
         <maven-plugin-testing-harness.version>3.3.0</maven-plugin-testing-harness.version>
         <maven-source-plugin.version>3.3.0</maven-source-plugin.version>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
-        <maven.version>3.9.4</maven.version>
-        <okio.version>3.5.0</okio.version>
-        <owasp-dependency-check.version>8.3.1</owasp-dependency-check.version>
+        <maven.version>3.9.6</maven.version>
+        <okio.version>3.6.0</okio.version>
+        <owasp-dependency-check.version>9.0.10</owasp-dependency-check.version>
         <pgv-java-stub.version>0.10.1</pgv-java-stub.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <protobuf.version>3.23.4</protobuf.version>
+        <protobuf.version>3.24.3</protobuf.version>
         <relaxng.version>4.0.3</relaxng.version>
-        <slf4j.version>2.0.7</slf4j.version>
+        <slf4j.version>2.0.9</slf4j.version>
         <snakeyaml.version>1.33</snakeyaml.version>
-        <spotless.version>2.38.0</spotless.version>
+        <spotless.version>2.40.0</spotless.version>
         <urnlib.version>2.0.1</urnlib.version>
         <wire.version>3.7.1</wire.version>
     </properties>
@@ -387,6 +387,7 @@
                 <configuration>
                     <failBuildOnCVSS>7</failBuildOnCVSS>
                     <failOnError>true</failOnError>
+                    <nvdApiKey>${NVD_API_KEY}</nvdApiKey>
                     <skipTestScope>true</skipTestScope>
                     <!-- suppressionFiles: see https://jeremylong.github.io/DependencyCheck/general/suppression.html -->
                     <suppressionFiles>

schema2proto-lib/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>no.entur</groupId>
         <artifactId>schema2proto-parent</artifactId>
-        <version>1.87</version>
+        <version>1.88</version>
     </parent>
     <artifactId>schema2proto-lib</artifactId>
     <packaging>jar</packaging>
@@ -106,7 +106,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.5.0</version>
+                <version>3.5.1</version>
                 <executions>
                     <execution>
                         <goals>

schema2proto-maven-plugin/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>no.entur</groupId>
         <artifactId>schema2proto-parent</artifactId>
-        <version>1.87</version>
+        <version>1.88</version>
     </parent>
     <artifactId>schema2proto-maven-plugin</artifactId>
     <packaging>maven-plugin</packaging>

schema2proto-wire/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>no.entur</groupId>
         <artifactId>schema2proto-parent</artifactId>
-        <version>1.87</version>
+        <version>1.88</version>
     </parent>
     <artifactId>schema2proto-wire</artifactId>
     <packaging>jar</packaging>

schema2proto-xsdproto/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>no.entur</groupId>
         <artifactId>schema2proto-parent</artifactId>
-        <version>1.87</version>
+        <version>1.88</version>
     </parent>
     <artifactId>schema2proto-xsdproto</artifactId>
     <packaging>jar</packaging>

schema2proto-xsom/pom.xml

@@ -15,7 +15,7 @@
     <parent>
         <groupId>no.entur</groupId>
         <artifactId>schema2proto-parent</artifactId>
-        <version>1.87</version>
+        <version>1.88</version>
     </parent>
     <artifactId>schema2proto-xsom</artifactId>
     <name>schema2proto-XSOM</name>
@@ -100,7 +100,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-enforcer-plugin</artifactId>
-                <version>3.3.0</version>
+                <version>3.4.1</version>
                 <configuration>
                     <rules>
                         <requireJavaVersion>