* Fix issue of not creating the project with MySQL 8

* Minor issues of Kotlin nullable object

Author: hainguyen

mycollab-app-community/src/main/config/application.yml

@@ -7,7 +7,7 @@ app:
   linkedinUrl: http://www.linkedin.com/company/mycollab
 
 server:
-  apiUrl: https://api.mycollab.com/api/
+  apiUrl: http://api.mycollab.com/api/
   port: 8080
   storageSystem: file
   siteUrl: http://%s:%d

mycollab-app-community/src/main/docker/Dockerfile

@@ -7,7 +7,7 @@ ADD staging/bin              /usr/share/mycollab/bin
 ADD staging/config           /usr/share/mycollab/config
 ADD staging/i18n             /usr/share/mycollab/i18n
 # Add Maven dependencies (not shaded into the artifact; Docker-cached)
-ADD target/staging/lib              /usr/share/mycollab/lib
+ADD staging/lib              /usr/share/mycollab/lib
 # Add the service itself
 ADD staging/executor.jar     /usr/share/mycollab/executor.jar
 

mycollab-app-community/src/main/docker/app.yml

@@ -1,16 +1,25 @@
 version: '3.1'
 services:
+    hlsoft-mysql:
+        image: mysql:latest
+        restart: always
+        hostname: mysql
+        command: mysqld --default-authentication-plugin=mysql_native_password
+        ports:
+            - "3306:3306"
+        environment:
+            MYSQL_ROOT_PASSWORD: esofthead321
+            MYSQL_DATABASE: mycollab
     hlsoft-app:
-        image: mycollab
+        image: mycollab/mycollab
         environment:
             - SPRING_PROFILES_ACTIVE=prod
             - JAVA_OPTS=-Djgroups.tcp.address=NON_LOOPBACK -Djava.net.preferIPv4Stack=true -Xmx2g -Xms2g
             - ES_JAVA_OPTS= -Xms750m -Xmx750m
+        tty: true
         ports:
             - 8080:8080
-    hlsoft-mysql:
-        image: mysql:5.6
-        restart: always
-        environment:
-          MYSQL_ROOT_PASSWORD: esofthead321
-          MYSQL_DATABASE: mycollab
+        links:
+          - hlsoft-mysql
+        depends_on:
+          - hlsoft-mysql

mycollab-app-community/src/main/docker/mysql.yml

@@ -1,7 +1,12 @@
 version: '3.1'
 services:
     hlsoft-mysql:
-        image: mysql:5.6
+        image: mysql:8.0.11
+        restart: always
+        hostname: mysql
+        command: mysqld --default-authentication-plugin=mysql_native_password
+        ports:
+            - "3306:3306"
         environment:
-            MYSQL_ROOT_PASSWORD: esofthead321
+            MYSQL_ROOT_PASSWORD: mycollab123
             MYSQL_DATABASE: mycollab

mycollab-caching/pom.xml

@@ -33,7 +33,7 @@
         <dependency>
             <groupId>org.infinispan</groupId>
             <artifactId>infinispan-spring-boot-starter-embedded</artifactId>
-            <version>2.0.0.Alpha1</version>
+            <version>2.0.0.Beta1</version>
         </dependency>
 
     </dependencies>

mycollab-config/src/main/java/com/mycollab/configuration/EmailConfiguration.kt

@@ -16,10 +16,8 @@
  */
 package com.mycollab.configuration
 
-import com.mycollab.core.MyCollabException
 import com.mycollab.core.arguments.ValuedBean
 import com.mycollab.core.utils.StringUtils
-
 import javax.validation.constraints.Digits
 import javax.validation.constraints.NotNull
 
@@ -32,19 +30,19 @@ import javax.validation.constraints.NotNull
 class EmailConfiguration internal constructor(@field:NotNull var host: String?,
                                               @field:NotNull var user: String?,
                                               @field:NotNull var password: String?,
-                                              port: Int, isStartTls: Boolean, isSsl: Boolean, notifyEmail: String) : ValuedBean() {
+                                              port: Int, startTls: Boolean, ssl: Boolean, notifyEmail: String) : ValuedBean() {
 
     @Digits(integer = 6, fraction = 0)
     var port: Int = 25
 
-    var isStartTls = false
-    var isSsl = false
+    var startTls = false
+    var ssl = false
     var notifyEmail: String? = null
 
     init {
         this.port = port
-        this.isStartTls = isStartTls
-        this.isSsl = isSsl
+        this.startTls = startTls
+        this.ssl = ssl
         this.notifyEmail = if (StringUtils.isBlank(notifyEmail)) user else notifyEmail
     }
 }

mycollab-config/src/main/java/com/mycollab/configuration/ServerConfiguration.kt

@@ -41,10 +41,8 @@ open class ServerConfiguration(var storageSystem: String = STORAGE_FILE, var por
 
     companion object {
 
-        @JvmField
-        val STORAGE_FILE = "file"
+        const val STORAGE_FILE = "file"
 
-        @JvmField
-        val STORAGE_S3 = "s3"
+        const val STORAGE_S3 = "s3"
     }
 }

mycollab-config/src/main/java/com/mycollab/configuration/logging/MailAppender.kt

@@ -45,7 +45,7 @@ class MailAppender : SMTPAppender() {
         this.setSMTPPort(conf.port)
         this.username = conf.user
         this.password = conf.password
-        this.isSTARTTLS = conf.isStartTls
+        this.isSTARTTLS = conf.startTls
         this.from = conf.notifyEmail
         this.addTo(SiteConfiguration.getSendErrorEmail())
         super.start()

mycollab-core/pom.xml

@@ -49,19 +49,19 @@
         <dependency>
             <groupId>org.apache.tika</groupId>
             <artifactId>tika-core</artifactId>
-            <version>1.16</version>
+            <version>1.18</version>
         </dependency>
 
         <dependency>
             <groupId>org.jsoup</groupId>
             <artifactId>jsoup</artifactId>
-            <version>1.10.3</version>
+            <version>1.11.3</version>
         </dependency>
 
         <dependency>
             <groupId>org.ocpsoft.prettytime</groupId>
             <artifactId>prettytime</artifactId>
-            <version>4.0.1.Final</version>
+            <version>4.0.2.Final</version>
         </dependency>
 
         <dependency>
@@ -87,7 +87,7 @@
         <dependency>
             <groupId>uk.com.robust-it</groupId>
             <artifactId>cloning</artifactId>
-            <version>1.9.6</version>
+            <version>1.9.10</version>
         </dependency>
     </dependencies>
 </project>

mycollab-core/src/main/java/com/mycollab/core/utils/FileUtils.kt

@@ -37,7 +37,7 @@ object FileUtils {
 
     init {
         val userFolder = System.getProperty("user.dir")
-        val homeDir = File(userFolder + "/.mycollab")
+        val homeDir = File("$userFolder/.mycollab")
         val userHomeDir = File(System.getProperty("user.home") + "/.mycollab")
         if (userHomeDir.exists()) {
             _homeFolder = try {
@@ -72,7 +72,7 @@ object FileUtils {
     @JvmStatic
     fun readFileAsPlainString(fileName: String): String {
         try {
-            val pricingFile = FileUtils.getDesireFile(userFolder, fileName, "src/main/conf/" + fileName)
+            val pricingFile = FileUtils.getDesireFile(userFolder, fileName, "src/main/conf/$fileName")
             return when {
                 pricingFile != null -> String(Files.readAllBytes(pricingFile.toPath()), Charset.forName("UTF-8"))
                 else -> ""