From 7eacb43042db614a33e10c70abb492c09907c0ab Mon Sep 17 00:00:00 2001
From: Martin Kanis <mkanis@redhat.com>
Date: Wed, 19 Dec 2018 11:34:27 +0100
Subject: [PATCH] Update versions and properties for proper alignment

(cherry picked from commit c8be651218b736c072bc1f04e2c32cdd81b72d4e)
---
 dependencies/drools-bom/pom.xml                | 3 ++-
 pom.xml                                        | 9 ++++++---
 testsuite/integration-arquillian/tests/pom.xml | 2 +-
 testsuite/jetty/jetty92/pom.xml                | 2 --
 testsuite/jetty/jetty93/pom.xml                | 2 --
 testsuite/jetty/jetty94/pom.xml                | 2 --
 6 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/dependencies/drools-bom/pom.xml b/dependencies/drools-bom/pom.xml
index 8618357b00..03ca397865 100644
--- a/dependencies/drools-bom/pom.xml
+++ b/dependencies/drools-bom/pom.xml
@@ -21,6 +21,7 @@
         <xstream.version>1.4.10</xstream.version>
         <antlr-runtime.version>3.5.2</antlr-runtime.version>
         <ant.version>1.8.4</ant.version>
+        <ant-launcher.version>1.8.4</ant-launcher.version>
         <maven.version>3.3.9</maven.version>
         <wagon.version>3.0.0</wagon.version>
         <plexus-classworlds.version>2.5.2</plexus-classworlds.version>
@@ -77,7 +78,7 @@
             <dependency>
                 <groupId>org.apache.ant</groupId>
                 <artifactId>ant-launcher</artifactId>
-                <version>${ant.version}</version>
+                <version>${ant-launcher.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.maven</groupId>
diff --git a/pom.xml b/pom.xml
index 62fe1131bd..9c483ff9fd 100755
--- a/pom.xml
+++ b/pom.xml
@@ -63,6 +63,7 @@
         <h2.version>1.4.193</h2.version>
         <javax.persistence.version>2.2</javax.persistence.version>
         <hibernate.core.version>5.3.6.Final</hibernate.core.version>
+        <hibernate.c3p0.version>5.3.6.Final</hibernate.c3p0.version>
         <infinispan.version>9.3.1.Final</infinispan.version>
         <jackson.version>2.9.5</jackson.version>
         <javax.mail.version>1.6.1</javax.mail.version>
@@ -75,7 +76,9 @@
         <jboss.spec.javax.servlet.jsp.jboss-jsp-api_2.3_spec.version>1.0.3.Final</jboss.spec.javax.servlet.jsp.jboss-jsp-api_2.3_spec.version>
         <log4j.version>1.2.17</log4j.version>
         <resteasy.version>3.6.1.Final</resteasy.version>
+        <resteasy.undertow.version>3.6.1.Final</resteasy.undertow.version>
         <owasp.html.sanitizer.version>20180219.1</owasp.html.sanitizer.version>
+        <slf4j-api.version>1.7.22</slf4j-api.version>
         <slf4j.version>1.7.22</slf4j.version>
         <sun.istack.version>3.0.5</sun.istack.version>
         <sun.jaxb.version>2.3.0</sun.jaxb.version>
@@ -304,7 +307,7 @@
             <dependency>
                 <groupId>org.jboss.resteasy</groupId>
                 <artifactId>resteasy-undertow</artifactId>
-                <version>${resteasy.version}</version>
+                <version>${resteasy.undertow.version}</version>
                 <exclusions>
                     <exclusion>
                         <groupId>io.undertow</groupId>
@@ -444,7 +447,7 @@
             <dependency>
                 <groupId>org.hibernate</groupId>
                 <artifactId>hibernate-c3p0</artifactId>
-                <version>${hibernate.core.version}</version>
+                <version>${hibernate.c3p0.version}</version>
                 <scope>test</scope>
             </dependency>
             <dependency>
@@ -571,7 +574,7 @@
             <dependency>
                 <groupId>org.slf4j</groupId>
                 <artifactId>slf4j-api</artifactId>
-                <version>${slf4j.version}</version>
+                <version>${slf4j-api.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.slf4j</groupId>
diff --git a/testsuite/integration-arquillian/tests/pom.xml b/testsuite/integration-arquillian/tests/pom.xml
index 4e5d628468..94ada4cd76 100755
--- a/testsuite/integration-arquillian/tests/pom.xml
+++ b/testsuite/integration-arquillian/tests/pom.xml
@@ -1483,7 +1483,7 @@
                 <dependency>
                     <groupId>org.apache.ant</groupId>
                     <artifactId>ant</artifactId>
-                    <version>1.9.2</version>
+                    <version>1.8.4</version>
                     <type>jar</type>
                 </dependency>
 
diff --git a/testsuite/jetty/jetty92/pom.xml b/testsuite/jetty/jetty92/pom.xml
index 3c1ac146a5..da14f0c54e 100755
--- a/testsuite/jetty/jetty92/pom.xml
+++ b/testsuite/jetty/jetty92/pom.xml
@@ -57,12 +57,10 @@
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
-            <version>1.6.1</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-log4j12</artifactId>
-            <version>1.6.1</version>
         </dependency>
         <dependency>
             <groupId>org.jboss.spec.javax.servlet</groupId>
diff --git a/testsuite/jetty/jetty93/pom.xml b/testsuite/jetty/jetty93/pom.xml
index 55bcba134d..0f851fbd23 100644
--- a/testsuite/jetty/jetty93/pom.xml
+++ b/testsuite/jetty/jetty93/pom.xml
@@ -54,12 +54,10 @@
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
-            <version>1.6.1</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-log4j12</artifactId>
-            <version>1.6.1</version>
         </dependency>
         <dependency>
             <groupId>org.jboss.spec.javax.servlet</groupId>
diff --git a/testsuite/jetty/jetty94/pom.xml b/testsuite/jetty/jetty94/pom.xml
index 3dfced60f3..6cce404e27 100644
--- a/testsuite/jetty/jetty94/pom.xml
+++ b/testsuite/jetty/jetty94/pom.xml
@@ -54,12 +54,10 @@
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
-            <version>1.6.1</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-log4j12</artifactId>
-            <version>1.6.1</version>
         </dependency>
         <dependency>
             <groupId>org.jboss.spec.javax.servlet</groupId>