mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-07-31 17:39:05 +00:00
REPO-3334: clean up the pom s
This commit is contained in:
Andrei Rebegea
@@ -1,18 +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/maven-v4_0_0.xsd">
|
||||
<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-content-services-community-full-distribution</artifactId>
|
||||
<name>Alfresco Content Services Community Full Distribution zip</name>
|
||||
<packaging>jar</packaging>
|
||||
|
||||
<parent>
|
||||
<groupId>org.alfresco</groupId>
|
||||
<artifactId>acs-community-packaging</artifactId>
|
||||
<version>6.0.4-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
<artifactId>alfresco-content-services-community-full-distribution</artifactId>
|
||||
<packaging>jar</packaging>
|
||||
<name>Alfresco Content Services Community Full Distribution</name>
|
||||
|
||||
<!-- To replace in share-config-custom.xml -->
|
||||
<properties>
|
||||
</properties>
|
||||
|
||||
<dependencies>
|
||||
<dependency>
|
||||
|
||||
@@ -12,19 +12,19 @@ ENV IMAGEMAGICK_LIB_RPM_URL=https://www.imagemagick.org/download/linux/CentOS/x8
|
||||
|
||||
RUN wget $ALFRESCO_PDF_RENDERER_LIB_RPM_URL && \
|
||||
tar xf alfresco-pdf-renderer-*-linux.tgz -C /usr/bin && \
|
||||
rm -f alfresco-pdf-renderer-*-linux.tgz && \
|
||||
\
|
||||
rm -f alfresco-pdf-renderer-*-linux.tgz && \
|
||||
\
|
||||
yum install -y cairo cups-libs libSM && \
|
||||
wget $LIBREOFFICE_RPM_URL && \
|
||||
tar xzf LibreOffice_*_Linux_x86-64_rpm.tar.gz && \
|
||||
yum localinstall -y LibreOffice*/RPMS/*.rpm && \
|
||||
rm -rf LibreOffice_*_Linux_x86-64_rpm.tar.gz LibreOffice_*_Linux_x86-64_rpm && \
|
||||
\
|
||||
\
|
||||
wget $IMAGEMAGICK_RPM_URL && \
|
||||
wget $IMAGEMAGICK_LIB_RPM_URL && \
|
||||
yum localinstall -y ImageMagick-*.x86_64.rpm && \
|
||||
rm -f ImageMagick-*.x86_64.rpm && \
|
||||
\
|
||||
\
|
||||
yum clean all
|
||||
|
||||
RUN mkdir -p /usr/local/tomcat/shared/classes && \
|
||||
|
||||
@@ -1,7 +1,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">
|
||||
<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</name>
|
||||
<name>ACS Community Docker Image Builder for Alfresco Community</name>
|
||||
<packaging>pom</packaging>
|
||||
|
||||
<parent>
|
||||
@@ -161,54 +162,46 @@
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
|
||||
<plugin>
|
||||
<groupId>io.fabric8</groupId>
|
||||
<artifactId>fabric8-maven-plugin</artifactId>
|
||||
<configuration>
|
||||
<images>
|
||||
<image>
|
||||
<name>alfresco/alfresco-content-services</name>
|
||||
<registry>quay.io</registry>
|
||||
<build>
|
||||
<dockerFileDir>${project.basedir}/</dockerFileDir>
|
||||
<tags>
|
||||
<tag>${project.version}</tag>
|
||||
</tags>
|
||||
</build>
|
||||
</image>
|
||||
</images>
|
||||
</configuration>
|
||||
<executions>
|
||||
<execution>
|
||||
<phase>deploy</phase>
|
||||
<id>buildAndPush</id>
|
||||
<goals>
|
||||
<goal>build</goal>
|
||||
<goal>push</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
|
||||
|
||||
<profiles>
|
||||
<profile>
|
||||
<id>communityDocker</id> <!-- local build only -->
|
||||
<id>dockerImages</id>
|
||||
<build>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>io.fabric8</groupId>
|
||||
<artifactId>fabric8-maven-plugin</artifactId>
|
||||
<version>${dependency.fabric8.version}</version>
|
||||
<configuration>
|
||||
<images>
|
||||
<image>
|
||||
<name>alfresco/alfresco-content-services-community</name>
|
||||
<registry>quay.io</registry>
|
||||
<build>
|
||||
<dockerFile>${project.basedir}/Dockerfile</dockerFile>
|
||||
<tags>
|
||||
<tag>latest</tag>
|
||||
</tags>
|
||||
</build>
|
||||
</image>
|
||||
</images>
|
||||
</configuration>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>build</id>
|
||||
<goals>
|
||||
<goal>build</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
</profile>
|
||||
|
||||
<profile>
|
||||
<id>dockerImages</id> <!-- includes docker push -->
|
||||
<build>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>io.fabric8</groupId>
|
||||
<artifactId>fabric8-maven-plugin</artifactId>
|
||||
<version>${dependency.fabric8.version}</version>
|
||||
<configuration>
|
||||
<images>
|
||||
<image>
|
||||
@@ -217,19 +210,7 @@
|
||||
<build>
|
||||
<dockerFileDir>${project.basedir}/</dockerFileDir>
|
||||
<tags>
|
||||
<!--<tag>${bamboo.inject.tag}</tag>-->
|
||||
<tag>testing-rc1</tag>
|
||||
</tags>
|
||||
</build>
|
||||
</image>
|
||||
<image>
|
||||
<name>alfresco-content-services-community</name>
|
||||
<registry>registry.hub.docker.com/alfresco</registry>
|
||||
<build>
|
||||
<dockerFileDir>${project.basedir}/</dockerFileDir>
|
||||
<tags>
|
||||
<!--<tag>${bamboo.inject.tag}</tag>-->
|
||||
<tag>testing-rc2</tag>
|
||||
<tag>${project.version}</tag>
|
||||
</tags>
|
||||
</build>
|
||||
</image>
|
||||
@@ -237,6 +218,7 @@
|
||||
</configuration>
|
||||
<executions>
|
||||
<execution>
|
||||
<phase>install</phase>
|
||||
<id>buildAndPush</id>
|
||||
<goals>
|
||||
<goal>build</goal>
|
||||
@@ -248,7 +230,6 @@
|
||||
</plugins>
|
||||
</build>
|
||||
</profile>
|
||||
|
||||
</profiles>
|
||||
|
||||
</project>
|
||||
1
docker-share/.maven-dockerignore
Normal file
1
docker-share/.maven-dockerignore
Normal file
@@ -0,0 +1 @@
|
||||
target/docker/
|
||||
@@ -1,4 +1,5 @@
|
||||
<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">
|
||||
<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-share</artifactId>
|
||||
<name>ACS Community Docker image builder for Share</name>
|
||||
@@ -62,7 +63,44 @@
|
||||
</executions>
|
||||
</plugin>
|
||||
</plugins>
|
||||
|
||||
</build>
|
||||
|
||||
|
||||
<profiles>
|
||||
<profile>
|
||||
<id>dockerImages</id>
|
||||
<build>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>io.fabric8</groupId>
|
||||
<artifactId>fabric8-maven-plugin</artifactId>
|
||||
<configuration>
|
||||
<images>
|
||||
<image>
|
||||
<name>alfresco/alfresco-full-share</name>
|
||||
<registry>quay.io</registry>
|
||||
<build>
|
||||
<dockerFileDir>${project.basedir}/</dockerFileDir>
|
||||
<tags>
|
||||
<tag>${project.version}</tag>
|
||||
</tags>
|
||||
</build>
|
||||
</image>
|
||||
</images>
|
||||
</configuration>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>buildAndPush</id>
|
||||
<goals>
|
||||
<goal>build</goal>
|
||||
<goal>push</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
</profile>
|
||||
</profiles>
|
||||
|
||||
</project>
|
||||
14
pom.xml
14
pom.xml
@@ -63,24 +63,23 @@
|
||||
<properties>
|
||||
<!-- Set to "Community Early Access" to add to the version.edition property in version.properties -->
|
||||
<version.edition>Community</version.edition>
|
||||
<bamboo.inject.tag>latest</bamboo.inject.tag>
|
||||
|
||||
<dependency.alfresco-repository.version>6.28</dependency.alfresco-repository.version>
|
||||
<dependency.alfresco-remote-api.version>6.19</dependency.alfresco-remote-api.version>
|
||||
<dependency.alfresco-trashcan-cleaner.version>2.3</dependency.alfresco-trashcan-cleaner.version>
|
||||
<dependency.alfresco-core.version>7.0</dependency.alfresco-core.version>
|
||||
<dependency.alfresco-data-model.version>8.0</dependency.alfresco-data-model.version>
|
||||
<dependency.alfresco-repository.version>6.28</dependency.alfresco-repository.version>
|
||||
<dependency.alfresco-remote-api.version>6.19</dependency.alfresco-remote-api.version>
|
||||
|
||||
<dependency.alfresco-mmt.version>6.0</dependency.alfresco-mmt.version>
|
||||
<dependency.alfresco-pdf-renderer.version>1.1</dependency.alfresco-pdf-renderer.version>
|
||||
<dependency.alfresco-trashcan-cleaner.version>2.3</dependency.alfresco-trashcan-cleaner.version>
|
||||
<dependency.alfresco-jlan.version>7.0</dependency.alfresco-jlan.version>
|
||||
<dependency.alfresco-server-root.version>6.0</dependency.alfresco-server-root.version>
|
||||
<dependency.alfresco-messaging-repo.version>1.2.8</dependency.alfresco-messaging-repo.version>
|
||||
|
||||
<dependency.spring.version>5.0.4.RELEASE</dependency.spring.version>
|
||||
<dependency.postgresql.version>9.4.1212</dependency.postgresql.version>
|
||||
<dependency.fabric8.version>3.5.37</dependency.fabric8.version>
|
||||
|
||||
<!-- Alfresco Share version -->
|
||||
<!-- Alfresco Share version -->
|
||||
<alfresco.share.version>5.2.f</alfresco.share.version>
|
||||
|
||||
<!-- Alfresco GoogleDocs integration version -->
|
||||
@@ -95,6 +94,9 @@
|
||||
<installer.version.name>${project.version}</installer.version.name>
|
||||
<alfresco.package.name>alfresco-community</alfresco.package.name>
|
||||
<alfresco.distribution.name>${alfresco.package.name}-distribution</alfresco.distribution.name>
|
||||
|
||||
<dependency.postgresql.version>9.4.1212</dependency.postgresql.version>
|
||||
|
||||
</properties>
|
||||
|
||||
<dependencyManagement>
|
||||
|
||||
19
war/pom.xml
19
war/pom.xml
@@ -12,9 +12,6 @@
|
||||
</parent>
|
||||
|
||||
<properties>
|
||||
<build-number>0</build-number>
|
||||
<build-key>BUILD-KEY</build-key>
|
||||
<build-name>Build-Name</build-name>
|
||||
<scm-path>local/development/workspace</scm-path>
|
||||
<scm-revision>${buildNumber}</scm-revision>
|
||||
|
||||
@@ -24,7 +21,7 @@
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>org.alfresco</groupId>
|
||||
<artifactId>alfresco-trashcan-cleaner</artifactId>
|
||||
<artifactId>alfresco-repository</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.alfresco</groupId>
|
||||
@@ -32,7 +29,11 @@
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.alfresco</groupId>
|
||||
<artifactId>alfresco-repository</artifactId>
|
||||
<artifactId>alfresco-trashcan-cleaner</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.alfresco.services</groupId>
|
||||
<artifactId>alfresco-messaging-repo</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>xalan</groupId>
|
||||
@@ -79,7 +80,6 @@
|
||||
<artifactId>standard</artifactId>
|
||||
<version>1.1.2</version>
|
||||
</dependency>
|
||||
|
||||
<!-- 'provided' dependencies, not packaged in war -->
|
||||
<dependency>
|
||||
<groupId>javax.servlet</groupId>
|
||||
@@ -99,19 +99,12 @@
|
||||
<version>2.0</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.alfresco.services</groupId>
|
||||
<artifactId>alfresco-messaging-repo</artifactId>
|
||||
</dependency>
|
||||
|
||||
<!-- CORS Filter Libraries -->
|
||||
<dependency>
|
||||
<groupId>com.thetransactioncompany</groupId>
|
||||
<artifactId>cors-filter</artifactId>
|
||||
<version>2.5</version>
|
||||
</dependency>
|
||||
|
||||
<!-- Test dependencies -->
|
||||
<dependency>
|
||||
<groupId>org.alfresco</groupId>
|
||||
|
||||
53
zip/pom.xml
53
zip/pom.xml
@@ -1,8 +1,9 @@
|
||||
<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">
|
||||
<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-content-services-community-distribution</artifactId>
|
||||
<name>Alfresco Content Services Community zip (WAR Installation)</name>
|
||||
<packaging>jar</packaging>
|
||||
<name>Alfresco Content Services Community WAR Installation</name>
|
||||
|
||||
<parent>
|
||||
<groupId>org.alfresco</groupId>
|
||||
@@ -19,18 +20,6 @@
|
||||
<version>${project.version}</version>
|
||||
<type>war</type>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.alfresco</groupId>
|
||||
<artifactId>alfresco-server-root</artifactId>
|
||||
<type>war</type>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.alfresco</groupId>
|
||||
<artifactId>alfresco-mmt</artifactId>
|
||||
</dependency>
|
||||
|
||||
<!-- JAR files, to extract alfresco/extension -->
|
||||
<dependency>
|
||||
<groupId>org.alfresco</groupId>
|
||||
<artifactId>alfresco-repository</artifactId>
|
||||
@@ -41,18 +30,19 @@
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.alfresco</groupId>
|
||||
<artifactId>content-services-community</artifactId>
|
||||
<version>${project.version}</version>
|
||||
<classifier>classes</classifier>
|
||||
<artifactId>alfresco-server-root</artifactId>
|
||||
<type>war</type>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.alfresco</groupId>
|
||||
<artifactId>alfresco-mmt</artifactId>
|
||||
</dependency>
|
||||
|
||||
<!-- 3rd party libs -->
|
||||
<dependency>
|
||||
<groupId>org.postgresql</groupId>
|
||||
<artifactId>postgresql</artifactId>
|
||||
<version>${dependency.postgresql.version}</version>
|
||||
</dependency>
|
||||
|
||||
<!-- Alfresco Pdf Renderer -->
|
||||
<dependency>
|
||||
<groupId>org.alfresco</groupId>
|
||||
@@ -118,7 +108,7 @@
|
||||
</artifactItems>
|
||||
</configuration>
|
||||
</execution>
|
||||
|
||||
|
||||
<!-- Copy ROOT.war -->
|
||||
<execution>
|
||||
<id>copy-resources</id>
|
||||
@@ -137,8 +127,8 @@
|
||||
</artifactItem>
|
||||
</artifactItems>
|
||||
</configuration>
|
||||
</execution>
|
||||
|
||||
</execution>
|
||||
|
||||
</executions>
|
||||
</plugin>
|
||||
|
||||
@@ -161,25 +151,6 @@
|
||||
</configuration>
|
||||
</plugin>
|
||||
|
||||
<plugin>
|
||||
<!-- Package distribution assembly descriptor, to be reused by Enterprise -->
|
||||
<artifactId>maven-jar-plugin</artifactId>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>create-assembly-descriptor</id>
|
||||
<goals>
|
||||
<goal>jar</goal>
|
||||
</goals>
|
||||
<configuration>
|
||||
<classifier>assembly</classifier>
|
||||
<classesDirectory>${basedir}/src</classesDirectory>
|
||||
<includes>
|
||||
<include>assemblies/*</include>
|
||||
</includes>
|
||||
</configuration>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
</project>
|
||||
@@ -1,8 +1,6 @@
|
||||
Alfresco Content Services Community ${project.version}
|
||||
======================
|
||||
|
||||
For Enterprise subscribers, refer to http://support.alfresco.com for release notes and detailed information on this release.
|
||||
|
||||
For users of Alfresco Community Edition, more information on this release is available at https://community.alfresco.com/community/ecm.
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user