From b25b05c7ffe61d86ded96f0f740d31ddf8584f37 Mon Sep 17 00:00:00 2001
From: Andrii Shvaika <ashvayka@thingsboard.io>
Date: Mon, 25 May 2020 15:05:08 +0300
Subject: [PATCH] Fix JS Build

---
 .../server/dao/model/sql/EventEntity.java         |  2 +-
 packaging/js/build.gradle                         | 15 ++++++++++++++-
 pom.xml                                           |  6 ------
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/EventEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/EventEntity.java
index 3790577144..d25d37c175 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/EventEntity.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/EventEntity.java
@@ -112,7 +112,7 @@ public class EventEntity  extends BaseSqlEntity<Event> implements BaseEntity<Eve
         return event;
     }
 
-    private long getTs(UUID uuid) {
+    private static long getTs(UUID uuid) {
         return (uuid.timestamp() - EPOCH_DIFF) / 10000;
     }
 }
diff --git a/packaging/js/build.gradle b/packaging/js/build.gradle
index 34399ae5ea..8baa1e76ce 100644
--- a/packaging/js/build.gradle
+++ b/packaging/js/build.gradle
@@ -92,10 +92,13 @@ buildRpm {
     permissionGroup pkgUser
 
     // Copy the system unit files
-    from("${buildDir}/control/${pkgName}.service") {
+    from("${buildDir}/control/template.service") {
         addParentDirs = false
         fileMode 0644
         into "/usr/lib/systemd/system"
+        rename { String filename ->
+            "${pkgName}.service"
+        }
     }
 
     link("/etc/${pkgName}/conf", "${pkgInstallFolder}/conf")
@@ -121,6 +124,16 @@ buildDeb {
     user pkgUser
     permissionGroup pkgUser
 
+    // Copy the system unit files
+    from("${buildDir}/control/template.service") {
+        addParentDirs = false
+        fileMode 0644
+        into "/lib/systemd/system"
+        rename { String filename ->
+            "${pkgName}.service"
+        }
+    }
+
     link("/etc/init.d/${pkgName}", "${pkgInstallFolder}/init/${pkgName}")
     link("/etc/${pkgName}/conf", "${pkgInstallFolder}/conf")
 }
diff --git a/pom.xml b/pom.xml
index cc81f4b2b6..b6f10028a1 100755
--- a/pom.xml
+++ b/pom.xml
@@ -1369,11 +1369,6 @@
                 <artifactId>commons-collections</artifactId>
                 <version>${commons-collections.version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.yaml</groupId>
-                <artifactId>snakeyaml</artifactId>
-                <version>${snakeyaml.version}</version>
-            </dependency>
             <dependency>
                 <groupId>org.apache.struts</groupId>
                 <artifactId>struts-core</artifactId>
@@ -1389,7 +1384,6 @@
                 <artifactId>struts-tiles</artifactId>
                 <version>${struts.version}</version>
             </dependency>
-
         </dependencies>
     </dependencyManagement>