From 5cb686d49b910c0613c3723c976955a0efa8e2a2 Mon Sep 17 00:00:00 2001
From: Sean Flanigan <sflaniga@redhat.com>
Date: Fri, 2 Jun 2017 11:14:14 +1000
Subject: [PATCH] Use private antlr module for compatibility with Hibernate

Avoids `java.lang.ClassCastException: antlr.CommonToken cannot be cast to
antlr.Token`. Alternatively, we could use
`-DANTLR_USE_DIRECT_CLASS_LOADING=true` or repackage antlr under a different
package name, but by the time the private module becomes a problem, we can
probably delete MigrateSeamTextToCommonMark.
---
 server/zanata-war/pom.xml                                       | 1 +
 .../main/webapp-jboss/WEB-INF/jboss-deployment-structure.xml    | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/server/zanata-war/pom.xml b/server/zanata-war/pom.xml
index 44a5e073053..55a1eda8b65 100644
--- a/server/zanata-war/pom.xml
+++ b/server/zanata-war/pom.xml
@@ -981,6 +981,7 @@
     <dependency>
       <groupId>antlr</groupId>
       <artifactId>antlr</artifactId>
+      <scope>provided</scope>
     </dependency>
 
     <dependency>
diff --git a/server/zanata-war/src/main/webapp-jboss/WEB-INF/jboss-deployment-structure.xml b/server/zanata-war/src/main/webapp-jboss/WEB-INF/jboss-deployment-structure.xml
index 2903e14b98b..0dc365614e9 100644
--- a/server/zanata-war/src/main/webapp-jboss/WEB-INF/jboss-deployment-structure.xml
+++ b/server/zanata-war/src/main/webapp-jboss/WEB-INF/jboss-deployment-structure.xml
@@ -12,6 +12,8 @@
       <!-- end of unsupported modules -->
 
       <!-- start of private modules -->
+      <!-- Needed by MigrateSeamTextToCommonMark -->
+      <module name="org.antlr" />
       <!-- end of private modules -->
 
       <!-- start of deprecated modules -->