Skip to content

Commit

Permalink
chore(release): adjust examples for 7.12 release
Browse files Browse the repository at this point in the history
* bpmn: remove Maven 1.x artifacts
* multi-tenancy: upgrade to WildFly
* process-engine-plugin: change listener event to assignment
* spring-nonpa: upgrade to WildFly
* spring-pa: upgrade to WildFly, refactor Arquillian WebArchive creation code

related to CAM-11015, CAM-11016, CAM-11017, CAM-11018, CAM-11019, CAM-11020, CAM-11099
  • Loading branch information
tmetzke committed Nov 26, 2019
1 parent a5d9f3a commit 00814ab
Show file tree
Hide file tree
Showing 131 changed files with 25,621 additions and 25,276 deletions.
34 changes: 25 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ Camunda BPM examples is a collection of focused usage examples for the [camunda
| Camunda Version | Link | Checkout command |
| -----------------|----------------------------------------------------------------------|-----------------------|
| Latest | [Master branch](https://github.com/camunda/camunda-bpm-examples) | `git checkout master` |
| 7.12 | [7.12 tag](https://github.com/camunda/camunda-bpm-examples/tree/7.12)| `git checkout 7.12` |
| 7.11 | [7.11 tag](https://github.com/camunda/camunda-bpm-examples/tree/7.11)| `git checkout 7.11` |
| 7.10 | [7.10 tag](https://github.com/camunda/camunda-bpm-examples/tree/7.10)| `git checkout 7.10` |
| 7.9 | [7.9 tag](https://github.com/camunda/camunda-bpm-examples/tree/7.9) | `git checkout 7.9` |
Expand Down Expand Up @@ -40,6 +41,7 @@ If you clone this repository, use the checkout commands to access the sources fo
* [SDK-JS Examples](#sdk-js-examples)
* [Authentication](#authentication)
* [Spring Boot Starter examples](#spring-boot-starter-examples)
* [External Task Client examples](#external-task-client-examples)

### Getting Started with camunda BPM

Expand All @@ -60,9 +62,10 @@ If you clone this repository, use the checkout commands to access the sources fo
| [Service Invocation Asynchronous](/servicetask/service-invocation-asynchronous) | Unit Test | Signal, Async |
| [User Task Assignment Email](/usertask/task-assignment-email) * | All | Email, Usertask |
| [User Task Form Embedded](/usertask/task-form-embedded) * | All | Html, Form, Usertask |
| [User Task Form Embedded - Serialized Java Object](/usertask/task-form-embedded-serialized-java-object) * | All | Html, Form, Usertask |
| [User Task Form Embedded - Serialized Java Object](/usertask/task-form-embedded-serialized-java-object) * | All | Html, Form, Usertask |
| [User Task Form Embedded - JSON](/usertask/task-form-embedded-json) * | All | Html, Form, Usertask |
| [User Task Form Embedded - Bpmn Elements](/usertask/task-form-embedded-bpmn-events) * | All | Html, Form, Usertask |
| [User Task Form Embedded - React](/usertask/task-form-embedded-react) * | All | Html, Form, Usertask |
| [User Task Form Generated](/usertask/task-form-generated) * | All | Html, Form, Usertask |
| [User Task Form JSF](/usertask/task-form-external-jsf) * | JavaEE Containers | JSF, Form, Usertask |
| [Script Task XSLT](/scripttask/xslt-scripttask) | Unit Test | XSLT Scripttask |
Expand All @@ -78,15 +81,12 @@ If you clone this repository, use the checkout commands to access the sources fo
| ----------------------------------------------------------------------------------------------|-----------------------|---------------------------|
| [Process Application - Servlet](deployment/servlet-pa) | All | War, Servlet |
| [Process Application - EJB](deployment/ejb-pa) | JavaEE Containers | Ejb, War |
| [Process Application - Spring Servlet - JBoss](deployment/spring-servlet-pa-jboss) | JBoss AS 7 | Spring, Servlet, War |
| [Process Application - Spring Servlet - WildFly](deployment/spring-servlet-pa-wildfly) | WildFly | Spring, Servlet, War |
| [Process Application - Spring Servlet - Embedded Tomcat](deployment/spring-servlet-pa-tomcat) | Tomcat | Spring, Servlet, War |
| [Embedded Spring with embedded REST](deployment/embedded-spring-rest) | vanilla Apache Tomcat | Spring, Rest, Embedded |
| [Plain Spring Webapplication JBoss AS 7](deployment/spring-jboss-non-pa) | JBoss AS 7 | Spring, Jndi, War |
| [Plain Spring Web application - WildFly](deployment/spring-wildfly-non-pa) | WildFly | Spring, Jndi, War |
| [Process Application - Spring Boot](deployment/spring-boot) | Spring Boot | Spring |

Hint: Any example using the JBoss 7 Camunda BPM distribution **must** use JDK 7 to run/compile the project. Otherwise the JBoss 7 will not start, just hang. This is a JBoss 7.2 issue and does not affect WildFly.


### Process Engine Plugin Examples

| Name | Container | Keywords |
Expand Down Expand Up @@ -196,13 +196,29 @@ Hint: Any example using the JBoss 7 Camunda BPM distribution **must** use JDK 7
| [Twitter](spring-boot-starter/example-twitter) | Spring boot with embedded engine and Webapps | Spring Boot Starter, Webapps, Twitter |
| [REST API DMN](spring-boot-starter/example-dmn-rest) | Spring boot with embedded engine and Webapps | Spring Boot Starter, REST API |

### External Task Client Examples

| Name | Environment | Keywords |
|------------------------------------------------------------------------------------------------------------------------------|-------------------------------------|-----------------------------------|
| [Loan Granting - Java](https://github.com/camunda/camunda-external-task-client-java/tree/master/examples/loan-granting) | Java External Task Client | External Task Client, Servicetask |
| [Order Handling - Java](https://github.com/camunda/camunda-external-task-client-java/tree/master/examples/order-handling) | Java External Task Client | External Task Client, Servicetask |
| [Loan Granting - JavaScript](https://github.com/camunda/camunda-external-task-client-js/tree/master/examples/granting-loans) | JavaScript External Task Client | External Task Client, Servicetask |
| [Order Handling - JavaScript](https://github.com/camunda/camunda-external-task-client-js/tree/master/examples/order) | JavaScript External Task Client | External Task Client, Servicetask |

### Container Specifics

| Name | Container | Keywords |
| ----------------------------------------------------------------------------------------------|-----------------------|---------------------------|
| [Jackson Annotation Example for WildFly](wildfly/jackson-annotations) | Wildfly | War, Servlet |



### Contribute!

* Website: http://www.camunda.org/
* Website: http://www.camunda.com/
* Getting Started: https://docs.camunda.org/get-started/
* Issue Tracker: https://app.camunda.com/jira
* Contribution Guidelines: http://www.camunda.org/community/contribute.html
* Issue Tracker: https://jira.camunda.com/projects/CAM/issues
* Contribution Guidelines: https://camunda.com/learn/community/#contribute

### License
The source files in this repository are made available under the [Apache License Version 2.0](./LICENSE).
2 changes: 1 addition & 1 deletion authentication/basic/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<version>1.0.0</version>

<properties>
<camunda.version>7.11.0</camunda.version>
<camunda.version>7.12.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
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@

import org.camunda.bpm.engine.IdentityService;
import org.camunda.bpm.engine.identity.User;
import org.camunda.bpm.engine.rest.filter.CacheControlFilter;
import org.camunda.bpm.engine.rest.security.auth.ProcessEngineAuthenticationFilter;
import org.jboss.resteasy.plugins.server.servlet.FilterDispatcher;
import org.springframework.beans.factory.annotation.Autowired;
Expand Down
6 changes: 0 additions & 6 deletions bpmn-model-api/generate-jsf-form/build.properties.example

This file was deleted.

28 changes: 0 additions & 28 deletions bpmn-model-api/generate-jsf-form/build.xml

This file was deleted.

46 changes: 25 additions & 21 deletions bpmn-model-api/generate-jsf-form/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
<description>Process application that uses the camunda BPM Platform and has been generated by the Maven archetype 'camunda-archetype-ejb-war-7.0.3-SNAPSHOT'</description>

<properties>
<camunda.version>7.11.0</camunda.version>
<arquillian.version>1.1.2.Final</arquillian.version>
<jboss.version>7.2.0.Final</jboss.version>
<camunda.version>7.12.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.7</maven.compiler.source>
<maven.compiler.target>1.7</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Expand Down Expand Up @@ -70,11 +70,11 @@
<version>2.3.2</version>
</dependency>

<!-- Java EE 6 Specification -->
<dependency>
<!-- Java EE 6 Specification -->
<groupId>org.jboss.spec</groupId>
<artifactId>jboss-javaee-web-6.0</artifactId>
<version>2.0.0.Final</version>
<version>3.0.2.Final</version>
<type>pom</type>
<scope>provided</scope>
<exclusions>
Expand All @@ -88,36 +88,40 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.8.2</version>
<version>4.12</version>
<scope>test</scope>
</dependency>

<!-- Needed for ArquillianTest -->
<dependency>
<!-- Needed for ArquillianTest -->
<groupId>org.jboss.arquillian.junit</groupId>
<artifactId>arquillian-junit-container</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<!-- Needed for ArquillianTest -->
<groupId>org.jboss.arquillian.protocol</groupId>
<artifactId>arquillian-protocol-servlet</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.shrinkwrap.resolver</groupId>
<artifactId>shrinkwrap-resolver-impl-maven</artifactId>
<scope>test</scope>
</dependency>

<dependency>
<!-- Needed for InMemoryH2Test -->
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
<version>1.2.132</version>
<version>1.4.190</version>
<scope>test</scope>
</dependency>

<!-- redirect slf4j logging to jdk logging -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-jdk14</artifactId>
<version>1.7.12</version>
<version>1.7.26</version>
<scope>test</scope>
</dependency>

Expand Down Expand Up @@ -145,8 +149,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>2.3.1</version>
<configuration>
<source>1.6</source>
<target>1.6</target>
<source>1.7</source>
<target>1.7</target>
</configuration>
</plugin>
<plugin>
Expand All @@ -169,12 +173,12 @@
<dependencies>
<dependency>
<!-- Needed for ArquillianTest -->
<!-- Requires a running JBoss AS7 with camunda BPM
<!-- Requires a running WildFly with camunda BPM
change to other artifact for embedded start or different server -->
<!-- Included here for convenience when running the test in Eclipse -->
<groupId>org.jboss.as</groupId>
<artifactId>jboss-as-arquillian-container-remote</artifactId>
<version>${jboss.version}</version>
<groupId>org.wildfly.arquillian</groupId>
<artifactId>wildfly-arquillian-container-remote</artifactId>
<version>${wildfly.container.adapter.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand All @@ -197,15 +201,15 @@
</profile>

<profile>
<id>arq-jbossas-remote</id>
<id>arq-wildfly-remote</id>
<dependencies>
<dependency>
<!-- Needed for ArquillianTest -->
<!-- Requires a running JBoss AS7 with camunda BPM
<!-- Requires a running WildFly with camunda BPM
change to other artifact for embedded start or different server -->
<groupId>org.jboss.as</groupId>
<artifactId>jboss-as-arquillian-container-remote</artifactId>
<version>${jboss.version}</version>
<groupId>org.wildfly.arquillian</groupId>
<artifactId>wildfly-arquillian-container-remote</artifactId>
<version>${wildfly.container.adapter.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ public class ArquillianTest {
public static WebArchive createDeployment() {
// resolve given dependencies from Maven POM
File[] libs = Maven.resolver()
.offline(true)
.loadPomFromFile("pom.xml")
.importRuntimeAndTestDependencies().resolve().withTransitivity().asFile();

Expand Down
8 changes: 4 additions & 4 deletions bpmn-model-api/generate-process-fluent-api/pom.xml
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.11.0</camunda.version>
<camunda.version>7.12.0</camunda.version>
<maven.compiler.source>1.7</maven.compiler.source>
<maven.compiler.target>1.7</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Expand Down Expand Up @@ -50,22 +50,22 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.11</version>
<version>4.12</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
<version>1.2.132</version>
<version>1.4.190</version>
<scope>test</scope>
</dependency>

<!-- redirect slf4j logging to jdk logging -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-jdk14</artifactId>
<version>1.7.12</version>
<version>1.7.26</version>
</dependency>

</dependencies>
Expand Down
6 changes: 3 additions & 3 deletions bpmn-model-api/parse-bpmn/pom.xml
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.11.0</version.camunda>
<version.camunda>7.12.0</version.camunda>
<maven.compiler.source>1.7</maven.compiler.source>
<maven.compiler.target>1.7</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Expand All @@ -26,14 +26,14 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.8.2</version>
<version>4.12</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<version>1.5.0</version>
<version>2.9.1</version>
</dependency>

</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion cmmn-model-api/typed-custom-elements/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ In [KPITransformListener][kpi-transform-listener], access to the custom model el
[cmmn-model]: https://github.com/camunda/camunda-cmmn-model
[test-case]: src/test/java/org/camunda/bpm/example/modelapi/TransformListenerCustomElementsTest.java
[kpi-transform-listener]: src/main/java/org/camunda/bpm/example/modelapi/KPITransformListener.java
[cmmn-transform-listener]: http://docs.camunda.org/7.3/api-references/javadoc/org/camunda/bpm/engine/impl/cmmn/transformer/CmmnTransformListener.html
[cmmn-transform-listener]: https://docs.camunda.org/javadoc/camunda-bpm-platform/7.12/org/camunda/bpm/engine/impl/cmmn/transformer/CmmnTransformListener.html
[process-engine-plugin]: src/main/java/org/camunda/bpm/example/modelapi/CustomElementsProcessEnginePlugin.java
[camunda-cfg-xml]: src/test/resources/camunda.cfg.xml
[kpi-element]: src/main/java/org/camunda/bpm/example/modelapi/KPIElement.java
Expand Down
Loading

0 comments on commit 00814ab

Please sign in to comment.