REPO-5358 Deployment modules should extend each other

The alfresco-community-repo's deployment module now provides the basis for alfresco-enterprise-repo and acs-packaging
deployment modules. This makes it like the other branches and avoids duplication of licenses between projects.

(partial picked from commit c4d1f5824d)
This commit is contained in:
Alan Davis
2020-10-02 11:06:47 +01:00
parent 4d1f6ae91e
commit c7b29613d4
4 changed files with 39 additions and 27 deletions

View File

@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<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>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-community-repo-distribution</artifactId>
<name>Package Licences and Keystore for Distribution</name>
<packaging>jar</packaging>
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-community-repo-packaging</artifactId>
<version>7.199.300-TEST2-SNAPSHOT</version>
</parent>
</project>

View File

@@ -19,6 +19,7 @@ ARG TOMCAT_DIR=/usr/local/tomcat
RUN mkdir -p ${TOMCAT_DIR}/shared/classes/alfresco/extension/mimetypes && \ RUN mkdir -p ${TOMCAT_DIR}/shared/classes/alfresco/extension/mimetypes && \
mkdir -p ${TOMCAT_DIR}/shared/classes/alfresco/extension/transform/renditions && \ mkdir -p ${TOMCAT_DIR}/shared/classes/alfresco/extension/transform/renditions && \
mkdir -p ${TOMCAT_DIR}/shared/classes/alfresco/extension/transform/pipelines && \ mkdir -p ${TOMCAT_DIR}/shared/classes/alfresco/extension/transform/pipelines && \
mkdir /licenses && \
mkdir ${TOMCAT_DIR}/alfresco-mmt && \ mkdir ${TOMCAT_DIR}/alfresco-mmt && \
touch ${TOMCAT_DIR}/shared/classes/alfresco-global.properties touch ${TOMCAT_DIR}/shared/classes/alfresco-global.properties
@@ -26,13 +27,11 @@ RUN mkdir -p ${TOMCAT_DIR}/shared/classes/alfresco/extension/mimetypes && \
# Copy the WAR files to the appropriate location for your application server # Copy the WAR files to the appropriate location for your application server
# Copy the JDBC drivers for the database you are using to the lib/ directory. # Copy the JDBC drivers for the database you are using to the lib/ directory.
# Copy the alfresco-mmt.jar # Copy the alfresco-mmt.jar
# Copy Licenses to the root of the Docker image
COPY ${resource_path}/war ${TOMCAT_DIR}/webapps COPY ${resource_path}/war ${TOMCAT_DIR}/webapps
COPY ${resource_path}/connector/* ${TOMCAT_DIR}/lib/ COPY ${resource_path}/connector/* ${TOMCAT_DIR}/lib/
COPY ${resource_path}/alfresco-mmt/* ${TOMCAT_DIR}/alfresco-mmt/ COPY ${resource_path}/alfresco-mmt/* ${TOMCAT_DIR}/alfresco-mmt/
COPY ${resource_path}/dependency/licenses/ /licenses/
# Copy Licenses to the root of the Docker image
RUN mkdir /licenses
COPY ${resource_path}/licenses/ /licenses/
# Change the value of the shared.loader= property to the following: # Change the value of the shared.loader= property to the following:
# shared.loader=${catalina.base}/shared/classes # shared.loader=${catalina.base}/shared/classes

View File

@@ -16,29 +16,6 @@
<build> <build>
<plugins> <plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<executions>
<execution>
<id>copy-licenses</id>
<phase>process-resources</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<configuration>
<resources>
<resource>
<!-- Extract licenses directory -->
<directory>../distribution/src/main/resources/licenses</directory>
<filtering>false</filtering>
</resource>
</resources>
<outputDirectory>${project.build.directory}/licenses</outputDirectory>
</configuration>
</execution>
</executions>
</plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId> <artifactId>maven-dependency-plugin</artifactId>
@@ -126,6 +103,24 @@
</artifactItems> </artifactItems>
</configuration> </configuration>
</execution> </execution>
<execution>
<id>unpack-licenses</id>
<phase>process-resources</phase>
<goals>
<goal>unpack</goal>
</goals>
<configuration>
<artifactItems>
<artifactItem>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-community-repo-distribution</artifactId>
<type>jar</type>
<version>${project.version}</version>
</artifactItem>
</artifactItems>
</configuration>
</execution>
</executions> </executions>
</plugin> </plugin>
</plugins> </plugins>

View File

@@ -18,6 +18,7 @@
</activation> </activation>
<modules> <modules>
<module>war</module> <module>war</module>
<module>distribution</module>
<module>docker-alfresco</module> <module>docker-alfresco</module>
</modules> </modules>
</profile> </profile>
@@ -25,18 +26,21 @@
<id>community</id> <id>community</id>
<modules> <modules>
<module>war</module> <module>war</module>
<module>distribution</module>
</modules> </modules>
</profile> </profile>
<profile> <profile>
<id>communityDocker</id> <id>communityDocker</id>
<modules> <modules>
<module>war</module> <module>war</module>
<module>distribution</module>
<module>docker-alfresco</module> <module>docker-alfresco</module>
</modules> </modules>
</profile> </profile>
<profile> <profile>
<id>all-tas-tests</id> <id>all-tas-tests</id>
<modules> <modules>
<module>distribution</module>
<module>tests</module> <module>tests</module>
</modules> </modules>
</profile> </profile>