chore(run): extract core module for distros

related to CAM-11292
chetanrahate · Feb 25, 2020 · 04bc1ed · 04bc1ed
1 parent ef3e3fe
commit 04bc1ed
Show file tree

Hide file tree

Showing 30 changed files with 137 additions and 101 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
+"$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/core/pom.xml 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>
diff --git a/...va/org/camunda/bpm/run/CamundaBpmRun.java → ...va/org/camunda/bpm/run/CamundaBpmRun.java b/...va/org/camunda/bpm/run/CamundaBpmRun.java → ...va/org/camunda/bpm/run/CamundaBpmRun.java
diff --git a/...n/CamundaBpmRunSecurityConfiguration.java → ...n/CamundaBpmRunSecurityConfiguration.java b/...n/CamundaBpmRunSecurityConfiguration.java → ...n/CamundaBpmRunSecurityConfiguration.java
diff --git a/...amundaBpmRunAuthenticationProperties.java → ...amundaBpmRunAuthenticationProperties.java b/...amundaBpmRunAuthenticationProperties.java → ...amundaBpmRunAuthenticationProperties.java
diff --git a/...n/property/CamundaBpmRunCorsProperty.java → ...n/property/CamundaBpmRunCorsProperty.java b/...n/property/CamundaBpmRunCorsProperty.java → ...n/property/CamundaBpmRunCorsProperty.java
diff --git a/...property/CamundaBpmRunLdapProperties.java → ...property/CamundaBpmRunLdapProperties.java b/...property/CamundaBpmRunLdapProperties.java → ...property/CamundaBpmRunLdapProperties.java
diff --git a/...run/property/CamundaBpmRunProperties.java → ...run/property/CamundaBpmRunProperties.java b/...run/property/CamundaBpmRunProperties.java → ...run/property/CamundaBpmRunProperties.java
diff --git a/.../run/distro/src/main/resources/banner.txt → ...ro/run/core/src/main/resources/banner.txt b/.../run/distro/src/main/resources/banner.txt → ...ro/run/core/src/main/resources/banner.txt
diff --git a/...amunda/bpm/run/test/AbstractRestTest.java → ...amunda/bpm/run/test/AbstractRestTest.java b/...amunda/bpm/run/test/AbstractRestTest.java → ...amunda/bpm/run/test/AbstractRestTest.java
diff --git a/...g/cors/CorsConfigurationDisabledTest.java → ...g/cors/CorsConfigurationDisabledTest.java b/...g/cors/CorsConfigurationDisabledTest.java → ...g/cors/CorsConfigurationDisabledTest.java
diff --git a/...onEnabledAllowedOriginConfiguredTest.java → ...onEnabledAllowedOriginConfiguredTest.java b/...onEnabledAllowedOriginConfiguredTest.java → ...onEnabledAllowedOriginConfiguredTest.java
diff --git a/...CorsConfigurationEnabledWildcardTest.java → ...CorsConfigurationEnabledWildcardTest.java b/...CorsConfigurationEnabledWildcardTest.java → ...CorsConfigurationEnabledWildcardTest.java
diff --git a/.../https/HttpsConfigurationEnabledTest.java → .../https/HttpsConfigurationEnabledTest.java b/.../https/HttpsConfigurationEnabledTest.java → .../https/HttpsConfigurationEnabledTest.java
diff --git a/...g/identity/DemoUserConfigurationTest.java → ...g/identity/DemoUserConfigurationTest.java b/...g/identity/DemoUserConfigurationTest.java → ...g/identity/DemoUserConfigurationTest.java
diff --git a/...onfig/identity/LdapConfigurationTest.java → ...onfig/identity/LdapConfigurationTest.java b/...onfig/identity/LdapConfigurationTest.java → ...onfig/identity/LdapConfigurationTest.java
diff --git a/...bpm/run/test/util/LoggingInterceptor.java → ...bpm/run/test/util/LoggingInterceptor.java b/...bpm/run/test/util/LoggingInterceptor.java → ...bpm/run/test/util/LoggingInterceptor.java
diff --git a/.../camunda/bpm/run/test/util/TestUtils.java → .../camunda/bpm/run/test/util/TestUtils.java b/.../camunda/bpm/run/test/util/TestUtils.java → .../camunda/bpm/run/test/util/TestUtils.java
diff --git a/...ources/application-test-auth-disabled.yml → ...ources/application-test-auth-disabled.yml b/...ources/application-test-auth-disabled.yml → ...ources/application-test-auth-disabled.yml
diff --git a/...sources/application-test-cors-enabled.yml → ...sources/application-test-cors-enabled.yml b/...sources/application-test-cors-enabled.yml → ...sources/application-test-cors-enabled.yml
diff --git a/.../resources/application-test-demo-user.yml → .../resources/application-test-demo-user.yml b/.../resources/application-test-demo-user.yml → .../resources/application-test-demo-user.yml
diff --git a/...ources/application-test-https-enabled.yml → ...ources/application-test-https-enabled.yml b/...ources/application-test-https-enabled.yml → ...ources/application-test-https-enabled.yml
diff --git a/...sources/application-test-ldap-enabled.yml → ...sources/application-test-ldap-enabled.yml b/...sources/application-test-ldap-enabled.yml → ...sources/application-test-ldap-enabled.yml
diff --git a/...un/distro/src/test/resources/keystore.p12 → .../run/core/src/test/resources/keystore.p12 b/...un/distro/src/test/resources/keystore.p12 → .../run/core/src/test/resources/keystore.p12
diff --git a/distro/run/distro/assembly.xml b/distro/run/distro/assembly.xml
@@ -23,23 +23,14 @@
     </dependencySet>
 
     <dependencySet>
-      <outputDirectory>configuration/database</outputDirectory>
+      <outputDirectory>configuration/database/</outputDirectory>
       <includes>
         <include>com.h2database:h2</include>
       </includes>
     </dependencySet>
 
   </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
@@ -13,100 +13,21 @@
 
   <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>
       <version>${project.version}</version>
       <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
@@ -87,6 +87,7 @@
       <modules>
         <module>modules</module>
         <module>modules/rest</module>
+        <module>core</module>
         <module>assembly</module>
       </modules>
     </profile>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -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"