Update to Latest OpenRemote version

Author: pankalog

.github/workflows/ci_cd.yml

@@ -5,7 +5,7 @@ on:
   # Push excluding tags and workflow changes
   push:
     branches:
-        - '**'
+      - '**'
     tags-ignore:
       - '*.*'
     paths-ignore:
@@ -15,7 +15,7 @@ on:
 
   # When a release is published
   release:
-    types: [published]    
+    types: [published]
 
   # Manual trigger
   workflow_dispatch:

.gitmodules

@@ -0,0 +1,31 @@
+/*
+ * Copyright 2021, OpenRemote Inc.
+ *
+ * See the CONTRIBUTORS.txt file in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package org.openremote.agent.teltonika;
+
+import org.openremote.model.AssetModelProvider;
+
+public class CustomAgentModelProvider implements AssetModelProvider {
+
+    @Override
+    public boolean useAutoScan() {
+        return true;
+    }
+}

agent/src/main/java/org/openremote/agent/teltonika/CustomAgentModelProvider.java

@@ -1,9 +1,7 @@
 
 allprojects {
-    // Apply common project setup but exclude submodule, it has its own build.gradle
-    if (!path.startsWith(":openremote")) {
-        apply from: "${project(":openremote").projectDir}/project.gradle"
-    }
+    // Apply common project setup
+    apply from: "${project.rootDir}/project.gradle"
 }
 
 // Uncomment the following to configure files to be encrypted/decrypted
@@ -26,17 +24,29 @@ allprojects {
 //        return password.toCharArray()
 //    }
 //}
-//task checkFilesGitIgnoredNew(type: Exec) {
-//    // The provided checkFilesGitIgnored task doesn't work on Windows so here's one that does
-//    def args = []
-//    if (org.apache.tools.ant.taskdefs.condition.Os.isFamily(org.apache.tools.ant.taskdefs.condition.Os.FAMILY_WINDOWS)) {
-//        args.add("cmd")
-//        args.add("/c")
-//    }
-//    args.add("git")
-//    args.add("check-ignore")
-//    args.add("-q")
-//    args.addAll(project.getProperties().get("gradleFileEncrypt").plainFiles)
+//tasks.register('checkFilesGitIgnoredNew') {
+//    doLast {
+//        // The provided checkFilesGitIgnored task doesn't work on Windows so here's one that does
+//        def plainFiles = project.getProperties().get("gradleFileEncrypt").plainFiles
+//        plainFiles.each { plainFile ->
+//            def args = []
+//            if (org.apache.tools.ant.taskdefs.condition.Os.isFamily(org.apache.tools.ant.taskdefs.condition.Os.FAMILY_WINDOWS)) {
+//                args.add("cmd")
+//                args.add("/c")
+//            }
+//            args.add("git")
+//            args.add("check-ignore")
+//            args.add("-q")
+//            args.add(plainFile) // Assuming plainFile is a single file path
+//
+//            def result = project.exec {
+//                commandLine args
+//                ignoreExitValue = true // Allow the build to continue so we can check the exit value
+//            }
 //
-//    commandLine args
-//}
+//            if (result.exitValue != 0) {
+//                throw new GradleException("Command execution failed for file ${plainFile} with exit code: ${result.exitValue}")
+//            }
+//        }
+//    }
+//}

build.gradle

@@ -1,12 +1,20 @@
 apply plugin: "java-library"
 
+configurations {
+    managerRuntime
+}
+
 dependencies {
     api project(":setup")
+    managerRuntime "io.openremote:openremote-manager:$openremoteVersion"
 }
 
-task license {
+tasks.register('license') {
     doLast {
-        def toConcatenate = files("${project(":openremote").projectDir}/LICENSE.txt", "${rootDir}/LICENSE.txt")
+        def licenseFiles = new ArrayList<>()
+        licenseFiles.add("${rootDir}/LICENSE.txt")
+
+        def toConcatenate = files(licenseFiles.toArray())
         def outputFileName = "${buildDir}/image/manager/app/LICENSE.txt"
         def output = new File(outputFileName)
         if (output.exists()) {
@@ -19,8 +27,9 @@ task license {
     }
 }
 
-task installDist(type: Copy) {
-    dependsOn (parent.getTasksByName('installDist', true).findAll {
+tasks.register('installDist', Copy) {
+    duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+    dependsOn(parent.getTasksByName('installDist', true).findAll {
         // Don't create circular dependency or depend on built in openremote submodule apps
         it.project != project && !it.project.path.startsWith(":openremote:ui:app")
     })
@@ -31,10 +40,14 @@ task installDist(type: Copy) {
 
     into("image") {
         from projectDir
-        exclude "build.gradle", "Dockerfile", "build", "**/*.mbtiles", "src", "**/*.md", ".gitignore"
+        exclude "build.gradle", "Dockerfile", "build", "**/*.mbtiles", "src", "**/*.md", ".gitignore", "**/*.encrypted"
     }
 
     into("image/manager/extensions") {
-        from getDeploymentJars()
+        from configurations.runtimeClasspath.resolvedConfiguration.resolvedArtifacts.collect {it.file }
+        // Don't include deps baked into the manager docker image
+        exclude configurations.managerRuntime.resolvedConfiguration.resolvedArtifacts.collect {it.file.name }
+        // Don't include any ui packaged JARs (used for dev purposes only)
+        exclude { (it.file.path.contains(".gradle")  || it.file.path.contains(".m2")) && it.file.path.contains("io.openremote.ui") }
     }
 }

deployment/build.gradle

@@ -116,9 +116,12 @@ services:
     volumes:
       - manager-data:/storage
       - deployment-data:/deployment
+      - "/Users/panos/Downloads/eindhoven_30mb (2).mbtiles:/efs/nb.mbtiles"
       # Map data should be accessed from a volume mount
       # 1). Host filesystem - /deployment.local:/deployment.local
       # 2) NFS/EFS network mount - efs-data:/efs
+    ports:
+    - "1883:1883"
     environment:
       # Here are some typical environment variables you want to set
       # see openremote/profile/deploy.yml for details
@@ -135,6 +138,6 @@ services:
       OR_ADDITIONAL_HOSTNAMES: ${OR_ADDITIONAL_HOSTNAMES:-}
       OR_SSL_PORT: ${OR_SSL_PORT:--1}
       OR_DEV_MODE: ${OR_DEV_MODE:-false}
-      OR_MAP_TILES_PATH: '/efs/europe.mbtiles'
-      #OR_MAP_TILES_PATH: '/efs/europe.mbtiles'
+      # OR_MAP_TILES_PATH: '/efs/europe.mbtiles'
+      OR_MAP_TILES_PATH: '/efs/nb.mbtiles'
 #    <<: *awslogs

docker-compose.yml

@@ -1,4 +1,13 @@
+org.gradle.parallel=true
+
 projectName = custom-project
-projectVersion = 1.0-SNAPSHOT
+version = 1.0-SNAPSHOT
+
+openremoteVersion = 1.8.0
+
+jacksonVersion = 2.16.0
 typescriptGeneratorVersion = 3.2.1263
-org.gradle.parallel=true
+
+
+swaggerVersion=2.2.28
+swaggeruiVersion = 5.18.2

gradle.properties

@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists