From c9743063f51499f7af8e4ea21cc08516d323bc0b Mon Sep 17 00:00:00 2001 From: alandavis Date: Fri, 20 Sep 2019 10:01:49 +0100 Subject: [PATCH 1/3] REPO-4452 Add local transformer pipelines (#121) Set priorities on 5 Tika transform routes so they are not used if LibreOffice is available. This currently has no impact on the Transform Service (priorities are not used for routing), but does on repository LocalTransforms as the wrong T-Engine is selected. --- .../src/main/resources/engine_config.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/alfresco-docker-tika/src/main/resources/engine_config.json b/alfresco-docker-tika/src/main/resources/engine_config.json index b747015f..ddf79787 100644 --- a/alfresco-docker-tika/src/main/resources/engine_config.json +++ b/alfresco-docker-tika/src/main/resources/engine_config.json @@ -319,7 +319,7 @@ {"sourceMediaType": "application/vnd.oasis.opendocument.spreadsheet", "targetMediaType": "application/xhtml+xml"}, {"sourceMediaType": "application/vnd.oasis.opendocument.spreadsheet", "targetMediaType": "text/xml"}, - {"sourceMediaType": "application/vnd.oasis.opendocument.text", "targetMediaType": "text/html"}, + {"sourceMediaType": "application/vnd.oasis.opendocument.text", "priority": 55, "targetMediaType": "text/html"}, {"sourceMediaType": "application/vnd.oasis.opendocument.text", "targetMediaType": "text/plain"}, {"sourceMediaType": "application/vnd.oasis.opendocument.text", "targetMediaType": "application/xhtml+xml"}, {"sourceMediaType": "application/vnd.oasis.opendocument.text", "targetMediaType": "text/xml"}, @@ -339,12 +339,12 @@ {"sourceMediaType": "application/vnd.oasis.opendocument.presentation-template", "targetMediaType": "application/xhtml+xml"}, {"sourceMediaType": "application/vnd.oasis.opendocument.presentation-template", "targetMediaType": "text/xml"}, - {"sourceMediaType": "application/vnd.oasis.opendocument.spreadsheet-template", "targetMediaType": "text/html"}, + {"sourceMediaType": "application/vnd.oasis.opendocument.spreadsheet-template", "priority": 55, "targetMediaType": "text/html"}, {"sourceMediaType": "application/vnd.oasis.opendocument.spreadsheet-template", "targetMediaType": "text/plain"}, {"sourceMediaType": "application/vnd.oasis.opendocument.spreadsheet-template", "targetMediaType": "application/xhtml+xml"}, {"sourceMediaType": "application/vnd.oasis.opendocument.spreadsheet-template", "targetMediaType": "text/xml"}, - {"sourceMediaType": "application/vnd.oasis.opendocument.text-template", "targetMediaType": "text/html"}, + {"sourceMediaType": "application/vnd.oasis.opendocument.text-template", "priority": 55, "targetMediaType": "text/html"}, {"sourceMediaType": "application/vnd.oasis.opendocument.text-template", "targetMediaType": "text/plain"}, {"sourceMediaType": "application/vnd.oasis.opendocument.text-template", "targetMediaType": "application/xhtml+xml"}, {"sourceMediaType": "application/vnd.oasis.opendocument.text-template", "targetMediaType": "text/xml"}, @@ -408,7 +408,7 @@ {"sourceMediaType": "application/rss+xml", "targetMediaType": "application/xhtml+xml"}, {"sourceMediaType": "application/rss+xml", "targetMediaType": "text/xml"}, - {"sourceMediaType": "application/rtf", "targetMediaType": "text/html"}, + {"sourceMediaType": "application/rtf", "priority": 55, "targetMediaType": "text/html"}, {"sourceMediaType": "application/rtf", "targetMediaType": "text/plain"}, {"sourceMediaType": "application/rtf", "targetMediaType": "application/xhtml+xml"}, {"sourceMediaType": "application/rtf", "targetMediaType": "text/xml"}, @@ -423,7 +423,7 @@ {"sourceMediaType": "application/vnd.openxmlformats-officedocument.presentationml.slide", "targetMediaType": "application/xhtml+xml"}, {"sourceMediaType": "application/vnd.openxmlformats-officedocument.presentationml.slide", "targetMediaType": "text/xml"}, - {"sourceMediaType": "application/vnd.sun.xml.writer", "targetMediaType": "text/html"}, + {"sourceMediaType": "application/vnd.sun.xml.writer", "priority": 55, "targetMediaType": "text/html"}, {"sourceMediaType": "application/vnd.sun.xml.writer", "targetMediaType": "text/plain"}, {"sourceMediaType": "application/vnd.sun.xml.writer", "targetMediaType": "application/xhtml+xml"}, {"sourceMediaType": "application/vnd.sun.xml.writer", "targetMediaType": "text/xml"}, From f9a2ec59ec68590ed217c00eb39e672c0cb7dd39 Mon Sep 17 00:00:00 2001 From: Travis CI User Date: Fri, 20 Sep 2019 09:50:27 +0000 Subject: [PATCH 2/3] [maven-release-plugin][skip ci] prepare release 2.1.0-RC2 --- alfresco-docker-alfresco-pdf-renderer/pom.xml | 2 +- alfresco-docker-imagemagick/pom.xml | 2 +- alfresco-docker-libreoffice/pom.xml | 2 +- alfresco-docker-tika/pom.xml | 2 +- alfresco-docker-transform-misc/pom.xml | 2 +- alfresco-transformer-base/pom.xml | 4 ++-- pom.xml | 4 ++-- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/alfresco-docker-alfresco-pdf-renderer/pom.xml b/alfresco-docker-alfresco-pdf-renderer/pom.xml index fcf75f4d..9a39ee12 100644 --- a/alfresco-docker-alfresco-pdf-renderer/pom.xml +++ b/alfresco-docker-alfresco-pdf-renderer/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-transform-core - 2.1.0-RC2-SNAPSHOT + 2.1.0-RC2 ../pom.xml diff --git a/alfresco-docker-imagemagick/pom.xml b/alfresco-docker-imagemagick/pom.xml index 878ecc57..4cfefb84 100644 --- a/alfresco-docker-imagemagick/pom.xml +++ b/alfresco-docker-imagemagick/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-transform-core - 2.1.0-RC2-SNAPSHOT + 2.1.0-RC2 ../pom.xml diff --git a/alfresco-docker-libreoffice/pom.xml b/alfresco-docker-libreoffice/pom.xml index 505caf94..0157efd2 100644 --- a/alfresco-docker-libreoffice/pom.xml +++ b/alfresco-docker-libreoffice/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-transform-core - 2.1.0-RC2-SNAPSHOT + 2.1.0-RC2 ../pom.xml diff --git a/alfresco-docker-tika/pom.xml b/alfresco-docker-tika/pom.xml index 03e565c6..a01d89df 100644 --- a/alfresco-docker-tika/pom.xml +++ b/alfresco-docker-tika/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-transform-core - 2.1.0-RC2-SNAPSHOT + 2.1.0-RC2 ../pom.xml diff --git a/alfresco-docker-transform-misc/pom.xml b/alfresco-docker-transform-misc/pom.xml index 844cfd73..0107b703 100644 --- a/alfresco-docker-transform-misc/pom.xml +++ b/alfresco-docker-transform-misc/pom.xml @@ -9,7 +9,7 @@ org.alfresco alfresco-transform-core - 2.1.0-RC2-SNAPSHOT + 2.1.0-RC2 ../pom.xml diff --git a/alfresco-transformer-base/pom.xml b/alfresco-transformer-base/pom.xml index 42dd9f59..932ef15a 100644 --- a/alfresco-transformer-base/pom.xml +++ b/alfresco-transformer-base/pom.xml @@ -4,12 +4,12 @@ org.alfresco alfresco-transform-core - 2.1.0-RC2-SNAPSHOT + 2.1.0-RC2 ../pom.xml alfresco-transformer-base - 2.1.0-RC2-SNAPSHOT + 2.1.0-RC2 diff --git a/pom.xml b/pom.xml index 6fc40de3..ca681be1 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ org.alfresco alfresco-transform-core - 2.1.0-RC2-SNAPSHOT + 2.1.0-RC2 pom @@ -45,7 +45,7 @@ scm:git:https://github.com/Alfresco/alfresco-transform-core.git scm:git:https://github.com/Alfresco/alfresco-transform-core.git https://github.com/Alfresco/alfresco-transform-core - HEAD + 2.1.0-RC2 From 694cd5dddd3ce53e80017a44110129d82f886512 Mon Sep 17 00:00:00 2001 From: Travis CI User Date: Fri, 20 Sep 2019 09:50:33 +0000 Subject: [PATCH 3/3] [maven-release-plugin][skip ci] prepare for next development iteration --- alfresco-docker-alfresco-pdf-renderer/pom.xml | 2 +- alfresco-docker-imagemagick/pom.xml | 2 +- alfresco-docker-libreoffice/pom.xml | 2 +- alfresco-docker-tika/pom.xml | 2 +- alfresco-docker-transform-misc/pom.xml | 2 +- alfresco-transformer-base/pom.xml | 4 ++-- pom.xml | 4 ++-- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/alfresco-docker-alfresco-pdf-renderer/pom.xml b/alfresco-docker-alfresco-pdf-renderer/pom.xml index 9a39ee12..92d9a120 100644 --- a/alfresco-docker-alfresco-pdf-renderer/pom.xml +++ b/alfresco-docker-alfresco-pdf-renderer/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-transform-core - 2.1.0-RC2 + 2.1.0-RC3-SNAPSHOT ../pom.xml diff --git a/alfresco-docker-imagemagick/pom.xml b/alfresco-docker-imagemagick/pom.xml index 4cfefb84..13bdc7d5 100644 --- a/alfresco-docker-imagemagick/pom.xml +++ b/alfresco-docker-imagemagick/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-transform-core - 2.1.0-RC2 + 2.1.0-RC3-SNAPSHOT ../pom.xml diff --git a/alfresco-docker-libreoffice/pom.xml b/alfresco-docker-libreoffice/pom.xml index 0157efd2..d50ea996 100644 --- a/alfresco-docker-libreoffice/pom.xml +++ b/alfresco-docker-libreoffice/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-transform-core - 2.1.0-RC2 + 2.1.0-RC3-SNAPSHOT ../pom.xml diff --git a/alfresco-docker-tika/pom.xml b/alfresco-docker-tika/pom.xml index a01d89df..8160a061 100644 --- a/alfresco-docker-tika/pom.xml +++ b/alfresco-docker-tika/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-transform-core - 2.1.0-RC2 + 2.1.0-RC3-SNAPSHOT ../pom.xml diff --git a/alfresco-docker-transform-misc/pom.xml b/alfresco-docker-transform-misc/pom.xml index 0107b703..dc11fb00 100644 --- a/alfresco-docker-transform-misc/pom.xml +++ b/alfresco-docker-transform-misc/pom.xml @@ -9,7 +9,7 @@ org.alfresco alfresco-transform-core - 2.1.0-RC2 + 2.1.0-RC3-SNAPSHOT ../pom.xml diff --git a/alfresco-transformer-base/pom.xml b/alfresco-transformer-base/pom.xml index 932ef15a..ad52b6bb 100644 --- a/alfresco-transformer-base/pom.xml +++ b/alfresco-transformer-base/pom.xml @@ -4,12 +4,12 @@ org.alfresco alfresco-transform-core - 2.1.0-RC2 + 2.1.0-RC3-SNAPSHOT ../pom.xml alfresco-transformer-base - 2.1.0-RC2 + 2.1.0-RC3-SNAPSHOT diff --git a/pom.xml b/pom.xml index ca681be1..ce559e46 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ org.alfresco alfresco-transform-core - 2.1.0-RC2 + 2.1.0-RC3-SNAPSHOT pom @@ -45,7 +45,7 @@ scm:git:https://github.com/Alfresco/alfresco-transform-core.git scm:git:https://github.com/Alfresco/alfresco-transform-core.git https://github.com/Alfresco/alfresco-transform-core - 2.1.0-RC2 + HEAD