Bump groovy from 2.5.14 to 3.0.8

Bumps [groovy](https://github.com/apache/groovy) from 2.5.14 to 3.0.8. - [Release notes](https://github.com/apache/groovy/releases) - [Commits](https://github.com/apache/groovy/commits) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Switch master to support ACS 7.1.0
2025-09-10 14:12:09 +00:00 · 2021-04-21 22:14:42 +00:00 · 2021-03-27 18:32:14 +00:00 · 2021-03-26 17:50:40 +00:00 · 2021-03-16 16:17:45 +02:00 · 2021-03-10 21:53:30 +00:00
23 changed files with 111 additions and 73 deletions
--- a/.gitbugtraq
+++ b/.gitbugtraq
@@ -1,4 +1,4 @@
 # For SmartGit
 [bugtraq "jira"]
- url = https://issues.alfresco.com/jira/browse/%BUGID%
+ url = https://alfresco.atlassian.net/browse/%BUGID%
 logRegex = ([A-Z]+-\\d+)
--- a/.travis.settings.xml
+++ b/.travis.settings.xml
@@ -25,10 +25,6 @@
                    <url>https://artifacts.alfresco.com/nexus/content/groups/public</url>
                </pluginRepository>
            </pluginRepositories>
-            <properties>
-                <!-- WhiteSource token -->
-                <org.whitesource.orgToken>${env.WHITESOURCE_API_KEY}</org.whitesource.orgToken>
-            </properties>
        </profile>
    </profiles>

--- a/.travis.yml
+++ b/.travis.yml
@@ -29,9 +29,9 @@ env:
  global:
    - TAS_SCRIPTS=../alfresco-community-repo/packaging/tests/scripts
    - TAS_ENVIRONMENT=./tests/environment
-    # Release version has to start with real version  (7.0.0-....) for the docker image to build successfully.
-    - RELEASE_VERSION=7.0.0-A27
-    - DEVELOPMENT_VERSION=7.0.0-SNAPSHOT
+    # Release version has to start with real version  (7.1.0-....) for the docker image to build successfully.
+    - RELEASE_VERSION=7.1.0-A0
+    - DEVELOPMENT_VERSION=7.1.0-SNAPSHOT

 stages:
  - name: test
@@ -149,6 +149,4 @@ jobs:
        - provider: script
          script: bash scripts/travis/copy_to_release_bucket.sh
          on:
-            branch: master
-
-
+            all_branches: true
--- a/dev/dev-acs-amps-overlay/pom.xml
+++ b/dev/dev-acs-amps-overlay/pom.xml
@@ -8,7 +8,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-dev-community-tomcat-env</artifactId>
-        <version>7.0.0-SNAPSHOT</version>
+        <version>7.1.0-SNAPSHOT</version>
    </parent>

    <properties>
--- a/dev/dev-tomcat/pom.xml
+++ b/dev/dev-tomcat/pom.xml
@@ -9,7 +9,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-dev-community-tomcat-env</artifactId>
-        <version>7.0.0-SNAPSHOT</version>
+        <version>7.1.0-SNAPSHOT</version>
    </parent>

    <properties>
--- a/dev/docker-compose.yml
+++ b/dev/docker-compose.yml
@@ -6,7 +6,7 @@ version: "2"

 services:
    transform-core-aio:
-        image: alfresco/alfresco-transform-core-aio:2.3.8
+        image: alfresco/alfresco-transform-core-aio:2.3.10
        mem_limit: 1536m
        environment:
            JAVA_OPTS: " -Xms256m -Xmx1536m"
@@ -14,7 +14,7 @@ services:
            - 8090:8090

    postgres:
-        image: postgres:11.7
+        image: postgres:13.1
        mem_limit: 512m
        environment:
            - POSTGRES_PASSWORD=alfresco
--- a/dev/pom.xml
+++ b/dev/pom.xml
@@ -9,7 +9,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>acs-community-packaging</artifactId>
-        <version>7.0.0-SNAPSHOT</version>
+        <version>7.1.0-SNAPSHOT</version>
    </parent>

    <properties>
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -7,7 +7,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>acs-community-packaging</artifactId>
-        <version>7.0.0-SNAPSHOT</version>
+        <version>7.1.0-SNAPSHOT</version>
    </parent>

    <dependencies>
@@ -25,10 +25,6 @@
            <groupId>org.alfresco</groupId>
            <artifactId>alfresco-repository</artifactId>
        </dependency>
-        <dependency>
-            <groupId>org.alfresco</groupId>
-            <artifactId>alfresco-data-model</artifactId>
-        </dependency>
        <dependency>
            <groupId>org.alfresco</groupId>
            <artifactId>alfresco-server-root</artifactId>
--- a/distribution/src/assembly/distribution.xml
+++ b/distribution/src/assembly/distribution.xml
@@ -13,6 +13,9 @@
        <fileSet>
            <directory>target/classes</directory>
            <outputDirectory></outputDirectory>
+            <excludes>
+                <exclude>META-INF/**</exclude>
+            </excludes>
        </fileSet>
        <!-- Licenses -->
        <fileSet>
--- a/docker-alfresco/pom.xml
+++ b/docker-alfresco/pom.xml
@@ -1,13 +1,13 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
-    <artifactId>content-services-community-docker-alfresco</artifactId>
-    <name>ACS Community Docker Image Builder for Alfresco Community</name>
+    <artifactId>content-services-community-docker</artifactId>
+    <name>ACS Community Docker Image Builder</name>
    <packaging>pom</packaging>

    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>acs-community-packaging</artifactId>
-        <version>7.0.0-SNAPSHOT</version>
+        <version>7.1.0-SNAPSHOT</version>
    </parent>

    <properties>
@@ -54,20 +54,6 @@
                                    <overWrite>false</overWrite>
                                    <outputDirectory>${project.build.directory}/amps</outputDirectory>
                                </artifactItem>
-<!--                                <artifactItem>-->
-<!--                                    <groupId>org.alfresco.aos-module</groupId>-->
-<!--                                    <artifactId>alfresco-aos-module</artifactId>-->
-<!--                                    <type>amp</type>-->
-<!--                                    <overWrite>false</overWrite>-->
-<!--                                    <outputDirectory>${project.build.directory}/amps</outputDirectory>-->
-<!--                                </artifactItem>-->
-<!--                                <artifactItem>-->
-<!--                                    <groupId>org.alfresco.integrations</groupId>-->
-<!--                                    <artifactId>alfresco-googledrive-repo-community</artifactId>-->
-<!--                                    <type>amp</type>-->
-<!--                                    <overWrite>false</overWrite>-->
-<!--                                    <outputDirectory>${project.build.directory}/amps</outputDirectory>-->
-<!--                                </artifactItem>-->
                            </artifactItems>
                        </configuration>
                    </execution>
@@ -108,7 +94,7 @@

        <profile>
            <id>internal</id>
-            <!-- publishes "image:latest" on Quay & DockerHub -->
+            <!-- publishes "image:latest" to Quay -->
            <build>
                <plugins>
                    <plugin>
@@ -140,29 +126,41 @@

        <profile>
            <id>release</id>
-            <!-- publishes "image:release_version" on Quay & DockerHub -->
+            <!-- publishes "image:release_version" to DockerHub -->
            <build>
                <plugins>
                    <plugin>
                        <groupId>io.fabric8</groupId>
                        <artifactId>docker-maven-plugin</artifactId>
-                        <configuration combine.self="override">
-                            <images>
-                                <!-- Quay image -->
-                                <image>
-                                    <name>${image.name}:${project.version}</name>
-                                    <registry>${image.registry}</registry>
-                                </image>
-                                <!-- DockerHub image -->
-                                <image>
-                                    <name>${image.name}:${project.version}</name>
-                                </image>
-                            </images>
-                        </configuration>
                        <executions>
                            <execution>
                                <id>build-push-image</id>
                                <phase>deploy</phase>
+                                <configuration combine.self="override">
+                                    <images>
+                                        <!-- DockerHub image -->
+                                        <image>
+                                            <name>${image.name}:${project.version}</name>
+                                        </image>
+                                    </images>
+                                </configuration>
+                                <goals>
+                                    <goal>build</goal>
+                                    <goal>push</goal>
+                                </goals>
+                            </execution>
+                            <execution>
+                                <id>build-push-quay-image</id>
+                                <phase>deploy</phase>
+                                <configuration combine.self="override">
+                                    <images>
+                                        <!-- Quay image -->
+                                        <image>
+                                            <name>${image.name}:${project.version}</name>
+                                            <registry>${image.registry}</registry>
+                                        </image>
+                                    </images>
+                                </configuration>
                                <goals>
                                    <goal>build</goal>
                                    <goal>push</goal>
--- a/pom.xml
+++ b/pom.xml
@@ -3,21 +3,21 @@
    <artifactId>acs-community-packaging</artifactId>
    <packaging>pom</packaging>
    <name>Alfresco Content Services Community Packaging</name>
-    <version>7.0.0-SNAPSHOT</version>
+    <version>7.1.0-SNAPSHOT</version>

    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo</artifactId>
        <relativePath>../alfresco-community-repo/pom.xml</relativePath>
-       <version>8.400</version>
+       <version>11.0</version>
    </parent>

    <properties>
-        <dependency.alfresco-community-repo.version>8.400</dependency.alfresco-community-repo.version>
+        <dependency.alfresco-community-repo.version>11.0</dependency.alfresco-community-repo.version>

-        <alfresco.share.version>7.0.0-A17</alfresco.share.version>
+        <alfresco.share.version>7.0.0</alfresco.share.version>
        <alfresco.alfresco-share-services.version>${alfresco.share.version}</alfresco.alfresco-share-services.version>
-        <alfresco.api-explorer.version>7.0.0-A4</alfresco.api-explorer.version>
+        <alfresco.api-explorer.version>7.0.0</alfresco.api-explorer.version>

        <repo.image.tag>${dependency.alfresco-community-repo.version}</repo.image.tag>
        <share.image.tag>${alfresco.share.version}</share.image.tag>
--- a/public-javadoc/pom.xml
+++ b/public-javadoc/pom.xml
@@ -5,7 +5,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>acs-community-packaging</artifactId>
-        <version>7.0.0-SNAPSHOT</version>
+        <version>7.1.0-SNAPSHOT</version>
    </parent>
    <packaging>pom</packaging>

--- a/scripts/travis/build_functions.sh
+++ b/scripts/travis/build_functions.sh
@@ -26,7 +26,13 @@ function cloneRepo() {
 }

 function retrievePomParentVersion() {
-  pushd "$(dirname "${BASH_SOURCE[0]}")/../../" >/dev/null
+  local REPO="${1}"
+
+  if [ -z "${REPO}" ]; then
+    pushd "$(dirname "${BASH_SOURCE[0]}")/../../" >/dev/null
+  else
+    pushd "$(dirname "${BASH_SOURCE[0]}")/../../../$(basename "${REPO%.git}")" >/dev/null
+  fi

  sed -n '/<parent>/,/<\/parent>/p' pom.xml \
    | sed -n '/<version>/,/<\/version>/p' \
@@ -39,8 +45,13 @@ function retrievePomParentVersion() {

 function retrievePomProperty() {
  local KEY="${1}"
+  local REPO="${2}"

-  pushd "$(dirname "${BASH_SOURCE[0]}")/../../" >/dev/null
+  if [ -z "${REPO}" ]; then
+    pushd "$(dirname "${BASH_SOURCE[0]}")/../../" >/dev/null
+  else
+    pushd "$(dirname "${BASH_SOURCE[0]}")/../../../$(basename "${REPO%.git}")" >/dev/null
+  fi

  sed -n '/<properties>/,/<\/properties>/p' pom.xml \
    | sed -n "/<${KEY}>/,/<\/${KEY}>/p" \
@@ -94,6 +105,42 @@ function pullUpstreamTag() {
  cloneRepo "${UPSTREAM_REPO}" "${TAG}"
 }

+function pullSameBranch() {
+  local UPSTREAM_REPO="${1}"
+
+  local SOURCE_BRANCH="$(identifyUpstreamSourceBranch "${UPSTREAM_REPO}")"
+
+  cloneRepo "${UPSTREAM_REPO}" "${SOURCE_BRANCH}"
+}
+
+function buildUpstreamTag() {
+  local UPSTREAM_REPO="${1}"
+  local TAG="${2}"
+  local EXTRA_BUILD_ARGUMENTS="${3}"
+
+  pushd "$(dirname "${BASH_SOURCE[0]}")/../../../"
+
+  cd "$(basename "${UPSTREAM_REPO%.git}")"
+
+  mvn -B -V clean package -DskipTests -Dmaven.javadoc.skip=true "-Dimage.tag=${TAG}" ${EXTRA_BUILD_ARGUMENTS}
+
+  popd
+}
+
+function buildSameBranchOnUpstream() {
+  local UPSTREAM_REPO="${1}"
+  local EXTRA_BUILD_ARGUMENTS="${2}"
+
+  pushd "$(dirname "${BASH_SOURCE[0]}")/../../../"
+
+  cd "$(basename "${UPSTREAM_REPO%.git}")"
+
+  mvn -B -V -q clean install -DskipTests -Dmaven.javadoc.skip=true ${EXTRA_BUILD_ARGUMENTS}
+  mvn -B -V -q install -DskipTests -f packaging/tests/pom.xml
+
+  popd
+}
+
 function pullUpstreamTagAndBuildDockerImage() {
  local UPSTREAM_REPO="${1}"
  local TAG="${2}"
--- a/scripts/travis/copy_to_release_bucket.sh
+++ b/scripts/travis/copy_to_release_bucket.sh
@@ -8,7 +8,7 @@ set -vex
 #

 if [ -z "${RELEASE_VERSION}" ]; then
-  echo "Please provide a RELEASE_VERSION in the format <acs-version>-<additional-info> (7.0.0-EA or 7.0.0-SNAPSHOT)"
+  echo "Please provide a RELEASE_VERSION in the format <acs-version>-<additional-info> (7.1.0-EA or 7.1.0-SNAPSHOT)"
  exit 1
 fi

--- a/scripts/travis/maven_release.sh
+++ b/scripts/travis/maven_release.sh
@@ -6,7 +6,7 @@ pushd "$(dirname "${BASH_SOURCE[0]}")/../../"


 if [ -z "${RELEASE_VERSION}" ] || [ -z "${DEVELOPMENT_VERSION}" ]; then
-  echo "Please provide a Release and Development version in the format <acs-version>-<additional-info> (7.0.0-EA or 7.0.0-SNAPSHOT)"
+  echo "Please provide a Release and Development version in the format <acs-version>-<additional-info> (7.1.0-EA or 7.1.0-SNAPSHOT)"
  exit 1
 fi

--- a/scripts/travis/verify_release_tag.sh
+++ b/scripts/travis/verify_release_tag.sh
@@ -9,7 +9,7 @@ pushd "$(dirname "${BASH_SOURCE[0]}")/../../"
 #

 if [ -z "${RELEASE_VERSION}" ]; then
-  echo "Please provide a RELEASE_VERSION in the format <acs-version>-<additional-info> (7.0.0-EA or 7.0.0-SNAPSHOT)"
+  echo "Please provide a RELEASE_VERSION in the format <acs-version>-<additional-info> (7.1.0-EA or 7.1.0-SNAPSHOT)"
  exit 1
 fi

--- a/tests/environment/.env
+++ b/tests/environment/.env
@@ -1,4 +1,4 @@
-TRANSFORMERS_TAG=2.3.8
+TRANSFORMERS_TAG=2.3.10
 SOLR6_TAG=2.0.1
-POSTGRES_TAG=11.7
+POSTGRES_TAG=13.1
 ACTIVEMQ_TAG=5.16.1
--- a/tests/pom.xml
+++ b/tests/pom.xml
@@ -6,7 +6,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>acs-community-packaging</artifactId>
-        <version>7.0.0-SNAPSHOT</version>
+        <version>7.1.0-SNAPSHOT</version>
    </parent>

    <modules>
--- a/tests/tas-cmis/pom.xml
+++ b/tests/tas-cmis/pom.xml
@@ -9,7 +9,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>content-repository-community-tests</artifactId>
-        <version>7.0.0-SNAPSHOT</version>
+        <version>7.1.0-SNAPSHOT</version>
    </parent>

    <developers>
--- a/tests/tas-email/pom.xml
+++ b/tests/tas-email/pom.xml
@@ -9,7 +9,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>content-repository-community-tests</artifactId>
-        <version>7.0.0-SNAPSHOT</version>
+        <version>7.1.0-SNAPSHOT</version>
    </parent>

    <developers>
--- a/tests/tas-integration/pom.xml
+++ b/tests/tas-integration/pom.xml
@@ -9,7 +9,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>content-repository-community-tests</artifactId>
-        <version>7.0.0-SNAPSHOT</version>
+        <version>7.1.0-SNAPSHOT</version>
    </parent>

    <developers>
@@ -23,7 +23,7 @@

    <properties>
        <suiteXmlFile>${project.basedir}/src/test/resources/integration-suite.xml</suiteXmlFile>
-        <dependency.groovy.version>2.5.14</dependency.groovy.version>
+        <dependency.groovy.version>3.0.8</dependency.groovy.version>
    </properties>

    <dependencies>
--- a/tests/tas-restapi/pom.xml
+++ b/tests/tas-restapi/pom.xml
@@ -9,7 +9,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>content-repository-community-tests</artifactId>
-        <version>7.0.0-SNAPSHOT</version>
+        <version>7.1.0-SNAPSHOT</version>
    </parent>

    <developers>
--- a/tests/tas-webdav/pom.xml
+++ b/tests/tas-webdav/pom.xml
@@ -9,7 +9,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>content-repository-community-tests</artifactId>
-        <version>7.0.0-SNAPSHOT</version>
+        <version>7.1.0-SNAPSHOT</version>
    </parent>

    <developers>
Author	SHA1	Message	Date
dependabot-preview[bot]	1f1849cd4a	Bump groovy from 2.5.14 to 3.0.8 Bumps [groovy](https://github.com/apache/groovy) from 2.5.14 to 3.0.8. - [Release notes](https://github.com/apache/groovy/releases) - [Commits](https://github.com/apache/groovy/commits) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2021-04-21 22:14:42 +00:00
alandavis	c47c9be32d	Switch master to support ACS 7.1.0 * incremented pom versions to 11.0 so that 9 may be used by 7.0.1 and 10 for 7.0.2	2021-03-27 18:32:14 +00:00
alandavis	175c3b3cf1	Remove whitesource token as we don't use whitesource any more	2021-03-26 17:50:40 +00:00
Cezar.Leahu	f5ac695ca6	Allow the CI Publish step on any branch [skip ci]	2021-03-16 16:17:45 +02:00
alandavis	37b662061f	Use master for ACS 7.0.1 * Reset pom.xml version to 7.0.1-SNAPSHOT * Parent pom to 9.0	2021-03-10 21:53:30 +00:00
pieCit87	04e67d2d84	Bump of Share to final version (#1276 )	2021-03-10 22:04:17 +02:00
alandavis	64d1377bfa	Update upstream version to 8.423	2021-03-09 20:45:22 +00:00
alandavis	e83c0a6d65	Pick up api-explorer 7.0.0	2021-03-09 17:51:40 +00:00
Alan Davis	2c8499d8b0	ATS-876 Update T-Engine and pick up latest community-repo (#1275 ) * Update upstream version to 8.422	2021-03-09 16:46:49 +00:00
dependabot-preview[bot]	c72d3a5a71	Bump dependency.alfresco-community-repo.version from 8.414 to 8.419 (#1269 )	2021-03-05 22:15:43 +00:00
dependabot-preview[bot]	2cdaf1da9d	Bump alfresco-community-repo from 8.414 to 8.419 (#1268 )	2021-03-05 22:15:36 +00:00
Travis CI User	fb1f206295	[maven-release-plugin][skip ci] prepare for next development iteration	2021-03-03 19:12:40 +00:00
Travis CI User	684a6d8491	[maven-release-plugin][skip ci] prepare release 7.0.0-A29	2021-03-03 19:12:34 +00:00
alandavis	4fca85e719	[release] 7.0.0-A29 Update upstream version to 8.414	2021-03-03 17:35:34 +00:00
alandavis	2be86a3890	[release] 7.0.0-A29 Update upstream version to 8.415	2021-03-03 17:31:50 +00:00
Travis CI User	ef24dfb718	[maven-release-plugin][skip ci] prepare for next development iteration	2021-02-27 22:15:20 +00:00
Travis CI User	84864a82e2	[maven-release-plugin][skip ci] prepare release 7.0.0-A28	2021-02-27 22:15:14 +00:00
alandavis	535bb4394e	[release] 7.0.0-A28	2021-02-27 19:35:20 +00:00
Travis CI User	885b65f816	[maven-release-plugin][skip ci] prepare for next development iteration	2021-02-27 19:08:24 +00:00
Travis CI User	5efa7ff3de	[maven-release-plugin][skip ci] prepare release 7.0.0-A27e	2021-02-27 19:08:19 +00:00
alandavis	286eb172bf	Test [release] 7.0.0-A27e Try to push to DockerHub and Quay.io - unique execution id	2021-02-27 17:50:20 +00:00
Travis CI User	43132b0a4c	[maven-release-plugin][skip ci] prepare for next development iteration	2021-02-27 15:43:35 +00:00
Travis CI User	8930bae15e	[maven-release-plugin][skip ci] prepare release 7.0.0-A27d	2021-02-27 15:43:30 +00:00
alandavis	0d356db8fc	Test [release] 7.0.0-A27d Try to push to DockerHub and Quay.io - unique execution id	2021-02-27 13:50:44 +00:00
alandavis	a264fb7683	Update upstream version to 8.411 and test [release] 7.0.0-A27d Try to push to DockerHub and Quay.io	2021-02-27 12:56:23 +00:00
pieCit87	532fff429e	Update pom.xml (#1261 )	2021-02-26 20:53:27 +02:00
CezarLeahu	bf5fb1df6f	Update the ACS build scripts (#1260 )	2021-02-26 11:46:27 +02:00
Nithin Nambiar	2e9871cf27	ACS-946 exclude meta-info folder from distribution (#1255 )	2021-02-25 15:01:18 +00:00
araschitor	00b2328d2b	feature/APPS-release-share: release share A18 on acs-packaging (#1253 )	2021-02-25 11:29:10 +02:00
alandavis	96709c3f36	Update upstream version to 8.405	2021-02-24 21:48:17 +00:00
Alan Davis	a0cebe77ff	ACS-1183 ACS 7 Stacks: PostgreSQL (#1256 ) Upgraded the version of PostgreSQL to the latest (13.1) in all tests that are not db specific Switch to new Jira url for gitbugtrack	2021-02-24 21:41:26 +00:00
Alan Davis	e04e757daf	ACS-1110 replace fabric8 with docker-maven-plugin (#1252 ) The community repo image was not being updated on DockerHub or quay.io after the original commit for this issue. It appears the new io.fabric8:docker-maven-plugin is only able to push to one registry. We had images for quay.io and dockerhub. On a branch we managed to release 7.0.0-A27c. In order to do so we temporarily had to comment out the upstream dependency check in build.sh. [skip ci]	2021-02-22 10:54:42 +00:00