Apply git configs (line endings)

This commit is contained in:
Alex Mukha
2017-10-13 17:30:04 +01:00
parent 42c5c4e9da
commit fb4e984570
9 changed files with 829 additions and 829 deletions

View File

@@ -1,118 +1,118 @@
<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>
<parent>
<groupId>org.alfresco</groupId>
<artifactId>full-community-packaging</artifactId>
<version>6.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>alfresco-content-services-community-full-distribution</artifactId>
<packaging>pom</packaging>
<name>Alfresco Content Services Community Full Distribution</name>
<!-- To replace in share-config-custom.xml -->
<properties>
<BITROCK_TOMCAT_PORT>8080</BITROCK_TOMCAT_PORT>
</properties>
<dependencies>
<dependency>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-content-services-community-distribution</artifactId>
<type>zip</type>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-solr4-distribution</artifactId>
<type>zip</type>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-content-services-share-distribution</artifactId>
<type>zip</type>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>
<build>
<finalName>${project.artifactId}-${installer.version.name}</finalName>
<resources>
<resource>
<directory>src/main/resources</directory>
<filtering>true</filtering>
</resource>
</resources>
<plugins>
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
<id>extract-keystore</id>
<phase>generate-resources</phase>
<goals>
<goal>unpack</goal>
</goals>
<configuration>
<artifactItems>
<artifactItem>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-content-services-community-distribution</artifactId>
<type>zip</type>
</artifactItem>
<artifactItem>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-solr4-distribution</artifactId>
<type>zip</type>
<outputDirectory>${project.build.directory}/dependency/solr4</outputDirectory>
</artifactItem>
<artifactItem>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-content-services-share-distribution</artifactId>
<type>zip</type>
</artifactItem>
</artifactItems>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
<id>make-assembly</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
<configuration>
<appendAssemblyId>false</appendAssemblyId>
<descriptors>
<descriptor>src/assembly/full-distribution.xml</descriptor>
</descriptors>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
<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>
<parent>
<groupId>org.alfresco</groupId>
<artifactId>full-community-packaging</artifactId>
<version>6.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>alfresco-content-services-community-full-distribution</artifactId>
<packaging>pom</packaging>
<name>Alfresco Content Services Community Full Distribution</name>
<!-- To replace in share-config-custom.xml -->
<properties>
<BITROCK_TOMCAT_PORT>8080</BITROCK_TOMCAT_PORT>
</properties>
<dependencies>
<dependency>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-content-services-community-distribution</artifactId>
<type>zip</type>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-solr4-distribution</artifactId>
<type>zip</type>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-content-services-share-distribution</artifactId>
<type>zip</type>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>
<build>
<finalName>${project.artifactId}-${installer.version.name}</finalName>
<resources>
<resource>
<directory>src/main/resources</directory>
<filtering>true</filtering>
</resource>
</resources>
<plugins>
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
<id>extract-keystore</id>
<phase>generate-resources</phase>
<goals>
<goal>unpack</goal>
</goals>
<configuration>
<artifactItems>
<artifactItem>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-content-services-community-distribution</artifactId>
<type>zip</type>
</artifactItem>
<artifactItem>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-solr4-distribution</artifactId>
<type>zip</type>
<outputDirectory>${project.build.directory}/dependency/solr4</outputDirectory>
</artifactItem>
<artifactItem>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-content-services-share-distribution</artifactId>
<type>zip</type>
</artifactItem>
</artifactItems>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
<id>make-assembly</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
<configuration>
<appendAssemblyId>false</appendAssemblyId>
<descriptors>
<descriptor>src/assembly/full-distribution.xml</descriptor>
</descriptors>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>

View File

@@ -1,62 +1,62 @@
<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
<id>distribution</id>
<includeBaseDirectory>false</includeBaseDirectory>
<formats>
<format>zip</format>
</formats>
<fileSets>
<!-- Local resources: README, etc. -->
<fileSet>
<directory>target/classes</directory>
<outputDirectory></outputDirectory>
</fileSet>
<!-- Platform Community Distribution -->
<fileSet>
<directory>${project.build.directory}/dependency/alfresco-content-services-community-distribution-${dependency.acs-community-packaging.version}</directory>
<outputDirectory/>
</fileSet>
<!-- Platform Enterprise Distribution -->
<fileSet>
<directory>${project.build.directory}/dependency/alfresco-content-services-distribution-${dependency.acs-packaging.version}</directory>
<outputDirectory/>
</fileSet>
<!-- Solr4 Distribution -->
<fileSet>
<directory>${project.build.directory}/dependency/solr4</directory>
<outputDirectory>solr4</outputDirectory>
<excludes>
<exclude>solr4.war</exclude>
</excludes>
</fileSet>
<fileSet>
<directory>${project.build.directory}/dependency/solr4</directory>
<outputDirectory>web-server/webapps</outputDirectory>
<includes>
<include>solr4.war</include>
</includes>
</fileSet>
<!-- Share -->
<fileSet>
<directory>${project.build.directory}/dependency/alfresco-content-services-share-distribution-${alfresco.share.version}</directory>
<outputDirectory/>
<includes>
<include>web-server/**</include>
<include>modules/**</include>
<include>amps/**</include>
</includes>
</fileSet>
<fileSet>
<directory>${project.build.directory}/dependency/alfresco-content-services-share-distribution-${alfresco.share.version}/web-extension-samples</directory>
<outputDirectory>web-server/shared/classes/alfresco/web-extension</outputDirectory>
</fileSet>
</fileSets>
</assembly>
<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
<id>distribution</id>
<includeBaseDirectory>false</includeBaseDirectory>
<formats>
<format>zip</format>
</formats>
<fileSets>
<!-- Local resources: README, etc. -->
<fileSet>
<directory>target/classes</directory>
<outputDirectory></outputDirectory>
</fileSet>
<!-- Platform Community Distribution -->
<fileSet>
<directory>${project.build.directory}/dependency/alfresco-content-services-community-distribution-${dependency.acs-community-packaging.version}</directory>
<outputDirectory/>
</fileSet>
<!-- Platform Enterprise Distribution -->
<fileSet>
<directory>${project.build.directory}/dependency/alfresco-content-services-distribution-${dependency.acs-packaging.version}</directory>
<outputDirectory/>
</fileSet>
<!-- Solr4 Distribution -->
<fileSet>
<directory>${project.build.directory}/dependency/solr4</directory>
<outputDirectory>solr4</outputDirectory>
<excludes>
<exclude>solr4.war</exclude>
</excludes>
</fileSet>
<fileSet>
<directory>${project.build.directory}/dependency/solr4</directory>
<outputDirectory>web-server/webapps</outputDirectory>
<includes>
<include>solr4.war</include>
</includes>
</fileSet>
<!-- Share -->
<fileSet>
<directory>${project.build.directory}/dependency/alfresco-content-services-share-distribution-${alfresco.share.version}</directory>
<outputDirectory/>
<includes>
<include>web-server/**</include>
<include>modules/**</include>
<include>amps/**</include>
</includes>
</fileSet>
<fileSet>
<directory>${project.build.directory}/dependency/alfresco-content-services-share-distribution-${alfresco.share.version}/web-extension-samples</directory>
<outputDirectory>web-server/shared/classes/alfresco/web-extension</outputDirectory>
</fileSet>
</fileSets>
</assembly>

View File

@@ -1,8 +1,8 @@
Alfresco Community (Build: ${installer.version.name})
===============================
Contains:
- Alfresco Content Services Community: ${dependency.acs-community-packaging.version}
- Alfresco Share: ${alfresco.share.version}
For users of Alfresco Community Edition, more information on this release is available at https://community.alfresco.com/community/ecm
Alfresco Community (Build: ${installer.version.name})
===============================
Contains:
- Alfresco Content Services Community: ${dependency.acs-community-packaging.version}
- Alfresco Share: ${alfresco.share.version}
For users of Alfresco Community Edition, more information on this release is available at https://community.alfresco.com/community/ecm