Change POM version to 11.21-ags-1.0-SNAPSHOT

2025-07-31 17:39:05 +00:00 · 2021-05-05 19:42:59 +01:00
parent ba16561c75
commit 3a2e10bc71
23 changed files with 86 additions and 115 deletions
--- a/amps/ags/license/licenses.properties
+++ b/amps/ags/license/licenses.properties
@@ -1,2 +1 @@
-alfresco_community=Alfresco Community
-alfresco_enterprise=Alfresco Enterprise
+alfresco_community=Alfresco Community
--- a/amps/ags/pom.xml
+++ b/amps/ags/pom.xml
@@ -2,67 +2,22 @@

   <modelVersion>4.0.0</modelVersion>
   <groupId>org.alfresco</groupId>
-   <artifactId>alfresco-governance-services</artifactId>
+   <artifactId>alfresco-governance-services-community-parent</artifactId>
   <packaging>pom</packaging>
-   <version>3.5.1-SNAPSHOT</version>
-   <name>Alfresco Governance Services</name>
+   <name>Alfresco Governance Services Community Parent</name>

-   <url>http://www.alfresco.org/</url>
-   <inceptionYear>2005</inceptionYear>
-   <organization>
-      <name>Alfresco Software</name>
-      <url>http://www.alfresco.org/</url>
-   </organization>
-
-   <scm>
-      <connection>scm:git:https://github.com/Alfresco/governance-services.git</connection>
-      <developerConnection>scm:git:https://github.com/Alfresco/governance-services.git</developerConnection>
-      <url>https://github.com/Alfresco/governance-services</url>
-     <tag>HEAD</tag>
-  </scm>
-
-   <issueManagement>
-      <system>JIRA</system>
-      <url>https://issues.alfresco.com/jira/browse/RM</url>
-   </issueManagement>
-   <ciManagement>
-      <system>Bamboo</system>
-      <url>https://bamboo.alfresco.com/bamboo/browse/RM</url>
-   </ciManagement>
-
-   <prerequisites>
-      <maven>3.3.9</maven>
-   </prerequisites>
-
-   <distributionManagement>
-      <repository>
-         <id>alfresco-internal</id>
-         <url>https://artifacts.alfresco.com/nexus/content/repositories/internal-releases/</url>
-      </repository>
-      <snapshotRepository>
-         <id>alfresco-internal-snapshots</id>
-         <url>https://artifacts.alfresco.com/nexus/content/repositories/internal-snapshots/</url>
-      </snapshotRepository>
-   </distributionManagement>
+   <parent>
+      <groupId>org.alfresco</groupId>
+      <artifactId>alfresco-community-repo-amps</artifactId>
+      <version>11.21-ags-1.0-SNAPSHOT</version>
+   </parent>

   <modules>
      <module>rm-community</module>
+      <module>rm-automation</module>
   </modules>

   <profiles>
-      <profile>
-         <id>enterprise</id>
-         <activation>
-            <property>
-               <name>!community</name>
-            </property>
-         </activation>
-         <modules>
-            <module>rm-enterprise</module>
-            <module>rm-automation</module>
-            <module>rm-benchmark</module>
-         </modules>
-      </profile>
      <!-- Generate the Javadoc for Public API only (filtered on AlfrescoPublicApi annotation) -->
      <profile>
      <id>publicapi</id>
@@ -398,8 +353,6 @@
      <alfresco.db.password>alfresco</alfresco.db.password>
      <alfresco.db.url>jdbc:mysql://${alfresco.db.host}:${alfresco.db.port}/${alfresco.db.name}</alfresco.db.url>
      <alfresco.db.username>alfresco</alfresco.db.username>
-      <alfresco.groupId>org.alfresco</alfresco.groupId>
-      <alfresco.share.artifactId>share</alfresco.share.artifactId>
      <alfresco-spring-webscripts.version>8.15</alfresco-spring-webscripts.version>
      <api.explorer.version>7.0.0</api.explorer.version>
      <!-- Set this here and override it in the community and enterprise modules. -->
@@ -464,8 +417,6 @@
      <javax-jaxb-impl.version>3.0.0-M4</javax-jaxb-impl.version>
      <javax.servlet-api.version>4.0.1</javax.servlet-api.version>
      <apache-compress.version>1.19</apache-compress.version>
-      <!-- 7.0.0 dependencies -->
-      <alfresco-community-repo.version>8.423</alfresco-community-repo.version>
   </properties>

   <dependencyManagement>
--- a/amps/ags/rm-automation/pom.xml
+++ b/amps/ags/rm-automation/pom.xml
@@ -1,14 +1,14 @@
 <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/maven-v4_0_0.xsd">

   <modelVersion>4.0.0</modelVersion>
-   <artifactId>alfresco-governance-services-automation</artifactId>
-   <name>Alfresco Governance Services Automation</name>
+   <artifactId>alfresco-governance-services-automation-community</artifactId>
+   <name>Alfresco Governance Services Automation Community</name>
   <packaging>pom</packaging>

   <parent>
      <groupId>org.alfresco</groupId>
-      <artifactId>alfresco-governance-services</artifactId>
-      <version>3.5.1-SNAPSHOT</version>
+      <artifactId>alfresco-governance-services-community-parent</artifactId>
+      <version>11.21-ags-1.0-SNAPSHOT</version>
   </parent>

   <licenses>
@@ -19,8 +19,6 @@

   <modules>
      <module>rm-automation-community-rest-api</module>
-      <module>rm-automation-enterprise-rest-api</module>
-      <module>rm-automation-ui</module>
   </modules>

   <properties>
--- 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,8 +7,8 @@

   <parent>
      <groupId>org.alfresco</groupId>
-      <artifactId>alfresco-governance-services-automation</artifactId>
-      <version>3.5.1-SNAPSHOT</version>
+      <artifactId>alfresco-governance-services-automation-community</artifactId>
+      <version>11.21-ags-1.0-SNAPSHOT</version>
   </parent>

   <properties>
@@ -57,6 +57,7 @@
         <groupId>org.alfresco.tas</groupId>
         <artifactId>restapi</artifactId>
         <version>${tas.restapi.version}</version>
+         <scope>provided</scope>
         <exclusions>
            <exclusion>
               <groupId>com.fasterxml.jackson.core</groupId>
@@ -71,6 +72,7 @@
      <dependency>
         <groupId>org.alfresco.tas</groupId>
         <artifactId>utility</artifactId>
+         <scope>provided</scope>
         <version>${tas.utility.version}</version>
      </dependency>
      <dependency>
@@ -105,5 +107,19 @@
         <artifactId>jackson-databind</artifactId>
         <version>${jackson.databind.version}</version>
      </dependency>
+      <dependency>
+         <groupId>org.json</groupId>
+         <artifactId>json</artifactId>
+      </dependency>
+      <dependency>
+         <groupId>org.alfresco.test</groupId>
+         <artifactId>dataprep</artifactId>
+         <scope>compile</scope>
+      </dependency>
+      <dependency>
+         <groupId>io.rest-assured</groupId>
+         <artifactId>rest-assured</artifactId>
+         <scope>compile</scope>
+      </dependency>
   </dependencies>
 </project>
--- a/amps/ags/rm-community/pom.xml
+++ b/amps/ags/rm-community/pom.xml
@@ -7,8 +7,8 @@

   <parent>
      <groupId>org.alfresco</groupId>
-      <artifactId>alfresco-governance-services</artifactId>
-      <version>3.5.1-SNAPSHOT</version>
+      <artifactId>alfresco-governance-services-community-parent</artifactId>
+      <version>11.21-ags-1.0-SNAPSHOT</version>
   </parent>

   <licenses>
@@ -20,22 +20,14 @@
   <modules>
      <module>rm-community-rest-api-explorer</module>
      <module>rm-community-repo</module>
-      <module>rm-community-share</module>
   </modules>

   <dependencyManagement>
      <dependencies>
         <dependency>
-            <groupId>${alfresco.groupId}</groupId>
+            <groupId>org.alfresco</groupId>
            <artifactId>alfresco-community-repo</artifactId>
-            <version>${alfresco-community-repo.version}</version>
-            <type>pom</type>
-            <scope>import</scope>
-         </dependency>
-         <dependency>
-            <groupId>${alfresco.groupId}</groupId>
-            <artifactId>alfresco-share-parent</artifactId>
-            <version>${share.version}</version>
+            <version>${project.version}</version>
            <type>pom</type>
            <scope>import</scope>
         </dependency>
@@ -75,8 +67,6 @@
   <properties>
      <spring.version>5.3.3</spring.version>
      <alfresco.min.version>7.0.0</alfresco.min.version>
-      <share.version>7.0.0</share.version>
-      <!-- The properties app.amp.* need to be set for share to work. -->
      <app.filtering.enabled>true</app.filtering.enabled>
   </properties>

--- a/amps/ags/rm-community/rm-community-repo/pom.xml
+++ b/amps/ags/rm-community/rm-community-repo/pom.xml
@@ -2,14 +2,14 @@

   <modelVersion>4.0.0</modelVersion>
   <artifactId>alfresco-governance-services-community-repo</artifactId>
-   <name>AGS Repo</name>
+   <name>Alfresco Governance Services Community Repository</name>
   <description>Alfresco Governance Services Repository Extension</description>
   <packaging>amp</packaging>

   <parent>
      <groupId>org.alfresco</groupId>
      <artifactId>alfresco-governance-services-community</artifactId>
-      <version>3.5.1-SNAPSHOT</version>
+      <version>11.21-ags-1.0-SNAPSHOT</version>
   </parent>

   <properties>
@@ -198,10 +198,10 @@
                     <outputDirectory>${app.amp.client.war.folder}</outputDirectory>
                     <artifactItems>
                        <artifactItem>
-                           <groupId>${alfresco.groupId}</groupId>
+                           <groupId>org.alfresco</groupId>
                           <artifactId>content-services-community</artifactId>
                           <type>war</type>
-                           <version>${alfresco-community-repo.version}</version>
+                           <version>${project.version}</version>
                        </artifactItem>
                     </artifactItems>
                  </configuration>
@@ -323,39 +323,39 @@
      <dependency>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-data-model</artifactId>
-         <version>${alfresco-community-repo.version}</version>
+         <version>${project.version}</version>
         <scope>provided</scope>
      </dependency>
      <dependency>
-         <groupId>${alfresco.groupId}</groupId>
+         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-remote-api</artifactId>
-         <version>${alfresco-community-repo.version}</version>
+         <version>${project.version}</version>
         <scope>provided</scope>
      </dependency>
      <dependency>
-         <groupId>${alfresco.groupId}</groupId>
+         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-repository</artifactId>
-         <version>${alfresco-community-repo.version}</version>
+         <version>${project.version}</version>
         <scope>provided</scope>
      </dependency>
      <dependency>
-         <groupId>${alfresco.groupId}</groupId>
+         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-repository</artifactId>
-         <version>${alfresco-community-repo.version}</version>
+         <version>${project.version}</version>
         <classifier>tests</classifier>
         <scope>test</scope>
      </dependency>
      <dependency>
-         <groupId>${alfresco.groupId}</groupId>
+         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-remote-api</artifactId>
-         <version>${alfresco-community-repo.version}</version>
+         <version>${project.version}</version>
         <classifier>tests</classifier>
         <scope>test</scope>
      </dependency>
      <dependency>
-         <groupId>${alfresco.groupId}</groupId>
+         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-core</artifactId>
-         <version>${alfresco-community-repo.version}</version>
+         <version>${project.version}</version>
         <classifier>tests</classifier>
         <scope>test</scope>
      </dependency>
@@ -492,10 +492,10 @@
                           <outputDirectory>${app.amp.client.war.folder}</outputDirectory>
                           <artifactItems>
                              <artifactItem>
-                                 <groupId>${alfresco.groupId}</groupId>
+                                 <groupId>org.alfresco</groupId>
                                 <artifactId>content-services-community</artifactId>
                                 <type>war</type>
-                                 <version>${alfresco-community-repo.version}</version>
+                                 <version>${project.version}</version>
                              </artifactItem>
                           </artifactItems>
                        </configuration>
--- 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</artifactId>
-      <version>3.5.1-SNAPSHOT</version>
+      <version>11.21-ags-1.0-SNAPSHOT</version>
   </parent>

   <properties>
--- a/amps/pom.xml
+++ b/amps/pom.xml
@@ -0,0 +1,16 @@
+<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-amps</artifactId>
+    <name>AMPs</name>
+    <packaging>pom</packaging>
+
+    <parent>
+        <groupId>org.alfresco</groupId>
+        <artifactId>alfresco-community-repo</artifactId>
+        <version>11.21-ags-1.0-SNAPSHOT</version>
+    </parent>
+
+    <modules>
+        <module>ags</module>
+    </modules>
+</project>