Skip to content

Commit

Permalink
chore(release): adjust examples for 7.15.0 release
Browse files Browse the repository at this point in the history 
Related to CAM-13242

Co-authored-by: Tassilo Weidner <tassilo.weidner@camunda.com>
Co-authored-by: Yana Vasileva <yana.vasileva@camunda.com>
Co-authored-by: Martin Stamm <martin.stamm@camunda.com>
Co-authored-by: Anton von Weltzien <anton.weltzien@camunda.com>
  • Loading branch information
@github-actions @tasso94
@yanavasileva @marstamm @yT0n1
5 people committed Apr 8, 2021
1 parent 295a466 commit c3a9d04
Show file tree
Hide file tree
Showing 145 changed files with 50,532 additions and 13,012 deletions.
1 change: 0 additions & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,6 @@ If you clone this repository, use the checkout commands to access the sources fo
|-----------------------------------------------------------|-------------|-----------------------------|
| [SDK JS forms](/sdk-js/browser-forms) * | Browser | HTML, task, form, SDK |
| [SDK JS forms AngularJS](/sdk-js/browser-forms-angular) * | Browser | HTML, task, form, AngularJS |
| [SDK JS node.js](/sdk-js/nodejs) * | node.js | CLI, deployment |

### Camunda Modeler Eclipse Plugin Examples

Expand Down
4 changes: 2 additions & 2 deletions authentication/basic/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.2.5.RELEASE</version>
<version>2.3.9.RELEASE</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>

Expand All @@ -16,7 +16,7 @@
<version>1.0.0</version>

<properties>
<camunda.version>7.14.0</camunda.version>
<camunda.version>7.15.0</camunda.version>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Expand Down
2 changes: 1 addition & 1 deletion bpmn-model-api/generate-jsf-form/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -225,5 +225,5 @@ User task form:
[7]: docs/support-task-form.png
[8]: docs/feature-start-form.png
[9]: docs/features-task-form.png
[10]: https://downloads.camunda.cloud/release/camunda-bpm/wildfly/7.14/
[10]: https://downloads.camunda.cloud/release/camunda-bpm/wildfly/7.15/
[11]: src/test/java/org/camunda/bpm
4 changes: 2 additions & 2 deletions bpmn-model-api/generate-jsf-form/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<description>Process application that uses the Camunda Platform and has been generated by the Maven archetype 'camunda-archetype-ejb-war-7.0.3-SNAPSHOT'</description>

<properties>
<camunda.version>7.14.0</camunda.version>
<camunda.version>7.15.0</camunda.version>
<arquillian.version>1.1.10.Final</arquillian.version>
<wildfly.container.adapter.version>2.2.0.Final</wildfly.container.adapter.version>
<maven.compiler.source>1.8</maven.compiler.source>
Expand Down Expand Up @@ -88,7 +88,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<version>4.13.1</version>
<scope>test</scope>
</dependency>

Expand Down
2 changes: 1 addition & 1 deletion bpmn-model-api/generate-process-fluent-api/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<version>1.0-SNAPSHOT</version>

<properties>
<camunda.version>7.14.0</camunda.version>
<camunda.version>7.15.0</camunda.version>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Expand Down
4 changes: 2 additions & 2 deletions bpmn-model-api/parse-bpmn/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<name>Parse BPMN by model API</name>

<properties>
<version.camunda>7.14.0</version.camunda>
<version.camunda>7.15.0</version.camunda>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Expand All @@ -26,7 +26,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<version>4.13.1</version>
<scope>test</scope>
</dependency>

Expand Down
80 changes: 40 additions & 40 deletions clients/java/dataformat/workflow.bpmn → clients/java/dataformat/dataformat-demo.bpmn
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" id="Definitions_1o8wnip" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="3.3.2">
<bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" id="Definitions_1o8wnip" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="4.6.0">
<bpmn:process id="DataformatDemoProcess" name="Dataformat demo" isExecutable="true">
<bpmn:startEvent id="StartEvent_1" name="Customer attributes entered">
<bpmn:extensionElements>
Expand Down Expand Up @@ -69,20 +69,52 @@
</bpmn:process>
<bpmndi:BPMNDiagram id="BPMNDiagram_1">
<bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="DataformatDemoProcess">
<bpmndi:BPMNShape id="_BPMNShape_StartEvent_2" bpmnElement="StartEvent_1">
<dc:Bounds x="179" y="109" width="36" height="36" />
<bpmndi:BPMNEdge id="SequenceFlow_1ptq3mq_di" bpmnElement="SequenceFlow_1ptq3mq">
<di:waypoint x="910" y="127" />
<di:waypoint x="972" y="127" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="SequenceFlow_02pt6uy_di" bpmnElement="SequenceFlow_02pt6uy">
<di:waypoint x="640" y="280" />
<di:waypoint x="730" y="280" />
<di:waypoint x="730" y="152" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="SequenceFlow_0f9o501_di" bpmnElement="SequenceFlow_0f9o501">
<di:waypoint x="450" y="152" />
<di:waypoint x="450" y="280" />
<di:waypoint x="540" y="280" />
<bpmndi:BPMNLabel>
<dc:Bounds x="154" y="152" width="86" height="27" />
<dc:Bounds x="453" y="213" width="24" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="SequenceFlow_1f3u59p_di" bpmnElement="SequenceFlow_1f3u59p">
<di:waypoint x="755" y="127" />
<di:waypoint x="810" y="127" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="SequenceFlow_0y2awwd_di" bpmnElement="SequenceFlow_0y2awwd">
<di:waypoint x="640" y="127" />
<di:waypoint x="705" y="127" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="SequenceFlow_167l25n_di" bpmnElement="SequenceFlow_167l25n">
<di:waypoint x="475" y="127" />
<di:waypoint x="540" y="127" />
<bpmndi:BPMNLabel>
<dc:Bounds x="498" y="109" width="19" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="SequenceFlow_0pjzf8z_di" bpmnElement="SequenceFlow_0pjzf8z">
<di:waypoint x="215" y="127" />
<di:waypoint x="260" y="127" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="SequenceFlow_11jz6eo_di" bpmnElement="SequenceFlow_11jz6eo">
<di:waypoint x="360" y="127" />
<di:waypoint x="425" y="127" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="SequenceFlow_0pjzf8z_di" bpmnElement="SequenceFlow_0pjzf8z">
<di:waypoint x="215" y="127" />
<di:waypoint x="260" y="127" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="_BPMNShape_StartEvent_2" bpmnElement="StartEvent_1">
<dc:Bounds x="179" y="109" width="36" height="36" />
<bpmndi:BPMNLabel>
<dc:Bounds x="154" y="152" width="86" height="27" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="UserTask_0xifxgu_di" bpmnElement="Task_1vjuj1c">
<dc:Bounds x="260" y="87" width="100" height="80" />
</bpmndi:BPMNShape>
Expand All @@ -92,20 +124,9 @@
<dc:Bounds x="419" y="78" width="61" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="SequenceFlow_167l25n_di" bpmnElement="SequenceFlow_167l25n">
<di:waypoint x="475" y="127" />
<di:waypoint x="540" y="127" />
<bpmndi:BPMNLabel>
<dc:Bounds x="498" y="109" width="19" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="ServiceTask_19zyafk_di" bpmnElement="Task_03zh96w">
<dc:Bounds x="540" y="87" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="SequenceFlow_0y2awwd_di" bpmnElement="SequenceFlow_0y2awwd">
<di:waypoint x="640" y="127" />
<di:waypoint x="705" y="127" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="EndEvent_1nrs79a_di" bpmnElement="EndEvent_1nrs79a">
<dc:Bounds x="972" y="109" width="36" height="36" />
<bpmndi:BPMNLabel>
Expand All @@ -115,33 +136,12 @@
<bpmndi:BPMNShape id="ExclusiveGateway_0tj5ibz_di" bpmnElement="ExclusiveGateway_0tj5ibz" isMarkerVisible="true">
<dc:Bounds x="705" y="102" width="50" height="50" />
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="SequenceFlow_1f3u59p_di" bpmnElement="SequenceFlow_1f3u59p">
<di:waypoint x="755" y="127" />
<di:waypoint x="810" y="127" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="SequenceFlow_0f9o501_di" bpmnElement="SequenceFlow_0f9o501">
<di:waypoint x="450" y="152" />
<di:waypoint x="450" y="280" />
<di:waypoint x="540" y="280" />
<bpmndi:BPMNLabel>
<dc:Bounds x="453" y="213" width="24" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="ServiceTask_1gai5pz_di" bpmnElement="Task_1x6a2xs">
<dc:Bounds x="540" y="240" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="SequenceFlow_02pt6uy_di" bpmnElement="SequenceFlow_02pt6uy">
<di:waypoint x="640" y="280" />
<di:waypoint x="730" y="280" />
<di:waypoint x="730" y="152" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="ServiceTask_0y2bzme_di" bpmnElement="Task_1p179ep">
<dc:Bounds x="810" y="87" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="SequenceFlow_1ptq3mq_di" bpmnElement="SequenceFlow_1ptq3mq">
<di:waypoint x="910" y="127" />
<di:waypoint x="972" y="127" />
</bpmndi:BPMNEdge>
</bpmndi:BPMNPlane>
</bpmndi:BPMNDiagram>
</bpmn:definitions>
45 changes: 28 additions & 17 deletions clients/java/dataformat/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,36 +1,33 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

<modelVersion>4.0.0</modelVersion>

<groupId>org.camunda.bpm</groupId>
<artifactId>dataformat-example</artifactId>
<version>1.0-SNAPSHOT</version>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.8</source>
<target>1.8</target>
</configuration>
</plugin>
</plugins>
</build>

<name>dataformat-example</name>

<dependencies>
<properties>
<camunda.platform.version>7.15.0</camunda.platform.version>
<slf4j.version>1.7.26</slf4j.version>
<jaxb.version>2.2.3</jaxb.version>
<maven.compiler.plugin.version>3.8.1</maven.compiler.plugin.version>
<java.version>8</java.version>
</properties>

<dependencies>
<dependency>
<groupId>org.camunda.bpm</groupId>
<artifactId>camunda-external-task-client</artifactId>
<version>1.4.1</version>
<version>${camunda.platform.version}</version>
</dependency>

<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>1.6.1</version>
<version>${slf4j.version}</version>
</dependency>

</dependencies>

<profiles>
Expand All @@ -45,11 +42,25 @@
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
<version>2.2.3</version>
<version>${jaxb.version}</version>
</dependency>
</dependencies>

</profile>
</profiles>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>${maven.compiler.plugin.version}</version>
<configuration>
<source>${java.version}</source>
<target>${java.version}</target>
</configuration>
</plugin>
</plugins>
</build>

</project>
37 changes: 19 additions & 18 deletions clients/java/loan-granting/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,51 +3,52 @@
In this tutorial you will learn how to use the External Task client for Java.

In a nutshell you will be guided through the following steps:
* Starting the Camunda BPM Platform
* Modeling and Deploying a workflow with the Camunda Modeler
* Starting the Camunda Platform Runtime
* Modeling and Deploying a process with the Camunda Modeler
* Bootstrapping the External Task client
* Monitor the workflow in Camunda Cockpit
* Monitor the process in Camunda Cockpit

## Prerequisites
* [Java JDK 8+](http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html)
* [Apache Maven](https://maven.apache.org/download.cgi)
* [Camunda Modeler >= 1.12.0](https://downloads.camunda.cloud/release/camunda-modeler/4.0.0/)
* [Camunda BPM Platform](https://downloads.camunda.cloud/release/camunda-bpm/tomcat/7.15/)
* [Camunda Modeler](https://camunda.com/download/modeler/)
* [Camunda Platform Runtime](https://camunda.com/download/)
* Camunda External Task Client

First, make sure that you have downloaded and installed all the necessary prerequisites. Please check the [compatibility matrix](https://docs.camunda.org/manual/user-guide/ext-client/compatibility-matrix/) if you use older client version.
First, make sure you have downloaded and installed all the necessary prerequisites,
and the running platform is [compatible](https://docs.camunda.org/manual/user-guide/ext-client/compatibility-matrix/) with the client version.

## Start the Camunda BPM Platform
## Start the Camunda Platform Runtime
* Microsoft Windows users need to run the `start-camunda.bat` file
* Users of Unix based operating systems need to run the `start-camunda.sh` file

## Model a Workflow
## Model a Process

Open the Camunda Modeler, create a new BPMN diagram and model the following simple workflow:
Open the Camunda Modeler, create a new BPMN diagram and model the following simple process:

![Camunda Modeler – Workflow](./img/image1.png)
![Camunda Modeler – Process](./img/image1.png)

1. Once a process instance is started, an External Task instance with the name "creditScoreChecker" is created
2. The External Task client will start to fetch and lock the External Task instances
3. Once the External Task client has performed some work based on the fetched task,
these task is completed and the result is sent to the Workflow Engine in the form of a list containing all credit scores
these task is completed and the result is sent to the Process Engine in the form of a list containing all credit scores
4. For each list entry a new instance of the subprocess is created
5. According to the respective credit score, a path of the exclusive gateway is selected
6. Based on the selection, further External Task topics are created

> **Note:** make sure to set the properties for the respective notation elements in the properties panel correctly
You can download the BPMN 2.0 XML of the workflow [here](https://github.com/raw/camunda/camunda-bpm-examples/master/clients/java/loan-granting/workflow.bpmn).
You can download the BPMN 2.0 XML of the process [here](https://github.com/raw/camunda/camunda-bpm-examples/master/clients/java/loan-granting/loan-granting.bpmn).

## Deploy a Workflow
## Deploy a Process

Next, we want to deploy the model to the Camunda BPM Platform. To do so, simply click on the "Deploy" icon
Next, we want to deploy the model to the Camunda Platform Runtime. To do so, simply click on the "Deploy" icon
![Camunda Modeler – Deploy Button](./img/image3.png) in the Camunda Modeler and select "Deploy Current Diagram".
A dialog appears where a deployment name can be selected. Feel free to select a name of your choice!

![Camunda Modeler – Deploy Dialog](./img/image2.png)

To complete the deployment click on the "Deploy" button. Your model is now ready to be executed by the **Camunda BPMN Workflow Engine**.
To complete the deployment click on the "Deploy" button. Your model is now ready to be executed by the **Camunda BPMN Process Engine**.

## Set Up a Project
In this step we will set up the External Task client.
Expand Down Expand Up @@ -83,7 +84,7 @@ client.subscribe("creditScoreChecker")
.lockDuration(1000)
.handler((externalTask, externalTaskService) -> {

// retrieve a variable from the Workflow Engine
// retrieve a variable from the Process Engine
int defaultScore = externalTask.getVariable("defaultScore");

List<Integer> creditScores = new ArrayList<>(Arrays.asList(defaultScore, 9, 1, 4, 10));
Expand Down Expand Up @@ -112,9 +113,9 @@ The External Task f3779b51-2cfd-11e8-96c2-769e8e30ca9b has been completed!
...
```

## Monitor the Workflow in Camunda Cockpit
## Monitor the Process in Camunda Cockpit
Open [Camunda Cockpit](http://localhost:8080/camunda/app/cockpit) click in the top navigation on "Processes" and then
on the process "Granting Loans". You should see the workflow with the activity instances:
on the process "Granting Loans". You should see the process with the activity instances:
![Camunda Cockpit – Process Definition View](./img/image4.png)

Now it is your turn: try to subscribe with the **Camunda External Task Client (Java)** either to the topic "loanGranter"
Expand Down
Binary file modified clients/java/loan-granting/img/image1.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified clients/java/loan-granting/img/image2.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified clients/java/loan-granting/img/image4.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit c3a9d04

Please sign in to comment.