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

Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1)

Browse Source 
123492 mrogers: Package the correct README for the all in one installer.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.1@124071 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Mark Rogers
2016-03-15 13:00:39 +00:00
parent b96f95aa7b
commit 0d96ad055d
2 changed files with 39 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
enterprise-update/assemblies/updateTool.xml
View File

@@ -38,12 +38,20 @@
<directory>${unpacked.alfresco.platform.distribution}</directory> <directory>${unpacked.alfresco.platform.distribution}</directory>
<outputDirectory>resources/distribution/platform</outputDirectory> <outputDirectory>resources/distribution/platform</outputDirectory>
<includes> <includes>
<include>README.txt</include>
<include>package.properties</include> <include>package.properties</include>
</includes> </includes>
<lineEnding>keep</lineEnding> <lineEnding>keep</lineEnding>
</fileSet> </fileSet>
<fileSet>
<directory>${unpacked.alfresco.one.distribution}</directory>
<outputDirectory>resources/distribution/platform</outputDirectory>
<includes>
<include>README.txt</include>
</includes>
<lineEnding>keep</lineEnding>
</fileSet>
<!-- Platform Only distribution - currently the same as full platform --> <!-- Platform Only distribution - currently the same as full platform -->
<fileSet> <fileSet>
<directory>${unpacked.alfresco.platform.distribution}</directory> <directory>${unpacked.alfresco.platform.distribution}</directory>

29
enterprise-update/pom.xml
View File

@@ -17,6 +17,7 @@
<unpacked.alfresco.share.distribution>${project.build.directory}/dependency/alfresco-share-distribution-${alfresco.share.version}</unpacked.alfresco.share.distribution> <unpacked.alfresco.share.distribution>${project.build.directory}/dependency/alfresco-share-distribution-${alfresco.share.version}</unpacked.alfresco.share.distribution>
<unpacked.alfresco.wcmqs.distribution>${project.build.directory}/dependency/wcmqs-${project.version}</unpacked.alfresco.wcmqs.distribution> <unpacked.alfresco.wcmqs.distribution>${project.build.directory}/dependency/wcmqs-${project.version}</unpacked.alfresco.wcmqs.distribution>
<unpacked.org.alfresco.aos.distribution>${project.build.directory}/dependency/aos-${alfresco.aos-module.version}</unpacked.org.alfresco.aos.distribution> <unpacked.org.alfresco.aos.distribution>${project.build.directory}/dependency/aos-${alfresco.aos-module.version}</unpacked.org.alfresco.aos.distribution>
<unpacked.alfresco.one.distribution>${project.build.directory}/dependency/alfresco-one-distribution-${project.version}</unpacked.alfresco.one.distribution>
<!-- e.g. pull the update scripts from src/main/resources/script/5.0 --> <!-- e.g. pull the update scripts from src/main/resources/script/5.0 -->
<unpacked.update.script>${project.build.directory}/classes/script/${version.major}.${version.minor}</unpacked.update.script> <unpacked.update.script>${project.build.directory}/classes/script/${version.major}.${version.minor}</unpacked.update.script>
@@ -102,6 +103,14 @@
<type>zip</type> <type>zip</type>
</dependency> </dependency>
<!-- Full Installer dependencies -->
<dependency>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-one-distribution</artifactId>
<version>${project.version}</version>
<type>jar</type>
</dependency>
<!-- Testing dependencies --> <!-- Testing dependencies -->
<dependency> <dependency>
<groupId>junit</groupId> <groupId>junit</groupId>
@@ -226,6 +235,26 @@
</artifactItem> </artifactItem>
</artifactItems> </artifactItems>
</configuration> </configuration>
</execution>
<execution>
<id>unpack-one-distribution</id>
<phase>generate-resources</phase>
<goals>
<goal>unpack</goal>
</goals>
<configuration>
<artifactItems>
<artifactItem>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-one-distribution</artifactId>
<version>${project.version}</version>
<overWrite>true</overWrite>
<type>jar</type>
<outputDirectory>${unpacked.alfresco.one.distribution}</outputDirectory>
</artifactItem>
</artifactItems>
</configuration>
</execution> </execution>
</executions> </executions>
</plugin> </plugin>