Move alfrescoEdition / maven.alfresco.edition up

This commit is contained in:
Ole Hejlskov 2017-03-24 14:50:33 +01:00
parent 93dde46f51
commit aebda9bf06
3 changed files with 10 additions and 23 deletions

View File

@ -40,13 +40,12 @@
<alfresco.platform.version>5.2.e</alfresco.platform.version>
<alfresco.share.version>5.2.d</alfresco.share.version>
<!-- Default is to run with a Community edition, change to 'enterprise' if using Enterprise edition -->
<maven.alfresco.edition>community</maven.alfresco.edition>
<!-- Alfresco Surf version, if you change Share version you might need to change Surf version -->
<alfresco.surf.version>6.11</alfresco.surf.version>
<!-- Aikau framework version, it is released separately, so it can be useful to be able
to bring in newer versions with bug fixes etc -->
<aikau.version>1.0.101.3</aikau.version>
<!-- JRebel Hot reloading of classpath stuff and web resource stuff -->
<jrebel.version>1.1.6</jrebel.version>
@ -284,8 +283,6 @@
<artifactId>alfresco-maven-plugin</artifactId>
<version>${alfresco.sdk.version}</version>
<configuration>
<!-- Default is to run with a Community edition, change to 'enterprise' if using Enterprise edition -->
<alfrescoEdition>community</alfrescoEdition>
<!-- We need the flat file H2 database to run the Repo -->
<enableH2>true</enableH2>
@ -332,7 +329,6 @@
JARs and AMPs that should be overlayed/applied to the Share WAR (i.e. share.war)
-->
<shareModules>
<!-- Bring in custom Modules -->
<moduleDependency>
<groupId>${project.groupId}</groupId>

View File

@ -40,6 +40,10 @@
<!-- Alfresco Share version, so we can bring in correct alfresco-share-services artifact -->
<alfresco.share.version>5.2.d</alfresco.share.version>
<!-- Default is to run with a Community edition, change to 'enterprise' if using Enterprise edition -->
<maven.alfresco.edition>community</maven.alfresco.edition>
<!-- JRebel Hot reloading of classpath stuff and web resource stuff -->
<jrebel.version>1.1.6</jrebel.version>
@ -123,9 +127,6 @@
</execution>
</executions>
<configuration>
<!-- Default is to run with a Community edition, change to 'enterprise' if using Enterprise edition -->
<alfrescoEdition>community</alfrescoEdition>
<!-- We need the flat file H2 database to run the Repo -->
<enableH2>true</enableH2>
<!-- This is a platform extension JAR, so we need the platform webapp (alfresco.war) -->

View File

@ -24,13 +24,12 @@
executing for example $ mvn clean install alfresco:run -->
<alfresco.share.version>5.2.d</alfresco.share.version>
<!-- Default is to run with a Community edition, change to 'enterprise' if using Enterprise edition -->
<maven.alfresco.edition>community</maven.alfresco.edition>
<!-- Alfresco Surf version, if you change Share version you might need to change Surf version -->
<alfresco.surf.version>6.11</alfresco.surf.version>
<!-- Aikau framework version, it is released separately, so it can be useful to be able
to bring in newer versions with bug fixes etc -->
<aikau.version>1.0.101.3</aikau.version>
<!-- Since alfresco.war (i.e. the Platform/Repository) is already running on port 8080, we run Share.WAR on port 8081.
If Alfresco Platform is not running, then generate a platform-jar-module and start it up. -->
<maven.tomcat.port>8081</maven.tomcat.port>
@ -72,8 +71,6 @@
<artifactId>alfresco-maven-plugin</artifactId>
<version>${alfresco.sdk.version}</version>
<configuration>
<!-- Default is to run with a Community edition, change to 'enterprise' if using Enterprise edition -->
<alfrescoEdition>community</alfrescoEdition>
<!-- We assume that the platform/repository is already running on localhost:8080 -->
<enableH2>false</enableH2>
@ -88,13 +85,6 @@
(i.e. share.war)
-->
<shareModules>
<moduleDependency>
<!-- Bring in a newer version of Aikau, can coexist with older versions in the
WAR distribution, newest version is picked. -->
<groupId>${alfresco.groupId}</groupId>
<artifactId>aikau</artifactId>
<version>${aikau.version}</version>
</moduleDependency>
<!-- Bring in this JAR project, need to be included here, otherwise share-config-custom.xml
will not be picked up. It will not be read from target/classes/META-INF -->
<moduleDependency>