Compare commits

...

6 Commits

Author SHA1 Message Date
Domenico Sibilio
7ba6fe8e21 Run [ags][tas] tests 2024-06-26 14:03:18 +02:00
Domenico Sibilio
95ed666f75 Run [ags] tests 2024-06-26 14:01:53 +02:00
Domenico Sibilio
bdfc3b1645 Run [ags] tests 2024-06-26 13:07:19 +02:00
Domenico Sibilio
c5af110c28 ACS-7904 Build AGS amp with latest alfresco-maven-plugin 2024-06-26 12:55:02 +02:00
Domenico Sibilio
833e9586f8 Merge branch 'master' of github.com:Alfresco/alfresco-community-repo into feature/investigate-alfresco-maven-plugin-bump 2024-06-26 10:29:56 +02:00
Domenico Sibilio
22c5a13aaf Investigate AMP bump to the latest version 2024-05-30 16:44:54 +02:00
5 changed files with 208 additions and 46 deletions

View File

@@ -1,7 +1,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/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>alfresco-governance-services-community-repo</artifactId>
<packaging>amp</packaging>
<packaging>jar</packaging>
<name>Alfresco Governance Services Community Repository AMP</name>
<description>Alfresco Governance Services Repository Extension</description>
@@ -218,26 +218,6 @@
</executions>
</plugin>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
<phase>prepare-package</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<target>
<move todir="${project.build.directory}/${project.build.finalName}/config/alfresco">
<fileset dir="${project.build.outputDirectory}/alfresco" />
</move>
<copy file="${project.build.directory}/${project.build.finalName}/config/alfresco/module/org_alfresco_module_rm/module.properties" todir="${project.build.directory}/${project.build.finalName}" />
<copy file="${project.build.directory}/generated-sources/license/THIRD-PARTY.txt" todir="${project.build.directory}/${project.build.finalName}/licenses/${artifactId}" />
</target>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
@@ -311,27 +291,60 @@
</executions>
</plugin>
<plugin>
<groupId>org.alfresco.maven.plugin</groupId>
<artifactId>alfresco-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>2.6</version>
<executions>
<execution>
<id>build-amp-file</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
<configuration>
<appendAssemblyId>false</appendAssemblyId>
<descriptor>src/main/assembly/amp.xml</descriptor>
</configuration>
</execution>
</executions>
<dependencies>
<dependency>
<groupId>org.alfresco.maven.plugin</groupId>
<artifactId>alfresco-maven-plugin</artifactId>
<version>${alfresco.maven-plugin.version}</version>
</dependency>
</dependencies>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<executions>
<execution>
<goals>
<goal>test-jar</goal>
</goals>
</execution>
</executions>
<configuration>
<excludes>
<exclude>**/alfresco-global.properties</exclude>
</excludes>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<executions>
<!-- <execution>-->
<!-- <id>default-jar</id>-->
<!-- <goals>-->
<!-- <goal>jar</goal>-->
<!-- </goals>-->
<!-- <configuration>-->
<!-- <excludes>-->
<!-- <exclude>alfresco/**</exclude>-->
<!-- </excludes>-->
<!-- </configuration>-->
<!-- </execution>-->
<execution>
<id>test-jar</id>
<goals>
<goal>test-jar</goal>
</goals>
<configuration>
<excludes>
<exclude>**/alfresco-global.properties</exclude>
</excludes>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>

View File

@@ -0,0 +1,62 @@
<assembly
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 http://maven.apache.org/xsd/assembly-1.1.3.xsd">
<id>build-amp-file</id>
<formats>
<format>amp</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
<files>
<!-- Filter module.properties and put at top level in the AMP -->
<file>
<source>config/alfresco/module/org_alfresco_module_rm/module.properties</source>
<filtered>true</filtered>
</file>
<!-- Include the POM and pom.properties files in the /META-INF/maven directory in the AMP -->
<!-- <file>-->
<!-- <source>pom.xml</source>-->
<!-- <outputDirectory>META-INF/maven/${project.groupId}/${project.artifactId}</outputDirectory>-->
<!-- </file>-->
<!-- <file>-->
<!-- <source>${project.build.directory}/maven-archiver/pom.properties</source>-->
<!-- <outputDirectory>META-INF/maven/${project.groupId}/${project.artifactId}</outputDirectory>-->
<!-- </file>-->
</files>
<fileSets>
<!-- Include the generated license file in the /license directory in the AMP -->
<fileSet>
<directory>${project.build.directory}/generated-sources/license</directory>
<outputDirectory>licenses/${project.artifactId}</outputDirectory>
</fileSet>
<!-- Anything in the alfresco directory will end up in the config/alfresco directory in the AMP -->
<fileSet>
<directory>${project.build.outputDirectory}/alfresco</directory>
<outputDirectory>config/alfresco</outputDirectory>
</fileSet>
<!-- Anything in the assembly/web directory will end up in the /web directory in the AMP -->
<fileSet>
<directory>src/main/assembly/web</directory>
<outputDirectory>web</outputDirectory>
<filtered>true</filtered> <!-- Will filter files and substitute POM props such as for example ${project.name} -->
<excludes>
<exclude>README.md</exclude>
</excludes>
</fileSet>
</fileSets>
<!-- Include the project artifact (JAR) in the /lib directory in the AMP, and any 3rd party libraries (JARs)
used by the customization.
-->
<dependencySets>
<dependencySet>
<outputDirectory>lib</outputDirectory>
</dependencySet>
</dependencySets>
</assembly>

View File

@@ -3,7 +3,7 @@
<artifactId>alfresco-share-services</artifactId>
<name>Alfresco Share Services AMP</name>
<description>Module to be applied to alfresco.war, containing APIs for Alfresco Share</description>
<packaging>amp</packaging>
<packaging>jar</packaging>
<parent>
<groupId>org.alfresco</groupId>
@@ -167,9 +167,34 @@
<plugins>
<plugin>
<groupId>org.alfresco.maven.plugin</groupId>
<artifactId>alfresco-maven-plugin</artifactId>
<extensions>true</extensions>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>2.6</version>
<executions>
<execution>
<id>build-amp-file</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
<configuration>
<appendAssemblyId>false</appendAssemblyId>
<descriptor>src/main/assembly/amp.xml</descriptor>
</configuration>
</execution>
</executions>
<dependencies>
<dependency>
<groupId>org.alfresco.maven.plugin</groupId>
<artifactId>alfresco-maven-plugin</artifactId>
<version>${alfresco.maven-plugin.version}</version>
</dependency>
</dependencies>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
<manifest>

View File

@@ -0,0 +1,62 @@
<assembly
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 http://maven.apache.org/xsd/assembly-1.1.3.xsd">
<id>build-amp-file</id>
<formats>
<format>amp</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
<files>
<!-- Filter module.properties and put at top level in the AMP -->
<file>
<source>src/main/amp/module.properties</source>
<filtered>true</filtered>
</file>
<!-- Include the POM and pom.properties files in the /META-INF/maven directory in the AMP -->
<!-- <file>-->
<!-- <source>pom.xml</source>-->
<!-- <outputDirectory>META-INF/maven/${project.groupId}/${project.artifactId}</outputDirectory>-->
<!-- </file>-->
<!-- <file>-->
<!-- <source>${project.build.directory}/maven-archiver/pom.properties</source>-->
<!-- <outputDirectory>META-INF/maven/${project.groupId}/${project.artifactId}</outputDirectory>-->
<!-- </file>-->
</files>
<fileSets>
<!-- Include the generated license file in the /license directory in the AMP -->
<fileSet>
<directory>${project.build.directory}/generated-sources/license</directory>
<outputDirectory>licenses/${project.artifactId}</outputDirectory>
</fileSet>
<!-- Anything in the config directory will end up in the config directory in the AMP -->
<fileSet>
<directory>${project.build.directory}/${project.build.finalName}/config</directory>
<outputDirectory>config</outputDirectory>
</fileSet>
<!-- Anything in the assembly/web directory will end up in the /web directory in the AMP -->
<fileSet>
<directory>src/main/assembly/web</directory>
<outputDirectory>web</outputDirectory>
<filtered>true</filtered> <!-- Will filter files and substitute POM props such as for example ${project.name} -->
<excludes>
<exclude>README.md</exclude>
</excludes>
</fileSet>
</fileSets>
<!-- Include the project artifact (JAR) in the /lib directory in the AMP, and any 3rd party libraries (JARs)
used by the customization.
-->
<dependencySets>
<dependencySet>
<outputDirectory>lib</outputDirectory>
</dependencySet>
</dependencySets>
</assembly>

View File

@@ -116,7 +116,7 @@
<alfresco.aos-module.version>3.1.0-A1</alfresco.aos-module.version>
<alfresco.api-explorer.version>23.2.0</alfresco.api-explorer.version> <!-- Also in alfresco-enterprise-share -->
<alfresco.maven-plugin.version>2.2.0</alfresco.maven-plugin.version>
<alfresco.maven-plugin.version>4.8.0</alfresco.maven-plugin.version>
<license-maven-plugin.version>2.0.1</license-maven-plugin.version>
<dependency.postgresql.version>42.6.0</dependency.postgresql.version>