Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ATS-864: Switch from fabric8 to docker mvn plugin #436

Merged
merged 8 commits into from
Feb 23, 2022

Conversation

TheOutsSeeker
Copy link
Contributor

@TheOutsSeeker TheOutsSeeker commented Jul 8, 2021

Replaced fabric8-maven-plugin with docker-maven-plugin and performed pom cleanup:

  • moved configurations from the plugin to the execution level to avoid overlap
  • removed duplicated execution of spring-boot:repackage

Ref. ATS-864

@KikoUK
Copy link
Contributor

KikoUK commented Jul 8, 2021

It seems like you need docker-compose deployment for IT tests.

@KikoUK KikoUK self-requested a review July 8, 2021 15:19
@TheOutsSeeker TheOutsSeeker marked this pull request as draft July 8, 2021 16:01
@mteodori mteodori force-pushed the ATS-864_Switch_from_fabric8_to_docker_mvn_plugin branch from d906f76 to 2f37037 Compare February 19, 2022 18:50
@mteodori mteodori marked this pull request as ready for review February 20, 2022 20:56
@alandavis
Copy link
Contributor

alandavis commented Feb 22, 2022

If you merge this, please also create the A releases for code freeze (and 5 down stream projects) as they have been done already ACS-2573

@montgolfiere
Copy link
Contributor

montgolfiere commented Feb 22, 2022

Thanks @mteodori

Some changes in line-endings only (so a little hard to see the PR diff in GitHub). See also ATS-690 ).

As a workaround, use:

https://github.com/Alfresco/alfresco-transform-core/pull/436/files?w=1

@mteodori mteodori merged commit 4429ba2 into master Feb 23, 2022
@mteodori mteodori deleted the ATS-864_Switch_from_fabric8_to_docker_mvn_plugin branch February 23, 2022 18:48
@mteodori
Copy link
Member

Thanks @mteodori

Some changes in line-endings only (so a little hard to see the PR diff in GitHub). See also ATS-690 ).

As a workaround, use:

https://github.com/Alfresco/alfresco-transform-core/pull/436/files?w=1

the changes are actually due to an existing mix of line endings in files, I've created another PR to fix and prevent this in the future using pre-commit as it's done in other repositories #540

montgolfiere added a commit that referenced this pull request Feb 25, 2022
* 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)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants