From 672cd2af3e4ec7359e6475b46bc936bf2ea8e400 Mon Sep 17 00:00:00 2001 From: circleci Date: Tue, 4 Jul 2023 09:31:52 +0000 Subject: [PATCH 01/16] [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 71e88172..92b9474a 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 no.entur schema2proto-parent - 1.86 + 1.87-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 7028e1f6..1ad210d1 100755 --- a/schema2proto-lib/pom.xml +++ b/schema2proto-lib/pom.xml @@ -4,7 +4,7 @@ no.entur schema2proto-parent - 1.86 + 1.87-SNAPSHOT schema2proto-lib jar diff --git a/schema2proto-maven-plugin/pom.xml b/schema2proto-maven-plugin/pom.xml index ae064d7e..b4d3f7de 100644 --- a/schema2proto-maven-plugin/pom.xml +++ b/schema2proto-maven-plugin/pom.xml @@ -4,7 +4,7 @@ no.entur schema2proto-parent - 1.86 + 1.87-SNAPSHOT schema2proto-maven-plugin maven-plugin diff --git a/schema2proto-wire/pom.xml b/schema2proto-wire/pom.xml index d6a80ab4..bfbf5f6c 100755 --- a/schema2proto-wire/pom.xml +++ b/schema2proto-wire/pom.xml @@ -4,7 +4,7 @@ no.entur schema2proto-parent - 1.86 + 1.87-SNAPSHOT schema2proto-wire jar diff --git a/schema2proto-xsdproto/pom.xml b/schema2proto-xsdproto/pom.xml index 3adb55c9..425d8eb8 100644 --- a/schema2proto-xsdproto/pom.xml +++ b/schema2proto-xsdproto/pom.xml @@ -4,7 +4,7 @@ no.entur schema2proto-parent - 1.86 + 1.87-SNAPSHOT schema2proto-xsdproto jar diff --git a/schema2proto-xsom/pom.xml b/schema2proto-xsom/pom.xml index de254c0b..8634d554 100644 --- a/schema2proto-xsom/pom.xml +++ b/schema2proto-xsom/pom.xml @@ -15,7 +15,7 @@ no.entur schema2proto-parent - 1.86 + 1.87-SNAPSHOT schema2proto-xsom schema2proto-XSOM From b718ad3e123b05f4d865a22b4c0dae8501372e5b Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 4 Jul 2023 09:32:20 +0000 Subject: [PATCH 02/16] Update maven.version from v3.9.2 to v3.9.3 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 92b9474a..648242c6 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ 3.3.0 1.8 1.8 - 3.9.2 + 3.9.3 3.3.0 8.3.1 0.10.1 From ba59306347c8222ba7f705c830dbc16f81b000ed Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 4 Jul 2023 14:20:19 +0000 Subject: [PATCH 03/16] Update dependency org.codehaus.mojo:license-maven-plugin from v2.1.0 to v2.2.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 648242c6..6ecc3787 100644 --- a/pom.xml +++ b/pom.xml @@ -52,7 +52,7 @@ org.codehaus.mojo license-maven-plugin - 2.1.0 + 2.2.0 Entur 2019 From 7a4c60e5b52abcce8bacf860490c38b8991b0ab9 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 6 Jul 2023 06:09:56 +0000 Subject: [PATCH 04/16] Update kotlin monorepo from v1.8.22 to v1.9.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6ecc3787..a4c81cc8 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ 1.2 5.9.3 4.13.2 - 1.8.22 + 1.9.0 3.5.0 3.9.0 3.3.0 From a827aa8e4f88a74a399c70731595f9582d332b28 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 6 Jul 2023 11:11:50 +0000 Subject: [PATCH 05/16] Update dependency com.google.jimfs:jimfs from v1.2 to v1.3.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a4c81cc8..d1678daf 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ 2.10.1 32.1.1-jre 4.12 - 1.2 + 1.3.0 5.9.3 4.13.2 1.9.0 From d37cbda31401bb1c3f0249321dbc9269e89f603d Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 7 Jul 2023 01:14:16 +0000 Subject: [PATCH 06/16] Update protobuf.version from v3.23.3 to v3.23.4 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d1678daf..3e160b5f 100644 --- a/pom.xml +++ b/pom.xml @@ -38,7 +38,7 @@ 0.10.1 UTF-8 UTF-8 - 3.23.3 + 3.23.4 4.0.3 2.0.7 1.33 From ff228a05f4cb4c5835b05523c2c86d37cc02cd40 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 7 Jul 2023 16:57:00 +0000 Subject: [PATCH 07/16] Update dependency com.squareup.okio:okio from v3.3.0 to v3.4.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3e160b5f..9e647eaa 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ 1.8 1.8 3.9.3 - 3.3.0 + 3.4.0 8.3.1 0.10.1 UTF-8 From 7f22b15c8ecabfa8b68d56713b215ea5d1d33575 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 18 Jul 2023 01:29:15 +0000 Subject: [PATCH 08/16] Update dependency com.diffplug.spotless:spotless-maven-plugin from v2.37.0 to v2.38.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9e647eaa..36090c0f 100644 --- a/pom.xml +++ b/pom.xml @@ -42,7 +42,7 @@ 4.0.3 2.0.7 1.33 - 2.37.0 + 2.38.0 2.0.1 3.7.1 From 311038e43b5d927dac5253d7812c8491e4efd4e7 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 23 Jul 2023 13:30:54 +0000 Subject: [PATCH 09/16] Update dependency org.junit.jupiter:junit-jupiter from v5.9.3 to v5.10.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 36090c0f..7ac44396 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ 32.1.1-jre 4.12 1.3.0 - 5.9.3 + 5.10.0 4.13.2 1.9.0 3.5.0 From 1c4fec715159de06a563e9c8bd585a648063133a Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 24 Jul 2023 10:53:51 +0000 Subject: [PATCH 10/16] Update dependency com.github.ekryd.sortpom:sortpom-maven-plugin from v3.2.1 to v3.3.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7ac44396..9a099494 100644 --- a/pom.xml +++ b/pom.xml @@ -176,7 +176,7 @@ com.github.ekryd.sortpom sortpom-maven-plugin - 3.2.1 + 3.3.0 custom_1 4 From d457c6a72f86e92239b757ecbfec70a58c538c28 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 28 Jul 2023 08:20:36 +0000 Subject: [PATCH 11/16] Update dependency org.apache.commons:commons-lang3 from v3.12.0 to v3.13.0 (#503) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9a099494..e01ec331 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ 3.24.2 1.5.0 2.13.0 - 3.12.0 + 3.13.0 1.10.0 2.10.1 32.1.1-jre From 6bbfc8a38ef538df7fcb07acbb12a8ad3708ed18 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 31 Jul 2023 22:45:12 +0000 Subject: [PATCH 12/16] Update dependency com.google.guava:guava from v32.1.1-jre to v32.1.2-jre --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e01ec331..5d6fef60 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ 3.13.0 1.10.0 2.10.1 - 32.1.1-jre + 32.1.2-jre 4.12 1.3.0 5.10.0 From 89a1119053b7ff949c58031a5dce3f8025333f30 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 2 Aug 2023 16:55:52 +0000 Subject: [PATCH 13/16] Update dependency com.squareup.okio:okio from v3.4.0 to v3.5.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5d6fef60..fcc5d5df 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ 1.8 1.8 3.9.3 - 3.4.0 + 3.5.0 8.3.1 0.10.1 UTF-8 From b833c30ed3fa47e4aac363f403ca9d0a75f2ca68 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 3 Aug 2023 10:12:37 +0000 Subject: [PATCH 14/16] Update maven.version from v3.9.3 to v3.9.4 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index fcc5d5df..b12fca53 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ 3.3.0 1.8 1.8 - 3.9.3 + 3.9.4 3.5.0 8.3.1 0.10.1 From 76332ec5cca76b595150d5dfa7726e5cd0077b18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20Skj=C3=B8lberg?= Date: Mon, 7 Aug 2023 16:19:12 +0300 Subject: [PATCH 15/16] Use dependency management, bump to junit vintage, bump okio for owasp (#507) * Use dependency management, bump to junit vintage, bump okio for owasp * Revert dependency removal --- pom.xml | 185 ++++++++++++++++++++++++++++++ schema2proto-lib/pom.xml | 18 --- schema2proto-maven-plugin/pom.xml | 12 +- schema2proto-wire/pom.xml | 9 -- schema2proto-xsom/pom.xml | 6 +- 5 files changed, 189 insertions(+), 41 deletions(-) diff --git a/pom.xml b/pom.xml index b12fca53..865003fa 100644 --- a/pom.xml +++ b/pom.xml @@ -29,6 +29,7 @@ 1.9.0 3.5.0 3.9.0 + 3.3.0 3.3.0 1.8 1.8 @@ -46,6 +47,190 @@ 2.0.1 3.7.1 + + + + ${project.groupId} + schema2proto-wire + ${project.version} + + + ${project.groupId} + schema2proto-xsom + ${project.parent.version} + + + ${project.groupId} + schema2proto-xsdproto + ${project.version} + + + ${project.groupId} + schema2proto-lib + ${project.version} + + + com.squareup.okio + okio + ${okio.version} + + + commons-io + commons-io + ${commons-io.version} + + + com.google.guava + guava + ${guava.version} + + + com.sun.xml.bind.external + relaxng-datatype + ${relaxng.version} + + + org.yaml + snakeyaml + ${snakeyaml.version} + + + org.slf4j + slf4j-api + ${slf4j.version} + + + org.slf4j + slf4j-simple + ${slf4j.version} + + + com.google.protobuf + protobuf-java + ${protobuf.version} + + + com.google.protobuf + protobuf-java-util + ${protobuf.version} + + + org.apache.commons + commons-lang3 + ${commons-lang3.version} + + + commons-cli + commons-cli + ${commons-cli.version} + + + build.buf.protoc-gen-validate + pgv-java-stub + ${pgv-java-stub.version} + + + org.apache.commons + commons-text + ${commons-text.version} + + + com.google.code.gson + gson + ${gson.version} + + + de.slub-dresden + urnlib + ${urnlib.version} + + + org.apache.maven + maven-plugin-api + ${maven.version} + + + org.apache.maven + maven-core + ${maven.version} + + + org.apache.maven + maven-artifact + ${maven.version} + + + org.apache.maven.plugin-tools + maven-plugin-annotations + ${maven-plugin-annotations.version} + + + org.jetbrains.kotlin + kotlin-stdlib + ${kotlin.version} + + + com.google.guava + guava + ${guava.version} + + + org.apache.commons + commons-lang3 + ${commons-lang3.version} + + + com.squareup.wire + wire-runtime + ${wire.version} + + + org.assertj + assertj-core + ${assertj.version} + + + io.github.java-diff-utils + java-diff-utils + ${java-diff-utils.version} + + + org.junit.jupiter + junit-jupiter + ${junit.jupiter.version} + + + com.google.jimfs + jimfs + ${jimfs.version} + + + org.apache.maven + maven-compat + ${maven.version} + + + org.apache.maven.plugin-testing + maven-plugin-testing-harness + ${maven-plugin-testing-harness.version} + + + io.github.java-diff-utils + java-diff-utils + ${java-diff-utils.version} + + + org.junit.jupiter + junit-jupiter + ${junit.jupiter.version} + + + org.junit.vintage + junit-vintage-engine + ${junit.jupiter.version} + + + diff --git a/schema2proto-lib/pom.xml b/schema2proto-lib/pom.xml index 1ad210d1..5d231d66 100755 --- a/schema2proto-lib/pom.xml +++ b/schema2proto-lib/pom.xml @@ -12,94 +12,76 @@ commons-io commons-io - ${commons-io.version} ${project.groupId} schema2proto-xsom - ${project.parent.version} com.google.guava guava - ${guava.version} org.yaml snakeyaml - ${snakeyaml.version} org.slf4j slf4j-api - ${slf4j.version} org.slf4j slf4j-simple - ${slf4j.version} no.entur schema2proto-wire - ${project.version} com.google.protobuf protobuf-java - ${protobuf.version} com.google.protobuf protobuf-java-util - ${protobuf.version} org.apache.commons commons-lang3 - ${commons-lang3.version} compile commons-cli commons-cli - ${commons-cli.version} build.buf.protoc-gen-validate pgv-java-stub - ${pgv-java-stub.version} org.apache.commons commons-text - ${commons-text.version} no.entur schema2proto-xsdproto - ${project.version} com.google.code.gson gson - ${gson.version} de.slub-dresden urnlib - ${urnlib.version} io.github.java-diff-utils java-diff-utils - ${java-diff-utils.version} test org.junit.jupiter junit-jupiter - ${junit.jupiter.version} test diff --git a/schema2proto-maven-plugin/pom.xml b/schema2proto-maven-plugin/pom.xml index b4d3f7de..3d07cb7c 100644 --- a/schema2proto-maven-plugin/pom.xml +++ b/schema2proto-maven-plugin/pom.xml @@ -13,7 +13,6 @@ no.entur schema2proto-lib - ${project.version} org.slf4j @@ -24,43 +23,36 @@ org.apache.maven maven-plugin-api - ${maven.version} provided org.apache.maven maven-core - ${maven.version} provided org.apache.maven maven-artifact - ${maven.version} provided org.apache.maven.plugin-tools maven-plugin-annotations - ${maven-plugin-annotations.version} provided org.apache.maven maven-compat - ${maven.version} test - junit - junit - ${junit.version} + org.junit.vintage + junit-vintage-engine test org.apache.maven.plugin-testing maven-plugin-testing-harness - 3.3.0 test diff --git a/schema2proto-wire/pom.xml b/schema2proto-wire/pom.xml index bfbf5f6c..d0e05b6a 100755 --- a/schema2proto-wire/pom.xml +++ b/schema2proto-wire/pom.xml @@ -12,51 +12,42 @@ org.jetbrains.kotlin kotlin-stdlib - ${kotlin.version} com.google.guava guava - ${guava.version} org.apache.commons commons-lang3 - ${commons-lang3.version} compile com.squareup.wire wire-runtime - ${wire.version} com.squareup.okio okio - ${okio.version} org.assertj assertj-core - ${assertj.version} test io.github.java-diff-utils java-diff-utils - ${java-diff-utils.version} test org.junit.jupiter junit-jupiter - ${junit.jupiter.version} test com.google.jimfs jimfs - ${jimfs.version} test diff --git a/schema2proto-xsom/pom.xml b/schema2proto-xsom/pom.xml index 8634d554..3a9a19c9 100644 --- a/schema2proto-xsom/pom.xml +++ b/schema2proto-xsom/pom.xml @@ -31,12 +31,10 @@ com.sun.xml.bind.external relaxng-datatype - ${relaxng.version} - junit - junit - ${junit.version} + org.junit.vintage + junit-vintage-engine test From 311ef8c3d2aa43d5d56092702222559b7e778883 Mon Sep 17 00:00:00 2001 From: circleci Date: Mon, 7 Aug 2023 13:20:32 +0000 Subject: [PATCH 16/16] [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 865003fa..b43b0eb8 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 no.entur schema2proto-parent - 1.87-SNAPSHOT + 1.87 pom Schema 2 proto parent pom Schema2proto - XSD schema to protobuf. diff --git a/schema2proto-lib/pom.xml b/schema2proto-lib/pom.xml index 5d231d66..7664a2e7 100755 --- a/schema2proto-lib/pom.xml +++ b/schema2proto-lib/pom.xml @@ -4,7 +4,7 @@ no.entur schema2proto-parent - 1.87-SNAPSHOT + 1.87 schema2proto-lib jar diff --git a/schema2proto-maven-plugin/pom.xml b/schema2proto-maven-plugin/pom.xml index 3d07cb7c..eef4ad1c 100644 --- a/schema2proto-maven-plugin/pom.xml +++ b/schema2proto-maven-plugin/pom.xml @@ -4,7 +4,7 @@ no.entur schema2proto-parent - 1.87-SNAPSHOT + 1.87 schema2proto-maven-plugin maven-plugin diff --git a/schema2proto-wire/pom.xml b/schema2proto-wire/pom.xml index d0e05b6a..9624009f 100755 --- a/schema2proto-wire/pom.xml +++ b/schema2proto-wire/pom.xml @@ -4,7 +4,7 @@ no.entur schema2proto-parent - 1.87-SNAPSHOT + 1.87 schema2proto-wire jar diff --git a/schema2proto-xsdproto/pom.xml b/schema2proto-xsdproto/pom.xml index 425d8eb8..0c37e99c 100644 --- a/schema2proto-xsdproto/pom.xml +++ b/schema2proto-xsdproto/pom.xml @@ -4,7 +4,7 @@ no.entur schema2proto-parent - 1.87-SNAPSHOT + 1.87 schema2proto-xsdproto jar diff --git a/schema2proto-xsom/pom.xml b/schema2proto-xsom/pom.xml index 3a9a19c9..e0b48ce1 100644 --- a/schema2proto-xsom/pom.xml +++ b/schema2proto-xsom/pom.xml @@ -15,7 +15,7 @@ no.entur schema2proto-parent - 1.87-SNAPSHOT + 1.87 schema2proto-xsom schema2proto-XSOM