From 1575f436a6c3d49d8cd81058e374f17a19ae6965 Mon Sep 17 00:00:00 2001
From: admin <admin@axelor.com>
Date: Wed, 6 Nov 2019 12:52:42 +0100
Subject: [PATCH] Switch to official hotswap-agent jars

Also, removed hibernate plugin as it's not working properly
in our case because of ehcache as L2 cache.

Hibernate support will be added later.
---
 axelor-core/build.gradle                                   | 3 +++
 .../java/com/axelor/gradle/support/HotswapSupport.java     | 2 +-
 gradle/libs.gradle                                         | 7 ++++++-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/axelor-core/build.gradle b/axelor-core/build.gradle
index 5536ff5a6f..a9b894571d 100644
--- a/axelor-core/build.gradle
+++ b/axelor-core/build.gradle
@@ -10,6 +10,9 @@ dependencies {
   testImplementation project(":axelor-test")
 
   api project(":axelor-common")
+
+  // these dependencies will be excluded from war package
+  implementation libs.hotswap_agent
   implementation project(":axelor-tomcat")
 
   api libs.groovy
diff --git a/axelor-gradle/src/main/java/com/axelor/gradle/support/HotswapSupport.java b/axelor-gradle/src/main/java/com/axelor/gradle/support/HotswapSupport.java
index 83e709b209..a2a9907656 100644
--- a/axelor-gradle/src/main/java/com/axelor/gradle/support/HotswapSupport.java
+++ b/axelor-gradle/src/main/java/com/axelor/gradle/support/HotswapSupport.java
@@ -75,7 +75,7 @@ public static List<String> getAgentArgs(Project project, boolean auto) {
     final List<String> args = new ArrayList<>();
     tomcat.getFiles().stream()
         .filter(f -> f.getName().endsWith(".jar"))
-        .filter(f -> f.getName().startsWith("hotswap-agent"))
+        .filter(f -> f.getName().startsWith("hotswap-agent-core"))
         .findFirst()
         .ifPresent(
             agentJar -> {
diff --git a/gradle/libs.gradle b/gradle/libs.gradle
index 0a7171027e..e82fa781c4 100644
--- a/gradle/libs.gradle
+++ b/gradle/libs.gradle
@@ -234,4 +234,9 @@ libs.tomcat_embed = [
 ]
 
 // currently deployed on axelor repo
-libs.hotswap_agent = "org.hotswap.agent:hotswap-agent:1.3.0"
+libs.hotswap_agent = [
+  "org.hotswapagent:hotswap-agent-core:1.3.0",
+  "org.hotswapagent:hotswap-agent-tomcat-plugin:1.3.0",
+  "org.hotswapagent:hotswap-agent-logback-plugin:1.3.0",
+  "org.hotswapagent:hotswap-agent-proxy-plugin:1.3.0",
+]