Commit Graph

304 Commits

Author SHA1 Message Date
Jan Vonka
462468a5dc Merge branch 'master' into ATS-812_PoC_FFmpeg_skeleton
* 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)
2022-02-25 15:33:26 +00:00
Travis CI User
ce7f300ed7 [maven-release-plugin][skip ci] prepare for next development iteration 2022-02-24 00:39:22 +00:00
Travis CI User
e37c17250f [maven-release-plugin][skip ci] prepare release 2.5.7-A4 2022-02-24 00:39:20 +00:00
alandavis
27b04ee049 ACS-2587 Fix test failure
[trigger release] 2.5.7-A4
2022-02-24 00:01:56 +00:00
Alan Davis
61c1f802ef ACS-2587 Include directAccessUrl in T-Config if supported (#539)
The t-config returned by the T-Router & T-Engines should include directAccessUrl as an optional transform option when the T-engine supports it.

[trigger release] 2.5.7-A4
2022-02-23 23:51:10 +00:00
Nebil Kisa
4429ba2823 ATS-864: Switch from fabric8 to docker mvn plugin (#436)
* ATS-864: Switch from fabric8 to docker mvn plugin

* moved docker-maven-plugin config to execution

* Update to latest docker-maven-plugin

* remove unnecessary config

Co-authored-by: David Edwards <david.edwards@alfresco.com>
Co-authored-by: Marcello Teodori <151025+mteodori@users.noreply.github.com>
2022-02-23 19:48:19 +01:00
Travis CI User
27bea9a89b [maven-release-plugin][skip ci] prepare for next development iteration 2022-02-21 14:38:45 +00:00
Travis CI User
5a37333992 [maven-release-plugin][skip ci] prepare release 2.5.7-A3 2022-02-21 14:38:43 +00:00
Travis CI User
f2478ee2b7 [maven-release-plugin][skip ci] prepare for next development iteration 2022-02-18 15:47:14 +00:00
Travis CI User
18b413c827 [maven-release-plugin][skip ci] prepare release 2.5.7-A2 2022-02-18 15:47:11 +00:00
Alan Davis
f05b54dea3 ACS-2497 Rework httpTransformRequestUsingDirectAccessUrlTest so it can be used in AI and Aspose (#535) 2022-02-18 14:08:18 +00:00
Travis CI User
ae095778e3 [maven-release-plugin][skip ci] prepare for next development iteration 2022-02-14 12:37:31 +00:00
Travis CI User
7497bdb464 [maven-release-plugin][skip ci] prepare release 2.5.7-A1 2022-02-14 12:37:29 +00:00
alandavis
64669eebd2 [trigger release] 2.5.7-A1 2022-02-14 11:59:15 +00:00
Kacper Magdziarz
11e3cb4b20 ACS-2497 T-Core: Accept DAU requests (#525)
* ACS-2497 Add implementation of Direct Access Url usage for transformation.
Add possibly to pass Direct Access Url to Transform request instead of a sending a file.
2022-02-14 11:30:48 +01:00
Alan Davis
a89e161004 ACS-2498 Switch to using a configVersion parameter on the /transform/config endpoint (#530)
* Fixed the config returned by the AIO as it did not include the coreVersion even though the individual ones did.
2022-02-10 23:50:19 +00:00
Alan Davis
df519cfd6f ACS-2498 Add coreVersion to T-Engine config (#526)
The bulk of the changes in this PR are to do with adding a coreVersion element to the transform element in the T-Engine config. For more detail see the class header of CoreVersionDecorator.

* Support the use of coreVersion so that it is possible to upgrade pods in any order
* Moved the majority of the RequestParamMap static finals to alfresco-transform-model and added a new one: "includeCoreVersion" parameter.
2022-02-09 22:39:40 +00:00
Travis CI User
edadc1122f [maven-release-plugin][skip ci] prepare for next development iteration 2022-01-27 19:10:16 +00:00
Travis CI User
f8be0f64ae [maven-release-plugin][skip ci] prepare release 2.5.6 2022-01-27 19:10:13 +00:00
Alan Davis
e76da6878c ACS-2479 AI Transformers do not start if built using ATS 1.5.0 components (#522)
[trigger release] 2.5.6

* Changes just tidy up white space and pick up the modified T-Model
2022-01-27 18:29:28 +00:00
Travis CI User
a4cc3d4818 [maven-release-plugin][skip ci] prepare for next development iteration 2022-01-26 18:30:11 +00:00
Travis CI User
bec806510e [maven-release-plugin][skip ci] prepare release 2.5.5 2022-01-26 18:30:09 +00:00
Alan Davis
167c77fb2c ATS-973 [trigger release] 2.5.5 (#521) 2022-01-26 17:51:00 +00:00
Travis CI User
ae61286098 [maven-release-plugin][skip ci] prepare for next development iteration 2022-01-13 22:27:44 +00:00
Travis CI User
2f1704322d [maven-release-plugin][skip ci] prepare release 2.5.5-A3 2022-01-13 22:27:42 +00:00
Travis CI User
0342d2f2c3 [maven-release-plugin][skip ci] prepare for next development iteration 2022-01-13 18:42:27 +00:00
Travis CI User
9a93e8bf89 [maven-release-plugin][skip ci] prepare release 2.5.5-A2 2022-01-13 18:42:25 +00:00
Alan Davis
59325bc38a Repeat Bump dependency.tika.version from 2.1.0 to 2.2.1 (#516)
* Repeat Bump dependency.tika.version from 2.1.0 to 2.2.1

Original PR https://github.com/Alfresco/alfresco-transform-core/pull/506 was merged to master where it failed. There had been no build of the PR before the merge, which is why this branch has been created.

* Use non deprecated TikaCoreProperties.SUBJECT with tika 2.2.1.

The deprecated OfficeOpenXMLCore.SUBJECT value worked in 2.2.0 but not 2.2.1

* With the upgrade of Tika from 2.2.0 to 2.2.1, the deprecated OfficeOpenXMLCore.SUBJECT metadata value became being null and the replacement TikaCoreProperties.SUBJECT became a multi value in a few of our test cases. For backward compatibility with very old versions of Alfresco, we have historically been added a number of extra values including "subject" and "description" back into the raw metadata, before mapping them onto Alfresco properties. These values existed in the original version of Tika used by Alfresco, so it is possible there are custom mappings out there that using them.

To complicate matters a little, out standard mappings for some types put the raw "subject" value into cm:description property. What makes it interesting is that the extra "description" value is not used but has the value originally in our expected metadata extarct data. That is why the quick_*_json files have been modified.
2022-01-13 17:25:56 +00:00
dependabot[bot]
3889fa73b5 Bump maven-jar-plugin from 3.2.0 to 3.2.2
Bumps [maven-jar-plugin](https://github.com/apache/maven-jar-plugin) from 3.2.0 to 3.2.2.
- [Release notes](https://github.com/apache/maven-jar-plugin/releases)
- [Commits](https://github.com/apache/maven-jar-plugin/compare/maven-jar-plugin-3.2.0...maven-jar-plugin-3.2.2)

---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-jar-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-01-13 15:39:58 +00:00
Jan Vonka
a0ec144310 ATS-812: PoC FFmpeg (experimental) - add frame width & height
- eg. to demo transcoding of video resolution (or even resize of frame if output to an image)
2022-01-07 10:58:42 +00:00
Jan Vonka
ec5a813cd8 ATS-812: PoC FFmpeg (experimental) - add duration (in addition to timeOffset) to enable video/audio trim
- only set default frames num (1) if target is a supported image format (note: currently configured for jpg and png)
2022-01-06 18:05:10 +00:00
Jan Vonka
c6d88fe870 Merge commit '2fd8361a783f117592b55bbca4fc7273adf1db49' into ATS-812_PoC_FFmpeg_skeleton
* 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
2022-01-06 11:10:21 +00:00
Travis CI User
2fd8361a78 [maven-release-plugin][skip ci] prepare for next development iteration 2022-01-05 20:58:51 +00:00
Travis CI User
06b8d1e8d4 [maven-release-plugin][skip ci] prepare release 2.5.5-A1 2022-01-05 20:58:49 +00:00
alandavis
b18798f313 [trigger release] 2.5.5-A1
- missing bit of useful debug included
2022-01-05 16:04:20 +00:00
Jan Vonka
dbafd81f5f ATS-812: PoC FFmpeg (experimental) - bump pom.xml to 2.5.5-A1-SNAPSHOT 2022-01-05 13:29:04 +00:00
Jan Vonka
2c68e29901 Merge commit '0c939761299358bec8084ab7675d0a4798d09b16' into ATS-812_PoC_FFmpeg_skeleton
* commit '0c939761299358bec8084ab7675d0a4798d09b16': (97 commits)
  [maven-release-plugin][skip ci] prepare release 2.5.4
  ACS-1998 Enhance the transform config (#484)
  Bump guava from 30.1.1-jre to 31.0.1-jre (#473)
  Bump jsoup from 1.14.2 to 1.14.3 (#475)
  Bump dependency.jackson.version from 2.12.5 to 2.13.0 (#476)
  Bump dependency.cxf.version from 3.4.4 to 3.4.5 (#477)
  Bump spring-boot-starter-parent from 2.5.4 to 2.5.6 (#479)
  ATS-970: Fix build after Travis secrets rotation (#469)
  Bump maven-javadoc-plugin from 3.3.0 to 3.3.1 (#466)
  Bump dependency.jackson.version from 2.12.4 to 2.12.5 (#464)
  [maven-release-plugin][skip ci] prepare for next development iteration
  [maven-release-plugin][skip ci] prepare release 2.5.3
  ATS-956: Release Alfresco Transform Core 2.5.3 [trigger release] (#463)
  Bump docker-maven-plugin from 0.36.1 to 0.37.0 (#450)
  Bump jsoup from 1.14.1 to 1.14.2 (#451)
  Bump activemq-client from 5.16.2 to 5.16.3 (#452)
  Bump spring-boot-starter-parent from 2.5.3 to 2.5.4 (#454)
  Bump alfresco/alfresco-base-java (#458)
  Bump alfresco/alfresco-base-java (#456)
  Bump alfresco/alfresco-base-java (#457)
  ...

# Conflicts:
#	.travis.yml
2022-01-05 12:20:09 +00:00
Alan Davis
a98f937b4a ACS-2002 Enhance T-Router debug (#507)
[trigger release] 2.5.5-A1

By default T-Engines now provide the more readable TransformerDebug DEBUG messages, rather than the original detailed request and reply messages, which are still available as TRACE.
2022-01-05 12:17:17 +00:00
Travis CI User
0e8f597c57 [maven-release-plugin][skip ci] prepare for next development iteration 2021-11-13 12:10:38 +00:00
Travis CI User
0c93976129 [maven-release-plugin][skip ci] prepare release 2.5.4 2021-11-13 12:10:36 +00:00
Alan Davis
00c8fc7b34 ACS-1998 Enhance the transform config (#484) 2021-11-13 11:29:21 +00:00
Travis CI User
f16b250d75 [maven-release-plugin][skip ci] prepare for next development iteration 2021-08-26 13:22:14 +00:00
Travis CI User
3ed8af329a [maven-release-plugin][skip ci] prepare release 2.5.3 2021-08-26 13:22:12 +00:00
Alan Davis
509acf4760 ACS-1778 Common transform routing code for Repo and t-router (#453)
* Addition of logWarn method
* Pick up new alfresco-transform-model tag 1.4.0
2021-08-19 17:58:10 +01:00
Travis CI User
09b8fd926e [maven-release-plugin][skip ci] prepare for next development iteration 2021-07-19 11:08:08 +00:00
Travis CI User
f2d6c64a1b [maven-release-plugin][skip ci] prepare release 2.5.2 2021-07-19 11:08:00 +00:00
Travis CI User
83cd0774b6 [maven-release-plugin][skip ci] prepare for next development iteration 2021-06-17 10:50:58 +00:00
Travis CI User
1ba0b1ac95 [maven-release-plugin][skip ci] prepare release 2.5.1 2021-06-17 10:50:52 +00:00
David Edwards
74680fbe58 ACS-1677 Provide file extension from JMS request if missing in SFS (#428) 2021-06-15 16:39:28 +01:00
Travis CI User
08a9c7f28d [maven-release-plugin][skip ci] prepare for next development iteration 2021-06-11 13:50:06 +00:00