Skip to content

Commit

Permalink
Switch to official hotswap-agent jars
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
admin committed Nov 6, 2019
1 parent d7ce6b5 commit 1575f43
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 2 deletions.
3 changes: 3 additions & 0 deletions axelor-core/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 -> {
Expand Down
7 changes: 6 additions & 1 deletion gradle/libs.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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",
]

0 comments on commit 1575f43

Please sign in to comment.