From 04bc1ed6e353267be6b037b05778f2903e12ff62 Mon Sep 17 00:00:00 2001
From: Tobias Metzke <tobias.metzke@camunda.com>
Date: Tue, 25 Feb 2020 12:15:58 +0100
Subject: [PATCH] chore(run): extract core module for distros

related to CAM-11292
---
 distro/run/assembly/assembly.xml              |  10 ++
 distro/run/assembly/pom.xml                   |   7 ++
 distro/run/assembly/resources/start.bat       |   2 +-
 distro/run/assembly/resources/start.sh        |   2 +-
 distro/run/core/pom.xml                       | 115 ++++++++++++++++++
 .../org/camunda/bpm/run/CamundaBpmRun.java    |   0
 .../CamundaBpmRunSecurityConfiguration.java   |   0
 ...CamundaBpmRunAuthenticationProperties.java |   0
 .../property/CamundaBpmRunCorsProperty.java   |   0
 .../property/CamundaBpmRunLdapProperties.java |   0
 .../run/property/CamundaBpmRunProperties.java |   0
 .../src/main/resources/banner.txt             |   0
 .../bpm/run/test/AbstractRestTest.java        |   0
 .../cors/CorsConfigurationDisabledTest.java   |   0
 ...ionEnabledAllowedOriginConfiguredTest.java |   0
 .../CorsConfigurationEnabledWildcardTest.java |   0
 .../https/HttpsConfigurationEnabledTest.java  |   0
 .../identity/DemoUserConfigurationTest.java   |   0
 .../identity/LdapConfigurationTest.java       |   0
 .../bpm/run/test/util/LoggingInterceptor.java |   0
 .../camunda/bpm/run/test/util/TestUtils.java  |   0
 .../application-test-auth-disabled.yml        |   0
 .../application-test-cors-enabled.yml         |   0
 .../resources/application-test-demo-user.yml  |   0
 .../application-test-https-enabled.yml        |   0
 .../application-test-ldap-enabled.yml         |   0
 .../src/test/resources/keystore.p12           | Bin
 distro/run/distro/assembly.xml                |  11 +-
 distro/run/distro/pom.xml                     |  90 +-------------
 distro/run/pom.xml                            |   1 +
 30 files changed, 137 insertions(+), 101 deletions(-)
 create mode 100644 distro/run/core/pom.xml
 rename distro/run/{distro => core}/src/main/java/org/camunda/bpm/run/CamundaBpmRun.java (100%)
 rename distro/run/{distro => core}/src/main/java/org/camunda/bpm/run/CamundaBpmRunSecurityConfiguration.java (100%)
 rename distro/run/{distro => core}/src/main/java/org/camunda/bpm/run/property/CamundaBpmRunAuthenticationProperties.java (100%)
 rename distro/run/{distro => core}/src/main/java/org/camunda/bpm/run/property/CamundaBpmRunCorsProperty.java (100%)
 rename distro/run/{distro => core}/src/main/java/org/camunda/bpm/run/property/CamundaBpmRunLdapProperties.java (100%)
 rename distro/run/{distro => core}/src/main/java/org/camunda/bpm/run/property/CamundaBpmRunProperties.java (100%)
 rename distro/run/{distro => core}/src/main/resources/banner.txt (100%)
 rename distro/run/{distro => core}/src/test/java/org/camunda/bpm/run/test/AbstractRestTest.java (100%)
 rename distro/run/{distro => core}/src/test/java/org/camunda/bpm/run/test/config/cors/CorsConfigurationDisabledTest.java (100%)
 rename distro/run/{distro => core}/src/test/java/org/camunda/bpm/run/test/config/cors/CorsConfigurationEnabledAllowedOriginConfiguredTest.java (100%)
 rename distro/run/{distro => core}/src/test/java/org/camunda/bpm/run/test/config/cors/CorsConfigurationEnabledWildcardTest.java (100%)
 rename distro/run/{distro => core}/src/test/java/org/camunda/bpm/run/test/config/https/HttpsConfigurationEnabledTest.java (100%)
 rename distro/run/{distro => core}/src/test/java/org/camunda/bpm/run/test/config/identity/DemoUserConfigurationTest.java (100%)
 rename distro/run/{distro => core}/src/test/java/org/camunda/bpm/run/test/config/identity/LdapConfigurationTest.java (100%)
 rename distro/run/{distro => core}/src/test/java/org/camunda/bpm/run/test/util/LoggingInterceptor.java (100%)
 rename distro/run/{distro => core}/src/test/java/org/camunda/bpm/run/test/util/TestUtils.java (100%)
 rename distro/run/{distro => core}/src/test/resources/application-test-auth-disabled.yml (100%)
 rename distro/run/{distro => core}/src/test/resources/application-test-cors-enabled.yml (100%)
 rename distro/run/{distro => core}/src/test/resources/application-test-demo-user.yml (100%)
 rename distro/run/{distro => core}/src/test/resources/application-test-https-enabled.yml (100%)
 rename distro/run/{distro => core}/src/test/resources/application-test-ldap-enabled.yml (100%)
 rename distro/run/{distro => core}/src/test/resources/keystore.p12 (100%)

diff --git a/distro/run/assembly/assembly.xml b/distro/run/assembly/assembly.xml
index d9aba86d73c..cc767c92218 100644
--- a/distro/run/assembly/assembly.xml
+++ b/distro/run/assembly/assembly.xml
@@ -11,6 +11,16 @@
   
   <includeBaseDirectory>false</includeBaseDirectory>
 
+  <dependencySets>
+    <dependencySet>
+      <outputDirectory>internal/</outputDirectory>
+      <includes>
+        <include>org.camunda.bpm.run:camunda-bpm-run-core</include>
+      </includes>
+      <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
+    </dependencySet>
+  </dependencySets>
+
   <files>
     <file>
       <source>resources/application.yml</source>
diff --git a/distro/run/assembly/pom.xml b/distro/run/assembly/pom.xml
index ec3880da99c..7f11ef00f9c 100644
--- a/distro/run/assembly/pom.xml
+++ b/distro/run/assembly/pom.xml
@@ -23,6 +23,13 @@
       <version>${project.version}</version>
       <type>pom</type>
     </dependency>
+
+    <dependency>
+      <groupId>org.camunda.bpm.run</groupId>
+      <artifactId>camunda-bpm-run-core</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+
   </dependencies>
 
   <build>
diff --git a/distro/run/assembly/resources/start.bat b/distro/run/assembly/resources/start.bat
index c3d89f9a0c2..7a69bfca1d2 100644
--- a/distro/run/assembly/resources/start.bat
+++ b/distro/run/assembly/resources/start.bat
@@ -60,4 +60,4 @@ ECHO classpath: %classPath%
 
 
 REM start the application
-call %JAVA% -Dloader.path="%classPath%" -jar "%BASEDIR%internal\camunda-bpm-run.jar" --spring.config.location=file:"%BASEDIR%configuration\application.yml"
+call %JAVA% -Dloader.path="%classPath%" -jar "%BASEDIR%internal\camunda-bpm-run-core.jar" --spring.config.location=file:"%BASEDIR%configuration\application.yml"
diff --git a/distro/run/assembly/resources/start.sh b/distro/run/assembly/resources/start.sh
index 97e5ec2ed5c..7973abf5d71 100644
--- a/distro/run/assembly/resources/start.sh
+++ b/distro/run/assembly/resources/start.sh
@@ -48,4 +48,4 @@ fi
 echo classpath: $classPath
 
 # start the application
-"$JAVA" -Dloader.path="$classPath" -jar "$BASEDIR/internal/camunda-bpm-run.jar" --spring.config.location=file:"$BASEDIR"/configuration/application.yml
\ No newline at end of file
+"$JAVA" -Dloader.path="$classPath" -jar "$BASEDIR/internal/camunda-bpm-run-core.jar" --spring.config.location=file:"$BASEDIR"/configuration/application.yml
\ No newline at end of file
diff --git a/distro/run/core/pom.xml b/distro/run/core/pom.xml
new file mode 100644
index 00000000000..6da9baf1152
--- /dev/null
+++ b/distro/run/core/pom.xml
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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>
+
+  <parent>
+    <groupId>org.camunda.bpm.run</groupId>
+    <artifactId>camunda-bpm-run-root</artifactId>
+    <version>7.13.0-SNAPSHOT</version>
+    <relativePath>..</relativePath>
+  </parent>
+
+  <artifactId>camunda-bpm-run-core</artifactId>
+  <name>Camunda BPM - Run - Core</name>
+  <packaging>jar</packaging>
+
+  <dependencies>
+
+    <dependency>
+      <groupId>org.camunda.bpm.springboot</groupId>
+      <artifactId>camunda-bpm-spring-boot-starter</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.camunda.bpm</groupId>
+      <artifactId>camunda-engine-plugin-spin</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.camunda.spin</groupId>
+      <artifactId>camunda-spin-dataformat-all</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.camunda.bpm.identity</groupId>
+      <artifactId>camunda-identity-ldap</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.camunda.bpm.springboot</groupId>
+      <artifactId>camunda-bpm-spring-boot-starter-rest</artifactId>
+      <scope>provided</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-jdbc</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>com.h2database</groupId>
+      <artifactId>h2</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.tomcat.embed</groupId>
+      <artifactId>tomcat-embed-core</artifactId>
+    </dependency>
+
+    <!-- Testing -->
+
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-test</artifactId>
+      <scope>test</scope>
+    </dependency>
+
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-maven-plugin</artifactId>
+        <configuration>
+          <layout>ZIP</layout>
+          <excludes>
+            <exclude>
+              <groupId>org.camunda.bpm.springboot</groupId>
+              <artifactId>camunda-bpm-spring-boot-starter-rest</artifactId>
+            </exclude>
+            <exclude>
+              <groupId>com.h2database</groupId>
+              <artifactId>h2</artifactId>
+            </exclude>
+          </excludes>
+        </configuration>
+        <executions>
+          <execution>
+            <goals>
+              <goal>repackage</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <systemPropertyVariables>
+            <sun.net.http.allowRestrictedHeaders>true</sun.net.http.allowRestrictedHeaders>
+          </systemPropertyVariables>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
+</project>
\ No newline at end of file
diff --git a/distro/run/distro/src/main/java/org/camunda/bpm/run/CamundaBpmRun.java b/distro/run/core/src/main/java/org/camunda/bpm/run/CamundaBpmRun.java
similarity index 100%
rename from distro/run/distro/src/main/java/org/camunda/bpm/run/CamundaBpmRun.java
rename to distro/run/core/src/main/java/org/camunda/bpm/run/CamundaBpmRun.java
diff --git a/distro/run/distro/src/main/java/org/camunda/bpm/run/CamundaBpmRunSecurityConfiguration.java b/distro/run/core/src/main/java/org/camunda/bpm/run/CamundaBpmRunSecurityConfiguration.java
similarity index 100%
rename from distro/run/distro/src/main/java/org/camunda/bpm/run/CamundaBpmRunSecurityConfiguration.java
rename to distro/run/core/src/main/java/org/camunda/bpm/run/CamundaBpmRunSecurityConfiguration.java
diff --git a/distro/run/distro/src/main/java/org/camunda/bpm/run/property/CamundaBpmRunAuthenticationProperties.java b/distro/run/core/src/main/java/org/camunda/bpm/run/property/CamundaBpmRunAuthenticationProperties.java
similarity index 100%
rename from distro/run/distro/src/main/java/org/camunda/bpm/run/property/CamundaBpmRunAuthenticationProperties.java
rename to distro/run/core/src/main/java/org/camunda/bpm/run/property/CamundaBpmRunAuthenticationProperties.java
diff --git a/distro/run/distro/src/main/java/org/camunda/bpm/run/property/CamundaBpmRunCorsProperty.java b/distro/run/core/src/main/java/org/camunda/bpm/run/property/CamundaBpmRunCorsProperty.java
similarity index 100%
rename from distro/run/distro/src/main/java/org/camunda/bpm/run/property/CamundaBpmRunCorsProperty.java
rename to distro/run/core/src/main/java/org/camunda/bpm/run/property/CamundaBpmRunCorsProperty.java
diff --git a/distro/run/distro/src/main/java/org/camunda/bpm/run/property/CamundaBpmRunLdapProperties.java b/distro/run/core/src/main/java/org/camunda/bpm/run/property/CamundaBpmRunLdapProperties.java
similarity index 100%
rename from distro/run/distro/src/main/java/org/camunda/bpm/run/property/CamundaBpmRunLdapProperties.java
rename to distro/run/core/src/main/java/org/camunda/bpm/run/property/CamundaBpmRunLdapProperties.java
diff --git a/distro/run/distro/src/main/java/org/camunda/bpm/run/property/CamundaBpmRunProperties.java b/distro/run/core/src/main/java/org/camunda/bpm/run/property/CamundaBpmRunProperties.java
similarity index 100%
rename from distro/run/distro/src/main/java/org/camunda/bpm/run/property/CamundaBpmRunProperties.java
rename to distro/run/core/src/main/java/org/camunda/bpm/run/property/CamundaBpmRunProperties.java
diff --git a/distro/run/distro/src/main/resources/banner.txt b/distro/run/core/src/main/resources/banner.txt
similarity index 100%
rename from distro/run/distro/src/main/resources/banner.txt
rename to distro/run/core/src/main/resources/banner.txt
diff --git a/distro/run/distro/src/test/java/org/camunda/bpm/run/test/AbstractRestTest.java b/distro/run/core/src/test/java/org/camunda/bpm/run/test/AbstractRestTest.java
similarity index 100%
rename from distro/run/distro/src/test/java/org/camunda/bpm/run/test/AbstractRestTest.java
rename to distro/run/core/src/test/java/org/camunda/bpm/run/test/AbstractRestTest.java
diff --git a/distro/run/distro/src/test/java/org/camunda/bpm/run/test/config/cors/CorsConfigurationDisabledTest.java b/distro/run/core/src/test/java/org/camunda/bpm/run/test/config/cors/CorsConfigurationDisabledTest.java
similarity index 100%
rename from distro/run/distro/src/test/java/org/camunda/bpm/run/test/config/cors/CorsConfigurationDisabledTest.java
rename to distro/run/core/src/test/java/org/camunda/bpm/run/test/config/cors/CorsConfigurationDisabledTest.java
diff --git a/distro/run/distro/src/test/java/org/camunda/bpm/run/test/config/cors/CorsConfigurationEnabledAllowedOriginConfiguredTest.java b/distro/run/core/src/test/java/org/camunda/bpm/run/test/config/cors/CorsConfigurationEnabledAllowedOriginConfiguredTest.java
similarity index 100%
rename from distro/run/distro/src/test/java/org/camunda/bpm/run/test/config/cors/CorsConfigurationEnabledAllowedOriginConfiguredTest.java
rename to distro/run/core/src/test/java/org/camunda/bpm/run/test/config/cors/CorsConfigurationEnabledAllowedOriginConfiguredTest.java
diff --git a/distro/run/distro/src/test/java/org/camunda/bpm/run/test/config/cors/CorsConfigurationEnabledWildcardTest.java b/distro/run/core/src/test/java/org/camunda/bpm/run/test/config/cors/CorsConfigurationEnabledWildcardTest.java
similarity index 100%
rename from distro/run/distro/src/test/java/org/camunda/bpm/run/test/config/cors/CorsConfigurationEnabledWildcardTest.java
rename to distro/run/core/src/test/java/org/camunda/bpm/run/test/config/cors/CorsConfigurationEnabledWildcardTest.java
diff --git a/distro/run/distro/src/test/java/org/camunda/bpm/run/test/config/https/HttpsConfigurationEnabledTest.java b/distro/run/core/src/test/java/org/camunda/bpm/run/test/config/https/HttpsConfigurationEnabledTest.java
similarity index 100%
rename from distro/run/distro/src/test/java/org/camunda/bpm/run/test/config/https/HttpsConfigurationEnabledTest.java
rename to distro/run/core/src/test/java/org/camunda/bpm/run/test/config/https/HttpsConfigurationEnabledTest.java
diff --git a/distro/run/distro/src/test/java/org/camunda/bpm/run/test/config/identity/DemoUserConfigurationTest.java b/distro/run/core/src/test/java/org/camunda/bpm/run/test/config/identity/DemoUserConfigurationTest.java
similarity index 100%
rename from distro/run/distro/src/test/java/org/camunda/bpm/run/test/config/identity/DemoUserConfigurationTest.java
rename to distro/run/core/src/test/java/org/camunda/bpm/run/test/config/identity/DemoUserConfigurationTest.java
diff --git a/distro/run/distro/src/test/java/org/camunda/bpm/run/test/config/identity/LdapConfigurationTest.java b/distro/run/core/src/test/java/org/camunda/bpm/run/test/config/identity/LdapConfigurationTest.java
similarity index 100%
rename from distro/run/distro/src/test/java/org/camunda/bpm/run/test/config/identity/LdapConfigurationTest.java
rename to distro/run/core/src/test/java/org/camunda/bpm/run/test/config/identity/LdapConfigurationTest.java
diff --git a/distro/run/distro/src/test/java/org/camunda/bpm/run/test/util/LoggingInterceptor.java b/distro/run/core/src/test/java/org/camunda/bpm/run/test/util/LoggingInterceptor.java
similarity index 100%
rename from distro/run/distro/src/test/java/org/camunda/bpm/run/test/util/LoggingInterceptor.java
rename to distro/run/core/src/test/java/org/camunda/bpm/run/test/util/LoggingInterceptor.java
diff --git a/distro/run/distro/src/test/java/org/camunda/bpm/run/test/util/TestUtils.java b/distro/run/core/src/test/java/org/camunda/bpm/run/test/util/TestUtils.java
similarity index 100%
rename from distro/run/distro/src/test/java/org/camunda/bpm/run/test/util/TestUtils.java
rename to distro/run/core/src/test/java/org/camunda/bpm/run/test/util/TestUtils.java
diff --git a/distro/run/distro/src/test/resources/application-test-auth-disabled.yml b/distro/run/core/src/test/resources/application-test-auth-disabled.yml
similarity index 100%
rename from distro/run/distro/src/test/resources/application-test-auth-disabled.yml
rename to distro/run/core/src/test/resources/application-test-auth-disabled.yml
diff --git a/distro/run/distro/src/test/resources/application-test-cors-enabled.yml b/distro/run/core/src/test/resources/application-test-cors-enabled.yml
similarity index 100%
rename from distro/run/distro/src/test/resources/application-test-cors-enabled.yml
rename to distro/run/core/src/test/resources/application-test-cors-enabled.yml
diff --git a/distro/run/distro/src/test/resources/application-test-demo-user.yml b/distro/run/core/src/test/resources/application-test-demo-user.yml
similarity index 100%
rename from distro/run/distro/src/test/resources/application-test-demo-user.yml
rename to distro/run/core/src/test/resources/application-test-demo-user.yml
diff --git a/distro/run/distro/src/test/resources/application-test-https-enabled.yml b/distro/run/core/src/test/resources/application-test-https-enabled.yml
similarity index 100%
rename from distro/run/distro/src/test/resources/application-test-https-enabled.yml
rename to distro/run/core/src/test/resources/application-test-https-enabled.yml
diff --git a/distro/run/distro/src/test/resources/application-test-ldap-enabled.yml b/distro/run/core/src/test/resources/application-test-ldap-enabled.yml
similarity index 100%
rename from distro/run/distro/src/test/resources/application-test-ldap-enabled.yml
rename to distro/run/core/src/test/resources/application-test-ldap-enabled.yml
diff --git a/distro/run/distro/src/test/resources/keystore.p12 b/distro/run/core/src/test/resources/keystore.p12
similarity index 100%
rename from distro/run/distro/src/test/resources/keystore.p12
rename to distro/run/core/src/test/resources/keystore.p12
diff --git a/distro/run/distro/assembly.xml b/distro/run/distro/assembly.xml
index 458ef2af4f8..5eeb86dccd0 100644
--- a/distro/run/distro/assembly.xml
+++ b/distro/run/distro/assembly.xml
@@ -23,7 +23,7 @@
     </dependencySet>
 
     <dependencySet>
-      <outputDirectory>configuration/database</outputDirectory>
+      <outputDirectory>configuration/database/</outputDirectory>
       <includes>
         <include>com.h2database:h2</include>
       </includes>
@@ -31,15 +31,6 @@
 
   </dependencySets>
 
-  <files>
-    <file>
-      <source>target/camunda-bpm-run-${project.version}.jar
-      </source>
-      <outputDirectory>internal/</outputDirectory>
-      <destName>camunda-bpm-run.jar</destName>
-    </file>
-  </files>
-
   <fileSets>
     <fileSet>
       <directory>../modules/webapps/target/dependency/</directory>
diff --git a/distro/run/distro/pom.xml b/distro/run/distro/pom.xml
index 556b79cd757..e717362f475 100644
--- a/distro/run/distro/pom.xml
+++ b/distro/run/distro/pom.xml
@@ -13,51 +13,10 @@
 
   <artifactId>camunda-bpm-run</artifactId>
   <name>Camunda BPM - Run - Distribution</name>
-  <packaging>jar</packaging>
+  <packaging>pom</packaging>
 
   <dependencies>
 
-    <dependency>
-      <groupId>org.camunda.bpm.springboot</groupId>
-      <artifactId>camunda-bpm-spring-boot-starter</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.camunda.bpm</groupId>
-      <artifactId>camunda-engine-plugin-spin</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.camunda.spin</groupId>
-      <artifactId>camunda-spin-dataformat-all</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.camunda.bpm.identity</groupId>
-      <artifactId>camunda-identity-ldap</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.camunda.bpm.springboot</groupId>
-      <artifactId>camunda-bpm-spring-boot-starter-rest</artifactId>
-      <scope>provided</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-starter-jdbc</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>com.h2database</groupId>
-      <artifactId>h2</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.tomcat.embed</groupId>
-      <artifactId>tomcat-embed-core</artifactId>
-    </dependency>
-
     <dependency>
       <groupId>org.camunda.bpm.run</groupId>
       <artifactId>camunda-bpm-run-assembly</artifactId>
@@ -65,48 +24,10 @@
       <type>tar.gz</type>
     </dependency>
 
-    <!-- Testing -->
-
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-starter-test</artifactId>
-      <scope>test</scope>
-    </dependency>
-
   </dependencies>
 
   <build>
     <plugins>
-      <plugin>
-        <groupId>org.springframework.boot</groupId>
-        <artifactId>spring-boot-maven-plugin</artifactId>
-        <configuration>
-          <layout>ZIP</layout>
-          <excludes>
-            <exclude>
-              <groupId>org.camunda.bpm.springboot</groupId>
-              <artifactId>camunda-bpm-spring-boot-starter-rest</artifactId>
-            </exclude>
-            <exclude>
-              <groupId>com.h2database</groupId>
-              <artifactId>h2</artifactId>
-            </exclude>
-          </excludes>
-        </configuration>
-        <executions>
-          <execution>
-            <goals>
-              <goal>repackage</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-assembly-plugin</artifactId>
@@ -131,15 +52,6 @@
           </execution>
         </executions>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <systemPropertyVariables>
-            <sun.net.http.allowRestrictedHeaders>true</sun.net.http.allowRestrictedHeaders>
-          </systemPropertyVariables>
-        </configuration>
-      </plugin>
     </plugins>
   </build>
 
diff --git a/distro/run/pom.xml b/distro/run/pom.xml
index b23c7a8598f..5d6f21a7a88 100644
--- a/distro/run/pom.xml
+++ b/distro/run/pom.xml
@@ -87,6 +87,7 @@
       <modules>
         <module>modules</module>
         <module>modules/rest</module>
+        <module>core</module>
         <module>assembly</module>
       </modules>
     </profile>