From a65d8f7ab99be4810c9599e64a4f190613dffaa5 Mon Sep 17 00:00:00 2001
From: alandavis <alan.davis@alfresco.com>
Date: Mon, 27 Nov 2017 17:52:09 +0000
Subject: [PATCH] Feature/repo 2908 jod (#9)

REPO-2910 Replace ooo.direct code with jodconverter code
---
 docker/Dockerfile | 7 +++----
 pom.xml           | 4 ++--
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 41e4c6bbcc..464817b431 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -17,10 +17,9 @@ RUN echo -e '\n\
 alfresco-pdf-renderer.root=/usr/bin/\n\
 alfresco-pdf-renderer.exe=${alfresco-pdf-renderer.root}/alfresco-pdf-renderer\n\
 \n\
-ooo.enabled=true\n\
-ooo.port=8100\n\
-ooo.exe=/opt/libreoffice5.4/program/soffice.bin\n\
-jodconverter.enabled=false\n\
+jodconverter.enabled=true\n\
+jodconverter.portNumbers=8100\n\
+jodconverter.officeHome=/opt/libreoffice5.4/\n\
 \n\
 img.root=/usr/lib64/ImageMagick-7.0.7\n\
 img.coders=/usr/lib64/ImageMagick-7.0.7/modules-Q16HDRI/coders\n\
diff --git a/pom.xml b/pom.xml
index 5c53d4745f..9bc71fc4cd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -40,8 +40,8 @@
         <!-- Set to "Community Early Access" to add to the version.edition property in version.properties -->
         <version.edition>Community</version.edition>
 
-        <dependency.alfresco-repository.version>6.10</dependency.alfresco-repository.version>
-        <dependency.alfresco-remote-api.version>6.6</dependency.alfresco-remote-api.version>
+        <dependency.alfresco-repository.version>6.12</dependency.alfresco-repository.version>
+        <dependency.alfresco-remote-api.version>6.7</dependency.alfresco-remote-api.version>
         <dependency.alfresco-trashcan-cleaner.version>2.2</dependency.alfresco-trashcan-cleaner.version>
         <dependency.alfresco-core.version>6.15</dependency.alfresco-core.version>
         <dependency.alfresco-data-model.version>6.22</dependency.alfresco-data-model.version>