-
Notifications
You must be signed in to change notification settings - Fork 206
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
07a403e
commit ae3ff70
Showing
5 changed files
with
175 additions
and
64 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
70 changes: 70 additions & 0 deletions
70
.ci/environments/quarkus-3/patches/0023_spring_boot_openapi_fix.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,70 @@ | ||
| diff --git a/springboot/bom/pom.xml b/springboot/bom/pom.xml | ||
| --- a/springboot/bom/pom.xml (revision 9e11adb52d8ca94fd2f25beebf07cd5925983ac4) | ||
| +++ b/springboot/bom/pom.xml (date 1693298572368) | ||
| @@ -16,7 +16,7 @@ | ||
|
|
||
| <properties> | ||
| <version.io.swagger.core.v3>2.2.7</version.io.swagger.core.v3> | ||
| - <version.org.springdoc>1.6.14</version.org.springdoc> | ||
| + <version.org.springdoc>2.1.0</version.org.springdoc> | ||
| <!-- Groovy --> | ||
| <!-- must be aligned with the Archetype plugin: https://maven.apache.org/archetype/maven-archetype-plugin/dependencies.html --> | ||
| <version.org.codehaus.groovy>2.4.16</version.org.codehaus.groovy> | ||
| @@ -39,7 +39,7 @@ | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.springdoc</groupId> | ||
| - <artifactId>springdoc-openapi-ui</artifactId> | ||
| + <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId> | ||
| <version>${version.org.springdoc}</version> | ||
| </dependency> | ||
| <dependency> | ||
| diff --git a/springboot/integration-tests/src/it/integration-tests-springboot-norest-it/pom.xml b/springboot/integration-tests/src/it/integration-tests-springboot-norest-it/pom.xml | ||
| --- a/springboot/integration-tests/src/it/integration-tests-springboot-norest-it/pom.xml (revision 9e11adb52d8ca94fd2f25beebf07cd5925983ac4) | ||
| +++ b/springboot/integration-tests/src/it/integration-tests-springboot-norest-it/pom.xml (date 1693298572352) | ||
| @@ -61,7 +61,7 @@ | ||
|
|
||
| <dependency> | ||
| <groupId>org.springdoc</groupId> | ||
| - <artifactId>springdoc-openapi-ui</artifactId> | ||
| + <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>io.swagger.parser.v3</groupId> | ||
| diff --git a/springboot/integration-tests/src/it/integration-tests-springboot-processes-it/pom.xml b/springboot/integration-tests/src/it/integration-tests-springboot-processes-it/pom.xml | ||
| --- a/springboot/integration-tests/src/it/integration-tests-springboot-processes-it/pom.xml (revision 9e11adb52d8ca94fd2f25beebf07cd5925983ac4) | ||
| +++ b/springboot/integration-tests/src/it/integration-tests-springboot-processes-it/pom.xml (date 1693298572361) | ||
| @@ -95,7 +95,7 @@ | ||
|
|
||
| <dependency> | ||
| <groupId>org.springdoc</groupId> | ||
| - <artifactId>springdoc-openapi-ui</artifactId> | ||
| + <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>io.swagger.parser.v3</groupId> | ||
| diff --git a/springboot/integration-tests/src/it/integration-tests-springboot-decisions-it/pom.xml b/springboot/integration-tests/src/it/integration-tests-springboot-decisions-it/pom.xml | ||
| --- a/springboot/integration-tests/src/it/integration-tests-springboot-decisions-it/pom.xml (revision 9e11adb52d8ca94fd2f25beebf07cd5925983ac4) | ||
| +++ b/springboot/integration-tests/src/it/integration-tests-springboot-decisions-it/pom.xml (date 1693298572365) | ||
| @@ -75,7 +75,7 @@ | ||
|
|
||
| <dependency> | ||
| <groupId>org.springdoc</groupId> | ||
| - <artifactId>springdoc-openapi-ui</artifactId> | ||
| + <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>io.swagger.parser.v3</groupId> | ||
| diff --git a/springboot/starters/pom.xml b/springboot/starters/pom.xml | ||
| --- a/springboot/starters/pom.xml (revision 9e11adb52d8ca94fd2f25beebf07cd5925983ac4) | ||
| +++ b/springboot/starters/pom.xml (date 1693298572356) | ||
| @@ -57,7 +57,7 @@ | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.springdoc</groupId> | ||
| - <artifactId>springdoc-openapi-ui</artifactId> | ||
| + <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId> | ||
| </dependency> | ||
| </dependencies> | ||
| </project> | ||
| \ No newline at end of file |
64 changes: 0 additions & 64 deletions
64
.ci/environments/quarkus-3/patches/0023_springboot_webflux.patch
This file was deleted.
Oops, something went wrong.
28 changes: 28 additions & 0 deletions
28
.ci/environments/quarkus-3/patches/0024_spring_boot_wiremock_fix.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| diff --git a/kogito-build/kogito-dependencies-bom/pom.xml b/kogito-build/kogito-dependencies-bom/pom.xml | ||
| --- a/kogito-build/kogito-dependencies-bom/pom.xml (revision 9e11adb52d8ca94fd2f25beebf07cd5925983ac4) | ||
| +++ b/kogito-build/kogito-dependencies-bom/pom.xml (date 1693299114156) | ||
| @@ -505,6 +505,12 @@ | ||
| <version>${version.com.github.tomakehurst.wiremock}</version> | ||
| <scope>test</scope> | ||
| </dependency> | ||
| + <dependency> | ||
| + <groupId>com.github.tomakehurst</groupId> | ||
| + <artifactId>wiremock-jre8-standalone</artifactId> | ||
| + <version>${version.com.github.tomakehurst.wiremock}</version> | ||
| + <scope>test</scope> | ||
| + </dependency> | ||
|
|
||
| <dependency> | ||
| <groupId>org.apache.maven.shared</groupId> | ||
| diff --git a/springboot/integration-tests/src/it/integration-tests-springboot-processes-it/pom.xml b/springboot/integration-tests/src/it/integration-tests-springboot-processes-it/pom.xml | ||
| --- a/springboot/integration-tests/src/it/integration-tests-springboot-processes-it/pom.xml (revision 9e11adb52d8ca94fd2f25beebf07cd5925983ac4) | ||
| +++ b/springboot/integration-tests/src/it/integration-tests-springboot-processes-it/pom.xml (date 1693298751800) | ||
| @@ -89,7 +89,7 @@ | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>com.github.tomakehurst</groupId> | ||
| - <artifactId>wiremock-jre8</artifactId> | ||
| + <artifactId>wiremock-jre8-standalone</artifactId> | ||
| <scope>test</scope> | ||
| </dependency> | ||
|
|
20 changes: 20 additions & 0 deletions
20
.ci/environments/quarkus-3/patches/0025_openapi_codegen_fix.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-deployment/src/main/java/org/kie/kogito/quarkus/serverless/workflow/openapi/WorkflowOpenApiHandlerGenerator.java b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-deployment/src/main/java/org/kie/kogito/quarkus/serverless/workflow/openapi/WorkflowOpenApiHandlerGenerator.java | ||
| --- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-deployment/src/main/java/org/kie/kogito/quarkus/serverless/workflow/openapi/WorkflowOpenApiHandlerGenerator.java (revision eae1492e2f8e90587095c369fe0506ae272ec12a) | ||
| +++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-deployment/src/main/java/org/kie/kogito/quarkus/serverless/workflow/openapi/WorkflowOpenApiHandlerGenerator.java (date 1693311380768) | ||
| @@ -27,6 +27,7 @@ | ||
| import org.jboss.jandex.DotName; | ||
| import org.jboss.jandex.MethodInfo; | ||
| import org.jboss.jandex.Type; | ||
| +import org.jboss.jandex.VoidType; | ||
| import org.kie.kogito.codegen.api.context.KogitoBuildContext; | ||
| import org.kie.kogito.quarkus.serverless.workflow.ClassAnnotatedWorkflowHandlerGenerator; | ||
| import org.kie.kogito.quarkus.serverless.workflow.WorkflowCodeGenUtils; | ||
| @@ -88,7 +89,7 @@ | ||
| BlockStmt body = executeMethod.createBody(); | ||
| MethodCallExpr methodCallExpr = new MethodCallExpr(new NameExpr(OPEN_API_REF), m.name()); | ||
| final NameExpr parameters = new NameExpr(WORK_ITEM_PARAMETERS); | ||
| - if (m.returnType().name().equals(DotName.createSimple(Response.class.getName()))) { | ||
| + if (m.returnType().name().equals(DotName.createSimple(Response.class.getName())) || (m.returnType() instanceof VoidType)) { | ||
| body.addStatement(methodCallExpr).addStatement(new ReturnStmt(new NullLiteralExpr())); | ||
| } else { | ||
| body.addStatement(new ReturnStmt(methodCallExpr)); |