chore(webapps): integrate webapps into build

related to CAM-12641

.github/dependabot.yml

@@ -5,3 +5,18 @@ updates:
   schedule:
     interval: daily
     timezone: Europe/Berlin
+- package-ecosystem: maven
+  directory: "/webapps"
+  schedule:
+    interval: daily
+    timezone: Europe/Berlin
+- package-ecosystem: npm
+  directory: "/webapps"
+  schedule:
+    interval: daily
+    timezone: Europe/Berlin
+- package-ecosystem: npm
+  directory: "/webapps/ui/cockpit"
+  schedule:
+    interval: daily
+    timezone: Europe/Berlin

webapps/h2-webapp/src/main/webapp/WEB-INF/web.xml → distro/h2-webapp/src/main/webapp/WEB-INF/web.xml

@@ -1,31 +1,31 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<web-app id="activiti-cycle" version="2.5"
-	xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://java.sun.com/xml/ns/javaee    http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
-
-	<display-name>H2 Console</display-name>
-
-	<description>H2 Console</description>
-
-  <servlet>
-    <servlet-name>H2Console</servlet-name>
-    <servlet-class>org.h2.server.web.WebServlet</servlet-class>
-
-    <init-param>
-      <param-name>webAllowOthers</param-name>
-      <param-value>true</param-value>
-    </init-param>
-
-    <load-on-startup>1</load-on-startup>
-  </servlet>
-
-  <servlet-mapping>
-    <servlet-name>H2Console</servlet-name>
-    <url-pattern>/h2/*</url-pattern>
-  </servlet-mapping>
-
-	<session-config>
-		<session-timeout>30</session-timeout>
-	</session-config>
-
-</web-app>
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app id="activiti-cycle" version="2.5"
+	xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://java.sun.com/xml/ns/javaee    http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+
+	<display-name>H2 Console</display-name>
+
+	<description>H2 Console</description>
+
+  <servlet>
+    <servlet-name>H2Console</servlet-name>
+    <servlet-class>org.h2.server.web.WebServlet</servlet-class>
+
+    <init-param>
+      <param-name>webAllowOthers</param-name>
+      <param-value>true</param-value>
+    </init-param>
+
+    <load-on-startup>1</load-on-startup>
+  </servlet>
+
+  <servlet-mapping>
+    <servlet-name>H2Console</servlet-name>
+    <url-pattern>/h2/*</url-pattern>
+  </servlet-mapping>
+
+	<session-config>
+		<session-timeout>30</session-timeout>
+	</session-config>
+
+</web-app>

pom.xml

@@ -66,7 +66,7 @@
 
         <module>qa</module>
 
-        <module>webapps/h2-webapp</module>
+        <module>distro/h2-webapp</module>
 
         <module>javaee/ejb-service</module>
         <module>javaee/ejb-client</module>
@@ -82,6 +82,8 @@
         <module>engine-spring</module>
         <module>engine-rest</module>
 
+        <module>webapps</module>
+
         <module>examples/invoice</module>
 
         <module>engine-plugins</module>
@@ -105,7 +107,7 @@
         <activeByDefault>true</activeByDefault>
       </activation>
       <modules>
-        <!-- This profile is run in the CI after the webapps were built (platform-DISTRO);
+        <!-- This profile is run in the CI after the webapps were built (platform-ASSEMBLY);
           It should activate any module that has a dependency to the webapps -->
         <module>spring-boot-starter</module>
 
@@ -121,13 +123,15 @@
       <modules>
         <module>qa</module>
 
-        <module>webapps/h2-webapp</module>
+        <module>distro/h2-webapp</module>
 
         <module>engine</module>
         <module>engine-cdi</module>
         <module>engine-spring</module>
         <module>engine-rest</module>
 
+        <module>webapps</module>
+
         <module>examples/invoice</module>
 
         <module>engine-plugins</module>
@@ -199,7 +203,7 @@
     <profile>
       <id>distro-starter</id>
       <!-- This profile is run in the release CI for building the enterprise artifacts
-          It can be removed if the webapp repo is merged to the platform and
+          It can be removed if the distro job is merged with the assembly job and
           distro-ce is not used for building the spring boot starter -->
       <modules>
         <module>spring-boot-starter</module>
@@ -248,6 +252,8 @@
 
         <module>javaee/ejb-client</module>
 
+        <module>webapps</module>
+
         <module>engine-plugins</module>
 
         <module>distro/webjar</module>

spring-boot-starter/pom.xml

@@ -55,7 +55,7 @@
     <profile>
       <id>distro-starter</id>
       <!-- This profile is run in the release CI for building the enterprise artifacts
-          It can be removed if the webapp repo is merged to the platform and
+          It can be removed if the distro job is merged with the assembly and
           distro-ce is not used for building the spring boot starter -->
       <modules>
         <module>starter-webapp-core</module>

webapps/README.md

@@ -34,11 +34,11 @@ See [plugin development guide](http://docs.camunda.org/latest/real-life/how-to/#
 
 ## Libraries
 
-### [camunda-bpm-sdk-js](https://github.com/camunda/camunda-bpm-webapp/tree/master/camunda-bpm-sdk-js)
+### [camunda-bpm-sdk-js](https://github.com/camunda/camunda-bpm-platform/tree/master/webapps/camunda-bpm-sdk-js)
 
 Has tools to work with the REST API and forms (included transitively via camunda-commons-ui).
 
-### [camunda-commons-ui](https://github.com/camunda/camunda-bpm-webapp/tree/master/camunda-commons-ui)
+### [camunda-commons-ui](https://github.com/camunda/camunda-bpm-platform/tree/master/webapps/camunda-commons-ui)
 
 Contains resources like images, [`.less`](http://lesscss.org) stylesheets as well as some [angular.js](http://angularjs.org) modules.
 
@@ -49,7 +49,7 @@ Contains the translation files for all application texts in different languages.
 
 ## Development
 
-**Please note that with Camunda 7.14.0 we moved Cockpit to a separate build step. Check out the development build and prerequisites in the [Cockpit directory](https://github.com/camunda/camunda-bpm-webapp/tree/master/ui/cockpit).** 
+**Please note that with Camunda 7.14.0 we moved Cockpit to a separate build step. Check out the development build and prerequisites in the [Cockpit directory](https://github.com/camunda/camunda-bpm-platform/tree/master/webapps/ui/cockpit).** 
 
 ### Prerequisite
 
@@ -67,8 +67,8 @@ Installing the webapps is done by Grunt:
 
 ```sh
 # cd <path to your workspace>
-git clone [email protected]:camunda/camunda-bpm-webapp.git
-cd camunda-bpm-webapp
+git clone [email protected]:camunda/camunda-bpm-platform.git
+cd camunda-bpm-platform/webapps
 npm install
 grunt
 ```
@@ -112,9 +112,9 @@ describe.only('Cockpit Dashboard Spec', function() {
 
 The supported browsers are:
 
-- Chrome
-- Firefox
-- Edge 79+
+- Chrome Latest
+- Firefox Latest
+- Edge Latest
 
 
 ## Contributing