Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Sync main branch with Apache main branch #34

Merged
merged 4 commits into from
Jul 8, 2024
Merged

Sync main branch with Apache main branch #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a777f22
[incubator-kie-issues-1286] Adhoc functionality missing in kogito jBP…
elguardian Jun 13, 2024
f6f6c38
[Fix #1965] Align camel version (#1966)
fjtirado Jun 13, 2024
4934fc7
Add "@EnableMethodSecurity" for spring security (#1932)
Teamop Jun 18, 2024
6c49020
kie-kogito-examples-1974: Fix typos in serverless-workflow-timeouts-s…
LuboTerifaj Jun 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion kogito-quarkus-examples/flexible-process-quarkus/src/main/resources/service-desk.bpmn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -743,7 +743,7 @@
<bpmn2:targetRef>supportCase</bpmn2:targetRef>
</bpmn2:dataOutputAssociation>
</bpmn2:serviceTask>
<bpmn2:completionCondition xsi:type="bpmn2:tFormalExpression" language="http://www.mvel.org/2.0"><![CDATA[org.kie.kogito.flexible.example.model.State.CLOSED.equals(supportCase.getState())]]></bpmn2:completionCondition>
<bpmn2:completionCondition xsi:type="bpmn2:tFormalExpression" language="java"><![CDATA[org.kie.kogito.flexible.example.model.State.CLOSED.equals(supportCase.getState())]]></bpmn2:completionCondition>
</bpmn2:adHocSubProcess>
</bpmn2:process>
<bpmndi:BPMNDiagram>
Expand Down
4 changes: 2 additions & 2 deletions kogito-springboot-examples/flexible-process-springboot/src/main/resources/service-desk.bpmn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -743,7 +743,7 @@
<bpmn2:targetRef>supportCase</bpmn2:targetRef>
</bpmn2:dataOutputAssociation>
</bpmn2:serviceTask>
<bpmn2:completionCondition xsi:type="bpmn2:tFormalExpression" language="http://www.mvel.org/2.0"><![CDATA[org.kie.kogito.flexible.example.model.State.CLOSED.equals(supportCase.getState())]]></bpmn2:completionCondition>
<bpmn2:completionCondition xsi:type="bpmn2:tFormalExpression" language="java"><![CDATA[org.kie.kogito.flexible.example.model.State.CLOSED.equals(supportCase.getState())]]></bpmn2:completionCondition>
</bpmn2:adHocSubProcess>
</bpmn2:process>
<bpmndi:BPMNDiagram>
Expand Down Expand Up @@ -902,4 +902,4 @@
<bpmn2:source>_fswpMKJxEDiZN4UVlvQdCA</bpmn2:source>
<bpmn2:target>_fswpMKJxEDiZN4UVlvQdCA</bpmn2:target>
</bpmn2:relationship>
</bpmn2:definitions>
</bpmn2:definitions>
2 changes: 2 additions & 0 deletions ...with-security-springboot/src/main/java/org/kie/kogito/tests/DefaultWebSecurityConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
import org.springframework.security.config.annotation.method.configuration.EnableMethodSecurity;
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
import org.springframework.security.crypto.password.NoOpPasswordEncoder;
Expand All @@ -30,6 +31,7 @@

@Configuration
@EnableWebSecurity
@EnableMethodSecurity(jsr250Enabled = true)
public class DefaultWebSecurityConfig {

@Bean
Expand Down
2 changes: 1 addition & 1 deletion serverless-workflow-examples/serverless-workflow-github-showcase/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
<version.surefire.plugin>3.0.0-M7</version.surefire.plugin>
<version.io.jjwt>0.11.2</version.io.jjwt>
<version.kohsuke.github>1.116</version.kohsuke.github>
<version.org.camel>2.13.0</version.org.camel>
<version.org.camel>3.9.0</version.org.camel>
<version.com.github.tomakehurst.wiremock>2.33.2</version.com.github.tomakehurst.wiremock>
</properties>
</project>
2 changes: 1 addition & 1 deletion serverless-workflow-examples/serverless-workflow-loanbroker-showcase/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
<version.io.cloudevents>2.5.0</version.io.cloudevents>
<!-- See: https://camel.apache.org/categories/Camel-Quarkus/ -->
<!-- Aligned with Quarkus. We don't use the Camel Quarkus platform BOM to avoid upgrade delays in our CI. Feel free to use the BOM in your projects, though -->
<version.org.apache.camel.quarkus>3.2.3</version.org.apache.camel.quarkus>
<version.org.apache.camel.quarkus>3.9.0</version.org.apache.camel.quarkus>

<version.surefire.plugin>3.0.0-M7</version.surefire.plugin>
<version.compiler.plugin>3.8.1</version.compiler.plugin>
Expand Down
6 changes: 3 additions & 3 deletions ...ow-examples/serverless-workflow-timeouts-showcase-operator-devprofile/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
minikube start --cpus 4 --memory 10g --addons registry --addons metrics-server --insecure-registry "10.0.0.0/24" --insecure-registry "localhost:5000"
```

> **NOTE:** If the number of allocated cpus and memory configurations don't feet well for your installation you can try to change this numbers.
> However lower configuration might lead your cluster to get out of memmory. Remember that every time you change this values, you will have to recreate your instance.
> **NOTE:** If the allocated cpus and memory configurations don't fit well for your installation, you can try adjusting these numbers.
> However, lower configurations might cause your cluster to run out of memory. Remember that every time you change these values, you will have to recreate your instance.

3. Be sure that the SonataFlow Operator is installed in your minikube.

Expand Down Expand Up @@ -39,7 +39,7 @@ kubectl apply -f workflows/callback_state_timeouts_devprofile.yaml -n timeouts-s

> **NOTE:** In local environments, we recommend that you deploy the workflows one by one at the same time you verify that
> each deployment was successful. To do that, you can execute this command after each deployment, and you might have to
> execute command several times until you see that the deployed workflow pod is running successfully, since it might take
> execute command several times until you see that the deployed workflow pod is running successfully, as it might take
> some time to download the images used by the operator.
>
>
Expand Down
Loading