From 9942a9b8464c0339245032d07ba3910e34e3cceb Mon Sep 17 00:00:00 2001 From: MansourD Date: Wed, 11 Jan 2023 16:52:46 +0100 Subject: [PATCH 1/2] changed OpenAPI from reprezen to latest networknt --- .../openapiplugin/model/OpenAPIFile.java | 2 +- .../inputreader/OpenAPIInputReader.java | 26 +++++++++---------- .../cobigen-openapiplugin-parent/pom.xml | 4 +-- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/cobigen-plugins/cobigen-openapiplugin-parent/cobigen-openapiplugin-model/src/main/java/com/devonfw/cobigen/openapiplugin/model/OpenAPIFile.java b/cobigen-plugins/cobigen-openapiplugin-parent/cobigen-openapiplugin-model/src/main/java/com/devonfw/cobigen/openapiplugin/model/OpenAPIFile.java index 66905540a0..76685f6d7e 100644 --- a/cobigen-plugins/cobigen-openapiplugin-parent/cobigen-openapiplugin-model/src/main/java/com/devonfw/cobigen/openapiplugin/model/OpenAPIFile.java +++ b/cobigen-plugins/cobigen-openapiplugin-parent/cobigen-openapiplugin-model/src/main/java/com/devonfw/cobigen/openapiplugin/model/OpenAPIFile.java @@ -3,7 +3,7 @@ import java.net.URI; import java.nio.file.Path; -import com.reprezen.kaizen.oasparser.model3.OpenApi3; +import com.networknt.oas.model.OpenApi3; /** Swagger file transfer object which contains the {@link Path} and the name of the file */ public class OpenAPIFile { diff --git a/cobigen-plugins/cobigen-openapiplugin-parent/cobigen-openapiplugin/src/main/java/com/devonfw/cobigen/openapiplugin/inputreader/OpenAPIInputReader.java b/cobigen-plugins/cobigen-openapiplugin-parent/cobigen-openapiplugin/src/main/java/com/devonfw/cobigen/openapiplugin/inputreader/OpenAPIInputReader.java index 9780ad82a0..74349d4938 100644 --- a/cobigen-plugins/cobigen-openapiplugin-parent/cobigen-openapiplugin/src/main/java/com/devonfw/cobigen/openapiplugin/inputreader/OpenAPIInputReader.java +++ b/cobigen-plugins/cobigen-openapiplugin-parent/cobigen-openapiplugin/src/main/java/com/devonfw/cobigen/openapiplugin/inputreader/OpenAPIInputReader.java @@ -30,19 +30,19 @@ import com.devonfw.cobigen.openapiplugin.model.ResponseDef; import com.devonfw.cobigen.openapiplugin.model.ServerDef; import com.devonfw.cobigen.openapiplugin.util.constants.Constants; -import com.reprezen.jsonoverlay.JsonOverlay; -import com.reprezen.jsonoverlay.Overlay; -import com.reprezen.kaizen.oasparser.OpenApiParser; -import com.reprezen.kaizen.oasparser.model3.Info; -import com.reprezen.kaizen.oasparser.model3.MediaType; -import com.reprezen.kaizen.oasparser.model3.OpenApi3; -import com.reprezen.kaizen.oasparser.model3.Operation; -import com.reprezen.kaizen.oasparser.model3.Parameter; -import com.reprezen.kaizen.oasparser.model3.Path; -import com.reprezen.kaizen.oasparser.model3.RequestBody; -import com.reprezen.kaizen.oasparser.model3.Response; -import com.reprezen.kaizen.oasparser.model3.Schema; -import com.reprezen.kaizen.oasparser.model3.Server; +import com.networknt.jsonoverlay.JsonOverlay; +import com.networknt.jsonoverlay.Overlay; +import com.networknt.oas.OpenApiParser; +import com.networknt.oas.model.Info; +import com.networknt.oas.model.MediaType; +import com.networknt.oas.model.OpenApi3; +import com.networknt.oas.model.Operation; +import com.networknt.oas.model.Parameter; +import com.networknt.oas.model.Path; +import com.networknt.oas.model.RequestBody; +import com.networknt.oas.model.Response; +import com.networknt.oas.model.Schema; +import com.networknt.oas.model.Server; /** * Extension for the {@link InputReader} Interface of the CobiGen, to be able to read OpenApi3 definition files into diff --git a/cobigen-plugins/cobigen-openapiplugin-parent/pom.xml b/cobigen-plugins/cobigen-openapiplugin-parent/pom.xml index 37cf8047f1..070ab452cf 100644 --- a/cobigen-plugins/cobigen-openapiplugin-parent/pom.xml +++ b/cobigen-plugins/cobigen-openapiplugin-parent/pom.xml @@ -18,9 +18,9 @@ - com.github.maybeec + com.networknt openapi-parser - 4.0.4 + 2.1.5 From c563612ddd0864ee932353d4546a656e49b1db67 Mon Sep 17 00:00:00 2001 From: MansourD Date: Thu, 19 Jan 2023 20:50:54 +0100 Subject: [PATCH 2/2] #1360 Fixed dependencies order, which caused a problem in the version of jackson-databind for openapiplugin Enabled crossOs in p2 plugin for github-actions Eclipse tests --- .github/workflows/maven-build-test.yml | 1 + .../TestDifferentFileSystems/pom.xml | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/maven-build-test.yml b/.github/workflows/maven-build-test.yml index 719f812d13..a26da37341 100644 --- a/.github/workflows/maven-build-test.yml +++ b/.github/workflows/maven-build-test.yml @@ -158,6 +158,7 @@ jobs: with: path: ./**/target/repository/ key: p2-plugins-${{ github.sha }} # key hit will not update cache + enableCrossOsArchive: true - name: Run tests (Linux) if: ${{ matrix.os == 'ubuntu-latest' }} diff --git a/cobigen-maven/cobigen-maven-systemtest/src/test/resources/testdata/systemtest/Devon4JTemplateTest/TestDifferentFileSystems/pom.xml b/cobigen-maven/cobigen-maven-systemtest/src/test/resources/testdata/systemtest/Devon4JTemplateTest/TestDifferentFileSystems/pom.xml index ccb1516f4d..bf86e26462 100644 --- a/cobigen-maven/cobigen-maven-systemtest/src/test/resources/testdata/systemtest/Devon4JTemplateTest/TestDifferentFileSystems/pom.xml +++ b/cobigen-maven/cobigen-maven-systemtest/src/test/resources/testdata/systemtest/Devon4JTemplateTest/TestDifferentFileSystems/pom.xml @@ -34,11 +34,6 @@ - - com.devonfw.cobigen - templates-devon4j - 20.08.002 - com.devonfw.cobigen tempeng-freemarker @@ -49,6 +44,11 @@ openapiplugin ${pluginVersion} + + com.devonfw.cobigen + templates-devon4j + 20.08.002 + com.devonfw.cobigen javaplugin