Merge pull request #28 from pymma/nicoSolr

upgrade version to 1.1-SNAPSHOT

docker-compose.yaml

@@ -43,11 +43,32 @@ services:
       - kie-wb
     restart: always
 
+
+  swimmingpool-wb:
+    image: swimmingpool-web-ui
+    container_name: "swimmingpool-web-ui"
+    environment:
+      PYMMA_OPTS: " "
+    networks:
+      drools-network-dev:
+        ipv4_address: 172.27.1.15
+    ports:
+      - 8080:12099
+    links:
+      - runtime-reverse-proxy:reverse-proxy
+    depends_on:
+      - runtime-reverse-proxy
+    restart: always
+
+
+#-Xdebug -Xrunjdwp:server=y,transport=dt_socket,address=4000,suspend=y
   runtime-proxy-1:
     image: runtime-proxy
     container_name: "runtime-proxy-1"
+    volumes:
+      - kieserverdir:/niodir-kieserver
     environment:
-      PYMMA_OPTS: "-Dorg.kie.server.id=server1"
+      PYMMA_OPTS: "-Dorg.kie.server.id=server1  "
     networks:
       drools-network-dev:
         ipv4_address: 172.27.1.22
@@ -65,6 +86,8 @@ services:
   runtime-proxy-2:
     image: runtime-proxy
     container_name: "runtime-proxy-2"
+    volumes:
+      - kieserverdir:/niodir-kieserver
     environment:
       PYMMA_OPTS: "-Dorg.kie.server.id=server2"
     networks:
@@ -84,6 +107,8 @@ services:
   runtime-proxy-3:
     image: runtime-proxy
     container_name: "runtime-proxy-3"
+    volumes:
+      - kieserverdir:/niodir-kieserver
     environment:
       PYMMA_OPTS: "-Dorg.kie.server.id=server3"
     networks:
@@ -103,6 +128,8 @@ services:
   runtime-proxy-4:
     image: runtime-proxy
     container_name: "runtime-proxy-4"
+    volumes:
+      - kieserverdir:/niodir-kieserver
     environment:
       PYMMA_OPTS: "-Dorg.kie.server.id=server4"
     networks:
@@ -122,6 +149,8 @@ services:
   runtime-proxy-5:
     image: runtime-proxy
     container_name: "runtime-proxy-5"
+    volumes:
+      - kieserverdir:/niodir-kieserver
     environment:
       PYMMA_OPTS: "-Dorg.kie.server.id=server5"
     networks:
@@ -211,4 +240,5 @@ volumes:
   mongodb_config:
   gitdata:
   lucenedata:
-  esdata2:
+  esdata2:
+  kieserverdir:

drools-framework-admin-console-parent/drools-framework-admin-console/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>drools-framework-admin-console-parent</artifactId>
         <groupId>com.pymmasoftware.jbpm</groupId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>
@@ -206,7 +206,7 @@
         <dependency>
             <groupId>com.pymmasoftware.jbpm</groupId>
             <artifactId>drools-framework-business-proxy-persistence</artifactId>
-            <version>1.0-SNAPSHOT</version>
+            <version>1.1-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>

drools-framework-admin-console-parent/drools-framework-admin-console/src/main/java/org/chtijbug/drools/console/restExpose/ElasticSearchExpose.java

@@ -23,7 +23,7 @@ public class ElasticSearchExpose {
     private IndexerService indexerService;
 
     @RequestMapping(value = "/findLastByTransactionId", method = RequestMethod.GET)
-    public BusinessTransactionPersistence findTransactionById(@RequestParam String transactionId,HttpServletRequest request, HttpServletResponse response) {
+    public BusinessTransactionPersistence findTransactionById(@RequestParam String transactionId, HttpServletRequest request, HttpServletResponse response) {
 
         BusinessTransactionPersistence tmp=null;
 

drools-framework-admin-console-parent/drools-framework-admin-console/src/main/java/org/chtijbug/drools/console/service/IndexerService.java

@@ -5,7 +5,6 @@ import org.chtijbug.drools.indexer.persistence.repository.BusinessTransactionPer
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.time.LocalDate;
 import java.util.Date;
 import java.util.GregorianCalendar;
 

drools-framework-admin-console-parent/drools-framework-admin-console/src/main/java/org/chtijbug/drools/console/vaadinComponent/componentView/GridActionLogging.java

@@ -3,8 +3,6 @@ package org.chtijbug.drools.console.vaadinComponent.componentView;
 import com.vaadin.flow.component.checkbox.Checkbox;
 import com.vaadin.flow.component.grid.Grid;
 import com.vaadin.flow.component.html.Label;
-import com.vaadin.flow.component.orderedlayout.HorizontalLayout;
-import com.vaadin.flow.component.orderedlayout.VerticalLayout;
 import com.vaadin.flow.component.textfield.TextField;
 import com.vaadin.flow.data.provider.ConfigurableFilterDataProvider;
 import com.vaadin.flow.data.provider.ListDataProvider;

drools-framework-admin-console-parent/drools-framework-admin-console/src/main/java/org/chtijbug/drools/console/vaadinComponent/componentView/GridLogging.java

@@ -9,15 +9,14 @@ import com.vaadin.flow.data.renderer.ComponentRenderer;
 import com.vaadin.flow.data.value.ValueChangeMode;
 import com.vaadin.flow.function.SerializablePredicate;
 import org.chtijbug.drools.console.service.IndexerService;
-import org.chtijbug.drools.console.service.ProjectPersistService;
-import org.chtijbug.drools.console.service.RuntimeService;
 import org.chtijbug.drools.console.service.util.AppContext;
 import org.chtijbug.drools.indexer.persistence.model.BusinessTransactionPersistence;
-import org.chtijbug.drools.proxy.persistence.model.ProjectPersist;
-import org.chtijbug.drools.proxy.persistence.model.RuntimePersist;
 import org.springframework.data.domain.PageRequest;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
 
 public class GridLogging extends Grid<BusinessTransactionPersistence> {
 

drools-framework-admin-console-parent/drools-framework-admin-console/src/main/java/org/chtijbug/drools/console/view/ActionLoggingView.java

@@ -1,24 +1,15 @@
 package org.chtijbug.drools.console.view;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.ObjectWriter;
 import com.vaadin.flow.component.button.Button;
-import com.vaadin.flow.component.orderedlayout.HorizontalLayout;
-import com.vaadin.flow.component.orderedlayout.VerticalLayout;
 import com.vaadin.flow.component.html.Label;
+import com.vaadin.flow.component.orderedlayout.VerticalLayout;
 import com.vaadin.flow.component.textfield.TextArea;
-import com.vaadin.flow.component.treegrid.TreeGrid;
-import com.vaadin.flow.data.provider.ListDataProvider;
 import org.chtijbug.drools.console.vaadinComponent.ComponentPerso.DialogPerso;
 import org.chtijbug.drools.console.vaadinComponent.componentView.GridActionLogging;
 import org.chtijbug.drools.indexer.persistence.model.BusinessTransactionAction;
 import org.chtijbug.drools.indexer.persistence.model.BusinessTransactionPersistence;
 import org.chtijbug.drools.logging.Fact;
 
-import java.util.List;
-import java.util.stream.Collectors;
-
 
 public class ActionLoggingView extends VerticalLayout {
 
@@ -110,7 +101,7 @@ public class ActionLoggingView extends VerticalLayout {
             if(b!=null&&b.getInputData()!=null&&b.getInputData().getRealFact()!=null){
 
                 VerticalLayout verticalLayout=new VerticalLayout();
-                Label label=new Label(b.getEventType().name()+" - "+(b.getRuleExecution()!=null&&b.getRuleExecution().getRuleName()!=null?b.getRuleExecution().getRuleName():""));
+                Label label=new Label(b.getEventType()+" - "+(b.getRuleExecution()!=null&&b.getRuleExecution().getRuleName()!=null?b.getRuleExecution().getRuleName():""));
                 label.setClassName("creation-runtime-title");
                 verticalLayout.add(label);
                 verticalLayout.setClassName("content-action-logging");
@@ -142,7 +133,7 @@ public class ActionLoggingView extends VerticalLayout {
             if(b!=null&&b.getFact()!=null&&b.getFact().getRealFact()!=null){
 
                 VerticalLayout verticalLayout=new VerticalLayout();
-                Label label=new Label(b.getEventType().name()+" - "+(b.getRuleExecution()!=null&&b.getRuleExecution().getRuleName()!=null?b.getRuleExecution().getRuleName():""));
+                Label label=new Label(b.getEventType()+" - "+(b.getRuleExecution()!=null&&b.getRuleExecution().getRuleName()!=null?b.getRuleExecution().getRuleName():""));
                 label.setClassName("creation-runtime-title");
                 verticalLayout.add(label);
                 verticalLayout.setClassName("content-action-logging");
@@ -174,7 +165,7 @@ public class ActionLoggingView extends VerticalLayout {
             if(b!=null&&b.getRuleExecution()!=null&&b.getRuleExecution().getThenFacts()!=null){
 
                 VerticalLayout verticalLayout=new VerticalLayout();
-                Label label=new Label(b.getEventType().name()+" - "+(b.getRuleExecution()!=null&&b.getRuleExecution().getRuleName()!=null?b.getRuleExecution().getRuleName():""));
+                Label label=new Label(b.getEventType()+" - "+(b.getRuleExecution()!=null&&b.getRuleExecution().getRuleName()!=null?b.getRuleExecution().getRuleName():""));
                 label.setClassName("creation-runtime-title");
                 verticalLayout.add(label);
                 verticalLayout.setClassName("content-action-logging");
@@ -207,7 +198,7 @@ public class ActionLoggingView extends VerticalLayout {
             if(b!=null&&b.getRuleExecution()!=null&&b.getRuleExecution().getWhenFacts()!=null){
 
                 VerticalLayout verticalLayout=new VerticalLayout();
-                Label label=new Label(b.getEventType().name()+" - "+(b.getRuleExecution()!=null&&b.getRuleExecution().getRuleName()!=null?b.getRuleExecution().getRuleName():""));
+                Label label=new Label(b.getEventType()+" - "+(b.getRuleExecution()!=null&&b.getRuleExecution().getRuleName()!=null?b.getRuleExecution().getRuleName():""));
                 label.setClassName("creation-runtime-title");
                 verticalLayout.add(label);
                 verticalLayout.setClassName("content-action-logging");

drools-framework-admin-console-parent/drools-framework-admin-console/src/main/resources/application.properties

@@ -8,6 +8,6 @@ spring.data.elasticsearch.cluster-nodes=localhost:9300
 
 
 spring.data.mongodb.database=businessProxyDB
-spring.data.mongodb.host=localhost:28017
+spring.data.mongodb.host=localhost:27017
 
 spring.servlet.multipart.enabled=false

drools-framework-admin-console-parent/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>pymma-jbpm-platform-parent</artifactId>
         <groupId>com.pymmasoftware.jbpm</groupId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>

drools-framework-base-tools-parent/drools-framework-common/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>drools-framework-base-tools-parent</artifactId>
         <groupId>com.pymmasoftware.jbpm</groupId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.1-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

drools-framework-base-tools-parent/drools-framework-examples/drools-framework-swimming-pool-model/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.pymmasoftware.jbpm</groupId>
         <artifactId>drools-framework-examples</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

drools-framework-base-tools-parent/drools-framework-examples/drools-framework-swimmingpool-web-ui/bower.json

@@ -1,5 +1,5 @@
 {
-  "name": "webapp",
+  "name": "productManagerApp",
   "version": "0.0.0",
   "dependencies": {
     "angular": "1.3.0-rc.5",

drools-framework-base-tools-parent/drools-framework-examples/drools-framework-swimmingpool-web-ui/pom.xml

@@ -4,201 +4,84 @@
     <parent>
         <groupId>com.pymmasoftware.jbpm</groupId>
         <artifactId>drools-framework-examples</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>drools-framework-swimmingpool-web-ui</artifactId>
 
 
     <name>swimming pool web site</name>
-    <packaging>war</packaging>
+    <packaging>jar</packaging>
     <description>This projects is a tiny web site to call loyalty drools soap service</description>
-
-
     <dependencyManagement>
         <dependencies>
-            <dependency>
-                <groupId>com.fasterxml.jackson.core</groupId>
-                <artifactId>jackson-core</artifactId>
-                <version>2.3.5</version>
-            </dependency>
-            <dependency>
-                <groupId>com.fasterxml.jackson.core</groupId>
-                <artifactId>jackson-databind</artifactId>
-                <version>2.8.9</version>
-            </dependency>
-            <dependency>
-                <groupId>com.fasterxml.jackson.core</groupId>
-                <artifactId>jackson-annotations</artifactId>
-                <version>2.8.9</version>
-            </dependency>
             <dependency>
                 <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-starter-data-jpa</artifactId>
+                <artifactId>spring-boot-dependencies</artifactId>
-                <version>1.4.0.RELEASE</version>
+                <version>${spring-boot.version}</version>
-            </dependency>
+                <type>pom</type>
-            <dependency>
+                <scope>import</scope>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-starter-data-rest</artifactId>
-                <version>1.4.0.RELEASE</version>
-            </dependency>
-            <dependency>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-starter-web</artifactId>
-                <version>1.4.0.RELEASE</version>
-            </dependency>
-            <dependency>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-starter-thymeleaf</artifactId>
-                <version>1.4.0.RELEASE</version>
-            </dependency>
-            <dependency>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-                <version>1.4.0.RELEASE</version>
-            </dependency>
-            <dependency>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot</artifactId>
-                <version>1.4.0.RELEASE</version>
-            </dependency>
-            <dependency>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-starter-websocket</artifactId>
-                <version>1.4.0.RELEASE</version>
-            </dependency>
-            <dependency>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-autoconfigure</artifactId>
-                <version>1.4.0.RELEASE</version>
-            </dependency>
-            <dependency>
-                <groupId>com.pymmasoftware.jbpm</groupId>
-                <artifactId>drools-framework-kie-server-client-connector</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.springframework</groupId>
-                <artifactId>spring-core</artifactId>
-                <version>4.3.1.RELEASE</version>
-            </dependency>
-            <dependency>
-                <groupId>org.springframework</groupId>
-                <artifactId>spring-web</artifactId>
-                <version>4.3.1.RELEASE</version>
-            </dependency>
-            <dependency>
-                <groupId>org.springframework</groupId>
-                <artifactId>spring-beans</artifactId>
-                <version>4.3.1.RELEASE</version>
-            </dependency>
-            <dependency>
-                <groupId>org.springframework</groupId>
-                <artifactId>spring-expression</artifactId>
-                <version>4.3.1.RELEASE</version>
-            </dependency>
-            <dependency>
-                <groupId>org.springframework</groupId>
-                <artifactId>spring-aop</artifactId>
-                <version>4.3.1.RELEASE</version>
-            </dependency>
-            <dependency>
-                <groupId>org.springframework</groupId>
-                <artifactId>spring-webmvc</artifactId>
-                <version>4.3.1.RELEASE</version>
-            </dependency>
-            <dependency>
-                <groupId>org.springframework</groupId>
-                <artifactId>spring-context</artifactId>
-                <version>4.3.1.RELEASE</version>
-            </dependency>
-            <dependency>
-                <groupId>javax.servlet</groupId>
-                <artifactId>javax.servlet-api</artifactId>
-                <version>3.1.0</version>
             </dependency>
         </dependencies>
     </dependencyManagement>
 
+
     <dependencies>
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
-            <scope>provided</scope>
-        </dependency>
 
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-thymeleaf</artifactId>
-            <exclusions>
-                <exclusion>
-                    <artifactId>logback-classic</artifactId>
-                    <groupId>ch.qos.logback</groupId>
-                </exclusion>
 
-            </exclusions>
+
-        </dependency>
 
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
-            <exclusions>
+            <version>${spring-boot.version}</version>
-                <exclusion>
-                    <groupId>org.springframework.boot</groupId>
-                    <artifactId>spring-boot-starter-tomcat</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-maven-plugin</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-web</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-beans</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-context</artifactId>
-            <version>4.3.1.RELEASE</version>
         </dependency>
+
         <dependency>
             <groupId>com.pymmasoftware.jbpm</groupId>
             <artifactId>drools-framework-swimming-pool-model</artifactId>
             <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-autoconfigure</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-websocket</artifactId>
             <exclusions>
                 <exclusion>
-                    <groupId>org.springframework.boot</groupId>
+                    <groupId>com.fasterxml.jackson.core</groupId>
-                    <artifactId>spring-boot-starter-tomcat</artifactId>
+                    <artifactId>jackson-databind</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <version>2.9.8</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.fasterxml.jackson.core</groupId>
+                    <artifactId>jackson-core</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.fasterxml.jackson.core</groupId>
+                    <artifactId>jackson-annotations</artifactId>
                 </exclusion>
             </exclusions>
         </dependency>
         <dependency>
-            <groupId>com.pymmasoftware.jbpm</groupId>
+            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>drools-framework-kie-server-client-connector</artifactId>
+            <artifactId>jackson-core</artifactId>
+            <version>2.9.8</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
+            <version>2.9.8</version>
         </dependency>
 
     </dependencies>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <start-class>org.chtijbug.swimmingpool.web.Application</start-class>
+        <start-class>org.chtijbug.swimmingpool.web.SwimmingPoolWebUIApplication</start-class>
         <java.version>1.7</java.version>
         <cxf.version>2.7.11</cxf.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -224,21 +107,16 @@
 
     <build>
         <finalName>swimmingpool-web</finalName>
+        <resources>
+            <resource>
+                <directory>${project.basedir}/src/main/resources</directory>
+            </resource>
+            <resource>
+                <directory>${project.build.directory}/generated-resources</directory>
+            </resource>
+        </resources>
         <plugins>
-
+            <!--plugin>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-                <version>1.1.3.RELEASE</version>
-
-            </plugin>
-            <plugin>
-                <artifactId>maven-war-plugin</artifactId>
-                <configuration>
-                    <failOnMissingWebXml>false</failOnMissingWebXml>
-                </configuration>
-            </plugin>
-            <plugin>
                 <groupId>com.github.trecloux</groupId>
                 <artifactId>yeoman-maven-plugin</artifactId>
                 <version>0.1</version>
@@ -252,7 +130,148 @@
                         </goals>
                     </execution>
                 </executions>
+            </plugin-->
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <version>${spring-boot.version}</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>repackage</goal>
+                        </goals>
+                    </execution>
+                </executions>
             </plugin>
+
         </plugins>
     </build>
+    <profiles>
+        <profile>
+            <id>docker-build</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>io.fabric8</groupId>
+                        <artifactId>docker-maven-plugin</artifactId>
+                        <version>0.21.0</version>
+
+                        <configuration>
+                            <!--registry>192.168.1.184:12500</registry-->
+                            <dockerHost>${docker.Host}</dockerHost>
+
+                            <!--  this is for Mac and Amazon Linux -->
+                            <!--dockerHost>unix:///var/run/docker.sock</dockerHost-->
+
+                            <verbose>true</verbose>
+                            <images>
+                                <image>
+                                    <name>swimmingpool-web-ui</name>
+                                    <build>
+                                        <dockerFileDir>${project.basedir}/src/main/docker</dockerFileDir>
+
+                                        <!--copies Jar to the maven directory (uses Assembly system)-->
+                                        <assembly>
+                                            <descriptorRef>artifact</descriptorRef>
+                                        </assembly>
+                                        <tags>
+                                            <tag>latest</tag>
+                                        </tags>
+
+                                    </build>
+
+                                    <run>
+                                        <extraHosts>
+                                            <host>mongodb:192.168.43.94</host>
+                                            <host>elasticsearchhost:192.168.43.94</host>
+                                            <host>kie-wb:192.168.43.94</host>
+                                        </extraHosts>
+                                        <ports>
+                                            <port>8200:8200</port>
+                                        </ports>
+                                    </run>
+                                </image>
+                            </images>
+                        </configuration>
+
+                        <executions>
+
+                            <execution>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>build</goal>
+                                </goals>
+                            </execution>
+
+
+                        </executions>
+
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <profile>
+            <id>docker-deploy</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>io.fabric8</groupId>
+                        <artifactId>docker-maven-plugin</artifactId>
+                        <version>0.21.0</version>
+
+                        <configuration>
+                            <registry>registry.hub.docker.com/pymmasoftware</registry>
+                            <dockerHost>${docker.Host}</dockerHost>
+                            <verbose>true</verbose>
+                            <images>
+                                <image>
+                                    <name>runtime-admin-console:${project.version}</name>
+                                    <alias>runtime-admin-console</alias>
+                                    <build>
+                                        <dockerFileDir>${project.basedir}/src/main/docker</dockerFileDir>
+
+                                        <!--copies Jar to the maven directory (uses Assembly system)-->
+                                        <assembly>
+                                            <descriptorRef>artifact</descriptorRef>
+                                        </assembly>
+                                        <!--tags>
+                                            <tag>latest</tag>
+                                        </tags-->
+
+                                    </build>
+
+                                    <run>
+                                        <extraHosts>
+                                            <host>mongodb:192.168.1.100</host>
+                                        </extraHosts>
+
+                                    </run>
+                                </image>
+                            </images>
+                            <authConfig>
+                                <username>pymmasoftwaredeploy</username>
+                                <password>pymmalomme</password>
+                            </authConfig>
+                            <retries>5</retries>
+                        </configuration>
+
+                        <executions>
+
+
+                            <execution>
+                                <id>mydeploy</id>
+                                <phase>deploy</phase>
+                                <goals>
+                                    <goal>build</goal>
+                                    <goal>push</goal>
+                                </goals>
+                            </execution>
+
+                        </executions>
+
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
 </project>

drools-framework-base-tools-parent/drools-framework-examples/drools-framework-swimmingpool-web-ui/src/main/docker/Dockerfile

@@ -0,0 +1,11 @@
+FROM openjdk:8-jre-slim
+
+EXPOSE 9080
+EXPOSE 8090
+ADD application.properties /application.properties
+ADD maven/swimmingpool-web.jar app.jar
+USER root
+RUN bash -c 'touch /app.jar'
+ENV JAVA_OPTS "-Dspring.config.location=file:./ "
+
+ENTRYPOINT exec java $JAVA_OPTS $PYMMA_OPTS -jar /app.jar

drools-framework-base-tools-parent/drools-framework-examples/drools-framework-swimmingpool-web-ui/src/main/docker/application.properties

@@ -0,0 +1,5 @@
+# See http://docs.spring.io/spring-boot/docs/1.1.4.RELEASE/reference/htmlsingle/#boot-features-external-config-profile-specific-properties
+# for more details about creating profile-specific property files
+# See http://docs.spring.io/spring-boot/docs/1.1.4.RELEASE/reference/htmlsingle/#howto-initialize-a-database-using-jpa
+url.swimmingpool.calculate=http://reverse-proxy:9500/
+server.port=8080

drools-framework-base-tools-parent/drools-framework-examples/drools-framework-swimmingpool-web-ui/src/main/java/org/chtijbug/swimmingpool/web/Application.java

@@ -1,55 +0,0 @@
-/*
- * Copyright 2014 Pymma Software
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * 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.chtijbug.swimmingpool.web;
-
-
-import org.chtijbug.drools.generic.restclient.GenericConnexionConfiguration;
-import org.chtijbug.drools.generic.restclient.rest.UsedRestAPI;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.PropertySource;
-
-
-@Configuration
-@ComponentScan
-
-@EnableAutoConfiguration
-@PropertySource("classpath:application.properties")
-public class Application {
-
-    @Value(value = "${url.swimmingpool.calculate}")
-    private String url;
-    @Value(value = "${url.swimmingpool.calculate.username}")
-    private String username;
-    @Value(value = "${url.swimmingpool.calculate.password}")
-    private String password;
-
-    public static void main(String[] args) {
-        SpringApplication.run(Application.class, args);
-    }
-
-    @Bean
-    public UsedRestAPI serviceCalculate() {
-        GenericConnexionConfiguration swimmingPoolConnexionConfiguration = new GenericConnexionConfiguration(url, username, password);
-
-        return swimmingPoolConnexionConfiguration.getGenericRestAPI();
-
-    }
-}

drools-framework-base-tools-parent/drools-framework-examples/drools-framework-swimmingpool-web-ui/src/main/java/org/chtijbug/swimmingpool/web/CharacterUTF8EncodingFilter.java

@@ -1,21 +0,0 @@
-package org.chtijbug.swimmingpool.web;
-
-import org.springframework.web.filter.CharacterEncodingFilter;
-
-import javax.servlet.annotation.WebFilter;
-import javax.servlet.annotation.WebInitParam;
-
-/**
- * Created by IntelliJ IDEA.
- * Date: 20/10/14
- * Time: 09:27
- * To change this template use File | Settings | File Templates.
- */
-@WebFilter(urlPatterns = {"/*"}, filterName = "CharacterEncodingFilter", initParams = {
-        @WebInitParam(name = "encoding", value = "UTF-8"),
-        @WebInitParam(name = "forceEncoding", value = "true"),
-})
-public class CharacterUTF8EncodingFilter extends CharacterEncodingFilter {
-
-
-}

drools-framework-base-tools-parent/drools-framework-examples/drools-framework-swimmingpool-web-ui/src/main/java/org/chtijbug/swimmingpool/web/QuoteController.java

@@ -1,50 +0,0 @@
-/*
- * Copyright 2014 Pymma Software
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * 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.chtijbug.swimmingpool.web;
-
-
-import org.chtijbug.drools.generic.restclient.rest.UsedRestAPI;
-import org.springframework.web.bind.annotation.*;
-import org.training.leisure.swimmingpool.Quote;
-
-import javax.annotation.Resource;
-
-/**
- * Created by IntelliJ IDEA.
- * Date: 08/10/14
- * Time: 10:37
- * To change this template use File | Settings | File Templates.
- */
-@RestController
-@RequestMapping("/quote")
-public class QuoteController {
-    @Resource
-    private UsedRestAPI serviceCalculate;
-
-    @RequestMapping(value = "/calculate/{containerId:.+}/{className:.+}", method = RequestMethod.PUT)
-    public Quote storeTicket(@PathVariable("containerId") String containerid,
-                             @PathVariable("className") String className,
-                             @RequestBody Quote quoteRequest) {
-        Quote response = null;
-        try {
-            //  response = (Quote) serviceCalculate.runSession(containerid, "swimmingpool.P000", Quote.class.getCanonicalName(), quoteRequest);
-            response = (Quote) serviceCalculate.runSession(containerid, "swimmingpool.P000", className, quoteRequest);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return response;
-    }
-}

drools-framework-base-tools-parent/drools-framework-examples/drools-framework-swimmingpool-web-ui/src/main/java/org/chtijbug/swimmingpool/web/SwimmingPoolWebUIApplication.java

@@ -15,15 +15,19 @@
  */
 package org.chtijbug.swimmingpool.web;
 
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
 
-@Controller
+import org.springframework.boot.SpringApplication;
-public class HomeController {
+import org.springframework.boot.autoconfigure.SpringBootApplication;
 
-    @RequestMapping("/")
+
-    public String home() {
+@SpringBootApplication
-        return "index";
+public class SwimmingPoolWebUIApplication {
+
+
+
+    public static void main(String[] args) {
+        SpringApplication.run(SwimmingPoolWebUIApplication.class, args);
     }
 
-}
+
+}

drools-framework-base-tools-parent/drools-framework-examples/drools-framework-swimmingpool-web-ui/src/main/java/org/chtijbug/swimmingpool/web/WebInitializer.java

@@ -1,32 +0,0 @@
-/*
- * Copyright 2014 Pymma Software
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * 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.chtijbug.swimmingpool.web;
-
-import org.springframework.boot.builder.SpringApplicationBuilder;
-import org.springframework.boot.web.support.SpringBootServletInitializer;
-
-/**
- * Created by IntelliJ IDEA.
- * Date: 07/10/14
- * Time: 14:07
- * To change this template use File | Settings | File Templates.
- */
-public class WebInitializer extends SpringBootServletInitializer {
-    @Override
-    protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
-        return application.sources(Application.class);
-    }
-}

drools-framework-base-tools-parent/drools-framework-examples/drools-framework-swimmingpool-web-ui/src/main/java/org/chtijbug/swimmingpool/web/controller/QuoteController.java

@@ -0,0 +1,92 @@
+/*
+ * Copyright 2014 Pymma Software
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * 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.chtijbug.swimmingpool.web.controller;
+
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.client.RequestCallback;
+import org.springframework.web.client.RestTemplate;
+import org.training.leisure.swimmingpool.Quote;
+
+import java.util.Scanner;
+
+/**
+ * Created by IntelliJ IDEA.
+ * Date: 08/10/14
+ * Time: 10:37
+ * To change this template use File | Settings | File Templates.
+ */
+@RestController
+@RequestMapping("/quote")
+public class QuoteController {
+    private static Logger logger = LoggerFactory.getLogger(QuoteController.class);
+    @Value("${url.swimmingpool.calculate}")
+    private String urlCalcul;
+    private RestTemplate restTemplateKieServer = new RestTemplate();
+    private ObjectMapper mapper = new ObjectMapper();
+
+    @RequestMapping(value = "/calculate/{containerId:.+}", method = RequestMethod.PUT)
+    public Quote storeTicket(@PathVariable("containerId") String containerid,
+                             @RequestBody Quote quoteRequest) {
+        Quote responseMoteur=null;
+        try {
+
+            String completeurl = urlCalcul+"/"+containerid;
+            logger.info("url moteur reco : " + completeurl);
+            ResponseEntity<Quote> response = restTemplateKieServer
+                    .execute(completeurl, HttpMethod.PUT, requestCallback(quoteRequest), clientHttpResponse -> {
+                        Quote extractedResponse = null;
+                        if (clientHttpResponse.getBody() != null) {
+                            Scanner s = new Scanner(clientHttpResponse.getBody()).useDelimiter("\\A");
+                            String result = s.hasNext() ? s.next() : "";
+                            extractedResponse = mapper.readValue(result, Quote.class);
+                        }
+                        ResponseEntity<Quote> extractedValue = new ResponseEntity<>(extractedResponse, clientHttpResponse.getHeaders(), clientHttpResponse.getStatusCode());
+                        return extractedValue;
+                    });
+            Quote reponseMoteur = null;
+            if (response.getBody() != null) {
+                reponseMoteur = response.getBody();
+            } else {
+                reponseMoteur = quoteRequest;
+            }
+            return reponseMoteur;
+
+
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return responseMoteur;
+    }
+    private RequestCallback requestCallback(final Quote updatedInstance) {
+        return clientHttpRequest -> {
+            ObjectMapper mapper = new ObjectMapper();
+            mapper.writeValue(clientHttpRequest.getBody(), updatedInstance);
+            clientHttpRequest.getHeaders().add(
+                    HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE);
+            clientHttpRequest.getHeaders().add(
+                    HttpHeaders.ACCEPT, MediaType.APPLICATION_JSON_VALUE);
+        };
+    }
+}

drools-framework-base-tools-parent/drools-framework-examples/drools-framework-swimmingpool-web-ui/src/main/resources/application.properties

@@ -1,6 +1,7 @@
 # See http://docs.spring.io/spring-boot/docs/1.1.4.RELEASE/reference/htmlsingle/#boot-features-external-config-profile-specific-properties
 # for more details about creating profile-specific property files
 # See http://docs.spring.io/spring-boot/docs/1.1.4.RELEASE/reference/htmlsingle/#howto-initialize-a-database-using-jpa
-url.swimmingpool.calculate=http://localhost:8090/rest/server
+url.swimmingpool.calculate=http://localhost:9500/
 url.swimmingpool.calculate.username=kieserver
 url.swimmingpool.calculate.password=kieserver1!
+server.port=12099

drools-framework-base-tools-parent/drools-framework-examples/drools-framework-swimmingpool-web-ui/src/main/resources/log4j.properties

@@ -0,0 +1,5 @@
+log4j.rootLogger=debug, stdout
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.Target=System.out
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.ConversionPattern=%t %-5p %c{2} - %m%n

drools-framework-base-tools-parent/drools-framework-examples/drools-framework-swimmingpool-web-ui/src/main/resources/static/js/app.js

@@ -66,8 +66,8 @@ productManagerModule.controller('quoteManagerController', function ($scope, $htt
     $scope.productSearch = "";
     $http.defaults.headers.post["Content-Type"] = "application/json";
     $scope.allSessionExecutionDetails = [];
-    $scope.containerid = "dev";
+    $scope.containerid = "dev-pymma-nautic";
-    $scope.aClassName = "org.training.leisure.swimmingpool.Quote";
+    $scope.aClassName = "";
     var _lastGoodResult = '';
     $scope.toPrettyJSON = function (objStr, tabWidth) {
         try {
@@ -107,7 +107,7 @@ productManagerModule.controller('quoteManagerController', function ($scope, $htt
 
     $scope.calculatePrice = function () {
         var myQuote = $scope.quote;
-        $http.put(urlBase + "/swimmingpool-web/quote/calculate/" + $scope.containerid + "/" + $scope.aClassName, myQuote).success(function (data) {
+        $http.put(urlBase + "/quote/calculate/" + $scope.containerid, myQuote).success(function (data) {
             $scope.quoteResult = data;
             $scope.allSessionExecutionDetails = JSON.parse(data.sessionLogging);
             $scope.sessionLogging = JSON.stringify($scope.allSessionExecutionDetails, null, 3);

drools-framework-base-tools-parent/drools-framework-examples/pom.xml

@@ -4,17 +4,21 @@
     <parent>
         <artifactId>drools-framework-base-tools-parent</artifactId>
         <groupId>com.pymmasoftware.jbpm</groupId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>drools-framework-examples</artifactId>
+    <properties>
+        <spring-boot.version>2.1.2.RELEASE</spring-boot.version>
+    </properties>
+
     <packaging>pom</packaging>
     <modules>
-        <module>drools-framework-loyalty-model</module>
+        <!--module>drools-framework-loyalty-model</module-->
         <module>drools-framework-swimming-pool-model</module>
         <module>drools-framework-swimmingpool-web-ui</module>
-        <module>drools-framework-loyalty-web</module>
+        <!--module>drools-framework-loyalty-web</module-->
     </modules>
 
 </project>

drools-framework-base-tools-parent/drools-framework-kie-server-parent/drools-framework-kie-server-client-connector/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>drools-framework-kie-server-parent</artifactId>
         <groupId>com.pymmasoftware.jbpm</groupId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

drools-framework-base-tools-parent/drools-framework-kie-server-parent/drools-framework-kie-server-extension-interface/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>drools-framework-kie-server-parent</artifactId>
         <groupId>com.pymmasoftware.jbpm</groupId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

drools-framework-base-tools-parent/drools-framework-kie-server-parent/drools-framework-kie-server-services-drools/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>drools-framework-kie-server-parent</artifactId>
         <groupId>com.pymmasoftware.jbpm</groupId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

drools-framework-base-tools-parent/drools-framework-kie-server-parent/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>drools-framework-base-tools-parent</artifactId>
         <groupId>com.pymmasoftware.jbpm</groupId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>

drools-framework-base-tools-parent/drools-framework-kie-wb-parent/drools-framework-kie-wb-rest-pojo/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>drools-framework-kie-wb-parent</artifactId>
         <groupId>com.pymmasoftware.jbpm</groupId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.1-SNAPSHOT</version>
     </parent>
     <artifactId>drools-framework-kie-wb-rest-pojo</artifactId>
     <packaging>jar</packaging>

drools-framework-base-tools-parent/drools-framework-kie-wb-parent/kie-drools-framework-rest-backend/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>drools-framework-kie-wb-parent</artifactId>
         <groupId>com.pymmasoftware.jbpm</groupId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>kie-drools-framework-rest-backend</artifactId>

drools-framework-base-tools-parent/drools-framework-kie-wb-parent/kie-wb/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <artifactId>drools-framework-kie-wb-parent</artifactId>
     <groupId>com.pymmasoftware.jbpm</groupId>
-    <version>1.0-SNAPSHOT</version>
+    <version>1.1-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

drools-framework-base-tools-parent/drools-framework-kie-wb-parent/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>drools-framework-base-tools-parent</artifactId>
         <groupId>com.pymmasoftware.jbpm</groupId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>

drools-framework-base-tools-parent/drools-framework-runtime-base/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>drools-framework-base-tools-parent</artifactId>
         <groupId>com.pymmasoftware.jbpm</groupId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.1-SNAPSHOT</version>
     </parent>
 
 

drools-framework-base-tools-parent/drools-framework-runtime-entity/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>drools-framework-base-tools-parent</artifactId>
         <groupId>com.pymmasoftware.jbpm</groupId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>drools-framework-runtime-entity</artifactId>

drools-framework-base-tools-parent/drools-framework-spring-boot-parent/drools-framework-kie-server-chtijbug-drools-springboot-jar/pom.xml

@@ -5,22 +5,19 @@
     <parent>
         <artifactId>drools-framework-spring-boot-parent</artifactId>
         <groupId>com.pymmasoftware.jbpm</groupId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>drools-framework-kie-server-chtijbug-drools-springboot-jar</artifactId>
     <dependencies>
-        <!--dependency>
+        <dependency>
             <groupId>org.kie</groupId>
             <artifactId>kie-server-spring-boot-starter-drools</artifactId>
             <version>${jbpm.version}</version>
-        </dependency-->
-        <dependency>
-            <groupId>com.pymmasoftware.jbpm</groupId>
-            <artifactId>drools-framework-kie-server-spring-boot-starter</artifactId>
-            <version>${project.version}</version>
         </dependency>
+        <!-- https://mvnrepository.com/artifact/org.kie/kie-server-spring-boot-starter-drools -->
+
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter</artifactId>
@@ -48,7 +45,7 @@
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
-                <version>${version.spring-boot}</version>
+                <version>${spring.boot.version}</version>
                 <executions>
                     <execution>
                         <goals>

drools-framework-base-tools-parent/drools-framework-spring-boot-parent/drools-framework-kie-server-springboot-autoconfigure-drools/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>drools-framework-spring-boot-parent</artifactId>
         <groupId>com.pymmasoftware.jbpm</groupId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -126,11 +126,7 @@
                 </exclusion>
             </exclusions>
         </dependency>
-        <dependency>
+
-            <groupId>com.pymmasoftware.jbpm</groupId>
-            <version>${project.version}</version>
-            <artifactId>drools-framework-kie-server-rest-drools</artifactId>
-        </dependency>
 
 
     </dependencies>

drools-framework-base-tools-parent/drools-framework-spring-boot-parent/pom.xml

@@ -5,13 +5,13 @@
     <parent>
         <artifactId>drools-framework-base-tools-parent</artifactId>
         <groupId>com.pymmasoftware.jbpm</groupId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>
 
     <properties>
-        <version.spring-boot>1.5.12.RELEASE</version.spring-boot>
+
         <version.cxf.jaxrs>3.1.11</version.cxf.jaxrs>
     </properties>
     <modules>

drools-framework-base-tools-parent/pom.xml

@@ -5,14 +5,14 @@
     <parent>
         <artifactId>pymma-jbpm-platform-parent</artifactId>
         <groupId>com.pymmasoftware.jbpm</groupId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>
     <artifactId>drools-framework-base-tools-parent</artifactId>
     <modules>
         <module>drools-framework-common</module>
-        <!--module>drools-framework-examples</module-->
+        <module>drools-framework-examples</module>
         <module>drools-framework-kie-server-parent</module>
         <module>drools-framework-runtime-base</module>
         <module>drools-framework-runtime-entity</module>

drools-framework-business-proxy-parent/drools-framework-business-indexer-app/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>drools-framework-business-proxy-parent</artifactId>
         <groupId>com.pymmasoftware.jbpm</groupId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

drools-framework-business-proxy-parent/drools-framework-business-indexer-app/src/main/docker/Dockerfile

@@ -2,7 +2,7 @@ FROM openjdk:8-jre-slim
 
 
 ADD application.properties /application.properties
-ADD maven/drools-framework-business-indexer-app-1.0-SNAPSHOT.jar app.jar
+ADD maven/drools-framework-business-indexer-app-1.1-SNAPSHOT.jar app.jar
 RUN mkdir /root/.ssh
 RUN echo toto > /root/.ssh/known_hosts
 

drools-framework-business-proxy-parent/drools-framework-business-indexer-persistence/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>drools-framework-business-proxy-parent</artifactId>
         <groupId>com.pymmasoftware.jbpm</groupId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

drools-framework-business-proxy-parent/drools-framework-business-proxy-app/pom.xml

@@ -24,7 +24,7 @@
     <parent>
         <groupId>com.pymmasoftware.jbpm</groupId>
         <artifactId>drools-framework-business-proxy-parent</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>drools-framework-business-proxy-app</artifactId>

drools-framework-business-proxy-parent/drools-framework-business-proxy-app/src/main/docker/Dockerfile

@@ -2,15 +2,16 @@ FROM openjdk:8-jre-slim
 
 EXPOSE 9080
 EXPOSE 8090
+EXPOSE 4000
 ADD application.properties /application.properties
-ADD maven/drools-framework-business-proxy-app-1.0-SNAPSHOT.jar app.jar
+ADD maven/drools-framework-business-proxy-app-1.1-SNAPSHOT.jar app.jar
 USER root
 RUN mkdir /m2_kieserver
 RUN mkdir /m2_kieserver/repository
 ADD settings.xml /m2_kieserver/settings.xml
 RUN mkdir /trace
 RUN mkdir /niodir-kieserver
-
+VOLUME /niodir-kieserver
 RUN bash -c 'touch /app.jar'
 ENV JAVA_OPTS "-Dspring.config.location=file:./ -DM2_HOME=/m2_kieserver -Dorg.chtijbug.server.tracedir=/trace -Dorg.appformer.m2repo.url=http://kie-wb:8080/kie-wb/maven2 -Dorg.uberfire.nio.git.dir=/niodir-kieserver -Dkie.maven.settings.custom=/m2_kieserver/settings.xml -Dorg.kie.server.repo=/niodir-kieserver -Dfile.encoding=UTF-8 -Duser.language=fr -Duser.country=FR -Dorg.chtijbug.server.sftpPort=9080"
 

drools-framework-business-proxy-parent/drools-framework-business-reverse-proxy/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>drools-framework-business-proxy-parent</artifactId>
         <groupId>com.pymmasoftware.jbpm</groupId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

drools-framework-business-proxy-parent/drools-framework-business-reverse-proxy/src/main/docker/Dockerfile

@@ -2,7 +2,7 @@ FROM openjdk:8-jre-slim
 
 
 ADD application.properties /application.properties
-ADD maven/drools-framework-business-reverse-proxy-1.0-SNAPSHOT.jar app.jar
+ADD maven/drools-framework-business-reverse-proxy-1.1-SNAPSHOT.jar app.jar
 
 
 

drools-framework-business-proxy-parent/drools-framewwork-business-proxy-persistence/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>drools-framework-business-proxy-parent</artifactId>
         <groupId>com.pymmasoftware.jbpm</groupId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

drools-framework-business-proxy-parent/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>pymma-jbpm-platform-parent</artifactId>
         <groupId>com.pymmasoftware.jbpm</groupId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

pom.xml

@@ -7,7 +7,7 @@
 
     <groupId>com.pymmasoftware.jbpm</groupId>
     <artifactId>pymma-jbpm-platform-parent</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>1.1-SNAPSHOT</version>
     <modules>
         <!--module>kie-wb-webapp</module-->
 
@@ -19,8 +19,8 @@
     <packaging>pom</packaging>
 
     <properties>
-        <jbpm.version>7.19.0.Final</jbpm.version>
+        <jbpm.version>7.20.0.Final</jbpm.version>
-        <spring.boot.version>1.5.12.RELEASE</spring.boot.version>
+        <spring.boot.version>2.1.2.RELEASE</spring.boot.version>
         <spring.version>4.3.16.RELEASE</spring.version>
         <version.thorntail>2.2.1.Final</version.thorntail>
     </properties>