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 branch 'master' into ATS-812_PoC_FFmpeg_skeleton

Browse Source 
* master: (52 commits)
  [maven-release-plugin][skip ci] prepare for next development iteration
  [maven-release-plugin][skip ci] prepare release 2.5.7-A4
  ACS-2587 Fix test failure
  ACS-2587 Include directAccessUrl in T-Config if supported (#539)
  ATS-864: fix dependabot
  ATS-864: Switch from fabric8 to docker mvn plugin (#436)
  ACS-2072 Enforce third party license compliance.
  [maven-release-plugin][skip ci] prepare for next development iteration
  [maven-release-plugin][skip ci] prepare release 2.5.7-A3
  [trigger release] 2.5.7-A3
  Bump activemq-client from 5.16.3 to 5.16.4 (#534)
  Bump maven-javadoc-plugin from 3.3.1 to 3.3.2 (#533)
  ATS-981 Avoid CVE-2022-23181 with spring-boot-starter-web 2.6.3 (#537)
  [maven-release-plugin][skip ci] prepare for next development iteration
  [maven-release-plugin][skip ci] prepare release 2.5.7-A2
  [trigger release] 2.5.7-A2
  ACS-2497 Rework httpTransformRequestUsingDirectAccessUrlTest so it can be used in AI and Aspose (#535)
  Bump docker-maven-plugin from 0.38.1 to 0.39.0 (#528)
  [maven-release-plugin][skip ci] prepare for next development iteration
  [maven-release-plugin][skip ci] prepare release 2.5.7-A1
  ...

# Conflicts:
#	.travis.yml
#	alfresco-transformer-base/src/main/java/org/alfresco/transformer/util/RequestParamMap.java

Also bumped pom.xml version (for two ffmpeg folders) from 2.5.5-A2-SNAPSHOT to match others (2.5.7-A5-SNAPSHOT)
This commit is contained in:
Jan Vonka
2022-02-25 15:33:26 +00:00
parent 14e776129d ce7f300ed7
commit 462468a5dc
92 changed files with 1215 additions and 1405 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-A2-SNAPSHOT</version>
<version>2.5.7-A5-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-A2-SNAPSHOT</version>
<version>2.5.7-A5-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>