From 2da022a111b629fe010d19d7c9a661b4d6a9a432 Mon Sep 17 00:00:00 2001 From: circleci Date: Mon, 7 Aug 2023 13:23:25 +0000 Subject: [PATCH 01/19] [ci skip]Update for next development version --- pom.xml | 2 +- schema2proto-lib/pom.xml | 2 +- schema2proto-maven-plugin/pom.xml | 2 +- schema2proto-wire/pom.xml | 2 +- schema2proto-xsdproto/pom.xml | 2 +- schema2proto-xsom/pom.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index b43b0eb8..a1b9adc5 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 no.entur schema2proto-parent - 1.87 + 1.88-SNAPSHOT pom Schema 2 proto parent pom Schema2proto - XSD schema to protobuf. diff --git a/schema2proto-lib/pom.xml b/schema2proto-lib/pom.xml index 7664a2e7..d3a14892 100755 --- a/schema2proto-lib/pom.xml +++ b/schema2proto-lib/pom.xml @@ -4,7 +4,7 @@ no.entur schema2proto-parent - 1.87 + 1.88-SNAPSHOT schema2proto-lib jar diff --git a/schema2proto-maven-plugin/pom.xml b/schema2proto-maven-plugin/pom.xml index eef4ad1c..af8579f6 100644 --- a/schema2proto-maven-plugin/pom.xml +++ b/schema2proto-maven-plugin/pom.xml @@ -4,7 +4,7 @@ no.entur schema2proto-parent - 1.87 + 1.88-SNAPSHOT schema2proto-maven-plugin maven-plugin diff --git a/schema2proto-wire/pom.xml b/schema2proto-wire/pom.xml index 9624009f..e2a0380b 100755 --- a/schema2proto-wire/pom.xml +++ b/schema2proto-wire/pom.xml @@ -4,7 +4,7 @@ no.entur schema2proto-parent - 1.87 + 1.88-SNAPSHOT schema2proto-wire jar diff --git a/schema2proto-xsdproto/pom.xml b/schema2proto-xsdproto/pom.xml index 0c37e99c..82d1471a 100644 --- a/schema2proto-xsdproto/pom.xml +++ b/schema2proto-xsdproto/pom.xml @@ -4,7 +4,7 @@ no.entur schema2proto-parent - 1.87 + 1.88-SNAPSHOT schema2proto-xsdproto jar diff --git a/schema2proto-xsom/pom.xml b/schema2proto-xsom/pom.xml index e0b48ce1..a9850768 100644 --- a/schema2proto-xsom/pom.xml +++ b/schema2proto-xsom/pom.xml @@ -15,7 +15,7 @@ no.entur schema2proto-parent - 1.87 + 1.88-SNAPSHOT schema2proto-xsom schema2proto-XSOM From d6718fcd0679f1b6465cb9ad533e7c9556e97c5c Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 10 Aug 2023 06:05:08 +0000 Subject: [PATCH 02/19] Update protobuf.version from v3.23.4 to v3.24.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a1b9adc5..871d1be5 100644 --- a/pom.xml +++ b/pom.xml @@ -39,7 +39,7 @@ 0.10.1 UTF-8 UTF-8 - 3.23.4 + 3.24.0 4.0.3 2.0.7 1.33 From 37f78b0b00118bb25bb8f49514c490653e8a514d Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 18 Aug 2023 22:28:03 +0000 Subject: [PATCH 03/19] Update protobuf.version from v3.24.0 to v3.24.1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 871d1be5..c0f7f2fe 100644 --- a/pom.xml +++ b/pom.xml @@ -39,7 +39,7 @@ 0.10.1 UTF-8 UTF-8 - 3.24.0 + 3.24.1 4.0.3 2.0.7 1.33 From 0954ccc1edfd5d530fa20fdb48e9592d0814f57c Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 19 Aug 2023 15:56:31 +0000 Subject: [PATCH 04/19] Update dependency org.owasp:dependency-check-maven from v8.3.1 to v8.4.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c0f7f2fe..f5962f0c 100644 --- a/pom.xml +++ b/pom.xml @@ -35,7 +35,7 @@ 1.8 3.9.4 3.5.0 - 8.3.1 + 8.4.0 0.10.1 UTF-8 UTF-8 From f90bd6130e4ae06a2af08431514e87f923d474dc Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 22 Aug 2023 20:50:18 +0000 Subject: [PATCH 05/19] Update dependency org.apache.maven.plugins:maven-enforcer-plugin from v3.3.0 to v3.4.0 --- schema2proto-xsom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/schema2proto-xsom/pom.xml b/schema2proto-xsom/pom.xml index a9850768..a7966257 100644 --- a/schema2proto-xsom/pom.xml +++ b/schema2proto-xsom/pom.xml @@ -100,7 +100,7 @@ org.apache.maven.plugins maven-enforcer-plugin - 3.3.0 + 3.4.0 From 600eb5b265683494812134782cf653151ff5a563 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 23 Aug 2023 11:08:46 +0000 Subject: [PATCH 06/19] Update kotlin monorepo from v1.9.0 to v1.9.10 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f5962f0c..324f5d96 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ 1.3.0 5.10.0 4.13.2 - 1.9.0 + 1.9.10 3.5.0 3.9.0 3.3.0 From 051c6ff693c1d7409a87f58acf7a16c1f2d3ed37 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 26 Aug 2023 01:56:51 +0000 Subject: [PATCH 07/19] Update protobuf.version from v3.24.1 to v3.24.2 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 324f5d96..01d4b342 100644 --- a/pom.xml +++ b/pom.xml @@ -39,7 +39,7 @@ 0.10.1 UTF-8 UTF-8 - 3.24.1 + 3.24.2 4.0.3 2.0.7 1.33 From 3946f5a7114b083abc76f5c86a02f0985f90808b Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 29 Aug 2023 07:23:18 +0000 Subject: [PATCH 08/19] Update dependency com.diffplug.spotless:spotless-maven-plugin from v2.38.0 to v2.39.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 01d4b342..39f63c9e 100644 --- a/pom.xml +++ b/pom.xml @@ -43,7 +43,7 @@ 4.0.3 2.0.7 1.33 - 2.38.0 + 2.39.0 2.0.1 3.7.1 From a98fae567f53c2e1692f705009b79eeff3f748cb Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 3 Sep 2023 18:41:20 +0000 Subject: [PATCH 09/19] Update slf4j.version from v2.0.7 to v2.0.9 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 39f63c9e..dada59ef 100644 --- a/pom.xml +++ b/pom.xml @@ -41,7 +41,7 @@ UTF-8 3.24.2 4.0.3 - 2.0.7 + 2.0.9 1.33 2.39.0 2.0.1 From cd6ab462ff8d575657eeace2a9072d70adbc9e46 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 6 Sep 2023 16:18:29 +0000 Subject: [PATCH 10/19] Update owasp orb from v0.0.18 to v0.0.19 --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 3e57b252..75a7a979 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -2,7 +2,7 @@ version: 2.1 orbs: maven: entur/maven-orb@0.0.12 - owasp: entur/owasp@0.0.18 + owasp: entur/owasp@0.0.19 queue: eddiewebb/queue@1.12.0 executors: From f698db4102245b79e403720e4738607ce8ab2271 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 7 Sep 2023 22:37:50 +0000 Subject: [PATCH 11/19] Update protobuf.version from v3.24.2 to v3.24.3 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index dada59ef..01aa0082 100644 --- a/pom.xml +++ b/pom.xml @@ -39,7 +39,7 @@ 0.10.1 UTF-8 UTF-8 - 3.24.2 + 3.24.3 4.0.3 2.0.9 1.33 From d62e763f3177f8d565d6e5a7f65f0bc74eab038b Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 10 Sep 2023 21:37:01 +0000 Subject: [PATCH 12/19] Update dependency org.apache.maven.plugins:maven-enforcer-plugin from v3.4.0 to v3.4.1 --- schema2proto-xsom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/schema2proto-xsom/pom.xml b/schema2proto-xsom/pom.xml index a7966257..e789a998 100644 --- a/schema2proto-xsom/pom.xml +++ b/schema2proto-xsom/pom.xml @@ -100,7 +100,7 @@ org.apache.maven.plugins maven-enforcer-plugin - 3.4.0 + 3.4.1 From 9e058aa5b08f0abf6fcb72d54f3aa198a8aa5497 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 15 Sep 2023 17:01:24 +0000 Subject: [PATCH 13/19] Update dependency org.apache.maven.plugins:maven-javadoc-plugin from v3.5.0 to v3.6.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 01aa0082..a6aa5dbe 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ 5.10.0 4.13.2 1.9.10 - 3.5.0 + 3.6.0 3.9.0 3.3.0 3.3.0 From 7fe9e33e199f190c8213b180da9689de766993f4 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 24 Sep 2023 22:52:47 +0000 Subject: [PATCH 14/19] Update dependency org.apache.maven.plugins:maven-shade-plugin from v3.5.0 to v3.5.1 --- schema2proto-lib/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/schema2proto-lib/pom.xml b/schema2proto-lib/pom.xml index d3a14892..c1321aca 100755 --- a/schema2proto-lib/pom.xml +++ b/schema2proto-lib/pom.xml @@ -106,7 +106,7 @@ org.apache.maven.plugins maven-shade-plugin - 3.5.0 + 3.5.1 From 743dbac83f5b787142429e6afa487f68014dfc7b Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 29 Sep 2023 00:48:40 +0000 Subject: [PATCH 15/19] Update dependency com.diffplug.spotless:spotless-maven-plugin from v2.39.0 to v2.40.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a6aa5dbe..668d8c8f 100644 --- a/pom.xml +++ b/pom.xml @@ -43,7 +43,7 @@ 4.0.3 2.0.9 1.33 - 2.39.0 + 2.40.0 2.0.1 3.7.1 From a7d9c3625e6b50c1e8bf87ac766521ffe07993f8 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 29 Sep 2023 21:31:37 +0000 Subject: [PATCH 16/19] Update dependency commons-io:commons-io from v2.13.0 to v2.14.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 668d8c8f..6ab27ed2 100644 --- a/pom.xml +++ b/pom.xml @@ -17,7 +17,7 @@ 3.24.2 1.5.0 - 2.13.0 + 2.14.0 3.13.0 1.10.0 2.10.1 From 1f2158730a4e06b7d10f91615bd43ba55e85fffe Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 2 Oct 2023 04:36:22 +0000 Subject: [PATCH 17/19] Update dependency com.squareup.okio:okio from v3.5.0 to v3.6.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6ab27ed2..b29ad0d9 100644 --- a/pom.xml +++ b/pom.xml @@ -34,7 +34,7 @@ 1.8 1.8 3.9.4 - 3.5.0 + 3.6.0 8.4.0 0.10.1 UTF-8 From 833174da0bdfee0d53094257e9057206214a497d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20Skj=C3=B8lberg?= Date: Wed, 27 Mar 2024 10:13:37 +0100 Subject: [PATCH 18/19] Bump owasp --- .gitignore | 1 + pom.xml | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 62da5da1..755b8634 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,4 @@ dependency-reduced-pom.xml .idea/ local_config/ +target diff --git a/pom.xml b/pom.xml index b29ad0d9..3d14d04f 100644 --- a/pom.xml +++ b/pom.xml @@ -33,9 +33,9 @@ 3.3.0 1.8 1.8 - 3.9.4 + 3.9.6 3.6.0 - 8.4.0 + 9.0.10 0.10.1 UTF-8 UTF-8 @@ -387,6 +387,7 @@ 7 true + ${NVD_API_KEY} true From 9af3177a04e2f792184e9eddc180f2a53b1ab701 Mon Sep 17 00:00:00 2001 From: circleci Date: Wed, 27 Mar 2024 09:15:06 +0000 Subject: [PATCH 19/19] [ci skip]Update versions for release --- pom.xml | 2 +- schema2proto-lib/pom.xml | 2 +- schema2proto-maven-plugin/pom.xml | 2 +- schema2proto-wire/pom.xml | 2 +- schema2proto-xsdproto/pom.xml | 2 +- schema2proto-xsom/pom.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index 3d14d04f..829841a3 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 no.entur schema2proto-parent - 1.88-SNAPSHOT + 1.88 pom Schema 2 proto parent pom Schema2proto - XSD schema to protobuf. diff --git a/schema2proto-lib/pom.xml b/schema2proto-lib/pom.xml index c1321aca..14828e63 100755 --- a/schema2proto-lib/pom.xml +++ b/schema2proto-lib/pom.xml @@ -4,7 +4,7 @@ no.entur schema2proto-parent - 1.88-SNAPSHOT + 1.88 schema2proto-lib jar diff --git a/schema2proto-maven-plugin/pom.xml b/schema2proto-maven-plugin/pom.xml index af8579f6..717e146b 100644 --- a/schema2proto-maven-plugin/pom.xml +++ b/schema2proto-maven-plugin/pom.xml @@ -4,7 +4,7 @@ no.entur schema2proto-parent - 1.88-SNAPSHOT + 1.88 schema2proto-maven-plugin maven-plugin diff --git a/schema2proto-wire/pom.xml b/schema2proto-wire/pom.xml index e2a0380b..1e52a9de 100755 --- a/schema2proto-wire/pom.xml +++ b/schema2proto-wire/pom.xml @@ -4,7 +4,7 @@ no.entur schema2proto-parent - 1.88-SNAPSHOT + 1.88 schema2proto-wire jar diff --git a/schema2proto-xsdproto/pom.xml b/schema2proto-xsdproto/pom.xml index 82d1471a..bf7db3a9 100644 --- a/schema2proto-xsdproto/pom.xml +++ b/schema2proto-xsdproto/pom.xml @@ -4,7 +4,7 @@ no.entur schema2proto-parent - 1.88-SNAPSHOT + 1.88 schema2proto-xsdproto jar diff --git a/schema2proto-xsom/pom.xml b/schema2proto-xsom/pom.xml index e789a998..d5607b5f 100644 --- a/schema2proto-xsom/pom.xml +++ b/schema2proto-xsom/pom.xml @@ -15,7 +15,7 @@ no.entur schema2proto-parent - 1.88-SNAPSHOT + 1.88 schema2proto-xsom schema2proto-XSOM