Update the latest changes to prepare the new release soon

Author: hainguyen

mycollab-app-community/pom.xml

@@ -19,11 +19,6 @@
     </properties>
 
     <dependencies>
-        <dependency>
-            <groupId>com.mycollab</groupId>
-            <artifactId>mycollab-client-api</artifactId>
-            <version>${project.version}</version>
-        </dependency>
 
         <dependency>
             <groupId>com.mycollab</groupId>
@@ -83,6 +78,12 @@
             <groupId>com.vaadin</groupId>
             <artifactId>vaadin-client</artifactId>
             <scope>provided</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>javax.validation</groupId>
+                    <artifactId>validation-api</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>
@@ -294,7 +295,7 @@
                                 </copy>
                                 <copy todir="${installer.staging.dir}/config">
                                     <fileset dir="${basedir}/src/main/config">
-                                        <exclude name="mycollab.properties"/>
+                                        <exclude name="application.properties"/>
                                     </fileset>
                                 </copy>
                                 <copy todir="${installer.staging.dir}/logs">
@@ -306,6 +307,7 @@
                                 <copy todir="${installer.staging.dir}/lib">
                                     <fileset dir="${basedir}/src/main/lib"/>
                                 </copy>
+                                <chmod dir="${installer.staging.dir}/bin/" includes="*.sh" perm="700"/>
                             </target>
                         </configuration>
                     </execution>

mycollab-app-community/src/main/config/application.properties.ftl

@@ -1,5 +1,5 @@
 #=====================================================
-# You can visit link http://community.mycollab.com/configuration/
+# You can visit link https://community.mycollab.com/docs/hosting-mycollab-on-your-own-server/advanced-configuration/
 # to get all configuration fieldBuilder and their meanings
 #=====================================================
 
@@ -10,9 +10,9 @@ app.siteName=${sitename}
 app.notifyEmail=${mailNotify}
 
 server.address=${serveraddress}
-server.apiUrl=http://api.mycollab.com/api/
+server.apiUrl=https://api.mycollab.com/
 server.storageSystem=file
-server.siteUrl=http://%s:%d
+server.siteUrl=http://%s:%d/
 server.resourceDownloadUrl=http://%s:%d/file/
 server.cdnUrl=http://%s:%d/assets/
 

mycollab-app-community/src/main/resources/banner.txt

@@ -0,0 +1,9 @@
+
+ ===================================================================================================================
+ ___  ___ _  _   ___   ___   __    __     ___  ____       ___   ___   ___  ___ ___  ___ __ __ __  __ __ ______ _  _
+ ||\\//|| \\//  //    // \\  ||    ||    // \\ || ))     //    // \\  ||\\//|| ||\\//|| || || ||\ || || | || | \\//
+ || \/ ||  )/  ((    ((   )) ||    ||    ||=|| ||=)     ((    ((   )) || \/ || || \/ || || || ||\\|| ||   ||    )/
+ ||    || //    \\__  \\_//  ||__| ||__| || || ||_))     \\__  \\_//  ||    || ||    || \\_// || \|| ||   ||   //
+
+ Version 6.0.0
+ ===================================================================================================================

mycollab-app-community/src/main/scripts/MyCollab6.exe

@@ -18,6 +18,7 @@ rem                   Required to run the with the "debug" argument.
 rem ---------------------------------------------------------------------------
 
 set _RUNJAVA=java
+set MYCOLLAB_PORT=9090
 set MYCOLLAB_OPTS=-noverify -server -Xms394m -Xmx768m -XX:NewSize=128m -XX:+DisableExplicitGC -XX:+CMSClassUnloadingEnabled -XX:+UseConcMarkSweepGC
 
 rem Suppress Terminate batch job on CTRL+C
@@ -85,7 +86,7 @@ goto execCmd
 
 rem Execute Java with the applicable properties
 cd ..
-%_EXECJAVA% -jar executor.jar %* %MYCOLLAB_OPTS%
+%_EXECJAVA% -jar executor.jar %* %MYCOLLAB_OPTS% -Dserver.port=%MYCOLLAB_PORT%
 goto end
 
 :end

mycollab-app-community/src/main/scripts/MyCollab6amd64.exe

@@ -20,6 +20,7 @@
 # -----------------------------------------------------------------------------
 # OS specific support.  $var _must_ be set to either true or false.
 
+export MYCOLLAB_PORT=9090
 export MYCOLLAB_OPTS=-noverify -server -Xms394m -Xmx768m -XX:NewSize=128m -XX:+DisableExplicitGC -XX:+CMSClassUnloadingEnabled -XX:+UseConcMarkSweepGC
 
 cygwin=false
@@ -153,7 +154,7 @@ if [ "$1" = "--start" ] ; then
   shift
   touch "$MYCOLLAB_OUT"
   cd ..
-  eval \"$_RUNJAVA\" -jar $MYCOLLAB_HOME/executor.jar $MYCOLLAB_OPTS &
+  eval \"$_RUNJAVA\" -jar $MYCOLLAB_HOME/executor.jar $MYCOLLAB_OPTS -Dserver.port=$MYCOLLAB_PORT &
 
   if [ ! -z "$MYCOLLAB_PID" ]; then
     echo $! > "$MYCOLLAB_PID"