[maven-release-plugin][skip ci] prepare release 23.1.0.103

Merge pull request #1918 from Alfresco/feature/ACS-5191_LicensePluginUpgrade
ACS-5191 Upgrade to license-maven-plugin 2.0.1.
2025-09-10 14:11:58 +00:00 · 2023-05-15 13:39:29 +00:00 · 2023-05-15 13:52:09 +01:00 · 2023-05-14 00:05:55 +00:00 · 2023-05-14 00:05:52 +00:00 · 2023-05-14 00:02:52 +00:00
27 changed files with 55 additions and 37 deletions
--- a/amps/ags/pom.xml
+++ b/amps/ags/pom.xml
@@ -7,7 +7,7 @@
   <parent>
      <groupId>org.alfresco</groupId>
      <artifactId>alfresco-community-repo-amps</artifactId>
-      <version>20.161</version>
+      <version>23.1.0.103</version>
   </parent>

   <modules>
--- a/amps/ags/rm-automation/pom.xml
+++ b/amps/ags/rm-automation/pom.xml
@@ -7,7 +7,7 @@
   <parent>
      <groupId>org.alfresco</groupId>
      <artifactId>alfresco-governance-services-community-parent</artifactId>
-      <version>20.161</version>
+      <version>23.1.0.103</version>
   </parent>

   <modules>
--- a/amps/ags/rm-automation/rm-automation-community-rest-api/pom.xml
+++ b/amps/ags/rm-automation/rm-automation-community-rest-api/pom.xml
@@ -7,7 +7,7 @@
   <parent>
      <groupId>org.alfresco</groupId>
      <artifactId>alfresco-governance-services-automation-community-repo</artifactId>
-      <version>20.161</version>
+      <version>23.1.0.103</version>
   </parent>

   <build>
--- a/amps/ags/rm-community/pom.xml
+++ b/amps/ags/rm-community/pom.xml
@@ -7,7 +7,7 @@
   <parent>
      <groupId>org.alfresco</groupId>
      <artifactId>alfresco-governance-services-community-parent</artifactId>
-      <version>20.161</version>
+      <version>23.1.0.103</version>
   </parent>

   <modules>
--- a/amps/ags/rm-community/rm-community-repo/pom.xml
+++ b/amps/ags/rm-community/rm-community-repo/pom.xml
@@ -8,7 +8,7 @@
   <parent>
      <groupId>org.alfresco</groupId>
      <artifactId>alfresco-governance-services-community-repo-parent</artifactId>
-      <version>20.161</version>
+      <version>23.1.0.103</version>
   </parent>

   <properties>
--- a/amps/ags/rm-community/rm-community-repo/test/resources/alfresco/version.properties
+++ b/amps/ags/rm-community/rm-community-repo/test/resources/alfresco/version.properties
@@ -3,8 +3,8 @@
 #

 # Version label
-version.major=7
-version.minor=4
+version.major=23
+version.minor=1
 version.revision=0
 version.label=

--- a/amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml
+++ b/amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml
@@ -7,7 +7,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-governance-services-community-repo-parent</artifactId>
-        <version>20.161</version>
+        <version>23.1.0.103</version>
    </parent>

    <build>
--- a/amps/pom.xml
+++ b/amps/pom.xml
@@ -7,7 +7,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo</artifactId>
-        <version>20.161</version>
+        <version>23.1.0.103</version>
    </parent>

    <modules>
--- a/amps/share-services/pom.xml
+++ b/amps/share-services/pom.xml
@@ -8,7 +8,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo-amps</artifactId>
-        <version>20.161</version>
+        <version>23.1.0.103</version>
    </parent>

    <properties>
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -7,7 +7,7 @@
   <parent>
      <groupId>org.alfresco</groupId>
      <artifactId>alfresco-community-repo</artifactId>
-      <version>20.161</version>
+      <version>23.1.0.103</version>
   </parent>

   <dependencies>
--- a/data-model/pom.xml
+++ b/data-model/pom.xml
@@ -7,7 +7,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo</artifactId>
-        <version>20.161</version>
+        <version>23.1.0.103</version>
    </parent>

    <properties>
--- a/mmt/pom.xml
+++ b/mmt/pom.xml
@@ -7,7 +7,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo</artifactId>
-        <version>20.161</version>
+        <version>23.1.0.103</version>
    </parent>

    <dependencies>
--- a/packaging/distribution/pom.xml
+++ b/packaging/distribution/pom.xml
@@ -9,6 +9,6 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo-packaging</artifactId>
-        <version>20.161</version>
+        <version>23.1.0.103</version>
    </parent>
 </project>
--- a/packaging/docker-alfresco/pom.xml
+++ b/packaging/docker-alfresco/pom.xml
@@ -7,7 +7,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo-packaging</artifactId>
-        <version>20.161</version>
+        <version>23.1.0.103</version>
    </parent>

    <properties>
--- a/packaging/pom.xml
+++ b/packaging/pom.xml
@@ -7,7 +7,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo</artifactId>
-        <version>20.161</version>
+        <version>23.1.0.103</version>
    </parent>

    <modules>
--- a/packaging/tests/pom.xml
+++ b/packaging/tests/pom.xml
@@ -6,7 +6,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo-packaging</artifactId>
-        <version>20.161</version>
+        <version>23.1.0.103</version>
    </parent>

    <modules>
--- a/packaging/tests/tas-cmis/pom.xml
+++ b/packaging/tests/tas-cmis/pom.xml
@@ -7,7 +7,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo-tests</artifactId>
-        <version>20.161</version>
+        <version>23.1.0.103</version>
    </parent>

    <organization>
--- a/packaging/tests/tas-email/pom.xml
+++ b/packaging/tests/tas-email/pom.xml
@@ -9,7 +9,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo-tests</artifactId>
-        <version>20.161</version>
+        <version>23.1.0.103</version>
    </parent>

    <developers>
--- a/packaging/tests/tas-integration/pom.xml
+++ b/packaging/tests/tas-integration/pom.xml
@@ -9,7 +9,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo-tests</artifactId>
-        <version>20.161</version>
+        <version>23.1.0.103</version>
    </parent>

    <developers>
--- a/packaging/tests/tas-restapi/pom.xml
+++ b/packaging/tests/tas-restapi/pom.xml
@@ -8,7 +8,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo-tests</artifactId>
-        <version>20.161</version>
+        <version>23.1.0.103</version>
    </parent>

    <properties>
@@ -20,7 +20,6 @@
        <org.glassfish.version>1.1.4</org.glassfish.version>
        <commons-lang3.version>3.12.0</commons-lang3.version>
        <scribejava-apis.version>8.3.1</scribejava-apis.version>
-        <license-maven-plugin.version>2.0.1.alfresco-2</license-maven-plugin.version>
        <java.version>11</java.version>
    </properties>

@@ -85,6 +84,13 @@
            <version>${commons-lang3.version}</version>
        </dependency>

+        <dependency>
+            <groupId>org.awaitility</groupId>
+            <artifactId>awaitility</artifactId>
+            <version>${dependency.awaitility.version}</version>
+            <scope>test</scope>
+        </dependency>
+
        <!-- REST ASSURED -->
        <dependency>
            <groupId>org.apache.httpcomponents</groupId>
--- a/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/renditions/RenditionIntegrationTests.java
+++ b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/renditions/RenditionIntegrationTests.java
@@ -1,5 +1,7 @@
 package org.alfresco.rest.renditions;

+import java.time.Duration;
+import com.google.common.base.Predicates;
 import org.alfresco.rest.RestTest;
 import org.alfresco.rest.core.RestResponse;
 import org.alfresco.rest.model.RestNodeModel;
@@ -8,6 +10,8 @@ import org.alfresco.utility.model.FileModel;
 import org.alfresco.utility.model.FolderModel;
 import org.alfresco.utility.model.SiteModel;
 import org.alfresco.utility.model.UserModel;
+import org.awaitility.Awaitility;
+import org.awaitility.Durations;
 import org.springframework.http.HttpStatus;
 import org.testng.Assert;
 import org.testng.annotations.BeforeClass;
@@ -68,15 +72,23 @@ public abstract class RenditionIntegrationTests extends RestTest
     */
    protected RestNodeModel uploadFile(String sourceFile) throws Exception
    {
-        FolderModel folder = FolderModel.getRandomFolderModel();
-        folder = dataContent.usingUser(user).usingSite(site).createFolder(folder);
+        FolderModel folder = Awaitility
+            .await()
+            .atMost(Duration.ofSeconds(30))
+            .pollInterval(Durations.ONE_SECOND)
+            .ignoreExceptions()
+            .until(() -> {
+                FolderModel randomFolderModel = FolderModel.getRandomFolderModel();
+                return dataContent.usingUser(user).usingSite(site).createFolder(randomFolderModel);
+            }, Predicates.notNull());
        restClient.authenticateUser(user).configureRequestSpec()
-                .addMultiPart("filedata", Utility.getResourceTestDataFile(sourceFile));
+            .addMultiPart("filedata", Utility.getResourceTestDataFile(sourceFile));
        RestNodeModel fileNode = restClient.authenticateUser(user).withCoreAPI().usingNode(folder).createNode();

        Assert.assertEquals(Integer.valueOf(restClient.getStatusCode()).intValue(), HttpStatus.CREATED.value(),
-                "Failed to created a node for rendition tests using file " + sourceFile);
+            "Failed to created a node for rendition tests using file " + sourceFile);

        return fileNode;
    }
+
 }
--- a/packaging/tests/tas-webdav/pom.xml
+++ b/packaging/tests/tas-webdav/pom.xml
@@ -9,7 +9,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo-tests</artifactId>
-        <version>20.161</version>
+        <version>23.1.0.103</version>
    </parent>

    <developers>
--- a/packaging/war/pom.xml
+++ b/packaging/war/pom.xml
@@ -7,7 +7,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo-packaging</artifactId>
-        <version>20.161</version>
+        <version>23.1.0.103</version>
    </parent>

    <properties>
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
 <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>alfresco-community-repo</artifactId>
-    <version>20.161</version>
+    <version>23.1.0.103</version>
    <packaging>pom</packaging>
    <name>Alfresco Community Repo Parent</name>

@@ -23,8 +23,8 @@
    </modules>

    <properties>
-        <acs.version.major>7</acs.version.major>
-        <acs.version.minor>4</acs.version.minor>
+        <acs.version.major>23</acs.version.major>
+        <acs.version.minor>1</acs.version.minor>
        <acs.version.revision>0</acs.version.revision>
        <acs.version.label />
        <amp.min.version>${acs.version.major}.0.0</amp.min.version>
@@ -113,10 +113,10 @@

        <alfresco.googledrive.version>3.4.0</alfresco.googledrive.version>
        <alfresco.aos-module.version>1.6.0</alfresco.aos-module.version>
-        <alfresco.api-explorer.version>7.3.0</alfresco.api-explorer.version> <!-- Also in alfresco-enterprise-share -->
+        <alfresco.api-explorer.version>7.4.0</alfresco.api-explorer.version> <!-- Also in alfresco-enterprise-share -->

        <alfresco.maven-plugin.version>2.2.0</alfresco.maven-plugin.version>
-        <license-maven-plugin.version>2.0.1.alfresco-2</license-maven-plugin.version>
+        <license-maven-plugin.version>2.0.1</license-maven-plugin.version>

        <dependency.postgresql.version>42.5.2</dependency.postgresql.version>
        <dependency.mysql.version>8.0.30</dependency.mysql.version>
@@ -150,7 +150,7 @@
        <connection>scm:git:https://github.com/Alfresco/alfresco-community-repo.git</connection>
        <developerConnection>scm:git:https://github.com/Alfresco/alfresco-community-repo.git</developerConnection>
        <url>https://github.com/Alfresco/alfresco-community-repo</url>
-        <tag>20.161</tag>
+        <tag>23.1.0.103</tag>
    </scm>

    <distributionManagement>
--- a/remote-api/pom.xml
+++ b/remote-api/pom.xml
@@ -7,7 +7,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo</artifactId>
-        <version>20.161</version>
+        <version>23.1.0.103</version>
    </parent>

    <dependencies>
--- a/repository/pom.xml
+++ b/repository/pom.xml
@@ -7,7 +7,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo</artifactId>
-        <version>20.161</version>
+        <version>23.1.0.103</version>
    </parent>

    <dependencies>
--- a/repository/src/main/resources/alfresco/repository.properties
+++ b/repository/src/main/resources/alfresco/repository.properties
@@ -3,7 +3,7 @@
 repository.name=Main Repository

 # Schema number
-version.schema=18000
+version.schema=19000

 # Directory configuration
Author	SHA1	Message	Date
alfresco-build	0d1a6c8a0a	[maven-release-plugin][skip ci] prepare release 23.1.0.103	2023-05-15 13:39:29 +00:00
Tom Page	4b9c052f0d	Merge pull request #1918 from Alfresco/feature/ACS-5191_LicensePluginUpgrade ACS-5191 Upgrade to license-maven-plugin 2.0.1.	2023-05-15 13:52:09 +01:00
alfresco-build	6fb0bb3042	[maven-release-plugin][skip ci] prepare for next development iteration	2023-05-14 00:05:55 +00:00
alfresco-build	78f3d58c46	[maven-release-plugin][skip ci] prepare release 23.1.0.102	2023-05-14 00:05:52 +00:00
Alfresco CI User	1913258e84	[force] Force release for 2023-05-14.	2023-05-14 00:02:52 +00:00
Tom Page	d95e6c8e34	ACS-5191 Upgrade to license-maven-plugin 2.0.1.	2023-05-12 16:19:38 +01:00
alfresco-build	958d217339	[maven-release-plugin][skip ci] prepare for next development iteration	2023-05-11 09:43:05 +00:00
alfresco-build	4417e28412	[maven-release-plugin][skip ci] prepare release 23.1.0.101	2023-05-11 09:43:02 +00:00
Damian Ujma	58653cb523	ACS-5087 Add more attempts to create a folder in RenditionIntegrationTests (#1904 ) * ACS-5087 Add more attempts to create a folder * ACS-5087 Use awaitility to add more attempts to create a folder * ACS-5087 Add ignoreExceptions condition * ACS-5087 Use a smaller pollInterval	2023-05-11 10:59:38 +02:00
alfresco-build	7af935d43a	[maven-release-plugin][skip ci] prepare for next development iteration	2023-05-08 12:41:15 +00:00
alfresco-build	f5d843446a	[maven-release-plugin][skip ci] prepare release 23.1.0.100	2023-05-08 12:41:11 +00:00
mstrankowski	817901e74e	Update Master branch to 23.1.0, forgotten updates	2023-05-08 13:52:16 +02:00
mstrankowski	c492683113	Update Master branch to 23.1.0	2023-05-08 13:02:01 +02:00
alfresco-build	e2305d053f	[maven-release-plugin][skip ci] prepare for next development iteration	2023-05-07 00:07:14 +00:00
alfresco-build	749768457e	[maven-release-plugin][skip ci] prepare release 20.163	2023-05-07 00:07:11 +00:00
Alfresco CI User	118f2ecbab	[force] Force release for 2023-05-07.	2023-05-07 00:03:02 +00:00
alfresco-build	a4ac93df7a	[maven-release-plugin][skip ci] prepare for next development iteration	2023-05-04 07:56:19 +00:00
alfresco-build	1e1fbe8207	[maven-release-plugin][skip ci] prepare release 20.162	2023-05-04 07:56:16 +00:00
Sara	e78f9ced98	ACS-5157_Bump_api-explorer_to_7-4-0 (#1912 )	2023-05-04 08:10:00 +01:00
alfresco-build	72221c777d	[maven-release-plugin][skip ci] prepare for next development iteration	2023-05-03 20:54:48 +00:00