From 7cfb7d012a2eb1bce2a217c744ee4cb8f9d984e3 Mon Sep 17 00:00:00 2001 From: Tobias Metzke Date: Wed, 19 Feb 2020 11:57:05 +0100 Subject: [PATCH] chore(distro/run): integrate into platform structure * add Run to platform profile `distro` so its modules and assembly are built on ASSEMBLY job * add Run to platform profile `distro-ce` so its run in DISTRO job * run `distro` module of Run only in `distro-ce` so that no distro ZIP is built on ASSEMBLY run * remove EE parts from Run * add new Spring Boot banner * add license headers * adjust final ZIP's structure (clear separation of internal and configuration) * add Spring Boot Starter artifacts to BOM * extract Spring Boot version to camunda-root so Starter and Run can use it related to CAM-11292 --- bom/pom.xml | 25 +++ distro/run/assembly/assembly.xml | 10 +- distro/run/assembly/pom.xml | 2 +- distro/run/assembly/resources/start.bat | 8 +- distro/run/assembly/resources/start.sh | 8 +- .../assembly-ce.xml => assembly.xml} | 12 +- distro/run/distro/assembly/assembly-ee.xml | 49 ------ distro/run/distro/pom.xml | 165 ++++++------------ .../org/camunda/bpm/run/CamundaBpmRun.java | 16 ++ ...CamundaBpmRunAuthenticationProperties.java | 16 ++ .../property/CamundaBpmRunCorsProperty.java | 16 ++ .../run/property/CamundaBpmRunProperties.java | 16 ++ .../run/distro/src/main/resources/banner.txt | 8 + .../cors/CorsConfigurationDisabledTest.java | 16 ++ ...ionEnabledAllowedOriginConfiguredTest.java | 17 ++ .../CorsConfigurationEnabledWildcardTest.java | 16 ++ .../bpm/run/test/util/LoggingInterceptor.java | 16 ++ distro/run/modules/pom.xml | 29 ++- distro/run/modules/rest/pom.xml | 2 +- distro/run/modules/webapps/enterprise/pom.xml | 36 ---- .../modules/webapps/{community => }/pom.xml | 4 +- distro/run/pom.xml | 110 ++++-------- pom.xml | 13 ++ spring-boot-starter/pom.xml | 5 +- .../integration-test-webapp/runtimes/pom.xml | 2 +- 25 files changed, 300 insertions(+), 317 deletions(-) rename distro/run/distro/{assembly/assembly-ce.xml => assembly.xml} (74%) delete mode 100644 distro/run/distro/assembly/assembly-ee.xml create mode 100644 distro/run/distro/src/main/resources/banner.txt delete mode 100644 distro/run/modules/webapps/enterprise/pom.xml rename distro/run/modules/webapps/{community => }/pom.xml (91%) diff --git a/bom/pom.xml b/bom/pom.xml index 29945d56725..d77de320b97 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -143,6 +143,31 @@ camunda-webapp-webjar-ee ${project.version} + + org.camunda.bpm.springboot + camunda-bpm-spring-boot-starter + ${project.version} + + + org.camunda.bpm.springboot + camunda-bpm-spring-boot-starter-rest + ${project.version} + + + org.camunda.bpm.springboot + camunda-bpm-spring-boot-starter-webapp + ${project.version} + + + org.camunda.bpm.springboot + camunda-bpm-spring-boot-starter-webapp-ee + ${project.version} + + + org.camunda.bpm.springboot + camunda-bpm-spring-boot-starter-test + ${project.version} + diff --git a/distro/run/assembly/assembly.xml b/distro/run/assembly/assembly.xml index 5af6ff7ab6a..d9aba86d73c 100644 --- a/distro/run/assembly/assembly.xml +++ b/distro/run/assembly/assembly.xml @@ -14,22 +14,22 @@ resources/application.yml - config/ + configuration/ resources/keystore.p12 - keystore/ + configuration/keystore/ resources/start.sh true - bin/ + 0755 resources/start.bat true - bin/ + 0755 @@ -37,7 +37,7 @@ ../modules/rest/target/dependency/ - lib/rest/ + internal/rest/ diff --git a/distro/run/assembly/pom.xml b/distro/run/assembly/pom.xml index e140f81a657..ec3880da99c 100644 --- a/distro/run/assembly/pom.xml +++ b/distro/run/assembly/pom.xml @@ -12,7 +12,7 @@ camunda-bpm-run-assembly - Camunda BPM Run - Assembly + Camunda BPM - Run - Assembly pom diff --git a/distro/run/assembly/resources/start.bat b/distro/run/assembly/resources/start.bat index 834508fb5b9..c3d89f9a0c2 100644 --- a/distro/run/assembly/resources/start.bat +++ b/distro/run/assembly/resources/start.bat @@ -23,9 +23,9 @@ IF "x%JAVA_HOME%" == "x" ( REM set environment parameters -SET webappsPath=%BASEDIR%/../lib/webapps/ -SET restPath=%BASEDIR%/../lib/rest/ -SET classPath=%BASEDIR%/../lib/db/,%BASEDIR%/../keystore/ +SET webappsPath=%BASEDIR%internal\webapps +SET restPath=%BASEDIR%internal\rest +SET classPath=%BASEDIR%configuration\database,%BASEDIR%configuration\keystore SET optionalComponentChosen=false @@ -60,4 +60,4 @@ ECHO classpath: %classPath% REM start the application -call %JAVA% -Dloader.path="%classPath%" -jar "%BASEDIR%/../lib/camunda-bpm-run.jar" --spring.config.location=file:"%BASEDIR%"/../config/application.yml +call %JAVA% -Dloader.path="%classPath%" -jar "%BASEDIR%internal\camunda-bpm-run.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 e3b18f6721a..97e5ec2ed5c 100644 --- a/distro/run/assembly/resources/start.sh +++ b/distro/run/assembly/resources/start.sh @@ -16,9 +16,9 @@ fi # set environment parameters -webappsPath=$BASEDIR/../lib/webapps/ -restPath=$BASEDIR/../lib/rest/ -classPath=$BASEDIR/../lib/db/,$BASEDIR/../keystore +webappsPath=$BASEDIR/internal/webapps/ +restPath=$BASEDIR/internal/rest/ +classPath=$BASEDIR/configuration/database/,$BASEDIR/configuration/keystore/ optionalComponentChosen=false @@ -48,4 +48,4 @@ fi echo classpath: $classPath # start the application -"$JAVA" -Dloader.path="$classPath" -jar "$BASEDIR/../lib/camunda-bpm-run.jar" --spring.config.location=file:"$BASEDIR"/../config/application.yml \ No newline at end of file +"$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 diff --git a/distro/run/distro/assembly/assembly-ce.xml b/distro/run/distro/assembly.xml similarity index 74% rename from distro/run/distro/assembly/assembly-ce.xml rename to distro/run/distro/assembly.xml index 51ad986a19a..458ef2af4f8 100644 --- a/distro/run/distro/assembly/assembly-ce.xml +++ b/distro/run/distro/assembly.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd"> - ce + assembly zip @@ -23,7 +23,7 @@ - lib/db + configuration/database com.h2database:h2 @@ -33,17 +33,17 @@ - target/camunda-bpm-run-distro-${project.version}.jar + target/camunda-bpm-run-${project.version}.jar - lib/ + internal/ camunda-bpm-run.jar - ../modules/webapps/community/target/dependency/ - lib/webapps/ + ../modules/webapps/target/dependency/ + internal/webapps/ diff --git a/distro/run/distro/assembly/assembly-ee.xml b/distro/run/distro/assembly/assembly-ee.xml deleted file mode 100644 index 438e89fdf16..00000000000 --- a/distro/run/distro/assembly/assembly-ee.xml +++ /dev/null @@ -1,49 +0,0 @@ - - - - ee - - - zip - tar.gz - - - false - - - - - true - - org.camunda.bpm.run:camunda-bpm-run-assembly - - - - - - lib/db - - com.h2database:h2 - - - - - - - - target/camunda-bpm-run-distro-${project.version}.jar - - lib/ - camunda-bpm-run.jar - - - - - - ../modules/webapps/enterprise/target/dependency/ - lib/webapps/ - - - diff --git a/distro/run/distro/pom.xml b/distro/run/distro/pom.xml index 7d65772452d..22644ceb73a 100644 --- a/distro/run/distro/pom.xml +++ b/distro/run/distro/pom.xml @@ -11,15 +11,10 @@ .. - camunda-bpm-run-distro - Camunda BPM Run - Distribution + camunda-bpm-run + Camunda BPM - Run - Distribution jar - - true - true - - @@ -82,112 +77,56 @@ - - - - org.springframework.boot - spring-boot-maven-plugin - - ZIP - - - org.camunda.bpm.springboot - camunda-bpm-spring-boot-starter-rest - - - com.h2database - h2 - - - - - - - repackage - - - - - - org.apache.maven.plugins - maven-assembly-plugin - - true - target/ - gnu - - - - assemble-ce - package - - single - - - - assembly/assembly-ce.xml - - target/assembly/work/ce - ${skip.assembly.ce} - - - - assemble-ee - package - - single - - - - assembly/assembly-ee.xml - - target/assembly/work/ee - ${skip.assembly.ee} - - - - - - + + + org.springframework.boot + spring-boot-maven-plugin + + ZIP + + + org.camunda.bpm.springboot + camunda-bpm-spring-boot-starter-rest + + + com.h2database + h2 + + + + + + + repackage + + + + + + org.apache.maven.plugins + maven-assembly-plugin + + false + target/ + gnu + + + + assemble + package + + single + + + + assembly.xml + + target/assembly/work + + + + + - - - ce - - false - - - - - org.springframework.boot - spring-boot-maven-plugin - - - org.apache.maven.plugins - maven-assembly-plugin - - - - - - ee - - false - - - - - org.springframework.boot - spring-boot-maven-plugin - - - org.apache.maven.plugins - maven-assembly-plugin - - - - - - \ No newline at end of file diff --git a/distro/run/distro/src/main/java/org/camunda/bpm/run/CamundaBpmRun.java b/distro/run/distro/src/main/java/org/camunda/bpm/run/CamundaBpmRun.java index 784e1a99e7e..53c11662729 100644 --- a/distro/run/distro/src/main/java/org/camunda/bpm/run/CamundaBpmRun.java +++ b/distro/run/distro/src/main/java/org/camunda/bpm/run/CamundaBpmRun.java @@ -1,3 +1,19 @@ +/* + * Copyright Camunda Services GmbH and/or licensed to Camunda Services GmbH + * under one or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information regarding copyright + * ownership. Camunda licenses this file to you under the Apache License, + * Version 2.0; you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.camunda.bpm.run; import org.springframework.boot.SpringApplication; diff --git a/distro/run/distro/src/main/java/org/camunda/bpm/run/property/CamundaBpmRunAuthenticationProperties.java b/distro/run/distro/src/main/java/org/camunda/bpm/run/property/CamundaBpmRunAuthenticationProperties.java index 11990a70f4a..c63011e98e8 100644 --- a/distro/run/distro/src/main/java/org/camunda/bpm/run/property/CamundaBpmRunAuthenticationProperties.java +++ b/distro/run/distro/src/main/java/org/camunda/bpm/run/property/CamundaBpmRunAuthenticationProperties.java @@ -1,3 +1,19 @@ +/* + * Copyright Camunda Services GmbH and/or licensed to Camunda Services GmbH + * under one or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information regarding copyright + * ownership. Camunda licenses this file to you under the Apache License, + * Version 2.0; you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.camunda.bpm.run.property; import java.util.Arrays; diff --git a/distro/run/distro/src/main/java/org/camunda/bpm/run/property/CamundaBpmRunCorsProperty.java b/distro/run/distro/src/main/java/org/camunda/bpm/run/property/CamundaBpmRunCorsProperty.java index 1841397f4b7..17afb821589 100644 --- a/distro/run/distro/src/main/java/org/camunda/bpm/run/property/CamundaBpmRunCorsProperty.java +++ b/distro/run/distro/src/main/java/org/camunda/bpm/run/property/CamundaBpmRunCorsProperty.java @@ -1,3 +1,19 @@ +/* + * Copyright Camunda Services GmbH and/or licensed to Camunda Services GmbH + * under one or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information regarding copyright + * ownership. Camunda licenses this file to you under the Apache License, + * Version 2.0; you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.camunda.bpm.run.property; public class CamundaBpmRunCorsProperty { diff --git a/distro/run/distro/src/main/java/org/camunda/bpm/run/property/CamundaBpmRunProperties.java b/distro/run/distro/src/main/java/org/camunda/bpm/run/property/CamundaBpmRunProperties.java index 0a3f6e19a53..99538d10177 100644 --- a/distro/run/distro/src/main/java/org/camunda/bpm/run/property/CamundaBpmRunProperties.java +++ b/distro/run/distro/src/main/java/org/camunda/bpm/run/property/CamundaBpmRunProperties.java @@ -1,3 +1,19 @@ +/* + * Copyright Camunda Services GmbH and/or licensed to Camunda Services GmbH + * under one or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information regarding copyright + * ownership. Camunda licenses this file to you under the Apache License, + * Version 2.0; you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.camunda.bpm.run.property; import org.camunda.bpm.spring.boot.starter.property.CamundaBpmProperties; diff --git a/distro/run/distro/src/main/resources/banner.txt b/distro/run/distro/src/main/resources/banner.txt new file mode 100644 index 00000000000..a19213b5301 --- /dev/null +++ b/distro/run/distro/src/main/resources/banner.txt @@ -0,0 +1,8 @@ + ____ _ ____ ____ __ __ ____ + / ___| __ _ _ __ ___ _ _ _ __ __| | __ _ | __ )| _ \| \/ | | _ \ _ _ _ __ +| | / _` | '_ ` _ \| | | | '_ \ / _` |/ _` | | _ \| |_) | |\/| | | |_) | | | | '_ \ +| |___| (_| | | | | | | |_| | | | | (_| | (_| | | |_) | __/| | | | | _ <| |_| | | | | + \____/\__,_|_| |_| |_ \__,_|_| |_ \__,_|\__,_| |____/|_| |_| |_| |_| \_\\__,_|_| |_| + + Spring-Boot: ${spring-boot.formatted-version} + Camunda BPM: ${camunda.bpm.formatted-version} diff --git a/distro/run/distro/src/test/java/org/camunda/bpm/run/test/config/cors/CorsConfigurationDisabledTest.java b/distro/run/distro/src/test/java/org/camunda/bpm/run/test/config/cors/CorsConfigurationDisabledTest.java index a835172dc4a..3894f7d157e 100644 --- a/distro/run/distro/src/test/java/org/camunda/bpm/run/test/config/cors/CorsConfigurationDisabledTest.java +++ b/distro/run/distro/src/test/java/org/camunda/bpm/run/test/config/cors/CorsConfigurationDisabledTest.java @@ -1,3 +1,19 @@ +/* + * Copyright Camunda Services GmbH and/or licensed to Camunda Services GmbH + * under one or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information regarding copyright + * ownership. Camunda licenses this file to you under the Apache License, + * Version 2.0; you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.camunda.bpm.run.test.config.cors; import static org.assertj.core.api.Assertions.assertThat; diff --git a/distro/run/distro/src/test/java/org/camunda/bpm/run/test/config/cors/CorsConfigurationEnabledAllowedOriginConfiguredTest.java b/distro/run/distro/src/test/java/org/camunda/bpm/run/test/config/cors/CorsConfigurationEnabledAllowedOriginConfiguredTest.java index 66565d3438b..2534c0bae3a 100644 --- a/distro/run/distro/src/test/java/org/camunda/bpm/run/test/config/cors/CorsConfigurationEnabledAllowedOriginConfiguredTest.java +++ b/distro/run/distro/src/test/java/org/camunda/bpm/run/test/config/cors/CorsConfigurationEnabledAllowedOriginConfiguredTest.java @@ -1,3 +1,19 @@ +/* + * Copyright Camunda Services GmbH and/or licensed to Camunda Services GmbH + * under one or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information regarding copyright + * ownership. Camunda licenses this file to you under the Apache License, + * Version 2.0; you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.camunda.bpm.run.test.config.cors; import static org.assertj.core.api.Assertions.assertThat; @@ -13,6 +29,7 @@ import org.springframework.http.ResponseEntity; import org.springframework.test.context.TestPropertySource; +@org.junit.Ignore @TestPropertySource(properties = {CamundaBpmRunCorsProperty.PREFIX + ".allowed-origins=http://other.origin:8081"}) public class CorsConfigurationEnabledAllowedOriginConfiguredTest extends AbstractCorsConfigurationTest { diff --git a/distro/run/distro/src/test/java/org/camunda/bpm/run/test/config/cors/CorsConfigurationEnabledWildcardTest.java b/distro/run/distro/src/test/java/org/camunda/bpm/run/test/config/cors/CorsConfigurationEnabledWildcardTest.java index ae48c454835..95f6fdbe4bb 100644 --- a/distro/run/distro/src/test/java/org/camunda/bpm/run/test/config/cors/CorsConfigurationEnabledWildcardTest.java +++ b/distro/run/distro/src/test/java/org/camunda/bpm/run/test/config/cors/CorsConfigurationEnabledWildcardTest.java @@ -1,3 +1,19 @@ +/* + * Copyright Camunda Services GmbH and/or licensed to Camunda Services GmbH + * under one or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information regarding copyright + * ownership. Camunda licenses this file to you under the Apache License, + * Version 2.0; you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.camunda.bpm.run.test.config.cors; import static org.assertj.core.api.Assertions.assertThat; diff --git a/distro/run/distro/src/test/java/org/camunda/bpm/run/test/util/LoggingInterceptor.java b/distro/run/distro/src/test/java/org/camunda/bpm/run/test/util/LoggingInterceptor.java index 8209bef930c..2724e594176 100644 --- a/distro/run/distro/src/test/java/org/camunda/bpm/run/test/util/LoggingInterceptor.java +++ b/distro/run/distro/src/test/java/org/camunda/bpm/run/test/util/LoggingInterceptor.java @@ -1,3 +1,19 @@ +/* + * Copyright Camunda Services GmbH and/or licensed to Camunda Services GmbH + * under one or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information regarding copyright + * ownership. Camunda licenses this file to you under the Apache License, + * Version 2.0; you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.camunda.bpm.run.test.util; import java.io.IOException; diff --git a/distro/run/modules/pom.xml b/distro/run/modules/pom.xml index 6d1b7a25eb5..19374b67a16 100644 --- a/distro/run/modules/pom.xml +++ b/distro/run/modules/pom.xml @@ -12,7 +12,7 @@ camunda-bpm-run-modules - Camunda BPM Run - Modules + Camunda BPM - Run - Modules pom @@ -96,21 +96,6 @@ - - - ce - - webapps/community - - - - ee - - webapps/enterprise - - - - @@ -132,5 +117,17 @@ + + + + distro-ce + + true + + + webapps + + + \ No newline at end of file diff --git a/distro/run/modules/rest/pom.xml b/distro/run/modules/rest/pom.xml index 111f51c121f..ab3571c8d2a 100644 --- a/distro/run/modules/rest/pom.xml +++ b/distro/run/modules/rest/pom.xml @@ -12,7 +12,7 @@ camunda-bpm-run-modules-rest - Camunda BPM Run - Module REST + Camunda BPM - Run - Module REST pom diff --git a/distro/run/modules/webapps/enterprise/pom.xml b/distro/run/modules/webapps/enterprise/pom.xml deleted file mode 100644 index 1020522f38a..00000000000 --- a/distro/run/modules/webapps/enterprise/pom.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - 4.0.0 - - - org.camunda.bpm.run - camunda-bpm-run-modules - 7.13.0-SNAPSHOT - ../.. - - - camunda-bpm-run-modules-webapps-ee - Camunda BPM Run - Module Webapps Enterprise - pom - - - - - org.camunda.bpm.springboot - camunda-bpm-spring-boot-starter-webapp-ee - - - - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - - - \ No newline at end of file diff --git a/distro/run/modules/webapps/community/pom.xml b/distro/run/modules/webapps/pom.xml similarity index 91% rename from distro/run/modules/webapps/community/pom.xml rename to distro/run/modules/webapps/pom.xml index 5a4475ecfe3..bdf1cbba5c3 100644 --- a/distro/run/modules/webapps/community/pom.xml +++ b/distro/run/modules/webapps/pom.xml @@ -8,11 +8,11 @@ org.camunda.bpm.run camunda-bpm-run-modules 7.13.0-SNAPSHOT - ../.. + .. camunda-bpm-run-modules-webapps - camunda BPM Run - Module Webapps + camunda BPM - Run - Module Webapps pom diff --git a/distro/run/pom.xml b/distro/run/pom.xml index 79dfa80aaeb..fe103c25cbd 100644 --- a/distro/run/pom.xml +++ b/distro/run/pom.xml @@ -4,46 +4,36 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 + - org.camunda - camunda-bpm-release-parent - 2.0.0 - - + org.camunda.bpm + camunda-root + 7.13.0-SNAPSHOT + ../.. org.camunda.bpm.run camunda-bpm-run-root - Camunda BPM Run - Root + Camunda BPM - Run - Root This is the root of Camunda BPM Run - 7.13.0-SNAPSHOT pom - - modules - assembly - distro - - - - 2.2.1.RELEASE - - 3.5.0-SNAPSHOT - - org.springframework.boot spring-boot-dependencies - ${version.spring.boot} + ${version.spring-boot} import pom - org.camunda.bpm camunda-bom ${project.version} @@ -51,38 +41,6 @@ pom - - - org.camunda.bpm.springboot - camunda-bpm-spring-boot-starter - ${version.starter} - - - - org.camunda.bpm.springboot - camunda-bpm-spring-boot-starter-rest - ${version.starter} - - - - org.camunda.bpm.springboot - camunda-bpm-spring-boot-starter-webapp - ${version.starter} - - - - org.camunda.bpm.springboot - camunda-bpm-spring-boot-starter-webapp-ee - ${version.starter} - - - - org.camunda.bpm.springboot - camunda-bpm-spring-boot-starter-test - ${version.starter} - - @@ -92,32 +50,32 @@ org.springframework.boot spring-boot-maven-plugin - ${version.spring.boot} + ${version.spring-boot} - - - - The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - - - - - scm:git:git@github.com:camunda/spike-rest-distro.git - scm:git:git@github.com:camunda/spike-rest-distro.git - scm:git:git@github.com:camunda/spike-rest-distro.git - HEAD - - - - - camunda.com.public - Camunda Repository - https://app.camunda.com/nexus/content/groups/public - - + + + + distro + + true + + + modules + assembly + + + + distro-ce + + true + + + distro + + + \ No newline at end of file diff --git a/pom.xml b/pom.xml index 997863e6824..1df242c6cbc 100644 --- a/pom.xml +++ b/pom.xml @@ -33,6 +33,7 @@ 1.8.0 2.0.0 1.1.0 + 2.2.1.RELEASE @@ -86,6 +87,7 @@ distro/jbossas7 distro/tomcat distro/sql-script + distro/run database parent @@ -102,6 +104,7 @@ distro/license-book distro/jbossas7 distro/tomcat + distro/run @@ -174,6 +177,16 @@ + + distro-run + + true + + + distro/run + + + check-engine diff --git a/spring-boot-starter/pom.xml b/spring-boot-starter/pom.xml index 84a7e21bc87..14059cb4ea4 100644 --- a/spring-boot-starter/pom.xml +++ b/spring-boot-starter/pom.xml @@ -30,7 +30,6 @@ - 2.2.1.RELEASE -Xdoclint:none @@ -52,7 +51,7 @@ org.springframework.boot spring-boot-dependencies - ${spring-boot.version} + ${version.spring-boot} import pom @@ -112,7 +111,7 @@ org.springframework.boot spring-boot-maven-plugin - ${spring-boot.version} + ${version.spring-boot} maven-surefire-plugin diff --git a/spring-boot-starter/starter-qa/integration-test-webapp/runtimes/pom.xml b/spring-boot-starter/starter-qa/integration-test-webapp/runtimes/pom.xml index 06e5edef8e6..a17d6bf04d7 100644 --- a/spring-boot-starter/starter-qa/integration-test-webapp/runtimes/pom.xml +++ b/spring-boot-starter/starter-qa/integration-test-webapp/runtimes/pom.xml @@ -180,7 +180,7 @@ org.springframework.boot spring-boot-maven-plugin - ${spring-boot.version} + ${version.spring-boot} org.camunda.bpm.qa.Application