diff --git a/.mergify.yml b/.mergify.yml
new file mode 100644
index 000000000000..fac2166e311e
--- /dev/null
+++ b/.mergify.yml
@@ -0,0 +1,7 @@
+pull_request_rules:
+  - name: Automatic merge on approval
+    conditions:
+      - "#approved-reviews-by>=1"
+    actions:
+      merge:
+        method: merge
diff --git a/jhipster-modules/jhipster-microservice/dealer-app/pom.xml b/jhipster-modules/jhipster-microservice/dealer-app/pom.xml
index 056bd60f3332..46a26033dfbb 100644
--- a/jhipster-modules/jhipster-microservice/dealer-app/pom.xml
+++ b/jhipster-modules/jhipster-microservice/dealer-app/pom.xml
@@ -33,7 +33,7 @@
         <liquibase-hibernate5.version>3.6</liquibase-hibernate5.version>
         <liquibase-slf4j.version>2.0.0</liquibase-slf4j.version>
         <liquibase.version>3.6.2</liquibase.version>
-        <logstash-logback-encoder.version>4.8</logstash-logback-encoder.version>
+        <logstash-logback-encoder.version>6.3</logstash-logback-encoder.version>
         <m2e.apt.activation>jdt_apt</m2e.apt.activation>
         <mapstruct.version>1.1.0.Final</mapstruct.version>
         <maven-eclipse-plugin.version>2.10</maven-eclipse-plugin.version>
@@ -44,8 +44,8 @@
         <metrics-spring.version>3.1.3</metrics-spring.version>
         <node.version>v6.10.0</node.version>
         <!-- These remain empty unless the corresponding profile is active -->
-        <profile.no-liquibase />
-        <profile.swagger />
+        <profile.no-liquibase/>
+        <profile.swagger/>
         <!-- Sonar properties -->
         <project.testresult.directory>${project.build.directory}/test-results</project.testresult.directory>
         <prometheus-simpleclient.version>0.0.20</prometheus-simpleclient.version>
@@ -439,7 +439,7 @@
                                         </goals>
                                     </pluginExecutionFilter>
                                     <action>
-                                        <ignore />
+                                        <ignore/>
                                     </action>
                                 </pluginExecution>
                             </pluginExecutions>
@@ -633,9 +633,9 @@
                     <diffChangeLogFile>src/main/resources/config/liquibase/changelog/${maven.build.timestamp}_changelog.xml</diffChangeLogFile>
                     <driver>org.h2.Driver</driver>
                     <url>jdbc:h2:file:./target/h2db/db/dealerapp</url>
-                    <defaultSchemaName />
+                    <defaultSchemaName/>
                     <username>dealerapp</username>
-                    <password />
+                    <password/>
                     <referenceUrl>hibernate:spring:com.dealer.app.domain?dialect=org.hibernate.dialect.H2Dialect&amp;hibernate.physical_naming_strategy=org.springframework.boot.orm.jpa.hibernate.SpringPhysicalNamingStrategy&amp;hibernate.implicit_naming_strategy=org.springframework.boot.orm.jpa.hibernate.SpringImplicitNamingStrategy</referenceUrl>
                     <verbose>true</verbose>
                     <logging>debug</logging>
@@ -682,7 +682,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-war-plugin</artifactId>
-                        <configuration />
+                        <configuration/>
                     </plugin>
                 </plugins>
             </build>
@@ -721,7 +721,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-war-plugin</artifactId>
-                        <configuration />
+                        <configuration/>
                     </plugin>
                     <plugin>
                         <groupId>org.springframework.boot</groupId>
diff --git a/json-modules/json/src/main/webapp/package.json b/json-modules/json/src/main/webapp/package.json
index 5dae00059373..f321fc1db53a 100644
--- a/json-modules/json/src/main/webapp/package.json
+++ b/json-modules/json/src/main/webapp/package.json
@@ -4,8 +4,8 @@
     "version": "0.0.1",
     "license": "MIT",
     "dependencies": {
-         "typings": "0.6.5",
-         "jsonforms": "0.0.19",
+         "typings": "0.7.0",
+         "jsonforms": "0.0.20",
          "bootstrap": "3.3.6"
      }
 }
\ No newline at end of file