inteligr8/alfresco-transform-core
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-transform-core.git synced 2025-08-14 17:58:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '2fd8361a783f117592b55bbca4fc7273adf1db49' into ATS-812_PoC_FFmpeg_skeleton

Browse Source 
* commit '2fd8361a783f117592b55bbca4fc7273adf1db49': (25 commits)
  [maven-release-plugin][skip ci] prepare for next development iteration
  [maven-release-plugin][skip ci] prepare release 2.5.5-A1
  [trigger release] 2.5.5-A1 (#511)
  [trigger release] 2.5.5-A1
  Bump dependency.jackson.version from 2.13.0 to 2.13.1
  Bump dependency.cxf.version from 3.4.5 to 3.5.0
  Revert "Bump dependency.tika.version from 2.1.0 to 2.2.1"
  Bump dependency.tika.version from 2.1.0 to 2.2.1
  ACS-2002 Enhance T-Router debug (#507)
  Bump license-maven-plugin from 2.0.0 to 2.0.1.alfresco-1 (#481)
  Bump bcmail-jdk15on from 1.69 to 1.70 (#492)
  Bump bcprov-jdk15on from 1.69 to 1.70 (#491)
  Bump spring-boot-starter-parent from 2.6.0 to 2.6.2 (#504)
  ACS-2352: Added Veracode agent-based scanning integration.
  Bump joda-time from 2.2 to 2.10.13
  ATS-969 Tika upgrade 1.x -> 2.x (#493)
  ATS-968 Migrate to CentOS 7 base images (#490)
  ACS-1983 CentOS 7 base image for the ImageMagic transformer (#489)
  Update travis linux dist to Focal (#478)
  Bump spring-boot-starter-parent from 2.5.6 to 2.6.0
  ...

# Conflicts:
#	alfresco-transform-core-aio/alfresco-transform-core-aio-boot/pom.xml
#	alfresco-transform-core-aio/alfresco-transform-core-aio/pom.xml
#	alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/pom.xml
#	alfresco-transform-imagemagick/alfresco-transform-imagemagick/pom.xml
#	alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/pom.xml
#	alfresco-transform-libreoffice/alfresco-transform-libreoffice/pom.xml
#	alfresco-transform-misc/alfresco-transform-misc-boot/pom.xml
#	alfresco-transform-misc/alfresco-transform-misc/pom.xml
#	alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer-boot/pom.xml
#	alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer/pom.xml
#	alfresco-transform-tika/alfresco-transform-tika-boot/pom.xml
#	alfresco-transform-tika/alfresco-transform-tika/pom.xml
#	alfresco-transformer-base/pom.xml
#	pom.xml
This commit is contained in:
Jan Vonka
2022-01-06 11:10:21 +00:00
parent 48c11c4aad 2fd8361a78
commit c6d88fe870
41 changed files with 521 additions and 354 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
alfresco-transform-ffmpeg/alfresco-transform-ffmpeg-boot/pom.xml
View File

@@ -9,7 +9,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-transform-core</artifactId>
<version>2.5.5-A1-SNAPSHOT</version>
<version>2.5.5-A2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

2
alfresco-transform-ffmpeg/alfresco-transform-ffmpeg/pom.xml
View File

@@ -7,7 +7,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-transform-core</artifactId>
<version>2.5.5-A1-SNAPSHOT</version>
<version>2.5.5-A2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>