From 1e241deb2a41bfb131e7bb29928cdbe6843fc410 Mon Sep 17 00:00:00 2001
From: Colm O hEigeartaigh <coheigea@apache.org>
Date: Tue, 27 Aug 2019 15:11:13 +0100
Subject: [PATCH] AMQ-7292 - WebConsole problem due to missing ecj jar

---
 activemq-web-console/pom.xml                 | 6 +++---
 assembly/pom.xml                             | 4 ++--
 assembly/src/main/descriptors/common-bin.xml | 2 +-
 pom.xml                                      | 1 +
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/activemq-web-console/pom.xml b/activemq-web-console/pom.xml
index ed3c3f3259..cfc36398e0 100644
--- a/activemq-web-console/pom.xml
+++ b/activemq-web-console/pom.xml
@@ -251,9 +251,9 @@
       <scope>test</scope>
     </dependency>
      <dependency>
-      <groupId>org.eclipse.jetty.orbit</groupId>
-      <artifactId>org.eclipse.jdt.core</artifactId>
-      <version>3.8.2.v20130121</version>
+      <groupId>org.eclipse.jdt</groupId>
+      <artifactId>ecj</artifactId>
+      <version>${ecj.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/assembly/pom.xml b/assembly/pom.xml
index d4546babf2..485a93e4e6 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -333,8 +333,8 @@
     </dependency>
     <dependency>
       <groupId>org.eclipse.jdt</groupId>
-      <artifactId>core</artifactId>
-      <version>3.1.1</version>
+      <artifactId>ecj</artifactId>
+      <version>${ecj.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.derby</groupId>
diff --git a/assembly/src/main/descriptors/common-bin.xml b/assembly/src/main/descriptors/common-bin.xml
index d9bf1de36d..aee0108111 100644
--- a/assembly/src/main/descriptors/common-bin.xml
+++ b/assembly/src/main/descriptors/common-bin.xml
@@ -280,7 +280,7 @@
 
         <include>org.apache.geronimo.specs:geronimo-annotation_1.0_spec</include>
         <include>org.ow2.asm:asm</include>
-        <include>org.eclipse.jetty.orbit:org.eclipse.jdt.core</include>
+        <include>org.eclipse.jdt:ecj</include>
 
         <!-- Atom/RSS support -->
         <include>com.rometools:rome</include>
diff --git a/pom.xml b/pom.xml
index b735b31ad4..bbf5d5787e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -61,6 +61,7 @@
     <commons-primitives-version>1.0</commons-primitives-version>
     <commons-net-version>3.6</commons-net-version>
     <directory-version>2.0.0.AM25</directory-version>
+    <ecj.version>3.17.0</ecj.version>
     <ftpserver-version>1.1.1</ftpserver-version>
     <geronimo-version>1.0</geronimo-version>
     <guava-version>28.0-jre</guava-version>