inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6 from Alfresco/develop

Browse Source 
Sync master with develop
This commit is contained in:
Alex Mukha
2017-10-13 10:38:21 +01:00
committed by GitHub
parent 1ad0851513 f83b24bafb
commit 31b61cb584
6 changed files with 311 additions and 189 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.gitbugtraq Normal file
View File

@@ -0,0 +1,4 @@
# For SmartGit
[bugtraq "jira"]
url = https://issues.alfresco.com/jira/browse/%BUGID%
logRegex = ([A-Z]+-\\d+)

11
docker/Dockerfile Normal file
View File

@@ -0,0 +1,11 @@
FROM tomcat:8.5.20-jre8-alpine
RUN mkdir -p /usr/local/tomcat/shared/classes
RUN touch /usr/local/tomcat/shared/classes/alfresco-global.properties
COPY target/war /usr/local/tomcat/webapps
COPY target/connector/* /usr/local/tomcat/lib/
RUN sed -i "s/shared.loader=/shared.loader=\${catalina.base}\/shared\/classes/" /usr/local/tomcat/conf/catalina.properties

104
docker/pom.xml Normal file
View File

@@ -0,0 +1,104 @@
<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</artifactId>
<name>Alfresco Content Services Community Docker image builder</name>
<packaging>pom</packaging>
<parent>
<groupId>org.alfresco</groupId>
<artifactId>acs-community-packaging</artifactId>
<version>6.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<dependencies>
<dependency>
<groupId>org.alfresco</groupId>
<artifactId>content-services-community</artifactId>
<version>${project.version}</version>
<type>war</type>
</dependency>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>${dependency.mysql.version}</version>
</dependency>
<dependency>
<groupId>org.mariadb.jdbc</groupId>
<artifactId>mariadb-java-client</artifactId>
<version>${dependency.mariadb.version}</version>
</dependency>
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
<version>${dependency.postgresql.version}</version>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>3.0.2</version>
<executions>
<execution>
<id>unpack-resources</id>
<phase>process-resources</phase>
<goals>
<goal>unpack</goal>
</goals>
<configuration>
<artifactItems>
<artifactItem>
<groupId>org.alfresco</groupId>
<artifactId>content-services-community</artifactId>
<version>${project.version}</version>
<type>war</type>
<overWrite>false</overWrite>
<outputDirectory>${project.build.directory}/war/alfresco</outputDirectory>
<destFileName>alfresco.war</destFileName>
</artifactItem>
</artifactItems>
</configuration>
</execution>
<execution>
<id>copy-resources</id>
<phase>process-resources</phase>
<goals>
<goal>copy</goal>
</goals>
<configuration>
<artifactItems>
<artifactItem>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<type>jar</type>
<overWrite>false</overWrite>
<outputDirectory>${project.build.directory}/connector</outputDirectory>
</artifactItem>
<artifactItem>
<groupId>org.mariadb.jdbc</groupId>
<artifactId>mariadb-java-client</artifactId>
<version>${dependency.mariadb.version}</version>
<overWrite>false</overWrite>
<outputDirectory>${project.build.directory}/connector</outputDirectory>
</artifactItem>
<artifactItem>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
<version>${dependency.postgresql.version}</version>
<type>jar</type>
<overWrite>false</overWrite>
<outputDirectory>${project.build.directory}/connector</outputDirectory>
</artifactItem>
</artifactItems>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>

8
pom.xml
View File

@@ -2,18 +2,19 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>acs-community-packaging</artifactId> <artifactId>acs-community-packaging</artifactId>
<name>Alfresco Content Services Community Packaging</name> <name>Alfresco Content Services Community Packaging</name>
<version>6.0.b-SNAPSHOT</version> <version>6.0.0-SNAPSHOT</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<parent> <parent>
<groupId>org.alfresco</groupId> <groupId>org.alfresco</groupId>
<artifactId>alfresco-super-pom</artifactId> <artifactId>alfresco-super-pom</artifactId>
<version>8</version> <version>9</version>
</parent> </parent>
<modules> <modules>
<module>war</module> <module>war</module>
<module>zip</module> <module>zip</module>
<module>docker</module>
</modules> </modules>
<scm> <scm>
@@ -40,7 +41,7 @@
<dependency.alfresco-remote-api.version>6.2</dependency.alfresco-remote-api.version> <dependency.alfresco-remote-api.version>6.2</dependency.alfresco-remote-api.version>
<dependency.alfresco-trashcan-cleaner.version>2.2</dependency.alfresco-trashcan-cleaner.version> <dependency.alfresco-trashcan-cleaner.version>2.2</dependency.alfresco-trashcan-cleaner.version>
<dependency.alfresco-core.version>6.13</dependency.alfresco-core.version> <dependency.alfresco-core.version>6.13</dependency.alfresco-core.version>
<dependency.alfresco-data-model.version>6.18</dependency.alfresco-data-model.version> <dependency.alfresco-data-model.version>6.19</dependency.alfresco-data-model.version>
<dependency.alfresco-mmt.version>6.0</dependency.alfresco-mmt.version> <dependency.alfresco-mmt.version>6.0</dependency.alfresco-mmt.version>
<dependency.alfresco-pdf-renderer.version>1.0</dependency.alfresco-pdf-renderer.version> <dependency.alfresco-pdf-renderer.version>1.0</dependency.alfresco-pdf-renderer.version>
<dependency.alfresco-jlan.version>6.3</dependency.alfresco-jlan.version> <dependency.alfresco-jlan.version>6.3</dependency.alfresco-jlan.version>
@@ -51,6 +52,7 @@
<dependency.spring.version>3.2.17.RELEASE</dependency.spring.version> <dependency.spring.version>3.2.17.RELEASE</dependency.spring.version>
<dependency.postgresql.version>9.4.1212</dependency.postgresql.version> <dependency.postgresql.version>9.4.1212</dependency.postgresql.version>
<dependency.mysql.version>5.1.40</dependency.mysql.version> <dependency.mysql.version>5.1.40</dependency.mysql.version>
<dependency.mariadb.version>2.0.1</dependency.mariadb.version>
</properties> </properties>
<dependencyManagement> <dependencyManagement>

2
war/pom.xml
View File

@@ -7,7 +7,7 @@
<parent> <parent>
<groupId>org.alfresco</groupId> <groupId>org.alfresco</groupId>
<artifactId>acs-community-packaging</artifactId> <artifactId>acs-community-packaging</artifactId>
<version>6.0.b-SNAPSHOT</version> <version>6.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>

371
zip/pom.xml
View File

@@ -1,185 +1,186 @@
<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"
<modelVersion>4.0.0</modelVersion> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<artifactId>alfresco-content-services-community-distribution</artifactId> <modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging> <artifactId>alfresco-content-services-community-distribution</artifactId>
<name>Alfresco Content Services Community WAR Installation</name> <packaging>jar</packaging>
<name>Alfresco Content Services Community WAR Installation</name>
<parent>
<groupId>org.alfresco</groupId> <parent>
<artifactId>acs-community-packaging</artifactId> <groupId>org.alfresco</groupId>
<version>6.0.b-SNAPSHOT</version> <artifactId>acs-community-packaging</artifactId>
<relativePath>../pom.xml</relativePath> <version>6.0.0-SNAPSHOT</version>
</parent> <relativePath>../pom.xml</relativePath>
</parent>
<dependencies>
<!-- WAR files --> <dependencies>
<dependency> <!-- WAR files -->
<groupId>org.alfresco</groupId> <dependency>
<artifactId>content-services-community</artifactId> <groupId>org.alfresco</groupId>
<version>${project.version}</version> <artifactId>content-services-community</artifactId>
<type>war</type> <version>${project.version}</version>
</dependency> <type>war</type>
<dependency> </dependency>
<groupId>org.alfresco</groupId> <dependency>
<artifactId>alfresco-server-root</artifactId> <groupId>org.alfresco</groupId>
<type>war</type> <artifactId>alfresco-server-root</artifactId>
</dependency> <type>war</type>
</dependency>
<dependency>
<groupId>org.alfresco</groupId> <dependency>
<artifactId>alfresco-mmt</artifactId> <groupId>org.alfresco</groupId>
</dependency> <artifactId>alfresco-mmt</artifactId>
</dependency>
<!-- JAR files, to extract alfresco/extension -->
<dependency> <!-- JAR files, to extract alfresco/extension -->
<groupId>org.alfresco</groupId> <dependency>
<artifactId>alfresco-repository</artifactId> <groupId>org.alfresco</groupId>
</dependency> <artifactId>alfresco-repository</artifactId>
<dependency> </dependency>
<groupId>org.alfresco</groupId> <dependency>
<artifactId>alfresco-data-model</artifactId> <groupId>org.alfresco</groupId>
</dependency> <artifactId>alfresco-data-model</artifactId>
<dependency> </dependency>
<groupId>org.alfresco</groupId> <dependency>
<artifactId>content-services-community</artifactId> <groupId>org.alfresco</groupId>
<version>${project.version}</version> <artifactId>content-services-community</artifactId>
<classifier>classes</classifier> <version>${project.version}</version>
</dependency> <classifier>classes</classifier>
</dependency>
<!-- 3rd party libs -->
<dependency> <!-- 3rd party libs -->
<groupId>org.postgresql</groupId> <dependency>
<artifactId>postgresql</artifactId> <groupId>org.postgresql</groupId>
<version>${dependency.postgresql.version}</version> <artifactId>postgresql</artifactId>
</dependency> <version>${dependency.postgresql.version}</version>
</dependency>
<!-- Alfresco Pdf Renderer -->
<dependency> <!-- Alfresco Pdf Renderer -->
<groupId>org.alfresco</groupId> <dependency>
<artifactId>alfresco-pdf-renderer</artifactId> <groupId>org.alfresco</groupId>
<classifier>linux</classifier> <artifactId>alfresco-pdf-renderer</artifactId>
<type>tgz</type> <classifier>linux</classifier>
</dependency> <type>tgz</type>
<dependency> </dependency>
<groupId>org.alfresco</groupId> <dependency>
<artifactId>alfresco-pdf-renderer</artifactId> <groupId>org.alfresco</groupId>
<classifier>win64</classifier> <artifactId>alfresco-pdf-renderer</artifactId>
<type>tgz</type> <classifier>win64</classifier>
</dependency> <type>tgz</type>
</dependency>
</dependencies>
</dependencies>
<build>
<finalName>${project.artifactId}-${project.version}</finalName> <build>
<!-- Filtering is required to make maven substitute variables in resources --> <finalName>${project.artifactId}-${project.version}</finalName>
<resources> <!-- Filtering is required to make maven substitute variables in resources -->
<resource> <resources>
<directory>src/main/resources</directory> <resource>
<filtering>true</filtering> <directory>src/main/resources</directory>
</resource> <filtering>true</filtering>
</resources> </resource>
<plugins> </resources>
<plugin> <plugins>
<artifactId>maven-dependency-plugin</artifactId> <plugin>
<executions> <artifactId>maven-dependency-plugin</artifactId>
<!-- Extract keystore from alfresco-repository --> <executions>
<execution> <!-- Extract keystore from alfresco-repository -->
<id>extract-keystore</id> <execution>
<phase>generate-resources</phase> <id>extract-keystore</id>
<goals> <phase>generate-resources</phase>
<goal>unpack</goal> <goals>
</goals> <goal>unpack</goal>
<configuration> </goals>
<artifactItems> <configuration>
<artifactItem> <artifactItems>
<groupId>org.alfresco</groupId> <artifactItem>
<artifactId>alfresco-repository</artifactId> <groupId>org.alfresco</groupId>
<includes>alfresco/keystore/**</includes> <artifactId>alfresco-repository</artifactId>
</artifactItem> <includes>alfresco/keystore/**</includes>
</artifactItems> </artifactItem>
</configuration> </artifactItems>
</execution> </configuration>
</execution>
<!-- Extract JLAN DLLs -->
<execution> <!-- Extract JLAN DLLs -->
<id>extract-jlan-dll</id> <execution>
<phase>generate-resources</phase> <id>extract-jlan-dll</id>
<goals> <phase>generate-resources</phase>
<goal>unpack</goal> <goals>
</goals> <goal>unpack</goal>
<configuration> </goals>
<artifactItems> <configuration>
<artifactItem> <artifactItems>
<groupId>org.alfresco</groupId> <artifactItem>
<artifactId>alfresco-jlan-embed</artifactId> <groupId>org.alfresco</groupId>
<classifier>windll</classifier> <artifactId>alfresco-jlan-embed</artifactId>
<includes>*.dll</includes> <classifier>windll</classifier>
</artifactItem> <includes>*.dll</includes>
</artifactItems> </artifactItem>
</configuration> </artifactItems>
</execution> </configuration>
</execution>
<!-- Copy ROOT.war -->
<execution> <!-- Copy ROOT.war -->
<id>copy-resources</id> <execution>
<phase>generate-resources</phase> <id>copy-resources</id>
<goals> <phase>generate-resources</phase>
<goal>copy</goal> <goals>
</goals> <goal>copy</goal>
<configuration> </goals>
<artifactItems> <configuration>
<artifactItem> <artifactItems>
<groupId>org.alfresco</groupId> <artifactItem>
<artifactId>alfresco-server-root</artifactId> <groupId>org.alfresco</groupId>
<type>war</type> <artifactId>alfresco-server-root</artifactId>
<outputDirectory>${project.build.outputDirectory}/web-server/webapps</outputDirectory> <type>war</type>
<destFileName>ROOT.war</destFileName> <outputDirectory>${project.build.outputDirectory}/web-server/webapps</outputDirectory>
</artifactItem> <destFileName>ROOT.war</destFileName>
</artifactItems> </artifactItem>
</configuration> </artifactItems>
</execution> </configuration>
</execution>
</executions>
</plugin> </executions>
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId> <plugin>
<executions> <artifactId>maven-assembly-plugin</artifactId>
<execution> <executions>
<id>make-assembly</id> <execution>
<phase>package</phase> <id>make-assembly</id>
<goals> <phase>package</phase>
<goal>single</goal> <goals>
</goals> <goal>single</goal>
</execution> </goals>
</executions> </execution>
<configuration> </executions>
<appendAssemblyId>false</appendAssemblyId> <configuration>
<descriptors> <appendAssemblyId>false</appendAssemblyId>
<descriptor>src/assemblies/distribution.xml</descriptor> <descriptors>
</descriptors> <descriptor>src/assemblies/distribution.xml</descriptor>
</configuration> </descriptors>
</plugin> </configuration>
</plugin>
<plugin>
<!-- Package distribution assembly descriptor, to be reused by Enterprise --> <plugin>
<artifactId>maven-jar-plugin</artifactId> <!-- Package distribution assembly descriptor, to be reused by Enterprise -->
<executions> <artifactId>maven-jar-plugin</artifactId>
<execution> <executions>
<id>create-assembly-descriptor</id> <execution>
<goals> <id>create-assembly-descriptor</id>
<goal>jar</goal> <goals>
</goals> <goal>jar</goal>
<configuration> </goals>
<classifier>assembly</classifier> <configuration>
<classesDirectory>${basedir}/src</classesDirectory> <classifier>assembly</classifier>
<includes> <classesDirectory>${basedir}/src</classesDirectory>
<include>assemblies/*</include> <includes>
</includes> <include>assemblies/*</include>
</configuration> </includes>
</execution> </configuration>
</executions> </execution>
</plugin> </executions>
</plugins> </plugin>
</build> </plugins>
</project> </build>
</project>