From e57e3015f5d08997120ca45f3c0c080accc723c1 Mon Sep 17 00:00:00 2001
From: serge-rider <serge@jkiss.org>
Date: Fri, 24 Apr 2020 14:21:06 +0300
Subject: [PATCH] CB aggregate maven build

---
 deploy/build.bat                        |  8 ++++----
 deploy/build.sh                         | 11 +++++------
 server/product/aggregate/.gitignore     |  1 +
 server/product/aggregate/build-full.cmd |  6 ++++++
 server/product/aggregate/pom.xml        | 19 +++++++++++++++++++
 5 files changed, 35 insertions(+), 10 deletions(-)
 create mode 100644 server/product/aggregate/.gitignore
 create mode 100644 server/product/aggregate/build-full.cmd
 create mode 100644 server/product/aggregate/pom.xml

diff --git a/deploy/build.bat b/deploy/build.bat
index 5ed980ee66..7be8e16757 100644
--- a/deploy/build.bat
+++ b/deploy/build.bat
@@ -12,14 +12,14 @@ cd ../..
 IF NOT EXIST dbeaver git clone https://github.com/dbeaver/dbeaver.git
 cd dbeaver
 git pull
-call mvn clean install -Dheadless-platform
 cd ../cloudbeaver/deploy
 
 echo "Build cloudbeaver server"
 
-cd ..\server
-call mvn clean package
-cd ..\deploy
+cd ..\server\product\aggregate
+call mvn clean package -Dheadless-platform
+
+cd ..\..\..\deploy
 
 echo "Copy server packages"
 
diff --git a/deploy/build.sh b/deploy/build.sh
index da1b35725d..6068357548 100755
--- a/deploy/build.sh
+++ b/deploy/build.sh
@@ -8,7 +8,7 @@ mkdir ./cloudbeaver/conf
 mkdir ./cloudbeaver/workspace
 mkdir ./cloudbeaver/web
 
-echo "Build dbeaver application"
+echo "Pull dbeaver platform"
 
 cd ../..
 if [[ ! -f dbeaver ]]
@@ -17,14 +17,13 @@ then
 fi
 cd dbeaver
 git pull
-mvn clean install -Dheadless-platform
 cd ../cloudbeaver/deploy
 
-echo "Build cloudbeaver server"
+echo "Build CloudBeaver server"
 
-cd ../server
-mvn clean package
-cd ../deploy
+cd ../server/product/aggregate
+call mvn clean package -Dheadless-platform
+cd ../../../deploy
 
 echo "Copy server packages"
 
diff --git a/server/product/aggregate/.gitignore b/server/product/aggregate/.gitignore
new file mode 100644
index 0000000000..9e6bf7cd69
--- /dev/null
+++ b/server/product/aggregate/.gitignore
@@ -0,0 +1 @@
+workspace
diff --git a/server/product/aggregate/build-full.cmd b/server/product/aggregate/build-full.cmd
new file mode 100644
index 0000000000..e530904a03
--- /dev/null
+++ b/server/product/aggregate/build-full.cmd
@@ -0,0 +1,6 @@
+@echo off
+set MAVEN_OPTS=-Xmx2048m
+
+call mvn clean package -Dheadless-platform
+
+pause
diff --git a/server/product/aggregate/pom.xml b/server/product/aggregate/pom.xml
new file mode 100644
index 0000000000..2daf10f079
--- /dev/null
+++ b/server/product/aggregate/pom.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+    xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>com.dbeaver</groupId>
+  <artifactId>ee.aggregate</artifactId>
+  <packaging>pom</packaging>
+  <name>CloudBeaver CE Aggregate</name>
+  <version>1.0.0-SNAPSHOT</version>
+
+  <modules>
+    <!-- dbeaver ce -->
+    <module>../../../../dbeaver</module>
+    <!-- cloudbeaver -->
+    <module>../..</module>
+  </modules>
+</project>
\ No newline at end of file