======== assembly/assembly.xml

17c17
<         <include>org.wildfly:wildfly-dist:tar.gz:${version.wildfly10}</include>
---
>         <include>org.wildfly:wildfly-dist:tar.gz:${version.wildfly}</include>
50c50
<       <outputDirectory>server/wildfly-${version.wildfly10}/modules</outputDirectory>
---
>       <outputDirectory>server/wildfly-${version.wildfly}/modules</outputDirectory>
79c79
<       <outputDirectory>server/wildfly-${version.wildfly10}/standalone/configuration</outputDirectory>
---
>       <outputDirectory>server/wildfly-${version.wildfly}/standalone/configuration</outputDirectory>
83c83
<       <outputDirectory>server/wildfly-${version.wildfly10}/standalone/configuration</outputDirectory>
---
>       <outputDirectory>server/wildfly-${version.wildfly}/standalone/configuration</outputDirectory>
87c87
<       <outputDirectory>server/wildfly-${version.wildfly10}/bin/</outputDirectory>
---
>       <outputDirectory>server/wildfly-${version.wildfly}/bin/</outputDirectory>
91c91
<       <outputDirectory>server/wildfly-${version.wildfly10}/bin/</outputDirectory>
---
>       <outputDirectory>server/wildfly-${version.wildfly}/bin/</outputDirectory>

======== assembly/pom.xml

5,6c5,6
<     <groupId>org.camunda.bpm.wildfly10</groupId>
<     <artifactId>camunda-wildfly10</artifactId>
---
>     <groupId>org.camunda.bpm.wildfly</groupId>
>     <artifactId>camunda-wildfly</artifactId>
10c10
<   <artifactId>camunda-wildfly10-assembly</artifactId>
---
>   <artifactId>camunda-wildfly-assembly</artifactId>
13c13
<   <name>camunda BPM - Wildfly 10 Assembly</name>
---
>   <name>camunda BPM - Wildfly Assembly</name>
24c24
<       <version>${version.wildfly10}</version>
---
>       <version>${version.wildfly}</version>
73,74c73,74
<       <groupId>org.camunda.bpm.wildfly10</groupId>
<       <artifactId>camunda-wildfly10-modules</artifactId>
---
>       <groupId>org.camunda.bpm.wildfly</groupId>
>       <artifactId>camunda-wildfly-modules</artifactId>

======== assembly/src/README.txt

34c34
<           server/wildfly-${version.wildfly10}/bin/standalone.{bat/sh}
---
>           server/wildfly-${version.wildfly}/bin/standalone.{bat/sh}
54c54
< Wildfly Application Server version: ${version.wildfly10}
---
> Wildfly Application Server version: ${version.wildfly}

======== assembly/src/start-camunda.bat

3c3
< set "JBOSS_HOME=%CD%\server\wildfly-${version.wildfly10}"
---
> set "JBOSS_HOME=%CD%\server\wildfly-${version.wildfly}"
5c5
< echo "starting camunda BPM platform ${project.version} on Wildfly Application Server ${version.wildfly10}"
---
> echo "starting camunda BPM platform ${project.version} on Wildfly Application Server ${version.wildfly}"
7c7
< cd server\wildfly-${version.wildfly10}\bin\
---
> cd server\wildfly-${version.wildfly}\bin\

======== assembly/src/start-camunda.sh

3c3
< export JBOSS_HOME="$(dirname "$0")/server/wildfly-${version.wildfly10}"
---
> export JBOSS_HOME="$(dirname "$0")/server/wildfly-${version.wildfly}"
7c7
< echo "starting camunda BPM ${project.version} on Wildfly Application Server ${version.wildfly10}";
---
> echo "starting camunda BPM ${project.version} on Wildfly Application Server ${version.wildfly}";
24c24
< /bin/sh "$(dirname "$0")/server/wildfly-${version.wildfly10}/bin/standalone.sh"
---
> /bin/sh "$(dirname "$0")/server/wildfly-${version.wildfly}/bin/standalone.sh"

======== distro/assembly.xml

19c19
<         <include>org.camunda.bpm.wildfly10:camunda-wildfly10-assembly</include>
---
>         <include>org.camunda.bpm.wildfly:camunda-wildfly-assembly</include>
41c41
<   		<outputDirectory>server/wildfly-${version.wildfly10}/standalone/deployments</outputDirectory>
---
>   		<outputDirectory>server/wildfly-${version.wildfly}/standalone/deployments</outputDirectory>
48c48
<         <outputDirectory>server/wildfly-${version.wildfly10}/standalone/deployments</outputDirectory>
---
>         <outputDirectory>server/wildfly-${version.wildfly}/standalone/deployments</outputDirectory>
55c55
<         <outputDirectory>server/wildfly-${version.wildfly10}/standalone/deployments</outputDirectory>
---
>         <outputDirectory>server/wildfly-${version.wildfly}/standalone/deployments</outputDirectory>
62c62
<         <outputDirectory>server/wildfly-${version.wildfly10}/standalone/deployments</outputDirectory>
---
>         <outputDirectory>server/wildfly-${version.wildfly}/standalone/deployments</outputDirectory>
70c70
<       <outputDirectory>server/wildfly-${version.wildfly10}/standalone/deployments/camunda-welcome.war</outputDirectory>
---
>       <outputDirectory>server/wildfly-${version.wildfly}/standalone/deployments/camunda-welcome.war</outputDirectory>
77c77
<       <outputDirectory>server/wildfly-${version.wildfly10}/standalone/deployments/</outputDirectory>
---
>       <outputDirectory>server/wildfly-${version.wildfly}/standalone/deployments/</outputDirectory>

======== distro/pom.xml

5,6c5,6
<     <groupId>org.camunda.bpm.wildfly10</groupId>
<     <artifactId>camunda-wildfly10</artifactId>
---
>     <groupId>org.camunda.bpm.wildfly</groupId>
>     <artifactId>camunda-wildfly</artifactId>
10c10
<   <artifactId>camunda-bpm-wildfly10</artifactId>
---
>   <artifactId>camunda-bpm-wildfly</artifactId>
13c13
<   <name>camunda BPM - Wildfly 10 Distro</name>
---
>   <name>camunda BPM - Wildfly Distro</name>
27,28c27,28
<       <groupId>org.camunda.bpm.wildfly10</groupId>
<       <artifactId>camunda-wildfly10-assembly</artifactId>
---
>       <groupId>org.camunda.bpm.wildfly</groupId>
>       <artifactId>camunda-wildfly-assembly</artifactId>
86c86
<               <finalName>camunda-bpm-wildfly10-${project.version}</finalName>
---
>               <finalName>camunda-bpm-wildfly-${project.version}</finalName>

======== modules/pom.xml

5,6c5,6
<     <groupId>org.camunda.bpm.wildfly10</groupId>
<     <artifactId>camunda-wildfly10</artifactId>
---
>     <groupId>org.camunda.bpm.wildfly</groupId>
>     <artifactId>camunda-wildfly</artifactId>
10c10
<   <artifactId>camunda-wildfly10-modules</artifactId>
---
>   <artifactId>camunda-wildfly-modules</artifactId>
12c12
<   <name>camunda BPM - Wildfly 10 Modules</name>
---
>   <name>camunda BPM - Wildfly Modules</name>
15a16,17
>     <version.jackson>2.6.3</version.jackson>
>     <version.jackson.annotations>2.6.0</version.jackson.annotations>
20,21c22,23
<       <groupId>org.camunda.bpm.wildfly10</groupId>
<       <artifactId>camunda-wildfly10-subsystem</artifactId>
---
>       <groupId>org.camunda.bpm.wildfly</groupId>
>       <artifactId>camunda-wildfly-subsystem</artifactId>
40,43d41
<         <exclusion>
<           <groupId>org.slf4j</groupId>
<           <artifactId>slf4j-api</artifactId>
<         </exclusion>
60,73d57
<       <exclusions>
<         <exclusion>
<           <groupId>com.fasterxml.jackson.core</groupId>
<           <artifactId>jackson-databind</artifactId>
<         </exclusion>
<         <exclusion>
<           <groupId>com.fasterxml.jackson.core</groupId>
<           <artifactId>jackson-core</artifactId>
<         </exclusion>
<         <exclusion>
<           <groupId>com.fasterxml.jackson.core</groupId>
<           <artifactId>jackson-annotations</artifactId>
<         </exclusion>
<       </exclusions>
89,94d72
<       <exclusions>
<         <exclusion>
<           <groupId>org.apache.httpcomponents</groupId>
<           <artifactId>httpclient</artifactId>
<         </exclusion>
<       </exclusions>
100,105d77
<       <exclusions>
<         <exclusion>
<           <groupId>org.apache.httpcomponents</groupId>
<           <artifactId>httpclient</artifactId>
<         </exclusion>
<       </exclusions>
124a97
>     <!-- exclude slf4j as it is part of wildfly distro -->
132,150d104
<     <dependency>
<       <groupId>com.fasterxml.jackson.core</groupId>
<       <artifactId>jackson-databind</artifactId>
<       <version>2.4.1</version>
<       <scope>provided</scope>
<     </dependency>
<     <dependency>
<       <groupId>com.fasterxml.jackson.core</groupId>
<       <artifactId>jackson-core</artifactId>
<       <version>2.4.1</version>
<       <scope>provided</scope>
<     </dependency>
<     <dependency>
<       <groupId>com.fasterxml.jackson.core</groupId>
<       <artifactId>jackson-annotations</artifactId>
<       <version>2.4.1</version>
<       <scope>provided</scope>
<     </dependency>
< 
186c140
<                       <regexpmapper from="^(org.camunda.bpm.*)/((camunda-[A-Za-z10-]*)[0-9\.]*).*.jar$$" to="\1/\3${project.version}.jar" handledirsep="yes" />
---
>                       <regexpmapper from="^(org.camunda.bpm.*)/((camunda-[A-Za-z-]*)[0-9\.]*).*.jar$$" to="\1/\3${project.version}.jar" handledirsep="yes" />
212a167,168
>                 <!-- copy jackson dependencies to slot -->
>                 <delete dir="target/modules/com/fasterxml/jackson" />
213a170,190
>                   <fileset refid="maven.project.dependencies" />
>                   <mapper>
>                     <chainedmapper>
>                       <regexpmapper from="^(.*)/([^/]+)/([^/]*)$$" to="\1/${version.jackson}/\3" handledirsep="yes" />
>                       <regexpmapper from="^(com.fasterxml.jackson.*/.*.jar)$$" to="\1" handledirsep="yes" />
>                     </chainedmapper>
>                   </mapper>
>                 </copy>
> 
>                 <delete dir="target/modules/com/fasterxml/jackson/core/jackson-annotations" />
>                 <copy todir="target/modules" flatten="false">
>                   <fileset refid="maven.project.dependencies" />
>                   <mapper>
>                     <chainedmapper>
>                       <regexpmapper from="^(.*)/([^/]+)/([^/]*)$$" to="\1/${version.jackson.annotations}/\3" handledirsep="yes" />
>                       <regexpmapper from="^(com.fasterxml.jackson.core.jackson-annotations/.*.jar)$$" to="\1" handledirsep="yes" />
>                     </chainedmapper>
>                   </mapper>
>                 </copy>
> 
>                 <copy todir="target/modules" flatten="false">
235a213,220
> 
>                 <replace dir="target/modules" token="@version.jackson@" value="${version.jackson}">
>                   <include name="**/module.xml" />
>                 </replace>
> 
>                 <replace dir="target/modules" token="@version.jackson.annotations@" value="${version.jackson.annotations}">
>                   <include name="**/module.xml" />
>                 </replace>

======== modules/src/main/modules/org/camunda/connect/camunda-connect-http-client/main/module.xml

13c13
<     <module name="org.apache.httpcomponents" />
---
>     <module name="org.apache.httpcomponents.httpclient" />

======== modules/src/main/modules/org/camunda/connect/camunda-connect-soap-http-client/main/module.xml

14c14
<     <module name="org.apache.httpcomponents" />
---
>     <module name="org.apache.httpcomponents.httpclient" />

======== modules/src/main/modules/org/camunda/spin/camunda-spin-dataformat-json-jackson/main/module.xml

14,15c14
<     <module name="com.fasterxml.jackson.core.jackson-core" />
<     <module name="com.fasterxml.jackson.core.jackson-databind" />
---
>     <module name="com.fasterxml.jackson.core.jackson-databind" slot="2.6.3" />

======== pom.xml

11,12c11,12
<   <groupId>org.camunda.bpm.wildfly10</groupId>
<   <artifactId>camunda-wildfly10</artifactId>
---
>   <groupId>org.camunda.bpm.wildfly</groupId>
>   <artifactId>camunda-wildfly</artifactId>
15c15
<   <name>camunda BPM - Wildfly 10</name>
---
>   <name>camunda BPM - Wildfly</name>
32c32
<                   <version>[1.8,)</version>
---
>                   <version>[1.7,)</version>
34c34
<                     *****************************************************************************************************
---
>                     ***************************************************************************************************
36,37c36,37
<                     *            You must use at least JDK 1.8 to compile Camunda Bpm Wildfly 10!!!                     *
<                     * Continue by excluding Wildfly from reactor by using '-P-distro-wildfly10' to disable the profile. *
---
>                     *            You must use at least JDK 1.7 to compile Camunda Bpm Wildfly!!!                      *
>                     * Continue by excluding Wildfly from reactor by using '-P-distro-wildfly' to disable the profile. *
39c39
<                     *****************************************************************************************************
---
>                     ***************************************************************************************************
52,53c52,53
<           <source>${version.java.wildfly10}</source>
<           <target>${version.java.wildfly10}</target>
---
>           <source>${version.java.wildfly}</source>
>           <target>${version.java.wildfly}</target>

======== subsystem/pom.xml

5,6c5,6
<     <groupId>org.camunda.bpm.wildfly10</groupId>
<     <artifactId>camunda-wildfly10</artifactId>
---
>     <groupId>org.camunda.bpm.wildfly</groupId>
>     <artifactId>camunda-wildfly</artifactId>
10c10
<   <artifactId>camunda-wildfly10-subsystem</artifactId>
---
>   <artifactId>camunda-wildfly-subsystem</artifactId>
13c13
<   <name>camunda BPM - Wildfly 10 Subsystem</name>
---
>   <name>camunda BPM - Wildfly Subsystem</name>
40a41,52
>       <artifactId>wildfly-controller</artifactId>
>       <version>${version.wildfly}</version>
>       <scope>provided</scope>
>     </dependency>
>     <dependency>
>       <groupId>org.wildfly</groupId>
>       <artifactId>wildfly-server</artifactId>
>       <version>${version.wildfly}</version>
>       <scope>provided</scope>
>     </dependency>
>     <dependency>
>       <groupId>org.wildfly</groupId>
42c54
<       <version>${version.wildfly10}</version>
---
>       <version>${version.wildfly}</version>
48c60
<       <version>${version.wildfly10}</version>
---
>       <version>${version.wildfly}</version>
60c72
<       <groupId>org.wildfly.core</groupId>
---
>       <groupId>org.wildfly</groupId>
62c74
<       <version>${version.wildfly10.core}</version>
---
>       <version>${version.wildfly}</version>
86,88d97
<           <excludes>
<             <exclude>**/BpmPlatformSubsystemTest.java</exclude>
<           </excludes>

======== subsystem/src/main/java/org/camunda/bpm/container/impl/jboss/extension/BpmPlatformExtension.java

31d30
< import org.jboss.as.controller.ModelVersion;
64c63
<     SubsystemRegistration subsystem = context.registerSubsystem(SUBSYSTEM_NAME, ModelVersion.create(BPM_PLATFORM_SUBSYSTEM_MAJOR_VERSION, BPM_PLATFORM_SUBSYSTEM_MINOR_VERSION));
---
>     SubsystemRegistration subsystem = context.registerSubsystem(SUBSYSTEM_NAME, BPM_PLATFORM_SUBSYSTEM_MAJOR_VERSION, BPM_PLATFORM_SUBSYSTEM_MINOR_VERSION);

======== subsystem/src/main/java/org/camunda/bpm/container/impl/jboss/extension/BpmPlatformParser.java

285d284
< 
412d410
< 
587c585,586
<     String attributeString = reader.getAttributeValue("", attributeName) == null ? null : reader.getAttributeValue("", attributeName).trim();
---
>     String attributeString = 
>             reader.getAttributeValue("", attributeName) == null ? null : reader.getAttributeValue("", attributeName).trim();

======== subsystem/src/main/java/org/camunda/bpm/container/impl/jboss/extension/handler/JobExecutorAdd.java

28,29d27
< import java.util.concurrent.ThreadFactory;
< import java.util.concurrent.TimeUnit;
39d36
< import org.jboss.as.threads.BoundedQueueThreadPoolService;
41d37
< import org.jboss.as.threads.ThreadFactoryService;
43d38
< import org.jboss.as.threads.TimeSpec;
46d40
< import org.jboss.msc.service.ServiceBuilder;
49,50d42
< import org.jboss.msc.service.ServiceName;
< import org.jboss.msc.service.ServiceTarget;
94d85
<     ServiceName jobExecutorThreadPoolServiceName = ServiceNames.forManagedThreadPool(jobExecutorThreadPoolName);
96,97d86
<     performRuntimeThreadPool(context, jobExecutorThreadPoolName, jobExecutorThreadPoolServiceName, verificationHandler, newControllers);
< 
100c89
<         .addDependency(jobExecutorThreadPoolServiceName, ManagedQueueExecutorService.class, service.getManagedQueueInjector())
---
>         .addDependency(ThreadsServices.EXECUTOR.append(jobExecutorThreadPoolName), ManagedQueueExecutorService.class, service.getManagedQueueInjector())
109,143d97
<   private void performRuntimeThreadPool(OperationContext context, String name, ServiceName jobExecutorThreadPoolServiceName,
<       ServiceVerificationHandler verificationHandler, List<ServiceController<?>> newControllers)
<       throws OperationFailedException {
< 
<     ServiceTarget serviceTarget = context.getServiceTarget();
< 
<     ThreadFactoryService threadFactory = new ThreadFactoryService();
<     threadFactory.setThreadGroupName("Camunda BPM "+name);
< 
<     final ServiceName threadFactoryServiceName = ThreadsServices.threadFactoryName(name);
< 
<     ServiceBuilder<ThreadFactory> factoryBuilder = serviceTarget.addService(threadFactoryServiceName, threadFactory);
<     if (verificationHandler != null) {
<       factoryBuilder.addListener(verificationHandler);
<     }
<     if (newControllers != null) {
<       newControllers.add(factoryBuilder.install());
<     } else {
<       factoryBuilder.install();
<     }
< 
<     final BoundedQueueThreadPoolService service = new BoundedQueueThreadPoolService(3, 19, 3, false, new TimeSpec(TimeUnit.SECONDS, 10), true);
< 
<     ServiceBuilder<ManagedQueueExecutorService> builder = serviceTarget.addService(jobExecutorThreadPoolServiceName, service)
<         .addDependency(threadFactoryServiceName, ThreadFactory.class, service.getThreadFactoryInjector())
<         .setInitialMode(ServiceController.Mode.ACTIVE);
<     if (verificationHandler != null) {
<       builder.addListener(verificationHandler);
<     }
<     if (newControllers != null) {
<       newControllers.add(builder.install());
<     } else {
<       builder.install();
<     }
<   }

======== subsystem/src/main/java/org/camunda/bpm/container/impl/jboss/service/ServiceNames.java

15d14
< import org.jboss.as.threads.CommonAttributes;
146,148d144
<   public static ServiceName forMscThreadFactoryService(String threadPoolName) {
<     return JOB_EXECUTOR.append(CommonAttributes.THREAD_FACTORY).append(threadPoolName);
<   }
150,152d145
<   public static ServiceName forManagedThreadPool(String threadPoolName) {
<     return JOB_EXECUTOR.append(threadPoolName);
<   }