From a6705609f50a45fa01727488367ce490abf82340 Mon Sep 17 00:00:00 2001 From: Tim Smyth Date: Wed, 12 Jul 2023 08:42:16 +0200 Subject: [PATCH 1/6] Generate json schema and package it --- .gitignore | 2 + agreement/pom.xml | 55 ++++++++++++++++++++++++++++ customer-bill-management/pom.xml | 55 ++++++++++++++++++++++++++++ customer-management/pom.xml | 55 ++++++++++++++++++++++++++++ party-catalog/pom.xml | 55 ++++++++++++++++++++++++++++ pom.xml | 6 +-- product-catalog/pom.xml | 55 ++++++++++++++++++++++++++++ product-inventory/pom.xml | 55 ++++++++++++++++++++++++++++ product-ordering-management/pom.xml | 55 ++++++++++++++++++++++++++++ resource-catalog/pom.xml | 55 ++++++++++++++++++++++++++++ resource-function-activation/pom.xml | 55 ++++++++++++++++++++++++++++ resource-inventory/pom.xml | 55 ++++++++++++++++++++++++++++ service-catalog/pom.xml | 55 ++++++++++++++++++++++++++++ 13 files changed, 610 insertions(+), 3 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..c081a2a9 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +**/target/* +.idea/* \ No newline at end of file diff --git a/agreement/pom.xml b/agreement/pom.xml index 7fbdd0e0..dac88082 100644 --- a/agreement/pom.xml +++ b/agreement/pom.xml @@ -229,6 +229,35 @@ + + smart-data-schema + generate-sources + + generate + + + ${tmforum.api.url} + org.fiware.agreement.modelngsi + smart-data + + ${project.build.directory} + false + + true + false + true + true + true + false + false + false + false + + + java.util.Date=java.time.Instant + + + @@ -236,8 +265,34 @@ micronaut-openapi-codegen ${version.io.kokuwa.micronaut.codegen} + + io.github.pulledtim + json-openapi-codegen + ${version.io.github.pulledtim.json-openapi-codegen} + + + + org.apache.maven.plugins + maven-jar-plugin + 3.3.0 + + + package + + jar + + + ./target/schema/ + schema + + *.json + + + + + org.codehaus.mojo diff --git a/customer-bill-management/pom.xml b/customer-bill-management/pom.xml index 841b9816..93208e35 100644 --- a/customer-bill-management/pom.xml +++ b/customer-bill-management/pom.xml @@ -223,6 +223,35 @@ + + smart-data-schema + generate-sources + + generate + + + ${tmforum.api.url} + org.fiware.customerbillmanagement.modelngsi + smart-data + + ${project.build.directory} + false + + true + false + true + true + true + false + false + false + false + + + java.util.Date=java.time.Instant + + + @@ -230,8 +259,34 @@ micronaut-openapi-codegen ${version.io.kokuwa.micronaut.codegen} + + io.github.pulledtim + json-openapi-codegen + ${version.io.github.pulledtim.json-openapi-codegen} + + + + org.apache.maven.plugins + maven-jar-plugin + 3.3.0 + + + package + + jar + + + ./target/schema/ + schema + + *.json + + + + + org.codehaus.mojo diff --git a/customer-management/pom.xml b/customer-management/pom.xml index 4d285a1c..9bfc345b 100644 --- a/customer-management/pom.xml +++ b/customer-management/pom.xml @@ -210,6 +210,35 @@ + + smart-data-schema + generate-sources + + generate + + + ${tmforum.api.url} + org.fiware.customermanagement.modelngsi + smart-data + + ${project.build.directory} + false + + true + false + true + true + true + false + false + false + false + + + java.util.Date=java.time.Instant + + + @@ -217,8 +246,34 @@ micronaut-openapi-codegen ${version.io.kokuwa.micronaut.codegen} + + io.github.pulledtim + json-openapi-codegen + ${version.io.github.pulledtim.json-openapi-codegen} + + + + org.apache.maven.plugins + maven-jar-plugin + 3.3.0 + + + package + + jar + + + ./target/schema/ + schema + + *.json + + + + + org.codehaus.mojo diff --git a/party-catalog/pom.xml b/party-catalog/pom.xml index b1fd24de..adce6736 100644 --- a/party-catalog/pom.xml +++ b/party-catalog/pom.xml @@ -207,6 +207,35 @@ + + smart-data-schema + generate-sources + + generate + + + ${tmforum.api.url} + org.fiware.party.modelngsi + smart-data + + ${project.build.directory} + false + + true + false + true + true + true + false + false + false + false + + + java.util.Date=java.time.Instant + + + @@ -214,8 +243,34 @@ micronaut-openapi-codegen ${version.io.kokuwa.micronaut.codegen} + + io.github.pulledtim + json-openapi-codegen + ${version.io.github.pulledtim.json-openapi-codegen} + + + + org.apache.maven.plugins + maven-jar-plugin + 3.3.0 + + + package + + jar + + + ./target/schema/ + schema + + *.json + + + + + org.codehaus.mojo diff --git a/pom.xml b/pom.xml index e13264d3..fed75900 100644 --- a/pom.xml +++ b/pom.xml @@ -85,9 +85,9 @@ - 6.1.0 - 3.1.0 - + 6.6.0 + 3.4.1 + 1.0.0-PRE-1-14 0.2.1 diff --git a/product-catalog/pom.xml b/product-catalog/pom.xml index 217b38c9..7f374733 100644 --- a/product-catalog/pom.xml +++ b/product-catalog/pom.xml @@ -227,6 +227,35 @@ + + smart-data-schema + generate-sources + + generate + + + ${tmforum.api.url} + org.fiware.productcatalog.modelngsi + smart-data + + ${project.build.directory} + false + + true + false + true + true + true + false + false + false + false + + + java.util.Date=java.time.Instant + + + @@ -234,8 +263,34 @@ micronaut-openapi-codegen ${version.io.kokuwa.micronaut.codegen} + + io.github.pulledtim + json-openapi-codegen + ${version.io.github.pulledtim.json-openapi-codegen} + + + + org.apache.maven.plugins + maven-jar-plugin + 3.3.0 + + + package + + jar + + + ./target/schema/ + schema + + *.json + + + + + org.codehaus.mojo diff --git a/product-inventory/pom.xml b/product-inventory/pom.xml index 024545c6..cc41fc38 100644 --- a/product-inventory/pom.xml +++ b/product-inventory/pom.xml @@ -229,6 +229,35 @@ + + smart-data-schema + generate-sources + + generate + + + ${tmforum.api.url} + org.fiware.productinventory.modelngsi + smart-data + + ${project.build.directory} + false + + true + false + true + true + true + false + false + false + false + + + java.util.Date=java.time.Instant + + + @@ -236,8 +265,34 @@ micronaut-openapi-codegen ${version.io.kokuwa.micronaut.codegen} + + io.github.pulledtim + json-openapi-codegen + ${version.io.github.pulledtim.json-openapi-codegen} + + + + org.apache.maven.plugins + maven-jar-plugin + 3.3.0 + + + package + + jar + + + ./target/schema/ + schema + + *.json + + + + + org.codehaus.mojo diff --git a/product-ordering-management/pom.xml b/product-ordering-management/pom.xml index 08c31854..ad6e1793 100644 --- a/product-ordering-management/pom.xml +++ b/product-ordering-management/pom.xml @@ -235,6 +235,35 @@ + + smart-data-schema + generate-sources + + generate + + + ${tmforum.api.url} + org.fiware.productordering.modelngsi + smart-data + + ${project.build.directory} + false + + true + false + true + true + true + false + false + false + false + + + java.util.Date=java.time.Instant + + + @@ -242,8 +271,34 @@ micronaut-openapi-codegen ${version.io.kokuwa.micronaut.codegen} + + io.github.pulledtim + json-openapi-codegen + ${version.io.github.pulledtim.json-openapi-codegen} + + + + org.apache.maven.plugins + maven-jar-plugin + 3.3.0 + + + package + + jar + + + ./target/schema/ + schema + + *.json + + + + + org.codehaus.mojo diff --git a/resource-catalog/pom.xml b/resource-catalog/pom.xml index d5a7c15f..9a75cce0 100644 --- a/resource-catalog/pom.xml +++ b/resource-catalog/pom.xml @@ -210,6 +210,35 @@ + + smart-data-schema + generate-sources + + generate + + + ${tmforum.api.url} + org.fiware.resourcecatalog.modelngsi + smart-data + + ${project.build.directory} + false + + true + false + true + true + true + false + false + false + false + + + java.util.Date=java.time.Instant + + + @@ -217,8 +246,34 @@ micronaut-openapi-codegen ${version.io.kokuwa.micronaut.codegen} + + io.github.pulledtim + json-openapi-codegen + ${version.io.github.pulledtim.json-openapi-codegen} + + + + org.apache.maven.plugins + maven-jar-plugin + 3.3.0 + + + package + + jar + + + ./target/schema/ + schema + + *.json + + + + + org.codehaus.mojo diff --git a/resource-function-activation/pom.xml b/resource-function-activation/pom.xml index 75cb8e0e..44207ea2 100644 --- a/resource-function-activation/pom.xml +++ b/resource-function-activation/pom.xml @@ -210,6 +210,35 @@ + + smart-data-schema + generate-sources + + generate + + + ${tmforum.api.url} + org.fiware.resourcefunction.modelngsi + smart-data + + ${project.build.directory} + false + + true + false + true + true + true + false + false + false + false + + + java.util.Date=java.time.Instant + + + @@ -217,8 +246,34 @@ micronaut-openapi-codegen ${version.io.kokuwa.micronaut.codegen} + + io.github.pulledtim + json-openapi-codegen + ${version.io.github.pulledtim.json-openapi-codegen} + + + + org.apache.maven.plugins + maven-jar-plugin + 3.3.0 + + + package + + jar + + + ./target/schema/ + schema + + *.json + + + + + org.codehaus.mojo diff --git a/resource-inventory/pom.xml b/resource-inventory/pom.xml index 89ee03b0..0b4f64b6 100644 --- a/resource-inventory/pom.xml +++ b/resource-inventory/pom.xml @@ -210,6 +210,35 @@ + + smart-data-schema + generate-sources + + generate + + + ${tmforum.api.url} + org.fiware.resourceinventory.modelngsi + smart-data + + ${project.build.directory} + false + + true + false + true + true + true + false + false + false + false + + + java.util.Date=java.time.Instant + + + @@ -217,8 +246,34 @@ micronaut-openapi-codegen ${version.io.kokuwa.micronaut.codegen} + + io.github.pulledtim + json-openapi-codegen + ${version.io.github.pulledtim.json-openapi-codegen} + + + + org.apache.maven.plugins + maven-jar-plugin + 3.3.0 + + + package + + jar + + + ./target/schema/ + schema + + *.json + + + + + org.codehaus.mojo diff --git a/service-catalog/pom.xml b/service-catalog/pom.xml index 48699e45..5c3be16c 100644 --- a/service-catalog/pom.xml +++ b/service-catalog/pom.xml @@ -216,6 +216,35 @@ + + smart-data-schema + generate-sources + + generate + + + ${tmforum.api.url} + org.fiware.servicecatalog.modelngsi + smart-data + + ${project.build.directory} + false + + true + false + true + true + true + false + false + false + false + + + java.util.Date=java.time.Instant + + + @@ -223,8 +252,34 @@ micronaut-openapi-codegen ${version.io.kokuwa.micronaut.codegen} + + io.github.pulledtim + json-openapi-codegen + ${version.io.github.pulledtim.json-openapi-codegen} + + + + org.apache.maven.plugins + maven-jar-plugin + 3.3.0 + + + package + + jar + + + ./target/schema/ + schema + + *.json + + + + + org.codehaus.mojo From dd8328fec03efbc7fb96062879af1d77fb04fb6c Mon Sep 17 00:00:00 2001 From: Tim Smyth Date: Wed, 12 Jul 2023 09:39:30 +0200 Subject: [PATCH 2/6] temp maven repo --- .github/settings.xml | 12 ++++++++++++ .github/workflows/conformance-test.yaml | 2 +- .github/workflows/parallel-test.yml | 2 +- .github/workflows/pre-release.yml | 2 +- .github/workflows/release.yml | 2 +- .github/workflows/test.yaml | 4 ++-- pom.xml | 10 ++++++++++ 7 files changed, 28 insertions(+), 6 deletions(-) create mode 100644 .github/settings.xml diff --git a/.github/settings.xml b/.github/settings.xml new file mode 100644 index 00000000..69a8de36 --- /dev/null +++ b/.github/settings.xml @@ -0,0 +1,12 @@ + + + + github + ${env.MAVEN_USERNAME} + ${env.MAVEN_PASSWORD} + + + \ No newline at end of file diff --git a/.github/workflows/conformance-test.yaml b/.github/workflows/conformance-test.yaml index 096691ae..120d7794 100644 --- a/.github/workflows/conformance-test.yaml +++ b/.github/workflows/conformance-test.yaml @@ -25,7 +25,7 @@ jobs: - name: Execute tests id: test run: | - mvn clean install -Pconformance-test --projects common,resource-shared-models,customer-shared-models,service-shared-models,product-shared-models,${{matrix.module}} -DskipTests -DskipITs + mvn clean install -Pconformance-test --projects common,resource-shared-models,customer-shared-models,service-shared-models,product-shared-models,${{matrix.module}} -DskipTests -DskipITs --settings=.github/settings.xml - name: Collect results shell: bash diff --git a/.github/workflows/parallel-test.yml b/.github/workflows/parallel-test.yml index 8b036330..b4676a00 100644 --- a/.github/workflows/parallel-test.yml +++ b/.github/workflows/parallel-test.yml @@ -23,4 +23,4 @@ jobs: - name: Execute tests id: test run: | - mvn clean test integration-test verify --projects common,resource-shared-models,customer-shared-models,service-shared-models,product-shared-models,${{matrix.module}} \ No newline at end of file + mvn clean test integration-test verify --projects common,resource-shared-models,customer-shared-models,service-shared-models,product-shared-models,${{matrix.module}} --settings=.github/settings.xml \ No newline at end of file diff --git a/.github/workflows/pre-release.yml b/.github/workflows/pre-release.yml index 34b35b40..574f7435 100644 --- a/.github/workflows/pre-release.yml +++ b/.github/workflows/pre-release.yml @@ -61,7 +61,7 @@ jobs: - name: Build&Push image run: | mvn versions:set -DnewVersion=${{ needs.generate-version.outputs.version }} - mvn clean install deploy -DskipITs -DskipTests -Poci -Dimage.tag=${{ needs.generate-version.outputs.version }} -Dimage.registry="${{ env.REGISTRY }}" -Dimage.repository="${{ env.REPOSITORY }}" + mvn clean install deploy -DskipITs -DskipTests -Poci -Dimage.tag=${{ needs.generate-version.outputs.version }} -Dimage.registry="${{ env.REGISTRY }}" -Dimage.repository="${{ env.REPOSITORY }}" --settings=.github/settings.xml git-release: needs: ["generate-version","tmforum-apis"] diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 7f706a77..b867aadc 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -53,7 +53,7 @@ jobs: - name: Build&Push image run: | mvn versions:set -DnewVersion=${{ needs.generate-version.outputs.version }} - mvn clean install deploy -Poci -DskipTests -DskipITs -Dimage.tag=${{ needs.generate-version.outputs.version }} -Dimage.registry="${{ env.REGISTRY }}" -Dimage.repository="${{ env.REPOSITORY }}" + mvn clean install deploy -Poci -DskipTests -DskipITs -Dimage.tag=${{ needs.generate-version.outputs.version }} -Dimage.registry="${{ env.REGISTRY }}" -Dimage.repository="${{ env.REPOSITORY }}" --settings=.github/settings.xml git-release: needs: ["generate-version", "tmforum-apis"] diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 5a259ffc..4ecf278e 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -27,9 +27,9 @@ jobs: - name: Execute tests id: test run: | - mvn clean test integration-test verify + mvn clean test integration-test verify --settings=.github/settings.xml - name: Submitt report id: coveralls run: | - mvn jacoco:merge jacoco:report coveralls:report -Dcoveralls.token=${{ secrets.COVERALLS_TOKEN }} -Preport-coveralls \ No newline at end of file + mvn jacoco:merge jacoco:report coveralls:report -Dcoveralls.token=${{ secrets.COVERALLS_TOKEN }} -Preport-coveralls --settings=.github/settings.xml \ No newline at end of file diff --git a/pom.xml b/pom.xml index fed75900..cc729c61 100644 --- a/pom.xml +++ b/pom.xml @@ -29,6 +29,16 @@ + + + github + https://maven.pkg.github.com/pulledtim/json-schema-openapi-codegen + + true + + + + common customer-shared-models From 35b5b86442e40a1aabf2576fc6e0a95f8872fbd3 Mon Sep 17 00:00:00 2001 From: Tim Smyth Date: Thu, 13 Jul 2023 09:07:33 +0200 Subject: [PATCH 3/6] a --- .github/settings.xml | 12 ------------ pom.xml | 12 +----------- 2 files changed, 1 insertion(+), 23 deletions(-) delete mode 100644 .github/settings.xml diff --git a/.github/settings.xml b/.github/settings.xml deleted file mode 100644 index 69a8de36..00000000 --- a/.github/settings.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - github - ${env.MAVEN_USERNAME} - ${env.MAVEN_PASSWORD} - - - \ No newline at end of file diff --git a/pom.xml b/pom.xml index cc729c61..e88d9f1c 100644 --- a/pom.xml +++ b/pom.xml @@ -29,16 +29,6 @@ - - - github - https://maven.pkg.github.com/pulledtim/json-schema-openapi-codegen - - true - - - - common customer-shared-models @@ -97,7 +87,7 @@ 6.6.0 3.4.1 - 1.0.0-PRE-1-14 + 1.1.0-PRE-3-27 0.2.1 From 3a83f2bc0d5690f163de535c77b598045d1ee247 Mon Sep 17 00:00:00 2001 From: Tim Smyth Date: Thu, 13 Jul 2023 09:09:23 +0200 Subject: [PATCH 4/6] final version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e88d9f1c..994c0c5b 100644 --- a/pom.xml +++ b/pom.xml @@ -87,7 +87,7 @@ 6.6.0 3.4.1 - 1.1.0-PRE-3-27 + 1.1.0 0.2.1 From e22d69772a758b78d450e107af3549639208d50d Mon Sep 17 00:00:00 2001 From: Tim Smyth Date: Thu, 13 Jul 2023 09:14:10 +0200 Subject: [PATCH 5/6] cleanup --- .github/workflows/conformance-test.yaml | 2 +- .github/workflows/parallel-test.yml | 2 +- .github/workflows/pre-release.yml | 2 +- .github/workflows/release.yml | 2 +- .github/workflows/test.yaml | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/conformance-test.yaml b/.github/workflows/conformance-test.yaml index 120d7794..096691ae 100644 --- a/.github/workflows/conformance-test.yaml +++ b/.github/workflows/conformance-test.yaml @@ -25,7 +25,7 @@ jobs: - name: Execute tests id: test run: | - mvn clean install -Pconformance-test --projects common,resource-shared-models,customer-shared-models,service-shared-models,product-shared-models,${{matrix.module}} -DskipTests -DskipITs --settings=.github/settings.xml + mvn clean install -Pconformance-test --projects common,resource-shared-models,customer-shared-models,service-shared-models,product-shared-models,${{matrix.module}} -DskipTests -DskipITs - name: Collect results shell: bash diff --git a/.github/workflows/parallel-test.yml b/.github/workflows/parallel-test.yml index b4676a00..8b036330 100644 --- a/.github/workflows/parallel-test.yml +++ b/.github/workflows/parallel-test.yml @@ -23,4 +23,4 @@ jobs: - name: Execute tests id: test run: | - mvn clean test integration-test verify --projects common,resource-shared-models,customer-shared-models,service-shared-models,product-shared-models,${{matrix.module}} --settings=.github/settings.xml \ No newline at end of file + mvn clean test integration-test verify --projects common,resource-shared-models,customer-shared-models,service-shared-models,product-shared-models,${{matrix.module}} \ No newline at end of file diff --git a/.github/workflows/pre-release.yml b/.github/workflows/pre-release.yml index 574f7435..34b35b40 100644 --- a/.github/workflows/pre-release.yml +++ b/.github/workflows/pre-release.yml @@ -61,7 +61,7 @@ jobs: - name: Build&Push image run: | mvn versions:set -DnewVersion=${{ needs.generate-version.outputs.version }} - mvn clean install deploy -DskipITs -DskipTests -Poci -Dimage.tag=${{ needs.generate-version.outputs.version }} -Dimage.registry="${{ env.REGISTRY }}" -Dimage.repository="${{ env.REPOSITORY }}" --settings=.github/settings.xml + mvn clean install deploy -DskipITs -DskipTests -Poci -Dimage.tag=${{ needs.generate-version.outputs.version }} -Dimage.registry="${{ env.REGISTRY }}" -Dimage.repository="${{ env.REPOSITORY }}" git-release: needs: ["generate-version","tmforum-apis"] diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b867aadc..7f706a77 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -53,7 +53,7 @@ jobs: - name: Build&Push image run: | mvn versions:set -DnewVersion=${{ needs.generate-version.outputs.version }} - mvn clean install deploy -Poci -DskipTests -DskipITs -Dimage.tag=${{ needs.generate-version.outputs.version }} -Dimage.registry="${{ env.REGISTRY }}" -Dimage.repository="${{ env.REPOSITORY }}" --settings=.github/settings.xml + mvn clean install deploy -Poci -DskipTests -DskipITs -Dimage.tag=${{ needs.generate-version.outputs.version }} -Dimage.registry="${{ env.REGISTRY }}" -Dimage.repository="${{ env.REPOSITORY }}" git-release: needs: ["generate-version", "tmforum-apis"] diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 4ecf278e..5a259ffc 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -27,9 +27,9 @@ jobs: - name: Execute tests id: test run: | - mvn clean test integration-test verify --settings=.github/settings.xml + mvn clean test integration-test verify - name: Submitt report id: coveralls run: | - mvn jacoco:merge jacoco:report coveralls:report -Dcoveralls.token=${{ secrets.COVERALLS_TOKEN }} -Preport-coveralls --settings=.github/settings.xml \ No newline at end of file + mvn jacoco:merge jacoco:report coveralls:report -Dcoveralls.token=${{ secrets.COVERALLS_TOKEN }} -Preport-coveralls \ No newline at end of file From d0678acd55301459eb83bd0b35e6ddae07c83977 Mon Sep 17 00:00:00 2001 From: Tim Smyth Date: Thu, 13 Jul 2023 09:49:19 +0200 Subject: [PATCH 6/6] exclude generated models --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index 994c0c5b..f6faad32 100644 --- a/pom.xml +++ b/pom.xml @@ -312,6 +312,7 @@ **/TMForumMapperImpl* **/NGSIMapperImpl* + **/modelngsi/*