From 679ef4d4b08ff68aa05e5fd2f174a62e9a99ed5a Mon Sep 17 00:00:00 2001
From: Alan Davis <alan.davis@alfresco.com>
Date: Wed, 22 Jul 2020 18:51:59 +0100
Subject: [PATCH] HB etc in latest build

---
 packaging/war/pom.xml |  2 +-
 pom.xml               | 17 +++++++++++------
 repository/pom.xml    |  5 -----
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml
index a26e5bd0ee..bb6473b035 100644
--- a/packaging/war/pom.xml
+++ b/packaging/war/pom.xml
@@ -187,7 +187,7 @@
 
             <plugin>
                 <artifactId>maven-war-plugin</artifactId>
-                <version>3.2.3</version>
+                <version>3.3.1</version>
                 <!-- This allows overlays to be prepared on the FS for minification and faster run -->
                 <executions>
                     <execution>
diff --git a/pom.xml b/pom.xml
index 2c46d1e4f5..4f53508bca 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,9 +38,12 @@
         <dependency.alfresco-trashcan-cleaner.version>2.3</dependency.alfresco-trashcan-cleaner.version>
         <dependency.alfresco-jlan.version>7.1</dependency.alfresco-jlan.version>
         <dependency.alfresco-server-root.version>6.0.1</dependency.alfresco-server-root.version>
-        <dependency.alfresco-api-explorer.version>6.3.0</dependency.alfresco-api-explorer.version>
+        <dependency.alfresco-api-explorer.version>7.0.0-A1</dependency.alfresco-api-explorer.version>
         <dependency.alfresco-messaging-repo.version>1.2.15</dependency.alfresco-messaging-repo.version>
         <dependency.alfresco-log-sanitizer.version>0.2</dependency.alfresco-log-sanitizer.version>
+        <dependency.activiti-engine.version>5.23.0</dependency.activiti-engine.version>
+        <dependency.activiti.version>5.23.0</dependency.activiti.version>
+        <dependency.transform.model.version>1.0.2.10</dependency.transform.model.version>
 
         <dependency.spring.version>5.2.7.RELEASE</dependency.spring.version>
         <dependency.antlr.version>3.5.2</dependency.antlr.version>
@@ -51,6 +54,8 @@
         <dependency.opencmis.version>1.0.0</dependency.opencmis.version>
         <dependency.pdfbox.version>2.0.20</dependency.pdfbox.version>
         <dependency.webscripts.version>8.5</dependency.webscripts.version>
+        <dependency.bouncycastle.version>1.66</dependency.bouncycastle.version>
+        <dependency.mockito-core.version>3.4.4</dependency.mockito-core.version>
 
         <alfresco.googledrive.version>3.2.0</alfresco.googledrive.version>
         <alfresco.aos-module.version>1.3.1</alfresco.aos-module.version>
@@ -62,7 +67,7 @@
         <dependency.tas-utility.version>3.0.21</dependency.tas-utility.version>
         <dependency.rest-assured.version>3.3.0</dependency.rest-assured.version>
         <dependency.javax.json.version>1.1.4</dependency.javax.json.version>
-        <dependency.tas-restapi.version>1.43</dependency.tas-restapi.version>
+        <dependency.tas-restapi.version>1.46</dependency.tas-restapi.version>
         <dependency.tas-cmis.version>1.13</dependency.tas-cmis.version>
         <dependency.tas-email.version>1.8</dependency.tas-email.version>
         <dependency.tas-webdav.version>1.6</dependency.tas-webdav.version>
@@ -314,7 +319,7 @@
             <dependency>
                 <groupId>org.json</groupId>
                 <artifactId>json</artifactId>
-                <version>20160212</version>
+                <version>20090211</version>
             </dependency>
             <dependency>
                 <groupId>org.springframework</groupId>
@@ -500,12 +505,12 @@
             <dependency>
                 <groupId>org.bouncycastle</groupId>
                 <artifactId>bcprov-jdk15on</artifactId>
-                <version>1.66</version>
+                <version>${dependency.bouncycastle.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.bouncycastle</groupId>
                 <artifactId>bcmail-jdk15on</artifactId>
-                <version>1.66</version>
+                <version>${dependency.bouncycastle.version}</version>
             </dependency>
             <dependency>
                 <groupId>xerces</groupId>
@@ -668,7 +673,7 @@
             <dependency>
                 <groupId>org.mockito</groupId>
                 <artifactId>mockito-core</artifactId>
-                <version>3.4.4</version>
+                <version>${dependency.mockito-core.version}</version>
                 <scope>test</scope>
             </dependency>
             <dependency>
diff --git a/repository/pom.xml b/repository/pom.xml
index a9f4442c81..0bdea4bb70 100644
--- a/repository/pom.xml
+++ b/repository/pom.xml
@@ -36,16 +36,11 @@
 
         <dependency.alfresco-legacy-lucene.version>6.2</dependency.alfresco-legacy-lucene.version>
         <dependency.alfresco-greenmail.version>6.2</dependency.alfresco-greenmail.version>
-        <dependency.alfresco-hb-data-sender.version>1.0.12</dependency.alfresco-hb-data-sender.version>
-        <dependency.transform.model.version>1.0.2.10</dependency.transform.model.version>
 
         <dependency.spring-security.version>5.2.1.RELEASE</dependency.spring-security.version>
-        <dependency.httpcomponents.version>4.5.10</dependency.httpcomponents.version>
         <dependency.truezip.version>7.7.10</dependency.truezip.version>
         <dependency.poi.version>4.1.2</dependency.poi.version>
         <dependency.ooxml-schemas.version>1.4</dependency.ooxml-schemas.version>
-        <dependency.activiti-engine.version>5.23.0</dependency.activiti-engine.version>
-        <dependency.activiti.version>5.23.0</dependency.activiti.version>
         <!-- REPO-4964 -->
         <dependency.keycloak.version>11.0.0-alfresco-001</dependency.keycloak.version>
         <dependency.jboss.logging.version>3.4.1.Final</dependency.jboss.logging.version>