From 88733eaca4272e58b6832171c63ae186e1bfa212 Mon Sep 17 00:00:00 2001 From: Travis CI User Date: Mon, 28 Oct 2019 10:33:41 +0000 Subject: [PATCH 01/21] [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 c8a2c810..322edc79 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 + 2.1.1-SNAPSHOT ../pom.xml diff --git a/alfresco-docker-imagemagick/pom.xml b/alfresco-docker-imagemagick/pom.xml index efa3770f..3093f597 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 + 2.1.1-SNAPSHOT ../pom.xml diff --git a/alfresco-docker-libreoffice/pom.xml b/alfresco-docker-libreoffice/pom.xml index be0c4e46..c86ea74e 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 + 2.1.1-SNAPSHOT ../pom.xml diff --git a/alfresco-docker-tika/pom.xml b/alfresco-docker-tika/pom.xml index 71b8283e..2159a19b 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 + 2.1.1-SNAPSHOT ../pom.xml diff --git a/alfresco-docker-transform-misc/pom.xml b/alfresco-docker-transform-misc/pom.xml index a43da877..f4c44288 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 + 2.1.1-SNAPSHOT ../pom.xml diff --git a/alfresco-transformer-base/pom.xml b/alfresco-transformer-base/pom.xml index 975d1625..c55d8746 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 + 2.1.1-SNAPSHOT ../pom.xml alfresco-transformer-base - 2.1.0 + 2.1.1-SNAPSHOT diff --git a/pom.xml b/pom.xml index 069efd4d..2bee44a1 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ org.alfresco alfresco-transform-core - 2.1.0 + 2.1.1-SNAPSHOT pom @@ -43,7 +43,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 + HEAD From 3af0b5079d80c3f5e3b2b4a72dd047aa593f3816 Mon Sep 17 00:00:00 2001 From: CezarLeahu <35226487+CezarLeahu@users.noreply.github.com> Date: Mon, 4 Nov 2019 12:06:55 +0200 Subject: [PATCH 02/21] ATS-584: Update projects to min source version (Java8 to Java 11) (#153) --- pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 2bee44a1..521f0f11 100644 --- a/pom.xml +++ b/pom.xml @@ -15,9 +15,9 @@ pom - 1.8 - 1.8 - 1.8 + 11 + 11 + 11 latest 2.0.17 @@ -304,7 +304,7 @@ before-integration-tests pre-integration-test - + stop start From c957349a456daaeba872bb10b389a47e819f60fc Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 6 Nov 2019 22:00:54 +0200 Subject: [PATCH 03/21] Bump maven-jar-plugin from 3.1.2 to 3.2.0 (#154) Bumps [maven-jar-plugin](https://github.com/apache/maven-jar-plugin) from 3.1.2 to 3.2.0. - [Release notes](https://github.com/apache/maven-jar-plugin/releases) - [Commits](https://github.com/apache/maven-jar-plugin/compare/maven-jar-plugin-3.1.2...maven-jar-plugin-3.2.0) Signed-off-by: dependabot-preview[bot] --- alfresco-transformer-base/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/alfresco-transformer-base/pom.xml b/alfresco-transformer-base/pom.xml index c55d8746..2fd9a99b 100644 --- a/alfresco-transformer-base/pom.xml +++ b/alfresco-transformer-base/pom.xml @@ -72,7 +72,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.1.2 + 3.2.0 From ee282e0bafb461ce5d33c6907a59c0dbe54cbe5d Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 7 Nov 2019 11:40:37 +0200 Subject: [PATCH 04/21] Bump dependency.cxf.version from 3.3.3 to 3.3.4 (#147) Bumps `dependency.cxf.version` from 3.3.3 to 3.3.4. Updates `cxf-core` from 3.3.3 to 3.3.4 Updates `cxf-rt-rs-client` from 3.3.3 to 3.3.4 Updates `cxf-rt-frontend-jaxws` from 3.3.3 to 3.3.4 Updates `cxf-rt-transports-http` from 3.3.3 to 3.3.4 Updates `cxf-rt-ws-policy` from 3.3.3 to 3.3.4 Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 521f0f11..fcda5719 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ 1.0.2.7 5.15.9 2.10.0 - 3.3.3 + 3.3.4 4.0.1 From 91711fdef98545da1bd248107399a79280756c33 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 7 Nov 2019 15:21:23 +0200 Subject: [PATCH 05/21] Bump fabric8-maven-plugin from 4.2.0 to 4.3.1 (#144) Bumps [fabric8-maven-plugin](https://github.com/fabric8io/fabric8-maven-plugin) from 4.2.0 to 4.3.1. - [Release notes](https://github.com/fabric8io/fabric8-maven-plugin/releases) - [Changelog](https://github.com/fabric8io/fabric8-maven-plugin/blob/master/CHANGELOG.md) - [Commits](https://github.com/fabric8io/fabric8-maven-plugin/compare/v4.2.0...v4.3.1) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index fcda5719..d66e071d 100644 --- a/pom.xml +++ b/pom.xml @@ -292,7 +292,7 @@ io.fabric8 fabric8-maven-plugin - 4.2.0 + 4.3.1 io.fabric8 From 030ea142127e5fe303c40975f56612e375cb3357 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 7 Nov 2019 16:12:13 +0200 Subject: [PATCH 06/21] Bump bcprov-jdk15on from 1.63 to 1.64 (#140) Bumps [bcprov-jdk15on](https://github.com/bcgit/bc-java) from 1.63 to 1.64. - [Release notes](https://github.com/bcgit/bc-java/releases) - [Changelog](https://github.com/bcgit/bc-java/blob/master/docs/releasenotes.html) - [Commits](https://github.com/bcgit/bc-java/commits) Signed-off-by: dependabot-preview[bot] --- alfresco-docker-tika/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/alfresco-docker-tika/pom.xml b/alfresco-docker-tika/pom.xml index 2159a19b..15876ba9 100644 --- a/alfresco-docker-tika/pom.xml +++ b/alfresco-docker-tika/pom.xml @@ -86,7 +86,7 @@ org.bouncycastle bcprov-jdk15on - 1.63 + 1.64 org.bouncycastle From c581767c60346e754f3b8c856cd5281e856cbfad Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 7 Nov 2019 16:31:54 +0200 Subject: [PATCH 07/21] Bump bcmail-jdk15on from 1.63 to 1.64 (#141) Bumps [bcmail-jdk15on](https://github.com/bcgit/bc-java) from 1.63 to 1.64. - [Release notes](https://github.com/bcgit/bc-java/releases) - [Changelog](https://github.com/bcgit/bc-java/blob/master/docs/releasenotes.html) - [Commits](https://github.com/bcgit/bc-java/commits) Signed-off-by: dependabot-preview[bot] --- alfresco-docker-tika/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/alfresco-docker-tika/pom.xml b/alfresco-docker-tika/pom.xml index 15876ba9..734a95f8 100644 --- a/alfresco-docker-tika/pom.xml +++ b/alfresco-docker-tika/pom.xml @@ -91,7 +91,7 @@ org.bouncycastle bcmail-jdk15on - 1.63 + 1.64 From 9dec6d1f6b9d836f2ac01e6a5d921c0915a92641 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 7 Nov 2019 16:50:29 +0200 Subject: [PATCH 08/21] Bump dependency.poi.version from 4.0.1 to 4.1.1 (#145) Bumps `dependency.poi.version` from 4.0.1 to 4.1.1. Updates `poi` from 4.0.1 to 4.1.1 Updates `poi-ooxml` from 4.0.1 to 4.1.1 Updates `poi-scratchpad` from 4.0.1 to 4.1.1 Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d66e071d..992a4ebc 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ 5.15.9 2.10.0 3.3.4 - 4.0.1 + 4.1.1 From 4e5915b94124cf45e4775a1e0d791c01c12da094 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 2 Dec 2019 13:25:49 +0200 Subject: [PATCH 09/21] Bump dependency.jackson.version from 2.10.0 to 2.10.1 (#156) Bumps `dependency.jackson.version` from 2.10.0 to 2.10.1. Updates `jackson-annotations` from 2.10.0 to 2.10.1 - [Release notes](https://github.com/FasterXML/jackson/releases) - [Commits](https://github.com/FasterXML/jackson/commits) Updates `jackson-databind` from 2.10.0 to 2.10.1 - [Release notes](https://github.com/FasterXML/jackson/releases) - [Commits](https://github.com/FasterXML/jackson/commits) Updates `jackson-core` from 2.10.0 to 2.10.1 - [Release notes](https://github.com/FasterXML/jackson-core/releases) - [Commits](https://github.com/FasterXML/jackson-core/compare/jackson-core-2.10.0...jackson-core-2.10.1) Updates `jackson-datatype-jdk8` from 2.10.0 to 2.10.1 Updates `jackson-datatype-jsr310` from 2.10.0 to 2.10.1 Updates `jackson-module-parameter-names` from 2.10.0 to 2.10.1 - [Release notes](https://github.com/FasterXML/jackson-modules-java8/releases) - [Commits](https://github.com/FasterXML/jackson-modules-java8/compare/jackson-modules-java8-2.10.0...jackson-modules-java8-2.10.1) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 992a4ebc..d6bbeef5 100644 --- a/pom.xml +++ b/pom.xml @@ -25,7 +25,7 @@ ${project.version} 1.0.2.7 5.15.9 - 2.10.0 + 2.10.1 3.3.4 4.1.1 From d863b63e4eae09d82e0c7034dee08abb157d0a44 Mon Sep 17 00:00:00 2001 From: "Cezar.Leahu" Date: Wed, 4 Dec 2019 18:20:15 +0200 Subject: [PATCH 10/21] ATS-628: Update release process --- .travis.yml | 7 +- docs/build-and-release.md | 133 +++++++++++++++----------------------- 2 files changed, 55 insertions(+), 85 deletions(-) diff --git a/.travis.yml b/.travis.yml index c942d1c8..86f29f4e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,8 +19,7 @@ branches: only: - master - /^SP\/.+$/ - - release - - /^release\/SP\/.+$/ + - /^HF\/.+$/ - company_release - /^ATS-.*$/ @@ -31,7 +30,7 @@ stages: jobs: include: - - name: "Build" + - name: "Build + Tests" stage: build if: branch NOT IN (company_release) before_install: bash _ci/init.sh @@ -46,7 +45,7 @@ jobs: - name: "Release" stage: release - if: branch = release OR branch =~ /^release\/SP\/.+$/ + if: commit_message ~= /\[trigger release\]/ AND branch ~= /^(master|SP\/.+|HF\/.+)$/ before_install: bash _ci/init.sh before_script: travis_wait bash _ci/cache_artifacts.sh script: travis_wait 30 bash _ci/release.sh diff --git a/docs/build-and-release.md b/docs/build-and-release.md index 0c1d88bb..b9466530 100644 --- a/docs/build-and-release.md +++ b/docs/build-and-release.md @@ -4,36 +4,29 @@ The `.travis.yml` config file can be found in the root of the repository. ## Stages and Jobs -1. **Build**: Java Build with Unit and Integration Tests, WhiteSource -2. **Release**: Publish to Quay & DockerHub, Publish the S3 staging -3. **Company Release**: Publish to S3 release +1. **Build**: Java build with unit tests, integration tests and WhiteSource scan. +2. **Release**: Release with artifact deployment to Nexus and AWS Staging bucket. +3. **Company Release**: Artifact deployment to AWS Release bucket. ## Branches Travis CI builds differ by branch: -* `master`: - - regular builds which include only the _Build_ stage; - - the _Build_ stage updates the `latest` T-Engines images (only - from the `master` branch) on both Quay and DockerHub: - - alfresco/alfresco-pdf-renderer - - alfresco/alfresco-imagemagick - - alfresco/alfresco-tika - - alfresco/alfresco-libreoffice - -* `ATS-*` (any branch starting with "ATS-"), `SP/1.3.N` and `SP/2.0.N`: - - regular builds which include only the _Build_ stage; - - although built and used on the CI agent, no docker images are updated on remote repositories; -* `release`: - - builds that include the _Build_ and _Release_ stages; - - PR builds with release as the target branch only execute dry runs of the actual release, - without actually publishing anything; -* `release/SP/1.3.N` and `release/SP/2.0.N`: - - builds that include the _Build_ and _Release_ stages; - - PR builds with one of the release branches as the target branch only execute dry runs of the actual release, -without actually publishing anything; - - the branches should be deleted once the builds are completed -* `company_release`: - - builds that include only the `company_release` stage; +* `master` / `SP/*` / `HF/*` branches: + - regular builds which include the _Build_ stage; + > On the `master` branch only the _Build_ stage updates the `latest` T-Engines images on + > both Quay and DockerHub: + > - alfresco/alfresco-pdf-renderer + > - alfresco/alfresco-imagemagick + > - alfresco/alfresco-tika + > - alfresco/alfresco-libreoffice + - if the commit message contains the `[trigger release]` tag, the builds will also + include the _Release_ stage; + - PR builds where the latest commit contains the `[trigger release]` tag will execute dry runs + of the release jobs (no artifacts will be published until the PR is actually merged). +* `ATS-*` branches: + - regular builds which include only the _Build_ and _Tests_ stages; +* `company_release` branch: + - builds that include the _Company Release_ stage only. - the `company_release` branch should be used for one-off events; once used (a build completes), the branch should be deleted. @@ -42,65 +35,43 @@ All other branches are ignored. ## Release process steps & info Prerequisites: - - the `master` branch has a green build and it contains all the changes that should be included in - the next release + - the `master` / `SP/*` / `HF/*` branch is green and it contains all the changes that should be + included in the next release. Steps: -1. Create a new branch from the `master` branch with the name `ATS-###_release_version`; -2. (Optional) Update the project version if the current POM version is not the next desired - release; use a maven command, i.e. `mvn versions:set -DnewVersion=2.0.19-SNAPSHOT versions:commit`; -3. Update the project's dependencies (remove the `-SNAPSHOT` suffixes) through a new commit on the - `ATS-###_release_version` branch; -4. Open a new Pull Request from the `ATS-###_release_version` branch into the `release` branch and - wait for a green build; the **Release** stage on the PR build will only execute a _Dry_Run_ of - the release; -5. Once it is approved, merge the PR through the **Create a merge commit** option (as opposed to - _Squash and merge_ or _Rebase and merge_), delete the `ATS-###_release_version` branch, and wait - for a green build on the `release` branch; -6. Merge back the `release` branch into the `master` branch; -7. Update the project dependencies (append the `-SNAPSHOT` suffixes) +1. Create a new branch with the name `ATS-###_release_version` from the `master` / `SP/*`/ `HF/*` +branch. +2. Update the project version if the current POM version is not the next desired release; use a +maven command, i.e. + ```bash + mvn versions:set -DnewVersion=#.##.#-SNAPSHOT versions:commit + ``` +3. Update the project's dependencies (remove the `-SNAPSHOT` suffixes - only for dependencies, not + for the local project version). +4. Create a new commit with the `[trigger release]` tag in its message. If no local changes have +been generated by steps (2) and (3), then an empty commit should be created - e.g. + ```bash + git commit --allow-empty -m "ATS-###: Release AIS #.##.# [trigger release]" + ``` + + > The location of the `[trigger release]` tag in the commit message is irrelevant. -Steps (6) and (7) can be done either directly from an IDE or through the GitHub flow, by creating -another branch and PR. Just make sure you don't add extra commits directly to the release branch, -as this will trigger another release. - -After the release, the reference deployments (docker-compose, helm) should be updated with the -latest docker image tags. - -### Release of a Service Pack (SP/1.3.N or SP/2.0.N) -Prerequisites: - - the `SP/` ( could be 1.3.N or 2.0.N) branch has a green build and it contains all the changes that should be included in - the next release - -**NOTE**: Make sure you release the proper version and the `SP/` is merged into the correct `release/SP/` (both having the same version). -E.g. When releasing a 1.3.N Service Pack, a new branch (`ATS-###_release_version`) should be created from `SP/1.3.N` and the PR should target the `release/SP/1.3.N` branch. - -Steps (similar to those describing the release from `master`): -1. Create a new branch from the `SP/` (SP/1.3.N or SP/2.0.N) branch with the name `ATS-###_release_version`; -2. (Optional) Update the project version if the current POM version is not the next desired - release; use a maven command, i.e. `mvn versions:set -DnewVersion=1.3.1-SNAPSHOT versions:commit`; -3. Update the project's dependencies (remove the `-SNAPSHOT` suffixes) through a new commit on the - `ATS-###_release_version` branch; -4. Open a new Pull Request from the `ATS-###_release_version` branch into the `release/SP/` branch and - wait for a green build; the **Release** stage on the PR build will only execute a _Dry_Run_ of - the release; -5. Once it is approved, merge the PR through the **Create a merge commit** option (as opposed to - _Squash and merge_ or _Rebase and merge_), delete the `ATS-###_release_version` branch, and wait - for a green build on the `release` branch; -6. Merge back the `release/SP/` branch into the `SP/` branch; -7. Update the project dependencies (append the `-SNAPSHOT` suffixes) + > If for any reason your PR contains multiple commits, the commit with the `[trigger release]` + tag should be the last (newest) one. This will trigger the Release dry runs. +5. Open a new Pull Request from the `ATS-###_release_version` branch into the original +`master` / `SP/*` / `HF/*` branch and wait for a green build; the **Release** stage on the PR build + will only execute a _Dry_Run_ of the release. +6. Once it is approved, merge the PR, preferably through the **Rebase and merge** option. If the +**Create a merge commit** (_Merge pull request_) or **Squash and merge** options are used, you +need to ensure that the _commit message_ contains the `[trigger release]` tag (sub-string). ## Company Release process steps & info Prerequisites: - - Engineering Release of the desired version has been done. - -Steps: -1. Create a new `company_release` branch from `release`. This job uses the git tag to identify the - version to be uploaded to S3 release bucket. -2. If the last commit on `company_release` branch contains `[skip_ci]` in its message it will - prevent Travis from starting a build. Push an empty commit in order to trigger the build, - `git commit --allow-empty -m "Company Release "`. Wait for a green build on the branch. -3. Delete local and remote `company_release` branch. + - The **Release** stage is complete - i.e. the release commit is tagged and the release + artifacts are deployed on Nexus. -### Release of a Service Pack (SP/1.3.N or SP/2.0.N) -Follow the steps described in the previous section, but instead of creating the `company_release` from `release`, it needs to be created from the proper `release/SP/` (depending on what version needs the Company Release). +Steps: +1. Create a new `company_release` branch from the `master` / `SP/*`/ `HF/*` branch. This job uses +the latest branch git tag to identify the version that must be uploaded to the S3 release bucket. +2. Wait for a green build on the branch. +3. Delete local and remote `company_release` branch. From addcba9652049b752b247268b5eca3df02e0f9fa Mon Sep 17 00:00:00 2001 From: DenisGabriela Date: Fri, 6 Dec 2019 12:10:06 +0200 Subject: [PATCH 11/21] ATS-627 : Security: DEPLOY-886 - Update Dockerfiles (ATS & AI-CE) to new Java Base Image (Open JDK 11.0.1) (#158) --- alfresco-docker-alfresco-pdf-renderer/Dockerfile | 2 +- alfresco-docker-imagemagick/Dockerfile | 2 +- alfresco-docker-libreoffice/Dockerfile | 2 +- alfresco-docker-tika/Dockerfile | 2 +- alfresco-docker-transform-misc/Dockerfile | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/alfresco-docker-alfresco-pdf-renderer/Dockerfile b/alfresco-docker-alfresco-pdf-renderer/Dockerfile index 2b3b8e6f..4ebcf24f 100644 --- a/alfresco-docker-alfresco-pdf-renderer/Dockerfile +++ b/alfresco-docker-alfresco-pdf-renderer/Dockerfile @@ -2,7 +2,7 @@ # alfresco-pdf-renderer uses the PDFium library from Google Inc. See the license at https://pdfium.googlesource.com/pdfium/+/master/LICENSE or in /pdfium.txt. -FROM alfresco/alfresco-base-java:11.0.1-openjdk-centos-7-6784d76a7b81 +FROM alfresco/alfresco-base-java:11.0.1-openjdk-centos-7-7a6031154417 ENV ALFRESCO_PDF_RENDERER_LIB_RPM_URL=https://nexus.alfresco.com/nexus/service/local/repositories/releases/content/org/alfresco/alfresco-pdf-renderer/1.1/alfresco-pdf-renderer-1.1-linux.tgz ENV PDFIUM_LICENSE_FILE=https://github.com/Alfresco/acs-community-packaging/blob/master/distribution/src/main/resources/licenses/3rd-party/pdfium.txt diff --git a/alfresco-docker-imagemagick/Dockerfile b/alfresco-docker-imagemagick/Dockerfile index 13ebcb22..84db7f2e 100644 --- a/alfresco-docker-imagemagick/Dockerfile +++ b/alfresco-docker-imagemagick/Dockerfile @@ -2,7 +2,7 @@ # ImageMagick is from ImageMagick Studio LLC. See the license at http://www.imagemagick.org/script/license.php or in /ImageMagick-license.txt. -FROM alfresco/alfresco-base-java:11.0.1-openjdk-centos-7-6784d76a7b81 +FROM alfresco/alfresco-base-java:11.0.1-openjdk-centos-7-7a6031154417 ARG IMAGEMAGICK_VERSION=7.0.7-27 diff --git a/alfresco-docker-libreoffice/Dockerfile b/alfresco-docker-libreoffice/Dockerfile index ba09549f..eba80d4a 100644 --- a/alfresco-docker-libreoffice/Dockerfile +++ b/alfresco-docker-libreoffice/Dockerfile @@ -2,7 +2,7 @@ # LibreOffice is from The Document Foundation. See the license at https://www.libreoffice.org/download/license/ or in /libreoffice.txt. -FROM alfresco/alfresco-base-java:11.0.1-openjdk-centos-7-6784d76a7b81 +FROM alfresco/alfresco-base-java:11.0.1-openjdk-centos-7-7a6031154417 ARG LIBREOFFICE_VERSION=6.1.6 diff --git a/alfresco-docker-tika/Dockerfile b/alfresco-docker-tika/Dockerfile index ce0c6762..7059ca1e 100644 --- a/alfresco-docker-tika/Dockerfile +++ b/alfresco-docker-tika/Dockerfile @@ -2,7 +2,7 @@ # Tika is from Apache. See the license at http://www.apache.org/licenses/LICENSE-2.0. -FROM alfresco/alfresco-base-java:11.0.1-openjdk-centos-7-6784d76a7b81 +FROM alfresco/alfresco-base-java:11.0.1-openjdk-centos-7-7a6031154417 ENV APACHE_LICENSE_FILE=https://github.com/Alfresco/acs-community-packaging/blob/master/distribution/src/main/resources/licenses/3rd-party/Apache%202.0.txt ENV JAVA_OPTS="" diff --git a/alfresco-docker-transform-misc/Dockerfile b/alfresco-docker-transform-misc/Dockerfile index 972c37a6..c6d559de 100644 --- a/alfresco-docker-transform-misc/Dockerfile +++ b/alfresco-docker-transform-misc/Dockerfile @@ -1,6 +1,6 @@ # Image provides a container in which to run miscellaneous transformations for Alfresco Content Services. -FROM alfresco/alfresco-base-java:11.0.1-openjdk-centos-7-6784d76a7b81 +FROM alfresco/alfresco-base-java:11.0.1-openjdk-centos-7-7a6031154417 ENV APACHE_LICENSE_FILE=https://github.com/Alfresco/acs-community-packaging/blob/master/distribution/src/main/resources/licenses/3rd-party/Apache%202.0.txt ENV JAVA_OPTS="" From a4912703757068eecf8ddafe2d4c3358a7f85e1a Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 6 Dec 2019 17:34:32 +0200 Subject: [PATCH 12/21] Bump spring-boot-starter-parent from 2.1.8.RELEASE to 2.2.1.RELEASE (#155) - fix tests --- .../transformer/AbstractTransformerControllerTest.java | 9 ++++----- pom.xml | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/alfresco-transformer-base/src/test/java/org/alfresco/transformer/AbstractTransformerControllerTest.java b/alfresco-transformer-base/src/test/java/org/alfresco/transformer/AbstractTransformerControllerTest.java index 47eb8c6e..f561b8ef 100644 --- a/alfresco-transformer-base/src/test/java/org/alfresco/transformer/AbstractTransformerControllerTest.java +++ b/alfresco-transformer-base/src/test/java/org/alfresco/transformer/AbstractTransformerControllerTest.java @@ -35,7 +35,6 @@ import static org.springframework.http.HttpHeaders.CONTENT_TYPE; import static org.springframework.http.HttpStatus.BAD_REQUEST; import static org.springframework.http.HttpStatus.INTERNAL_SERVER_ERROR; import static org.springframework.http.HttpStatus.OK; -import static org.springframework.http.MediaType.APPLICATION_JSON_UTF8_VALUE; import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.header; @@ -352,7 +351,7 @@ public abstract class AbstractTransformerControllerTest String response = mockMvc .perform(MockMvcRequestBuilders.get("/transform/config")) .andExpect(status().is(OK.value())) - .andExpect(header().string(CONTENT_TYPE, APPLICATION_JSON_UTF8_VALUE)) + .andExpect(header().string(CONTENT_TYPE, APPLICATION_JSON_VALUE)) .andReturn().getResponse().getContentAsString(); TransformConfig transformConfig = objectMapper.readValue(response, TransformConfig.class); @@ -371,7 +370,7 @@ public abstract class AbstractTransformerControllerTest String response = mockMvc .perform(MockMvcRequestBuilders.get("/transform/config")) .andExpect(status().is(OK.value())) - .andExpect(header().string(CONTENT_TYPE, APPLICATION_JSON_UTF8_VALUE)) + .andExpect(header().string(CONTENT_TYPE, APPLICATION_JSON_VALUE)) .andReturn().getResponse().getContentAsString(); TransformConfig transformConfig = objectMapper.readValue(response, TransformConfig.class); @@ -398,7 +397,7 @@ public abstract class AbstractTransformerControllerTest String response = mockMvc .perform(MockMvcRequestBuilders.get("/transform/config")) .andExpect(status().is(OK.value())) - .andExpect(header().string(CONTENT_TYPE, APPLICATION_JSON_UTF8_VALUE)) + .andExpect(header().string(CONTENT_TYPE, APPLICATION_JSON_VALUE)) .andReturn().getResponse().getContentAsString(); TransformConfig transformConfig = objectMapper.readValue(response, TransformConfig.class); @@ -421,7 +420,7 @@ public abstract class AbstractTransformerControllerTest String response = mockMvc .perform(MockMvcRequestBuilders.get("/transform/config")) .andExpect(status().is(OK.value())) - .andExpect(header().string(CONTENT_TYPE, APPLICATION_JSON_UTF8_VALUE)) + .andExpect(header().string(CONTENT_TYPE, APPLICATION_JSON_VALUE)) .andReturn().getResponse().getContentAsString(); TransformConfig transformConfig = objectMapper.readValue(response, TransformConfig.class); diff --git a/pom.xml b/pom.xml index d6bbeef5..34aca612 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.1.8.RELEASE + 2.2.1.RELEASE From 8f0cc3d919a0ee62d50d188ea1bbfc99578eb065 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 6 Dec 2019 22:12:09 +0000 Subject: [PATCH 13/21] Bump spring-boot-starter-parent from 2.2.1.RELEASE to 2.2.2.RELEASE Bumps spring-boot-starter-parent from 2.2.1.RELEASE to 2.2.2.RELEASE. Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 34aca612..f3d3879a 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.2.1.RELEASE + 2.2.2.RELEASE From a718a3972422d14e0be495edfcb69077e2dbc478 Mon Sep 17 00:00:00 2001 From: DenisGabriela Date: Wed, 18 Dec 2019 16:51:11 +0200 Subject: [PATCH 14/21] ATS-636 : Security: DEPLOY-904 - Update Dockerfiles (ATS & AI-CE) to new Java Base Image (Open JDK 11.0.1) --- alfresco-docker-alfresco-pdf-renderer/Dockerfile | 2 +- alfresco-docker-imagemagick/Dockerfile | 2 +- alfresco-docker-libreoffice/Dockerfile | 2 +- alfresco-docker-tika/Dockerfile | 2 +- alfresco-docker-transform-misc/Dockerfile | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/alfresco-docker-alfresco-pdf-renderer/Dockerfile b/alfresco-docker-alfresco-pdf-renderer/Dockerfile index 4ebcf24f..222d94b0 100644 --- a/alfresco-docker-alfresco-pdf-renderer/Dockerfile +++ b/alfresco-docker-alfresco-pdf-renderer/Dockerfile @@ -2,7 +2,7 @@ # alfresco-pdf-renderer uses the PDFium library from Google Inc. See the license at https://pdfium.googlesource.com/pdfium/+/master/LICENSE or in /pdfium.txt. -FROM alfresco/alfresco-base-java:11.0.1-openjdk-centos-7-7a6031154417 +FROM alfresco/alfresco-base-java:11.0.1-openjdk-centos-7-4c75291884e5 ENV ALFRESCO_PDF_RENDERER_LIB_RPM_URL=https://nexus.alfresco.com/nexus/service/local/repositories/releases/content/org/alfresco/alfresco-pdf-renderer/1.1/alfresco-pdf-renderer-1.1-linux.tgz ENV PDFIUM_LICENSE_FILE=https://github.com/Alfresco/acs-community-packaging/blob/master/distribution/src/main/resources/licenses/3rd-party/pdfium.txt diff --git a/alfresco-docker-imagemagick/Dockerfile b/alfresco-docker-imagemagick/Dockerfile index 84db7f2e..d7a50b38 100644 --- a/alfresco-docker-imagemagick/Dockerfile +++ b/alfresco-docker-imagemagick/Dockerfile @@ -2,7 +2,7 @@ # ImageMagick is from ImageMagick Studio LLC. See the license at http://www.imagemagick.org/script/license.php or in /ImageMagick-license.txt. -FROM alfresco/alfresco-base-java:11.0.1-openjdk-centos-7-7a6031154417 +FROM alfresco/alfresco-base-java:11.0.1-openjdk-centos-7-4c75291884e5 ARG IMAGEMAGICK_VERSION=7.0.7-27 diff --git a/alfresco-docker-libreoffice/Dockerfile b/alfresco-docker-libreoffice/Dockerfile index eba80d4a..72ef1dc4 100644 --- a/alfresco-docker-libreoffice/Dockerfile +++ b/alfresco-docker-libreoffice/Dockerfile @@ -2,7 +2,7 @@ # LibreOffice is from The Document Foundation. See the license at https://www.libreoffice.org/download/license/ or in /libreoffice.txt. -FROM alfresco/alfresco-base-java:11.0.1-openjdk-centos-7-7a6031154417 +FROM alfresco/alfresco-base-java:11.0.1-openjdk-centos-7-4c75291884e5 ARG LIBREOFFICE_VERSION=6.1.6 diff --git a/alfresco-docker-tika/Dockerfile b/alfresco-docker-tika/Dockerfile index 7059ca1e..6cc50233 100644 --- a/alfresco-docker-tika/Dockerfile +++ b/alfresco-docker-tika/Dockerfile @@ -2,7 +2,7 @@ # Tika is from Apache. See the license at http://www.apache.org/licenses/LICENSE-2.0. -FROM alfresco/alfresco-base-java:11.0.1-openjdk-centos-7-7a6031154417 +FROM alfresco/alfresco-base-java:11.0.1-openjdk-centos-7-4c75291884e5 ENV APACHE_LICENSE_FILE=https://github.com/Alfresco/acs-community-packaging/blob/master/distribution/src/main/resources/licenses/3rd-party/Apache%202.0.txt ENV JAVA_OPTS="" diff --git a/alfresco-docker-transform-misc/Dockerfile b/alfresco-docker-transform-misc/Dockerfile index c6d559de..4fe2c395 100644 --- a/alfresco-docker-transform-misc/Dockerfile +++ b/alfresco-docker-transform-misc/Dockerfile @@ -1,6 +1,6 @@ # Image provides a container in which to run miscellaneous transformations for Alfresco Content Services. -FROM alfresco/alfresco-base-java:11.0.1-openjdk-centos-7-7a6031154417 +FROM alfresco/alfresco-base-java:11.0.1-openjdk-centos-7-4c75291884e5 ENV APACHE_LICENSE_FILE=https://github.com/Alfresco/acs-community-packaging/blob/master/distribution/src/main/resources/licenses/3rd-party/Apache%202.0.txt ENV JAVA_OPTS="" From 9c2cfb4fc84817a722a23793bf7e005d2dc87007 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 27 Dec 2019 22:12:28 +0000 Subject: [PATCH 15/21] Bump guava from 28.1-jre to 28.2-jre Bumps [guava](https://github.com/google/guava) from 28.1-jre to 28.2-jre. - [Release notes](https://github.com/google/guava/releases) - [Commits](https://github.com/google/guava/commits) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f3d3879a..1e7f2eac 100644 --- a/pom.xml +++ b/pom.xml @@ -140,7 +140,7 @@ com.google.guava guava - 28.1-jre + 28.2-jre From 628ec8bfbb4baa0509b28340d683eb724e7eac80 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 16 Jan 2020 22:18:32 +0000 Subject: [PATCH 16/21] Bump spring-boot-starter-parent from 2.2.2.RELEASE to 2.2.3.RELEASE Bumps spring-boot-starter-parent from 2.2.2.RELEASE to 2.2.3.RELEASE. Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1e7f2eac..c43235a8 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.2.2.RELEASE + 2.2.3.RELEASE From ba3a67105c48b3451b845b6cd3861236895b5d78 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 17 Jan 2020 09:49:16 +0000 Subject: [PATCH 17/21] Bump docker-maven-plugin from 0.31.0 to 0.32.0 Bumps [docker-maven-plugin](https://github.com/fabric8io/docker-maven-plugin) from 0.31.0 to 0.32.0. - [Release notes](https://github.com/fabric8io/docker-maven-plugin/releases) - [Changelog](https://github.com/fabric8io/docker-maven-plugin/blob/master/doc/changelog.md) - [Commits](https://github.com/fabric8io/docker-maven-plugin/compare/v0.31.0...v0.32.0) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c43235a8..25123b50 100644 --- a/pom.xml +++ b/pom.xml @@ -297,7 +297,7 @@ io.fabric8 docker-maven-plugin - 0.31.0 + 0.32.0 true From e15b8f40b0d8f40f89d966f01edfac48182729f4 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 20 Jan 2020 11:55:57 +0200 Subject: [PATCH 18/21] Bump dependency.cxf.version from 3.3.4 to 3.3.5 (#171) Bumps `dependency.cxf.version` from 3.3.4 to 3.3.5. Updates `cxf-core` from 3.3.4 to 3.3.5 Updates `cxf-rt-rs-client` from 3.3.4 to 3.3.5 Updates `cxf-rt-frontend-jaxws` from 3.3.4 to 3.3.5 Updates `cxf-rt-transports-http` from 3.3.4 to 3.3.5 Updates `cxf-rt-ws-policy` from 3.3.4 to 3.3.5 Signed-off-by: dependabot-preview[bot] Co-authored-by: CezarLeahu <35226487+CezarLeahu@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 25123b50..a2a44d89 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ 1.0.2.7 5.15.9 2.10.1 - 3.3.4 + 3.3.5 4.1.1 From 1fb030563d719e4ffd495be7a4cf198eae892f0e Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 20 Jan 2020 12:17:38 +0200 Subject: [PATCH 19/21] Bump dependency.pdfbox.version from 2.0.17 to 2.0.18 (#163) Bumps `dependency.pdfbox.version` from 2.0.17 to 2.0.18. Updates `pdfbox` from 2.0.17 to 2.0.18 Updates `pdfbox-tools` from 2.0.17 to 2.0.18 Signed-off-by: dependabot-preview[bot] Co-authored-by: CezarLeahu <35226487+CezarLeahu@users.noreply.github.com> --- alfresco-docker-transform-misc/pom.xml | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/alfresco-docker-transform-misc/pom.xml b/alfresco-docker-transform-misc/pom.xml index f4c44288..964f7b45 100644 --- a/alfresco-docker-transform-misc/pom.xml +++ b/alfresco-docker-transform-misc/pom.xml @@ -70,7 +70,7 @@ org.apache.pdfbox pdfbox-tools - 2.0.17 + 2.0.18 diff --git a/pom.xml b/pom.xml index a2a44d89..763504bf 100644 --- a/pom.xml +++ b/pom.xml @@ -20,7 +20,7 @@ 11 latest - 2.0.17 + 2.0.18 3.0.1.1 ${project.version} 1.0.2.7 From f509d64e2cb96cb0581c3372efedca17ab5d324e Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 20 Jan 2020 12:43:22 +0200 Subject: [PATCH 20/21] Bump commons-codec from 1.13 to 1.14 (#165) Bumps [commons-codec](https://github.com/apache/commons-codec) from 1.13 to 1.14. - [Release notes](https://github.com/apache/commons-codec/releases) - [Changelog](https://github.com/apache/commons-codec/blob/master/RELEASE-NOTES.txt) - [Commits](https://github.com/apache/commons-codec/compare/commons-codec-1.13...commons-codec-1.14) Signed-off-by: dependabot-preview[bot] Co-authored-by: CezarLeahu <35226487+CezarLeahu@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 763504bf..989362a7 100644 --- a/pom.xml +++ b/pom.xml @@ -163,7 +163,7 @@ commons-codec commons-codec - 1.13 + 1.14 From 7caf461733d18fe131eece07c1340bcaeee32275 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 20 Jan 2020 12:55:37 +0200 Subject: [PATCH 21/21] Bump dependency.jackson.version from 2.10.1 to 2.10.2 (#166) Bumps `dependency.jackson.version` from 2.10.1 to 2.10.2. Updates `jackson-annotations` from 2.10.1 to 2.10.2 - [Release notes](https://github.com/FasterXML/jackson/releases) - [Commits](https://github.com/FasterXML/jackson/commits) Updates `jackson-databind` from 2.10.1 to 2.10.2 - [Release notes](https://github.com/FasterXML/jackson/releases) - [Commits](https://github.com/FasterXML/jackson/commits) Updates `jackson-core` from 2.10.1 to 2.10.2 - [Release notes](https://github.com/FasterXML/jackson-core/releases) - [Commits](https://github.com/FasterXML/jackson-core/compare/jackson-core-2.10.1...jackson-core-2.10.2) Updates `jackson-datatype-jdk8` from 2.10.1 to 2.10.2 Updates `jackson-datatype-jsr310` from 2.10.1 to 2.10.2 Updates `jackson-module-parameter-names` from 2.10.1 to 2.10.2 - [Release notes](https://github.com/FasterXML/jackson-modules-java8/releases) - [Commits](https://github.com/FasterXML/jackson-modules-java8/compare/jackson-modules-java8-2.10.1...jackson-modules-java8-2.10.2) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 989362a7..81d15f51 100644 --- a/pom.xml +++ b/pom.xml @@ -25,7 +25,7 @@ ${project.version} 1.0.2.7 5.15.9 - 2.10.1 + 2.10.2 3.3.5 4.1.1