From 4449a75c74d62b69e5fe9c78b986afbca56f36af Mon Sep 17 00:00:00 2001 From: GitHub Action Date: Wed, 14 Aug 2024 16:33:37 +0000 Subject: [PATCH 01/18] [maven-release-plugin] prepare for next development iteration --- api/pom.xml | 2 +- custom-generator/pom.xml | 2 +- pom.xml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/api/pom.xml b/api/pom.xml index 300b8ec7..37524b37 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -4,7 +4,7 @@ io.serverlessworkflow serverlessworkflow-parent - 7.0.0-alpha1 + 7.0.0-SNAPSHOT serverlessworkflow-api diff --git a/custom-generator/pom.xml b/custom-generator/pom.xml index 141eb418..7aaedbda 100644 --- a/custom-generator/pom.xml +++ b/custom-generator/pom.xml @@ -3,7 +3,7 @@ io.serverlessworkflow serverlessworkflow-parent - 7.0.0-alpha1 + 7.0.0-SNAPSHOT custom-generator diff --git a/pom.xml b/pom.xml index e21ad024..ba410801 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ io.serverlessworkflow serverlessworkflow-parent - 7.0.0-alpha1 + 7.0.0-SNAPSHOT pom Serverless Workflow :: Parent @@ -33,7 +33,7 @@ scm:git:git@github.com:serverlessworkflow/sdk-java.git scm:git:git@github.com:serverlessworkflow/sdk-java.git https://github.com/serverlessworkflow/sdk-java - 7.0.0-alpha1 + HEAD From 66105c6c24336ecacdf79c0e277901dbde49716c Mon Sep 17 00:00:00 2001 From: Ricardo Zanini Date: Mon, 19 Aug 2024 08:34:37 -0400 Subject: [PATCH 02/18] Add fjtirado to the maintainers list Signed-off-by: Ricardo Zanini --- .github/CODEOWNERS | 1 + .github/OWNERS | 2 ++ MAINTAINERS.md | 1 + 3 files changed, 4 insertions(+) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 8e8e53f6..a211cd9e 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1 +1,2 @@ * @ricardozanini +* @fjtirado diff --git a/.github/OWNERS b/.github/OWNERS index 65579b4f..378a8d78 100644 --- a/.github/OWNERS +++ b/.github/OWNERS @@ -1,7 +1,9 @@ reviewers: - ricardozanini - manick02 + - fjtirado approvers: - ricardozanini + - fjtirado labels: - sig/contributor-experience diff --git a/MAINTAINERS.md b/MAINTAINERS.md index 0c9d05b9..a7a6b525 100644 --- a/MAINTAINERS.md +++ b/MAINTAINERS.md @@ -1,4 +1,5 @@ # Serverless Workflow Java SDK Maintainers +* [Francisco Javier Tirado Sarti](https://github.com/fjtirado) * [Manick Sundaram](https://github.com/manick02) * [Ricardo Zanini](https://github.com/ricardozanini) From ee212dd3df8c82ca4ac31fb7ba979dbb0c531635 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 19 Aug 2024 13:30:43 +0000 Subject: [PATCH 03/18] Bump org.apache.maven.plugins:maven-failsafe-plugin from 3.3.1 to 3.4.0 Bumps [org.apache.maven.plugins:maven-failsafe-plugin](https://github.com/apache/maven-surefire) from 3.3.1 to 3.4.0. - [Release notes](https://github.com/apache/maven-surefire/releases) - [Commits](https://github.com/apache/maven-surefire/compare/surefire-3.3.1...surefire-3.4.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-failsafe-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ba410801..455104dc 100644 --- a/pom.xml +++ b/pom.xml @@ -54,7 +54,7 @@ 3.13.0 3.1.2 3.5.0 - 3.3.1 + 3.4.0 2.23 3.2.5 3.4.2 From 868bb412a6f75ad36861736a1cd376f2dddca687 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 19 Aug 2024 13:30:50 +0000 Subject: [PATCH 04/18] Bump org.apache.maven.plugins:maven-surefire-plugin from 3.3.1 to 3.4.0 Bumps [org.apache.maven.plugins:maven-surefire-plugin](https://github.com/apache/maven-surefire) from 3.3.1 to 3.4.0. - [Release notes](https://github.com/apache/maven-surefire/releases) - [Commits](https://github.com/apache/maven-surefire/compare/surefire-3.3.1...surefire-3.4.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-surefire-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ba410801..337fe2b8 100644 --- a/pom.xml +++ b/pom.xml @@ -63,7 +63,7 @@ 3.8.0 3.1.1 3.3.1 - 3.3.1 + 3.4.0 From 1ca2f84250c9c3933329dec2469d61c7155a9931 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 19 Aug 2024 13:31:05 +0000 Subject: [PATCH 05/18] Bump version.org.junit.jupiter from 5.10.3 to 5.11.0 Bumps `version.org.junit.jupiter` from 5.10.3 to 5.11.0. Updates `org.junit.jupiter:junit-jupiter-api` from 5.10.3 to 5.11.0 - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/compare/r5.10.3...r5.11.0) Updates `org.junit.jupiter:junit-jupiter-engine` from 5.10.3 to 5.11.0 - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/compare/r5.10.3...r5.11.0) Updates `org.junit.jupiter:junit-jupiter-params` from 5.10.3 to 5.11.0 - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/compare/r5.10.3...r5.11.0) --- updated-dependencies: - dependency-name: org.junit.jupiter:junit-jupiter-api dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.junit.jupiter:junit-jupiter-engine dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.junit.jupiter:junit-jupiter-params dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ba410801..6aea424f 100644 --- a/pom.xml +++ b/pom.xml @@ -73,7 +73,7 @@ 3.1.0 1.5.2 3.26.3 - 5.10.3 + 5.11.0 5.12.0 2.0.16 From 828a38c6686c5b013650cee201faa06c3bb00ab5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 19 Aug 2024 13:31:14 +0000 Subject: [PATCH 06/18] Bump ch.qos.logback:logback-classic from 1.5.6 to 1.5.7 Bumps [ch.qos.logback:logback-classic](https://github.com/qos-ch/logback) from 1.5.6 to 1.5.7. - [Commits](https://github.com/qos-ch/logback/compare/v_1.5.6...v_1.5.7) --- updated-dependencies: - dependency-name: ch.qos.logback:logback-classic dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ba410801..2a594092 100644 --- a/pom.xml +++ b/pom.xml @@ -67,7 +67,7 @@ - 1.5.6 + 1.5.7 2.17.2 1.5.1 3.1.0 From 56cab350e37bdf39bba8c0faac6e6a32359e4af4 Mon Sep 17 00:00:00 2001 From: Francisco Javier Tirado Sarti Date: Mon, 26 Aug 2024 12:17:35 +0200 Subject: [PATCH 07/18] [Fix #412] Fixing problem with listen task Signed-off-by: Francisco Javier Tirado Sarti --- .../serverlessworkflow/api/FeaturesTest.java | 3 +- api/src/test/resources/features/listen.yaml | 12 ++++ .../generator/AllAnyOneOfSchemaRule.java | 72 ++++++++++++------- .../generator/GeneratorUtils.java | 21 +++--- .../generator/UnevaluatedPropertiesRule.java | 16 +++-- 5 files changed, 82 insertions(+), 42 deletions(-) create mode 100644 api/src/test/resources/features/listen.yaml diff --git a/api/src/test/java/io/serverlessworkflow/api/FeaturesTest.java b/api/src/test/java/io/serverlessworkflow/api/FeaturesTest.java index de2591a3..8e77673b 100644 --- a/api/src/test/java/io/serverlessworkflow/api/FeaturesTest.java +++ b/api/src/test/java/io/serverlessworkflow/api/FeaturesTest.java @@ -42,7 +42,8 @@ public class FeaturesTest { "features/raise.yaml", "features/set.yaml", "features/switch.yaml", - "features/try.yaml" + "features/try.yaml", + "features/listen.yaml" }) public void testSpecFeaturesParsing(String workflowLocation) throws IOException { Workflow workflow = readWorkflowFromClasspath(workflowLocation); diff --git a/api/src/test/resources/features/listen.yaml b/api/src/test/resources/features/listen.yaml new file mode 100644 index 00000000..393355d0 --- /dev/null +++ b/api/src/test/resources/features/listen.yaml @@ -0,0 +1,12 @@ +document: + dsl: 1.0.0-alpha1 + namespace: default + name: listen-task +do: + - listenToSomething: + listen: + to: + any: + - with: + source: pepe + type: pepe \ No newline at end of file diff --git a/custom-generator/src/main/java/io/serverlessworkflow/generator/AllAnyOneOfSchemaRule.java b/custom-generator/src/main/java/io/serverlessworkflow/generator/AllAnyOneOfSchemaRule.java index 1e99f0fd..c5496edc 100644 --- a/custom-generator/src/main/java/io/serverlessworkflow/generator/AllAnyOneOfSchemaRule.java +++ b/custom-generator/src/main/java/io/serverlessworkflow/generator/AllAnyOneOfSchemaRule.java @@ -105,19 +105,41 @@ private JDefinedClass populateClass( JDefinedClass definedClass, Optional refType, Collection unionTypes) { JType clazzClass = definedClass.owner()._ref(Object.class); - JFieldVar valueField = - definedClass.field( - JMod.PRIVATE, - clazzClass, - ruleFactory.getNameHelper().getPropertyName("value", null), - null); + Optional valueField; + if (!unionTypes.isEmpty()) { + valueField = + Optional.of( + definedClass.field( + JMod.PRIVATE, + clazzClass, + ruleFactory.getNameHelper().getPropertyName("value", null), + null)); + + definedClass._implements( + definedClass.owner().ref(GeneratorUtils.ONE_OF_VALUE_PROVIDER_INTERFACE_NAME)); - definedClass._implements( - definedClass.owner().ref(GeneratorUtils.ONE_OF_VALUE_PROVIDER_INTERFACE_NAME)); + GeneratorUtils.implementInterface(definedClass, valueField.orElseThrow()); - GeneratorUtils.implementInterface(definedClass, valueField); + try { + JDefinedClass serializer = generateSerializer(definedClass); + definedClass.annotate(JsonSerialize.class).param("using", serializer); + } catch (JClassAlreadyExistsException ex) { + // already serialized aware + } + + try { + JDefinedClass deserializer = generateDeserializer(definedClass, unionTypes); + definedClass.annotate(JsonDeserialize.class).param("using", deserializer); + } catch (JClassAlreadyExistsException ex) { + // already deserialized aware + } + for (JType unionType : unionTypes) { + wrapIt(definedClass, valueField, unionType); + } + } else { + valueField = Optional.empty(); + } - unionTypes.forEach(unionType -> wrapIt(definedClass, valueField, unionType)); refType.ifPresent( type -> { if (type instanceof JClass) { @@ -126,6 +148,7 @@ private JDefinedClass populateClass( wrapIt(definedClass, valueField, type); } }); + if (definedClass.constructors().hasNext() && definedClass.getConstructor(new JType[0]) == null) { definedClass.constructor(JMod.PUBLIC); @@ -133,7 +156,8 @@ private JDefinedClass populateClass( return definedClass; } - private JDefinedClass generateSerializer(JDefinedClass relatedClass) { + private JDefinedClass generateSerializer(JDefinedClass relatedClass) + throws JClassAlreadyExistsException { JDefinedClass definedClass = GeneratorUtils.serializerClass(relatedClass); GeneratorUtils.fillSerializer( definedClass, @@ -150,7 +174,8 @@ private JDefinedClass generateSerializer(JDefinedClass relatedClass) { } private JDefinedClass generateDeserializer( - JDefinedClass relatedClass, Collection unionTypes) { + JDefinedClass relatedClass, Collection unionTypes) + throws JClassAlreadyExistsException { JDefinedClass definedClass = GeneratorUtils.deserializerClass(relatedClass); GeneratorUtils.fillDeserializer( definedClass, @@ -173,22 +198,18 @@ private JDefinedClass generateDeserializer( private JDefinedClass createUnionClass( String nodeName, JPackage container, Optional refType, Collection unionTypes) { - final String className = - ruleFactory.getNameHelper().getUniqueClassName(nodeName, null, container); try { - JDefinedClass definedClass = container._class(className); - definedClass.annotate(JsonSerialize.class).param("using", generateSerializer(definedClass)); - definedClass - .annotate(JsonDeserialize.class) - .param("using", generateDeserializer(definedClass, unionTypes)); - - return populateClass(definedClass, refType, unionTypes); + return populateClass( + container._class( + ruleFactory.getNameHelper().getUniqueClassName(nodeName, null, container)), + refType, + unionTypes); } catch (JClassAlreadyExistsException e) { throw new IllegalArgumentException(e); } } - private void wrapIt(JDefinedClass definedClass, JFieldVar valueField, JType unionType) { + private void wrapIt(JDefinedClass definedClass, Optional valueField, JType unionType) { final String name = unionType.name(); JFieldVar instanceField = definedClass.field( @@ -196,10 +217,9 @@ private void wrapIt(JDefinedClass definedClass, JFieldVar valueField, JType unio GeneratorUtils.buildMethod(definedClass, instanceField, ruleFactory.getNameHelper(), name); JMethod constructor = definedClass.constructor(JMod.PUBLIC); JVar instanceParam = constructor.param(unionType, instanceField.name()); - constructor - .body() - .assign(JExpr._this().ref(valueField), instanceParam) - .assign(JExpr._this().ref(instanceField), instanceParam); + JBlock body = constructor.body(); + valueField.ifPresent(v -> body.assign(JExpr._this().ref(v), instanceParam)); + body.assign(JExpr._this().ref(instanceField), instanceParam); } private void unionType( diff --git a/custom-generator/src/main/java/io/serverlessworkflow/generator/GeneratorUtils.java b/custom-generator/src/main/java/io/serverlessworkflow/generator/GeneratorUtils.java index ebf1c507..ce3badc2 100644 --- a/custom-generator/src/main/java/io/serverlessworkflow/generator/GeneratorUtils.java +++ b/custom-generator/src/main/java/io/serverlessworkflow/generator/GeneratorUtils.java @@ -49,11 +49,13 @@ public interface DeserializerFiller { void accept(JMethod method, JVar parserParam); } - public static JDefinedClass serializerClass(JDefinedClass relatedClass) { + public static JDefinedClass serializerClass(JDefinedClass relatedClass) + throws JClassAlreadyExistsException { return createClass(relatedClass, JsonSerializer.class, "Serializer"); } - public static JDefinedClass deserializerClass(JDefinedClass relatedClass) { + public static JDefinedClass deserializerClass(JDefinedClass relatedClass) + throws JClassAlreadyExistsException { return createClass(relatedClass, JsonDeserializer.class, "Deserializer"); } @@ -97,15 +99,12 @@ public static void fillDeserializer( } private static JDefinedClass createClass( - JDefinedClass relatedClass, Class serializerClass, String suffix) { - try { - JDefinedClass definedClass = - relatedClass._package()._class(JMod.NONE, relatedClass.name() + suffix); - definedClass._extends(definedClass.owner().ref(serializerClass).narrow(relatedClass)); - return definedClass; - } catch (JClassAlreadyExistsException ex) { - throw new IllegalArgumentException(ex); - } + JDefinedClass relatedClass, Class serializerClass, String suffix) + throws JClassAlreadyExistsException { + JDefinedClass definedClass = + relatedClass._package()._class(JMod.NONE, relatedClass.name() + suffix); + definedClass._extends(definedClass.owner().ref(serializerClass).narrow(relatedClass)); + return definedClass; } private GeneratorUtils() {} diff --git a/custom-generator/src/main/java/io/serverlessworkflow/generator/UnevaluatedPropertiesRule.java b/custom-generator/src/main/java/io/serverlessworkflow/generator/UnevaluatedPropertiesRule.java index 25eacd11..0e937658 100644 --- a/custom-generator/src/main/java/io/serverlessworkflow/generator/UnevaluatedPropertiesRule.java +++ b/custom-generator/src/main/java/io/serverlessworkflow/generator/UnevaluatedPropertiesRule.java @@ -20,6 +20,7 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.sun.codemodel.JBlock; import com.sun.codemodel.JClass; +import com.sun.codemodel.JClassAlreadyExistsException; import com.sun.codemodel.JDefinedClass; import com.sun.codemodel.JExpr; import com.sun.codemodel.JFieldVar; @@ -52,14 +53,19 @@ public JDefinedClass apply( } else if (node != null && checkIntValue(parent, "maxProperties", 1) && checkIntValue(parent, "minProperties", 1)) { - return addKeyValueFields(jclass, node, parent, nodeName, schema); + try { + return addKeyValueFields(jclass, node, parent, nodeName, schema); + } catch (JClassAlreadyExistsException e) { + throw new IllegalArgumentException(e); + } } else { return super.apply(nodeName, node, parent, jclass, schema); } } private JDefinedClass addKeyValueFields( - JDefinedClass jclass, JsonNode node, JsonNode parent, String nodeName, Schema schema) { + JDefinedClass jclass, JsonNode node, JsonNode parent, String nodeName, Schema schema) + throws JClassAlreadyExistsException { NameHelper nameHelper = ruleFactory.getNameHelper(); JType stringClass = jclass.owner()._ref(String.class); JFieldVar nameField = @@ -107,7 +113,8 @@ private JDefinedClass addKeyValueFields( return jclass; } - private JDefinedClass generateDeserializer(JDefinedClass relatedClass, JType propertyType) { + private JDefinedClass generateDeserializer(JDefinedClass relatedClass, JType propertyType) + throws JClassAlreadyExistsException { JDefinedClass definedClass = GeneratorUtils.deserializerClass(relatedClass); GeneratorUtils.fillDeserializer( definedClass, @@ -127,7 +134,8 @@ private JDefinedClass generateDeserializer(JDefinedClass relatedClass, JType pro } private JDefinedClass generateSerializer( - JDefinedClass relatedClass, JMethod nameMethod, JMethod valueMethod) { + JDefinedClass relatedClass, JMethod nameMethod, JMethod valueMethod) + throws JClassAlreadyExistsException { JDefinedClass definedClass = GeneratorUtils.serializerClass(relatedClass); GeneratorUtils.fillSerializer( definedClass, From 53c94201965e28535053678b600193a74c529217 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 26 Aug 2024 13:48:48 +0000 Subject: [PATCH 08/18] Bump com.spotify.fmt:fmt-maven-plugin from 2.23 to 2.24 Bumps [com.spotify.fmt:fmt-maven-plugin](https://github.com/spotify/fmt-maven-plugin) from 2.23 to 2.24. - [Release notes](https://github.com/spotify/fmt-maven-plugin/releases) - [Commits](https://github.com/spotify/fmt-maven-plugin/compare/2.23...2.24) --- updated-dependencies: - dependency-name: com.spotify.fmt:fmt-maven-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6bf2cb81..d034ba48 100644 --- a/pom.xml +++ b/pom.xml @@ -55,7 +55,7 @@ 3.1.2 3.5.0 3.4.0 - 2.23 + 2.24 3.2.5 3.4.2 ${java.version} From 9a5ee5b946486ea57a19a7a48e6da98eec4dc1fe Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 26 Aug 2024 13:48:51 +0000 Subject: [PATCH 09/18] Bump org.apache.maven.plugins:maven-checkstyle-plugin Bumps [org.apache.maven.plugins:maven-checkstyle-plugin](https://github.com/apache/maven-checkstyle-plugin) from 3.4.0 to 3.5.0. - [Commits](https://github.com/apache/maven-checkstyle-plugin/compare/maven-checkstyle-plugin-3.4.0...maven-checkstyle-plugin-3.5.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-checkstyle-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6bf2cb81..2d9af190 100644 --- a/pom.xml +++ b/pom.xml @@ -50,7 +50,7 @@ 3.2.0 - 3.4.0 + 3.5.0 3.13.0 3.1.2 3.5.0 From eeec957516c28a0460ac429f2b76e228f438b26c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 26 Aug 2024 13:48:56 +0000 Subject: [PATCH 10/18] Bump org.apache.maven.plugins:maven-deploy-plugin from 3.1.2 to 3.1.3 Bumps [org.apache.maven.plugins:maven-deploy-plugin](https://github.com/apache/maven-deploy-plugin) from 3.1.2 to 3.1.3. - [Release notes](https://github.com/apache/maven-deploy-plugin/releases) - [Commits](https://github.com/apache/maven-deploy-plugin/compare/maven-deploy-plugin-3.1.2...maven-deploy-plugin-3.1.3) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-deploy-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6bf2cb81..cc055fcf 100644 --- a/pom.xml +++ b/pom.xml @@ -52,7 +52,7 @@ 3.2.0 3.4.0 3.13.0 - 3.1.2 + 3.1.3 3.5.0 3.4.0 2.23 From d0f17a0203e5fca1c9a1c50cf0e3d02110741edf Mon Sep 17 00:00:00 2001 From: Javier Date: Wed, 28 Aug 2024 18:52:00 +0200 Subject: [PATCH 11/18] [Fix #418] Adding const support Signed-off-by: Javier --- api/pom.xml | 1 + .../io/serverlessworkflow/api/ApiTest.java | 19 +++++++++ .../serverlessworkflow/api/FeaturesTest.java | 3 +- .../test/resources/features/callFunction.yaml | 18 +++++++++ .../generator/ConstAnnotator.java | 40 +++++++++++++++++++ 5 files changed, 80 insertions(+), 1 deletion(-) create mode 100644 api/src/test/resources/features/callFunction.yaml create mode 100644 custom-generator/src/main/java/io/serverlessworkflow/generator/ConstAnnotator.java diff --git a/api/pom.xml b/api/pom.xml index 37524b37..3bf0047e 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -101,6 +101,7 @@ true true io.serverlessworkflow.generator.UnreferencedFactory + io.serverlessworkflow.generator.ConstAnnotator diff --git a/api/src/test/java/io/serverlessworkflow/api/ApiTest.java b/api/src/test/java/io/serverlessworkflow/api/ApiTest.java index ac5f7532..20248f35 100644 --- a/api/src/test/java/io/serverlessworkflow/api/ApiTest.java +++ b/api/src/test/java/io/serverlessworkflow/api/ApiTest.java @@ -18,6 +18,7 @@ import static io.serverlessworkflow.api.WorkflowReader.readWorkflowFromClasspath; import static org.assertj.core.api.Assertions.assertThat; +import io.serverlessworkflow.api.types.CallFunction; import io.serverlessworkflow.api.types.CallHTTP; import io.serverlessworkflow.api.types.CallTask; import io.serverlessworkflow.api.types.Task; @@ -44,4 +45,22 @@ void testCallHTTPAPI() throws IOException { assertThat(httpCall.getWith().getMethod()).isEqualTo("get"); } } + + @Test + void testCallFunctionAPIWithoutArguments() throws IOException { + Workflow workflow = readWorkflowFromClasspath("features/callFunction.yaml"); + assertThat(workflow.getDo()).isNotEmpty(); + assertThat(workflow.getDo().get(0).getName()).isNotNull(); + assertThat(workflow.getDo().get(0).getTask()).isNotNull(); + Task task = workflow.getDo().get(0).getTask(); + CallTask callTask = task.getCallTask(); + assertThat(callTask).isNotNull(); + assertThat(callTask.get()).isInstanceOf(CallFunction.class); + if (callTask.get() instanceof CallFunction) { + CallFunction functionCall = callTask.getCallFunction(); + assertThat(functionCall).isNotNull(); + assertThat(callTask.getCallAsyncAPI()).isNull(); + assertThat(functionCall.getWith()).isNull(); + } + } } diff --git a/api/src/test/java/io/serverlessworkflow/api/FeaturesTest.java b/api/src/test/java/io/serverlessworkflow/api/FeaturesTest.java index 8e77673b..af11a49b 100644 --- a/api/src/test/java/io/serverlessworkflow/api/FeaturesTest.java +++ b/api/src/test/java/io/serverlessworkflow/api/FeaturesTest.java @@ -43,7 +43,8 @@ public class FeaturesTest { "features/set.yaml", "features/switch.yaml", "features/try.yaml", - "features/listen.yaml" + "features/listen.yaml", + "features/callFunction.yaml" }) public void testSpecFeaturesParsing(String workflowLocation) throws IOException { Workflow workflow = readWorkflowFromClasspath(workflowLocation); diff --git a/api/src/test/resources/features/callFunction.yaml b/api/src/test/resources/features/callFunction.yaml new file mode 100644 index 00000000..162ec31e --- /dev/null +++ b/api/src/test/resources/features/callFunction.yaml @@ -0,0 +1,18 @@ +document: + dsl: 1.0.0-alpha1 + namespace: default + name: http-call-with-response-output + +use: + functions: + getPet: + call: http + with: + method: get + endpoint: + uri: https://petstore.swagger.io/v2/pet/{petId} + output: response + +do: + - getPetFunctionCall: + call: getPet \ No newline at end of file diff --git a/custom-generator/src/main/java/io/serverlessworkflow/generator/ConstAnnotator.java b/custom-generator/src/main/java/io/serverlessworkflow/generator/ConstAnnotator.java new file mode 100644 index 00000000..a893cfb5 --- /dev/null +++ b/custom-generator/src/main/java/io/serverlessworkflow/generator/ConstAnnotator.java @@ -0,0 +1,40 @@ +/* + * Copyright 2020-Present The Serverless Workflow Specification Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package io.serverlessworkflow.generator; + +import com.fasterxml.jackson.databind.JsonNode; +import com.sun.codemodel.JDefinedClass; +import com.sun.codemodel.JFieldVar; +import jakarta.validation.constraints.Pattern; +import org.jsonschema2pojo.AbstractAnnotator; +import org.jsonschema2pojo.GenerationConfig; + +public class ConstAnnotator extends AbstractAnnotator { + + private static final String CONST = "const"; + + public ConstAnnotator(GenerationConfig generationConfig) { + super(generationConfig); + } + + @Override + public void propertyField( + JFieldVar field, JDefinedClass clazz, String propertyName, JsonNode propertyNode) { + if (propertyNode.has(CONST)) { + field.annotate(Pattern.class).param("regexp", propertyNode.get(CONST).asText()); + } + } +} From 3b65612d602c6cf0abfd303463a58e06b33072da Mon Sep 17 00:00:00 2001 From: Javier Date: Wed, 28 Aug 2024 19:39:11 +0200 Subject: [PATCH 12/18] [Fix #418] Adding Jsr 303 validation support Notice that this will force us to add version and other mandatory field we were not including in the examples Signed-off-by: Javier --- api/pom.xml | 14 ++--- .../api/ObjectMapperFactory.java | 7 ++- ...eanDeserializerModifierWithValidation.java | 35 +++++++++++++ .../BeanDeserializerWithValidation.java | 51 +++++++++++++++++++ .../serialization/DeserializeHelper.java | 3 +- .../test/resources/features/callFunction.yaml | 1 + api/src/test/resources/features/callHttp.yaml | 1 + .../test/resources/features/callOpenAPI.yaml | 1 + .../test/resources/features/composite.yaml | 1 + .../test/resources/features/data-flow.yaml | 1 + api/src/test/resources/features/emit.yaml | 1 + api/src/test/resources/features/flow.yaml | 1 + api/src/test/resources/features/for.yaml | 1 + api/src/test/resources/features/listen.yaml | 1 + api/src/test/resources/features/raise.yaml | 4 +- api/src/test/resources/features/set.yaml | 1 + api/src/test/resources/features/switch.yaml | 1 + api/src/test/resources/features/try.yaml | 1 + pom.xml | 14 ++++- 19 files changed, 130 insertions(+), 10 deletions(-) create mode 100644 api/src/main/java/io/serverlessworkflow/serialization/BeanDeserializerModifierWithValidation.java create mode 100644 api/src/main/java/io/serverlessworkflow/serialization/BeanDeserializerWithValidation.java diff --git a/api/pom.xml b/api/pom.xml index 3bf0047e..d5128d57 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -33,7 +33,14 @@ jakarta.validation jakarta.validation-api - + + org.hibernate.validator + hibernate-validator + + + org.glassfish.expressly + expressly + org.junit.jupiter @@ -65,11 +72,6 @@ logback-classic test - - org.assertj - assertj-core - test - diff --git a/api/src/main/java/io/serverlessworkflow/api/ObjectMapperFactory.java b/api/src/main/java/io/serverlessworkflow/api/ObjectMapperFactory.java index 7bc8414e..850e7da7 100644 --- a/api/src/main/java/io/serverlessworkflow/api/ObjectMapperFactory.java +++ b/api/src/main/java/io/serverlessworkflow/api/ObjectMapperFactory.java @@ -17,8 +17,10 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.SerializationFeature; +import com.fasterxml.jackson.databind.module.SimpleModule; import com.fasterxml.jackson.dataformat.yaml.YAMLFactory; import com.fasterxml.jackson.dataformat.yaml.YAMLGenerator.Feature; +import io.serverlessworkflow.serialization.BeanDeserializerModifierWithValidation; class ObjectMapperFactory { @@ -36,10 +38,13 @@ public static final ObjectMapper yamlMapper() { } private static ObjectMapper configure(ObjectMapper mapper) { + SimpleModule validationModule = new SimpleModule(); + validationModule.setDeserializerModifier(new BeanDeserializerModifierWithValidation()); return mapper .configure(SerializationFeature.INDENT_OUTPUT, true) .configure(SerializationFeature.WRITE_EMPTY_JSON_ARRAYS, false) - .configure(SerializationFeature.WRITE_NULL_MAP_VALUES, false); + .configure(SerializationFeature.WRITE_NULL_MAP_VALUES, false) + .registerModule(validationModule); } private ObjectMapperFactory() {} diff --git a/api/src/main/java/io/serverlessworkflow/serialization/BeanDeserializerModifierWithValidation.java b/api/src/main/java/io/serverlessworkflow/serialization/BeanDeserializerModifierWithValidation.java new file mode 100644 index 00000000..e4e019ac --- /dev/null +++ b/api/src/main/java/io/serverlessworkflow/serialization/BeanDeserializerModifierWithValidation.java @@ -0,0 +1,35 @@ +/* + * Copyright 2020-Present The Serverless Workflow Specification Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package io.serverlessworkflow.serialization; + +import com.fasterxml.jackson.databind.BeanDescription; +import com.fasterxml.jackson.databind.DeserializationConfig; +import com.fasterxml.jackson.databind.JsonDeserializer; +import com.fasterxml.jackson.databind.deser.BeanDeserializer; +import com.fasterxml.jackson.databind.deser.BeanDeserializerModifier; + +public class BeanDeserializerModifierWithValidation extends BeanDeserializerModifier { + + private static final long serialVersionUID = 1L; + + @Override + public JsonDeserializer modifyDeserializer( + DeserializationConfig config, BeanDescription beanDesc, JsonDeserializer deserializer) { + return deserializer instanceof BeanDeserializer + ? new BeanDeserializerWithValidation((BeanDeserializer) deserializer) + : deserializer; + } +} diff --git a/api/src/main/java/io/serverlessworkflow/serialization/BeanDeserializerWithValidation.java b/api/src/main/java/io/serverlessworkflow/serialization/BeanDeserializerWithValidation.java new file mode 100644 index 00000000..a77e117d --- /dev/null +++ b/api/src/main/java/io/serverlessworkflow/serialization/BeanDeserializerWithValidation.java @@ -0,0 +1,51 @@ +/* + * Copyright 2020-Present The Serverless Workflow Specification Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package io.serverlessworkflow.serialization; + +import com.fasterxml.jackson.core.JsonParser; +import com.fasterxml.jackson.databind.DeserializationContext; +import com.fasterxml.jackson.databind.deser.BeanDeserializer; +import com.fasterxml.jackson.databind.deser.BeanDeserializerBase; +import jakarta.validation.ConstraintViolation; +import jakarta.validation.ConstraintViolationException; +import jakarta.validation.Validation; +import jakarta.validation.Validator; +import java.io.IOException; +import java.util.Set; + +public class BeanDeserializerWithValidation extends BeanDeserializer { + private static final long serialVersionUID = 1L; + private static final Validator validator = + Validation.buildDefaultValidatorFactory().getValidator(); + + protected BeanDeserializerWithValidation(BeanDeserializerBase src) { + super(src); + } + + private void validate(T t) throws IOException { + Set> violations = validator.validate(t); + if (!violations.isEmpty()) { + throw new ConstraintViolationException(violations); + } + } + + @Override + public Object deserialize(JsonParser p, DeserializationContext ctxt) throws IOException { + Object instance = super.deserialize(p, ctxt); + validate(instance); + return instance; + } +} diff --git a/api/src/main/java/io/serverlessworkflow/serialization/DeserializeHelper.java b/api/src/main/java/io/serverlessworkflow/serialization/DeserializeHelper.java index fc5390f1..72b4cce0 100644 --- a/api/src/main/java/io/serverlessworkflow/serialization/DeserializeHelper.java +++ b/api/src/main/java/io/serverlessworkflow/serialization/DeserializeHelper.java @@ -19,6 +19,7 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.TreeNode; import com.fasterxml.jackson.databind.JsonMappingException; +import jakarta.validation.ConstraintViolationException; import java.io.IOException; import java.util.Collection; @@ -33,7 +34,7 @@ public static T deserializeOneOf( try { Object object = p.getCodec().treeToValue(node, unionType); return targetClass.getConstructor(unionType).newInstance(object); - } catch (IOException | ReflectiveOperationException io) { + } catch (IOException | ReflectiveOperationException | ConstraintViolationException io) { ex.addSuppressed(io); } } diff --git a/api/src/test/resources/features/callFunction.yaml b/api/src/test/resources/features/callFunction.yaml index 162ec31e..95a3a987 100644 --- a/api/src/test/resources/features/callFunction.yaml +++ b/api/src/test/resources/features/callFunction.yaml @@ -2,6 +2,7 @@ document: dsl: 1.0.0-alpha1 namespace: default name: http-call-with-response-output + version: 1.0.0 use: functions: diff --git a/api/src/test/resources/features/callHttp.yaml b/api/src/test/resources/features/callHttp.yaml index 9b48c783..4022e38a 100644 --- a/api/src/test/resources/features/callHttp.yaml +++ b/api/src/test/resources/features/callHttp.yaml @@ -2,6 +2,7 @@ document: dsl: 1.0.0-alpha1 namespace: default name: http-call-with-response-output + version: 1.0.0 do: - getPet: call: http diff --git a/api/src/test/resources/features/callOpenAPI.yaml b/api/src/test/resources/features/callOpenAPI.yaml index 46ecc921..1a1d0c56 100644 --- a/api/src/test/resources/features/callOpenAPI.yaml +++ b/api/src/test/resources/features/callOpenAPI.yaml @@ -2,6 +2,7 @@ document: dsl: 1.0.0-alpha1 namespace: default name: openapi-call-with-content-output + version: 1.0.0 do: - findPet: call: openapi diff --git a/api/src/test/resources/features/composite.yaml b/api/src/test/resources/features/composite.yaml index 71b0dea4..515cda25 100644 --- a/api/src/test/resources/features/composite.yaml +++ b/api/src/test/resources/features/composite.yaml @@ -2,6 +2,7 @@ document: dsl: 1.0.0-alpha1 namespace: default name: do + version: 1.0.0 do: - compositeExample: do: diff --git a/api/src/test/resources/features/data-flow.yaml b/api/src/test/resources/features/data-flow.yaml index d66d7848..bebb2123 100644 --- a/api/src/test/resources/features/data-flow.yaml +++ b/api/src/test/resources/features/data-flow.yaml @@ -2,6 +2,7 @@ document: dsl: 1.0.0-alpha1 namespace: default name: output-filtering + version: 1.0.0 do: - getPet: call: http diff --git a/api/src/test/resources/features/emit.yaml b/api/src/test/resources/features/emit.yaml index 488feedc..983407d9 100644 --- a/api/src/test/resources/features/emit.yaml +++ b/api/src/test/resources/features/emit.yaml @@ -2,6 +2,7 @@ document: dsl: 1.0.0-alpha1 namespace: default name: emit + version: 1.0.0 do: - emitEvent: emit: diff --git a/api/src/test/resources/features/flow.yaml b/api/src/test/resources/features/flow.yaml index 83baf04c..6bd8a6e7 100644 --- a/api/src/test/resources/features/flow.yaml +++ b/api/src/test/resources/features/flow.yaml @@ -2,6 +2,7 @@ document: dsl: 1.0.0-alpha1 namespace: default name: implicit-sequence + version: 1.0.0 do: - setRed: set: diff --git a/api/src/test/resources/features/for.yaml b/api/src/test/resources/features/for.yaml index f8ae826d..662dff91 100644 --- a/api/src/test/resources/features/for.yaml +++ b/api/src/test/resources/features/for.yaml @@ -2,6 +2,7 @@ document: dsl: 1.0.0-alpha1 namespace: default name: for + version: 1.0.0 do: - loopColors: for: diff --git a/api/src/test/resources/features/listen.yaml b/api/src/test/resources/features/listen.yaml index 393355d0..1c56c229 100644 --- a/api/src/test/resources/features/listen.yaml +++ b/api/src/test/resources/features/listen.yaml @@ -2,6 +2,7 @@ document: dsl: 1.0.0-alpha1 namespace: default name: listen-task + version: 1.0.0 do: - listenToSomething: listen: diff --git a/api/src/test/resources/features/raise.yaml b/api/src/test/resources/features/raise.yaml index 9dd6b4f3..7745162c 100644 --- a/api/src/test/resources/features/raise.yaml +++ b/api/src/test/resources/features/raise.yaml @@ -2,10 +2,12 @@ document: dsl: 1.0.0-alpha1 namespace: default name: raise-custom-error + version: 1.0.0 do: - raiseError: raise: error: status: 400 type: https://serverlessworkflow.io/errors/types/compliance - title: Compliance Error \ No newline at end of file + title: Compliance Error + instance: raiseError \ No newline at end of file diff --git a/api/src/test/resources/features/set.yaml b/api/src/test/resources/features/set.yaml index 1589792f..dfebbf2d 100644 --- a/api/src/test/resources/features/set.yaml +++ b/api/src/test/resources/features/set.yaml @@ -2,6 +2,7 @@ document: dsl: 1.0.0-alpha1 namespace: default name: set + version: 1.0.0 do: - setShape: set: diff --git a/api/src/test/resources/features/switch.yaml b/api/src/test/resources/features/switch.yaml index 74d046cb..aa073fed 100644 --- a/api/src/test/resources/features/switch.yaml +++ b/api/src/test/resources/features/switch.yaml @@ -2,6 +2,7 @@ document: dsl: 1.0.0-alpha1 namespace: default name: switch-match + version: 1.0.0 do: - switchColor: switch: diff --git a/api/src/test/resources/features/try.yaml b/api/src/test/resources/features/try.yaml index 7f9ba599..ec19194d 100644 --- a/api/src/test/resources/features/try.yaml +++ b/api/src/test/resources/features/try.yaml @@ -2,6 +2,7 @@ document: dsl: 1.0.0-alpha1 namespace: default name: try-catch-404 + version: 1.0.0 do: - tryGetPet: try: diff --git a/pom.xml b/pom.xml index 42064622..5311c098 100644 --- a/pom.xml +++ b/pom.xml @@ -76,7 +76,8 @@ 5.11.0 5.12.0 2.0.16 - + 8.0.1.Final + 5.0.0 true @@ -124,6 +125,17 @@ json-schema-validator ${version.com.networknt} + + org.hibernate.validator + hibernate-validator + ${version.org.hibernate.validator} + + + org.glassfish.expressly + expressly + ${version.org.glassfish.expressly} + + com.fasterxml.jackson.dataformat jackson-dataformat-yaml From 75b7ea39685589a5a76a0f249c589bf22303d368 Mon Sep 17 00:00:00 2001 From: Francisco Javier Tirado Sarti <65240126+fjtirado@users.noreply.github.com> Date: Sat, 31 Aug 2024 11:53:36 +0200 Subject: [PATCH 13/18] Update project.yml Signed-off-by: Javier --- .github/project.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/project.yml b/.github/project.yml index 859faefb..dad54d74 100644 --- a/.github/project.yml +++ b/.github/project.yml @@ -1,3 +1,3 @@ release: - current-version: 7.0.0-alpha1 + current-version: 7.0.0-alpha2 next-version: 7.0.0-SNAPSHOT From 150a02f63d14e8ad59b8b25efa65359aea717bd6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 2 Sep 2024 13:14:42 +0000 Subject: [PATCH 14/18] Bump org.apache.maven.plugins:maven-failsafe-plugin from 3.4.0 to 3.5.0 Bumps [org.apache.maven.plugins:maven-failsafe-plugin](https://github.com/apache/maven-surefire) from 3.4.0 to 3.5.0. - [Release notes](https://github.com/apache/maven-surefire/releases) - [Commits](https://github.com/apache/maven-surefire/compare/surefire-3.4.0...surefire-3.5.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-failsafe-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5311c098..a487b4eb 100644 --- a/pom.xml +++ b/pom.xml @@ -54,7 +54,7 @@ 3.13.0 3.1.3 3.5.0 - 3.4.0 + 3.5.0 2.24 3.2.5 3.4.2 From 982ee34bf4af356cd30ef31d971510fb44a09586 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 2 Sep 2024 13:14:49 +0000 Subject: [PATCH 15/18] Bump org.mockito:mockito-core from 5.12.0 to 5.13.0 Bumps [org.mockito:mockito-core](https://github.com/mockito/mockito) from 5.12.0 to 5.13.0. - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v5.12.0...v5.13.0) --- updated-dependencies: - dependency-name: org.mockito:mockito-core dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5311c098..e52e921c 100644 --- a/pom.xml +++ b/pom.xml @@ -74,7 +74,7 @@ 1.5.2 3.26.3 5.11.0 - 5.12.0 + 5.13.0 2.0.16 8.0.1.Final 5.0.0 From 07686a2e67433841d8c4cb6e81cb905df8d793d5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 2 Sep 2024 13:14:53 +0000 Subject: [PATCH 16/18] Bump org.apache.maven.plugins:maven-javadoc-plugin from 3.8.0 to 3.10.0 Bumps [org.apache.maven.plugins:maven-javadoc-plugin](https://github.com/apache/maven-javadoc-plugin) from 3.8.0 to 3.10.0. - [Release notes](https://github.com/apache/maven-javadoc-plugin/releases) - [Commits](https://github.com/apache/maven-javadoc-plugin/compare/maven-javadoc-plugin-3.8.0...maven-javadoc-plugin-3.10.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-javadoc-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5311c098..bdbf2e60 100644 --- a/pom.xml +++ b/pom.xml @@ -60,7 +60,7 @@ 3.4.2 ${java.version} 1.2.1 - 3.8.0 + 3.10.0 3.1.1 3.3.1 3.4.0 From c41950966c1e720096d1d7b68aa5522fb0a90aea Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 2 Sep 2024 13:14:57 +0000 Subject: [PATCH 17/18] Bump org.apache.maven.plugins:maven-surefire-plugin from 3.4.0 to 3.5.0 Bumps [org.apache.maven.plugins:maven-surefire-plugin](https://github.com/apache/maven-surefire) from 3.4.0 to 3.5.0. - [Release notes](https://github.com/apache/maven-surefire/releases) - [Commits](https://github.com/apache/maven-surefire/compare/surefire-3.4.0...surefire-3.5.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-surefire-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5311c098..86f0ddb9 100644 --- a/pom.xml +++ b/pom.xml @@ -63,7 +63,7 @@ 3.8.0 3.1.1 3.3.1 - 3.4.0 + 3.5.0 From efc17f116ca90722de8c3243b647e2e34d7dd235 Mon Sep 17 00:00:00 2001 From: GitHub Action Date: Tue, 3 Sep 2024 13:19:55 +0000 Subject: [PATCH 18/18] [maven-release-plugin] prepare release 7.0.0-alpha2 --- api/pom.xml | 2 +- custom-generator/pom.xml | 2 +- pom.xml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/api/pom.xml b/api/pom.xml index d5128d57..81151188 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -4,7 +4,7 @@ io.serverlessworkflow serverlessworkflow-parent - 7.0.0-SNAPSHOT + 7.0.0-alpha2 serverlessworkflow-api diff --git a/custom-generator/pom.xml b/custom-generator/pom.xml index 7aaedbda..1dee3299 100644 --- a/custom-generator/pom.xml +++ b/custom-generator/pom.xml @@ -3,7 +3,7 @@ io.serverlessworkflow serverlessworkflow-parent - 7.0.0-SNAPSHOT + 7.0.0-alpha2 custom-generator diff --git a/pom.xml b/pom.xml index b8b29aea..b27e5461 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ io.serverlessworkflow serverlessworkflow-parent - 7.0.0-SNAPSHOT + 7.0.0-alpha2 pom Serverless Workflow :: Parent @@ -33,7 +33,7 @@ scm:git:git@github.com:serverlessworkflow/sdk-java.git scm:git:git@github.com:serverlessworkflow/sdk-java.git https://github.com/serverlessworkflow/sdk-java - HEAD + 7.0.0-alpha2 pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy