100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps
Java asset-managementbuildingdashboarddataplatformdevice-managementedge-computingenergyenergy-managementenergy-monitorfleet-managementfleet-telematicsiotiot-applicationiot-platformmodbusmqttmqtt-brokerota-updaterules-enginesmartcity
Release management build configuration added (#766)
Rich Turner4874e89c198f
diff --git a/.ci_cd/README.md b/.ci_cd/README.mdindex 6148540e4..120821aa8 100644--- a/.ci_cd/README.md+++ b/.ci_cd/README.md@@ -16,7 +16,7 @@ docker image tag updates. The file layout is:// Comma separated list of tags to push to openremote/manager docker hub image// This can only be used on the main openremote repo (openremote/openremote)"distribute": {- "tags": "develop"+ "docker": "develop"},// Singleton or array of deployments to execute, a deployment consists of (environment and/or managerTag see variables for explanation)"deploy": {@@ -26,7 +26,7 @@ docker image tag updates. The file layout is:},"master": {"distribute": {- "tags": "latest"+ "docker": "latest"}}},@@ -35,7 +35,8 @@ docker image tag updates. The file layout is:// Comma separated list of tags to push to openremote/manager docker hub image $version is replaced with release version// This can only be used on the main openremote repo (openremote/openremote)"distribute": {- "tags": "latest,$version"+ "docker": "latest,$version",+ "maven": "$version"},// Singleton or array of deployments to execute, a deployment consists of (environment and/or managerTag see variables for explanation)"deploy": {diff --git a/.ci_cd/aws/provision_account.sh b/.ci_cd/aws/provision_account.shindex 07eb88654..ecb4472fb 100644--- a/.ci_cd/aws/provision_account.sh+++ b/.ci_cd/aws/provision_account.sh@@ -147,7 +147,10 @@ if [ "$VPCID" == 'None' ]; thenVPCID=$(aws ec2 create-default-vpc --query "Vpc.VpcId" --output text $ACCOUNT_PROFILE)# Add IPv6 CIDR- IPV6CIDR=$(aws ec2 associate-vpc-cidr-block --amazon-provided-ipv6-cidr-block --ipv6-cidr-block-network-border-group $AWS_REGION --vpc-id $VPCID --query "Ipv6CidrBlockAssociation.Ipv6CidrBlock" --output text $ACCOUNT_PROFILE)+ aws ec2 associate-vpc-cidr-block --amazon-provided-ipv6-cidr-block --ipv6-cidr-block-network-border-group $AWS_REGION --vpc-id $VPCID $ACCOUNT_PROFILE+ # Wait a short while for it to be provisioned+ sleep 10+ IPV6CIDR=$(aws ec2 describe-vpcs --vpc-ids $VPCID --query "Vpcs[0].Ipv6CidrBlockAssociationSet[0].Ipv6CidrBlock" --output text $ACCOUNT_PROFILE)# Add IPv6 CIDR to each subnet and add IPv6 route for internet gatewaySUBNETID1=$(aws ec2 describe-subnets --filter "Name=vpc-id,Values=$VPCID" --query "Subnets[0].[SubnetId]" --output text $ACCOUNT_PROFILE)diff --git a/.ci_cd/ci_cd.json b/.ci_cd/ci_cd.jsonindex 1aee8b96e..91f0877d5 100644--- a/.ci_cd/ci_cd.json+++ b/.ci_cd/ci_cd.json@@ -2,7 +2,7 @@"push": {"master": {"distribute": {- "tags": "develop,latest"+ "docker": "develop,latest"},"deploy": {"managerTag": "develop",@@ -12,7 +12,8 @@},"release": {"distribute": {- "tags": "latest,$version"+ "docker": "latest,$version",+ "maven": "$version"},"deploy": {"managerTag": "latest",diff --git a/.github/workflows/ci_cd.yml b/.github/workflows/ci_cd.ymlindex 96662b9d4..4f1b54780 100644--- a/.github/workflows/ci_cd.yml+++ b/.github/workflows/ci_cd.yml@@ -67,7 +67,7 @@ on:# When a release is publishedrelease:- types: [published]+ types: [published]# Manual triggerworkflow_dispatch:@@ -287,7 +287,10 @@ jobs:os.system(f"echo 'Outputting manifest info for tag: {key}'")os.system(f"docker manifest inspect openremote/manager:{key} > ~/manager-tags-new/{key}")os.system("echo 'Tag manifests generated:'")- os.system("find ~/manager-tags-new")+ os.system("find ~/manager-tags-new")+ env:+ EVENT_NAME: ${{ github.event_name }}+ REF_NAME: ${{ github.ref_name }}- name: Load manager tag cacheif: ${{ steps.check_cicd_json.outputs.files_exists == 'true' && github.event_name == 'schedule' }}@@ -312,7 +315,8 @@ jobs:refName = os.getenv('REF_NAME')isMainRepo = os.getenv('IS_MAIN_REPO')deploys = None- tags = None+ dockerPublishTags = None+ mavenPublishTag = NonedeployEnvironment = Nonef = open(".ci_cd/ci_cd.json")@@ -361,25 +365,33 @@ jobs:eventConfig = eventConfig[refName]if eventConfig is not None:deploys = eventConfig['deploy'] if 'deploy' in eventConfig else None- if 'distribute' in eventConfig and 'tags' in eventConfig['distribute']:- tags = eventConfig['distribute']['tags']+ if 'distribute' in eventConfig and 'docker' in eventConfig['distribute']:+ dockerPublishTags = eventConfig['distribute']['docker']elif eventName == "release" and refName in eventConfig:eventConfig = eventConfig[refName]if eventConfig is not None:deploys = eventConfig['deploy'] if 'deploy' in eventConfig else {}- if 'distribute' in eventConfig and 'tags' in eventConfig['distribute']:- tags = eventConfig['distribute']['tags']+ if 'distribute' in eventConfig:+ if 'docker' in eventConfig['distribute']:+ dockerPublishTags = eventConfig['distribute']['docker']+ if 'maven' in eventConfig['distribute']:+ mavenPublishTag = eventConfig['distribute']['maven']- if tags is not None and isMainRepo == 'true':- tags = tags.replace("$version", refName)- firstTag = tags.split(",")[0]- os.system(f"echo ::set-output name=firstTag::{firstTag}")- os.system(f" echo 'Manager tags to push to docker: {tags}'")- tags = " ".join(map(lambda t: f"-t openremote/manager:{t.strip()}", tags.split(",")))- os.system(f"echo ::set-output name=tags::{tags}")-+ if dockerPublishTags is not None and isMainRepo == 'true':+ dockerPublishTags = dockerPublishTags.replace("$version", refName)+ firstDockerTag = dockerPublishTags.split(",")[0]+ os.system(f"echo ::set-output name=firstDockerTag::{firstDockerTag}")+ os.system(f" echo 'Manager tags to push to docker: {dockerPublishTags}'")+ dockerPublishTags = " ".join(map(lambda t: f"-t openremote/manager:{t.strip()}", dockerPublishTags.split(",")))+ os.system(f"echo ::set-output name=dockerTags::{dockerPublishTags}")++ if mavenPublishTag is not None and isMainRepo == 'true':+ mavenPublishTag = mavenPublishTag.replace("$version", refName)+ os.system(f" echo 'Maven publish version: {mavenPublishTag}'")+ os.system(f"echo ::set-output name=mavenTag::{mavenPublishTag}")+deployStr = Noneif deploys is not None:if not isinstance(deploys, list):@@ -471,12 +483,26 @@ jobs:echo "::set-output name=buildPath::$buildPath"echo "::set-output name=refTag::$commitShaShort"env:- FIRST_MANAGER_TAG: ${{ steps.ci-cd-output.outputs.firstTag }}- MANAGER_TAGS: ${{ steps.ci-cd-output.outputs.tags }}+ FIRST_MANAGER_TAG: ${{ steps.ci-cd-output.outputs.firstDockerTag }}+ MANAGER_TAGS: ${{ steps.ci-cd-output.outputs.dockerTags }}DEPLOYMENTS: ${{ steps.deployments.outputs.value }}IS_CUSTOM_PROJECT: ${{ steps.check_custom_project.outputs.files_exists }}TEST_UI_CMD: ${{ steps.test-ui-command.outputs.value }}-++ - name: Define maven publish command+ id: maven-publish-command+ if: ${{ steps.ci-cd-output.outputs.mavenTag != '' }}+ shell: bash+ run: |+ command="./gradlew publish -PopenremoteVersion=$MAVEN_TAG -PsigningKey=$SIGNING_KEY -PsigningPassword=$SIGNING_PASSWORD -PpublishUsername=$MAVEN_USERNAME -P$MAVEN_PASSWORD"+ echo "::set-output name=value::$command"+ env:+ MAVEN_TAG: ${{ steps.ci-cd-output.outputs.mavenTag }}+ SIGNING_PASSWORD: ${{ steps.inputs-and-secrets.outputs._TEMP_SIGNING_PASSWORD }}+ SIGNING_KEY: ${{ steps.inputs-and-secrets.outputs._TEMP_SIGNING_KEY }}+ MAVEN_USERNAME: ${{ steps.inputs-and-secrets.outputs._TEMP_MAVEN_USERNAME }}+ MAVEN_PASSWORD: ${{ steps.inputs-and-secrets.outputs._TEMP_MAVEN_PASSWORD }}+- name: Define deployment docker build commandid: deployment-docker-commandshell: bash@@ -508,13 +534,14 @@ jobs:shell: bashrun: |if [ -n "$MANAGER_DOCKER_CMD" ]; then- echo "::set-output name=value::./gradlew installDist"+ echo "::set-output name=value::./gradlew installDist -PopenremoteVersion=$REF_NAME"elif [ -n "$DEPLOYMENT_DOCKER_CMD" ]; thenecho "::set-output name=value::./gradlew -p deployment installDist"fienv:MANAGER_DOCKER_CMD: ${{ steps.manager-docker-command.outputs.value }}DEPLOYMENT_DOCKER_CMD: ${{ steps.deployment-docker-command.outputs.value }}+ REF_NAME: ${{ github.ref_name }}- name: Login to DockerHubif: ${{ steps.manager-docker-command.outputs.pushRequired == 'true' }}@@ -576,6 +603,7 @@ jobs:echo 'Test backend command: ${{ steps.test-backend-command.outputs.value }}'echo 'Test UI command: ${{ steps.test-ui-command.outputs.value }}'echo 'Manager docker build command: ${{ steps.manager-docker-command.outputs.value }}'+ echo 'Maven publish command: ${{ steps.maven-publish-command.outputs.value }}'echo 'Deployment docker build command: ${{ steps.deployment-docker-command.outputs.value }}'echo 'InstallDist command: ${{ steps.install-command.outputs.value }}'echo "Java version: $(java --version)"@@ -693,10 +721,14 @@ jobs:run: |${{ steps.manager-docker-command.outputs.value }}+ - name: Run maven publish command+ if: steps.maven-publish-command.outputs.value != ''+ run: |+ ${{ steps.maven-publish-command.outputs.value }}+- name: Run frontend testsif: steps.test-ui-command.outputs.value != ''- run: |-+ run: |composeProfile='profile/dev-ui.yml'if [ $IS_CUSTOM_PROJECT == 'true' ]; thendiff --git a/LICENSE.txt b/LICENSE.txtindex c68849b06..eb8653e89 100644--- a/LICENSE.txt+++ b/LICENSE.txt@@ -29,7 +29,6 @@ com.fasterxml.jackson.jaxrs:*: APACHE LICENSE, VERSION 2.0com.fasterxml:classmate: APACHE LICENSE, VERSION 2.0com.google.code.findbugs: GNU LESSER GENERAL PUBLIC LICENSE, VERSION 3com.google.errorprone:error_prone_annotations: APACHE LICENSE, VERSION 2.0-com.google.guava:*: APACHE LICENSE, VERSION 2.0com.ning:async-http-client: APACHE LICENSE, VERSION 2.0com.sun.xml.bind:*: GNU GENERAL PUBLIC LICENSE, VERSION 2.0 WITH CLASSPATH EXCEPTIONcom.zaxxer:HikariCP: APACHE LICENSE, VERSION 2.0diff --git a/agent/build.gradle b/agent/build.gradleindex 95b174da0..00273edb5 100644--- a/agent/build.gradle+++ b/agent/build.gradle@@ -1,5 +1,7 @@apply plugin: "java-library"apply plugin: "groovy"+apply plugin: "maven-publish"+apply plugin: "signing"dependencies {@@ -46,3 +48,66 @@ dependencies {jar {archivesBaseName = "openremote-${project.name}"}++javadoc {+ failOnError = false+}++java {+ withJavadocJar()+ withSourcesJar()+}++publishing {+ publications {+ maven(MavenPublication) {+ group = "io.openremote"+ artifactId = "openremote-${project.name}"+ from components.java+ pom {+ name = 'OpenRemote Agent'+ description = 'Provides agent SPI and built in agents; add maven {url "https://jitpack.io"} and maven {url "https://repo.osgeo.org/repository/release/"} and maven {url "https://pkgs.dev.azure.com/OpenRemote/OpenRemote/_packaging/OpenRemote/maven/v1"} to resolve all dependencies'+ url = 'https://github.com/openremote/openremote'+ licenses {+ license {+ name = 'GNU Affero General Public License v3.0'+ url = 'https://www.gnu.org/licenses/agpl-3.0.en.html'+ }+ }+ developers {+ developer {+ id = 'developers'+ name = 'Developers'+ email = '[email protected]'+ organization = 'OpenRemote'+ organizationUrl = 'https://openremote.io'+ }+ }+ scm {+ connection = 'scm:git:git://github.com/openremote/openremote.git'+ developerConnection = 'scm:git:ssh://github.com:openremote/openremote.git'+ url = 'https://github.com/openremote/openremote/tree/master'+ }+ }+ }+ }++ repositories {+ maven {+ if (!version.endsWith('-LOCAL')) {+ credentials {+ username findProperty("publishUsername")+ password findProperty("publishPassword")+ }+ }+ url = version.endsWith('-LOCAL') ? layout.buildDirectory.dir('repo') : version.endsWith('-SNAPSHOT') ? findProperty("snapshotsRepoUrl") : findProperty("releasesRepoUrl")+ }+ }+}++signing {+ def signingKey = findProperty("signingKey")+ def signingPassword = findProperty("signingPassword")+ useInMemoryPgpKeys(signingKey, signingPassword)+ sign publishing.publications.maven+}diff --git a/agent/src/main/java/org/openremote/agent/protocol/tradfri/util/CoapClient.java b/agent/src/main/java/org/openremote/agent/protocol/tradfri/util/CoapClient.javaindex f76b7f902..63e10dff4 100644--- a/agent/src/main/java/org/openremote/agent/protocol/tradfri/util/CoapClient.java+++ b/agent/src/main/java/org/openremote/agent/protocol/tradfri/util/CoapClient.java@@ -10,9 +10,11 @@ import org.eclipse.californium.core.coap.Response;import org.eclipse.californium.core.network.CoapEndpoint;import org.eclipse.californium.core.network.Endpoint;import org.eclipse.californium.core.network.EndpointManager;+import org.eclipse.californium.elements.config.Configuration;import org.eclipse.californium.scandium.DTLSConnector;import org.eclipse.californium.scandium.config.DtlsConnectorConfig;-import org.eclipse.californium.scandium.dtls.pskstore.InMemoryPskStore;+import org.eclipse.californium.scandium.dtls.pskstore.AdvancedSinglePskStore;+import org.eclipse.californium.scandium.util.SecretUtil;import org.openremote.model.util.ValueUtil;import java.io.IOException;@@ -66,15 +68,14 @@ public class CoapClient {*/private void updateDtlsConnector() throws IOException {if(dtlsEndpoint != null) dtlsEndpoint.destroy();- DtlsConnectorConfig.Builder builder = new DtlsConnectorConfig.Builder();+ DtlsConnectorConfig.Builder builder = new DtlsConnectorConfig.Builder(new Configuration());builder.setAddress(new InetSocketAddress(0));- InMemoryPskStore pskStore = new InMemoryPskStore();- pskStore.addKnownPeer(new InetSocketAddress(ApiEndpoint.getGatewayIp(), 5684),- credentials.getIdentity(),- credentials.getKey().getBytes());- builder.setPskStore(pskStore);+ AdvancedSinglePskStore pskStore = new AdvancedSinglePskStore(+ credentials.getIdentity(),+ SecretUtil.create(credentials.getKey().getBytes(), "PSK"));+ builder.setAdvancedPskStore(pskStore);- DTLSConnector dtlsconnector = new DTLSConnector(builder.build(), null);+ DTLSConnector dtlsconnector = new DTLSConnector(builder.build());CoapEndpoint.Builder endpointBuilder = new CoapEndpoint.Builder();endpointBuilder.setConnector(dtlsconnector);diff --git a/container/build.gradle b/container/build.gradleindex 4c584a064..9ef3948cf 100644--- a/container/build.gradle+++ b/container/build.gradle@@ -1,19 +1,20 @@apply plugin: "java-library"apply plugin: "groovy"+apply plugin: "maven-publish"+apply plugin: "signing"dependencies {api resolveProject(":model")api "org.codehaus.groovy:groovy-all:$groovyVersion"- api "org.kohsuke:groovy-sandbox:$groovySandboxVersion"+ api "org.craftercms:groovy-sandbox:$groovySandboxVersion"api "org.slf4j:slf4j-api:$slf4jVersion"api "org.slf4j:slf4j-jdk14:$slf4jVersion"api "org.slf4j:jcl-over-slf4j:$slf4jVersion"api "org.slf4j:log4j-over-slf4j:$slf4jVersion"- api "com.google.guava:guava:$guavaVersion"api "com.devskiller.friendly-id:friendly-id:$friendlyIdVersion"api "io.undertow:undertow-servlet:$undertowVersion"@@ -62,3 +63,66 @@ dependencies {jar {archivesBaseName = "openremote-${project.name}"}++javadoc {+ failOnError = false+}++java {+ withJavadocJar()+ withSourcesJar()+}++publishing {+ publications {+ maven(MavenPublication) {+ group = "io.openremote"+ artifactId = "openremote-${project.name}"+ from components.java+ pom {+ name = 'OpenRemote Container'+ description = 'Application container for running; add maven {url "https://jitpack.io"} and maven {url "https://repo.osgeo.org/repository/release/"} and maven {url "https://pkgs.dev.azure.com/OpenRemote/OpenRemote/_packaging/OpenRemote/maven/v1"} to resolve all dependencies'+ url = 'https://github.com/openremote/openremote'+ licenses {+ license {+ name = 'GNU Affero General Public License v3.0'+ url = 'https://www.gnu.org/licenses/agpl-3.0.en.html'+ }+ }+ developers {+ developer {+ id = 'developers'+ name = 'Developers'+ email = '[email protected]'+ organization = 'OpenRemote'+ organizationUrl = 'https://openremote.io'+ }+ }+ scm {+ connection = 'scm:git:git://github.com/openremote/openremote.git'+ developerConnection = 'scm:git:ssh://github.com:openremote/openremote.git'+ url = 'https://github.com/openremote/openremote/tree/master'+ }+ }+ }+ }++ repositories {+ maven {+ if (!version.endsWith('-LOCAL')) {+ credentials {+ username findProperty("publishUsername")+ password findProperty("publishPassword")+ }+ }+ url = version.endsWith('-LOCAL') ? layout.buildDirectory.dir('repo') : version.endsWith('-SNAPSHOT') ? findProperty("snapshotsRepoUrl") : findProperty("releasesRepoUrl")+ }+ }+}++signing {+ def signingKey = findProperty("signingKey")+ def signingPassword = findProperty("signingPassword")+ useInMemoryPgpKeys(signingKey, signingPassword)+ sign publishing.publications.maven+}diff --git a/container/src/main/java/org/openremote/container/persistence/PersistenceService.java b/container/src/main/java/org/openremote/container/persistence/PersistenceService.javaindex 51e22af90..8d042edc1 100644--- a/container/src/main/java/org/openremote/container/persistence/PersistenceService.java+++ b/container/src/main/java/org/openremote/container/persistence/PersistenceService.java@@ -480,6 +480,7 @@ public class PersistenceService implements ContainerService, Consumer<PersistencappendSchemaLocations(locations);flyway = Flyway.configure()+ .cleanDisabled(false).dataSource(connectionUrl, databaseUsername, databasePassword).schemas(schemas.toArray(new String[0])).locations(locations.toArray(new String[0]))diff --git a/container/src/main/java/org/openremote/container/web/file/GzipResponseFilter.java b/container/src/main/java/org/openremote/container/web/file/GzipResponseFilter.javaindex d3d59bef5..517fcf6fd 100644--- a/container/src/main/java/org/openremote/container/web/file/GzipResponseFilter.java+++ b/container/src/main/java/org/openremote/container/web/file/GzipResponseFilter.java@@ -83,7 +83,7 @@ import static java.util.Collections.unmodifiableSet;* <param-value>150</param-value>* </init-param>* <init-param>- * <description>The mimetypes which needs to be compressed. Must be a commaseparated string. Defaults to the below values.</description>+ * <description>The mimetypes which needs to be compressed. Must be a comma separated string. Defaults to the below values.</description>* <param-name>mimetypes</param-name>* <param-value>* text/plain, text/html, text/xml, text/css, text/javascript, text/csv, text/rtf,@@ -205,4 +205,4 @@ public class GzipResponseFilter extends HttpFilter {return false;}-}\ No newline at end of file+}diff --git a/gradle.properties b/gradle.propertiesindex 3d2959510..f5c4bd3a5 100644--- a/gradle.properties+++ b/gradle.properties@@ -1,52 +1,51 @@org.gradle.jvmargs=-Xms256m -Xmx1024m-openremoteVersion = 3.0-SNAPSHOT-jaxrsSpecVersion = 2.0.1.FinaljavaxAnnotationsVersion = 2.0.1.FinaljavaxPersistenceVersion = 1.0.2.FinaljavaxELVersion = 2.2.6slf4jVersion = 1.7.30-guavaVersion = 30.1-jre-undertowVersion = 2.2.3.Final+guavaVersion = 31.1-jre+undertowVersion = 2.2.18.FinalresteasyVersion = 3.14.0.FinalresteasyVersionAsyncHttpServlet = 3.0.19.FinaljbossLoggingAnnotationsVersion = 2.0.2.FinalkeycloakVersion = 18.0.2-jacksonVersion = 2.13.1+classgraphVersion=4.8.149+jacksonVersion = 2.13.3groovyVersion = 3.0.9-groovySandboxVersion = 1.19+groovySandboxVersion = 4.0.0sqliteVersion = 3.34.0-hibernateVersion = 5.6.5.Final-hibernateValidatorVersion = 6.2.1.Final-postgresJdbcVersion = 42.3.1-hikaricpVersion = 3.4.5+hibernateVersion = 5.6.10.Final+hibernateValidatorVersion = 6.2.3.Final+postgresJdbcVersion = 42.4.0+hikaricpVersion = 5.0.1junitVersion = 4.13.2spockVersion = 2.0-groovy-3.0byteBuddyVersion = 1.11.0objenesisVersion = 3.2-camelVersion = 2.19.0+camelVersion = 2.25.4sunriseSunsetCalculatorVersion = 1.2easyRulesVersion = 4.1.0quartzVersion= 2.3.2calimeroVersion = 2.4-uuidGeneratorVersion = 3.1.3+uuidGeneratorVersion = 4.0.1jSerialCommVersion = 2.7.0-saxonHEVersion = 9.8.0-3+saxonHEVersion = 11.3jmxtermVersion = 1.0.0-nettyVersion = 4.1.72.Final-flywaydbVersion = 8.4.0+nettyVersion = 4.1.79.Final+flywaydbVersion = 9.0.1ical4jVersion = 2.1.5jafamaVersion = 2.3.1friendlyIdVersion = 1.0.1geotoolsVersion = 19.1firebaseAdminVersion = 7.1.0simpleJavaMailVersion = 5.0.4-jaywayJsonPathVersion = 2.4.0+jaywayJsonPathVersion = 2.7.0typescriptGeneratorVersion = 2.28.785moquetteVersion = 0.15californiumCoreVersion = 2.1.0-californiumScandiumVersion = 2.1.0+californiumScandiumVersion = 3.5.0zwaveVersion = 3.4.0-SNAPSHOThibernateTypesVersion = 2.14.0reflectionsVersion=0.9.12@@ -56,3 +55,5 @@ hiveMQClientVersion=1.2.2bluetoothVersion = 0.39nashornVersion=15.3failsafeVersion=3.1.0+snapshotsRepoUrl=https://s01.oss.sonatype.org/content/repositories/snapshots/+releasesRepoUrl=https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/diff --git a/manager/build.gradle b/manager/build.gradleindex d1eccc696..6da10f0f2 100644--- a/manager/build.gradle+++ b/manager/build.gradle@@ -1,6 +1,10 @@+import java.nio.file.Paths+apply plugin: "java-library"apply plugin: "application"apply plugin: "distribution"+apply plugin: "maven-publish"+apply plugin: "signing"mainClassName = "org.openremote.manager.Main"@@ -34,11 +38,6 @@ dependencies {}}-// Load version properties file and use same version as source code-def props = new Properties()-file("src/main/resources/system.properties").withInputStream { props.load(it) }-version = props.get("version")-jar {archivesBaseName = "openremote-${project.name}"}@@ -61,3 +60,57 @@ distributions {}}}++javadoc {+ failOnError = false+}++java {+ withJavadocJar()+ withSourcesJar()+}++publishing {+ publications {+ maven(MavenPublication) {+ group = "io.openremote"+ artifactId = "openremote-${project.name}"+ from components.java+ pom {+ name = 'OpenRemote Manager'+ description = 'Provides core container services and is the main component of the OpenRemote backend; add maven {url "https://jitpack.io"} and maven {url "https://repo.osgeo.org/repository/release/"} and maven {url "https://pkgs.dev.azure.com/OpenRemote/OpenRemote/_packaging/OpenRemote/maven/v1"} to resolve all dependencies'+ url = 'https://github.com/openremote/openremote'+ licenses {+ license {+ name = 'GNU Affero General Public License v3.0'+ url = 'https://www.gnu.org/licenses/agpl-3.0.en.html'+ }+ }+ developers {+ developer {+ id = 'developers'+ name = 'Developers'+ email = '[email protected]'+ organization = 'OpenRemote'+ organizationUrl = 'https://openremote.io'+ }+ }+ }+ }+ }++ repositories {+ maven {+ name = 'myRepo'+ url = layout.buildDirectory.dir("repo")+ }+ }+}++// Output version.properties file+task setVersionProperties(type: WriteProperties) {+ outputFile = Paths.get(projectDir.path, "src", "main", "resources", "version.properties").toFile()+ property 'version', project.version+}+publish.mustRunAfter(setVersionProperties)+publish.dependsOn(setVersionProperties)diff --git a/manager/src/main/java/org/openremote/manager/asset/AssetProcessingService.java b/manager/src/main/java/org/openremote/manager/asset/AssetProcessingService.javaindex d1c2549d2..b94eda2d9 100644--- a/manager/src/main/java/org/openremote/manager/asset/AssetProcessingService.java+++ b/manager/src/main/java/org/openremote/manager/asset/AssetProcessingService.java@@ -310,7 +310,7 @@ public class AssetProcessingService extends RouteBuilder implements ContainerSer// Regular user must have write attributes roleif (!authContext.hasResourceRoleOrIsSuperUser(ClientRole.WRITE_ATTRIBUTES.getValue(),- authContext.getClientId())) {+ Constants.KEYCLOAK_CLIENT_ID)) {throw new AssetProcessingException(INSUFFICIENT_ACCESS);}diff --git a/manager/src/main/java/org/openremote/manager/asset/AssetStorageService.java b/manager/src/main/java/org/openremote/manager/asset/AssetStorageService.javaindex 7cc627a46..ee1b4eeae 100644--- a/manager/src/main/java/org/openremote/manager/asset/AssetStorageService.java+++ b/manager/src/main/java/org/openremote/manager/asset/AssetStorageService.java@@ -179,7 +179,7 @@ public class AssetStorageService extends RouteBuilder implements ContainerServic}// Regular user must have role- if (!filter.isPublicEvents() && !isAnonymous && !auth.hasResourceRole(ClientRole.READ_ASSETS.getValue(), auth.getClientId())) {+ if (!filter.isPublicEvents() && !isAnonymous && !auth.hasResourceRole(ClientRole.READ_ASSETS.getValue(), Constants.KEYCLOAK_CLIENT_ID)) {return false;}@@ -501,7 +501,7 @@ public class AssetStorageService extends RouteBuilder implements ContainerServic}}- if (query.access != PUBLIC && !authContext.hasResourceRole(ClientRole.READ_ASSETS.getValue(), authContext.getClientId())) {+ if (query.access != PUBLIC && !authContext.hasResourceRole(ClientRole.READ_ASSETS.getValue(), Constants.KEYCLOAK_CLIENT_ID)) {String msg = "User must have '" + ClientRole.READ_ASSETS.getValue() + "' role to read non public assets";LOG.fine(msg);throw new IllegalStateException(msg);diff --git a/manager/src/main/java/org/openremote/manager/event/EventSubscriptions.java b/manager/src/main/java/org/openremote/manager/event/EventSubscriptions.javaindex 289a97d9b..b77021f5f 100644--- a/manager/src/main/java/org/openremote/manager/event/EventSubscriptions.java+++ b/manager/src/main/java/org/openremote/manager/event/EventSubscriptions.java@@ -160,7 +160,7 @@ public class EventSubscriptions {TriggeredEventSubscription<T> triggeredEventSubscription = new TriggeredEventSubscription<>(events, sessionSub.subscriptionId);if (sessionSub.subscription.getInternalConsumer() == null) {- Message msg = new DefaultMessage();+ Message msg = new DefaultMessage(exchange.getContext());msg.setBody(triggeredEventSubscription); // Don't copy the event, use same referencemsg.setHeaders(new HashMap<>(exchange.getIn().getHeaders())); // Copy headersmsg.setHeader(ConnectionConstants.SESSION_KEY, sessionKey);diff --git a/manager/src/main/java/org/openremote/manager/provisioning/UserAssetProvisioningMQTTHandler.java b/manager/src/main/java/org/openremote/manager/provisioning/UserAssetProvisioningMQTTHandler.javaindex 83d40f703..2c48edc8a 100644--- a/manager/src/main/java/org/openremote/manager/provisioning/UserAssetProvisioningMQTTHandler.java+++ b/manager/src/main/java/org/openremote/manager/provisioning/UserAssetProvisioningMQTTHandler.java@@ -27,6 +27,7 @@ import io.moquette.interception.messages.InterceptUnsubscribeMessage;import io.netty.handler.codec.mqtt.MqttQoS;import org.apache.camel.builder.RouteBuilder;import org.openremote.container.message.MessageBrokerService;+import org.openremote.model.Constants;import org.openremote.model.PersistenceEvent;import org.openremote.container.timer.TimerService;import org.openremote.container.util.UniqueIdentifierGenerator;@@ -419,7 +420,7 @@ public class UserAssetProvisioningMQTTHandler extends MQTTHandler {identityProvider.updateUserRoles(realm,serviceUser.getId(),- username,+ Constants.KEYCLOAK_CLIENT_ID,Arrays.stream(provisioningConfig.getUserRoles()).map(ClientRole::getValue).toArray(String[]::new));} else {diff --git a/manager/src/main/java/org/openremote/manager/rules/RulesService.java b/manager/src/main/java/org/openremote/manager/rules/RulesService.javaindex 72de1466d..2e21cd89c 100644--- a/manager/src/main/java/org/openremote/manager/rules/RulesService.java+++ b/manager/src/main/java/org/openremote/manager/rules/RulesService.java@@ -21,6 +21,7 @@ package org.openremote.manager.rules;import org.apache.camel.builder.RouteBuilder;import org.openremote.container.message.MessageBrokerService;+import org.openremote.model.Constants;import org.openremote.model.PersistenceEvent;import org.openremote.container.persistence.PersistenceService;import org.openremote.container.timer.TimerService;@@ -169,7 +170,7 @@ public class RulesService extends RouteBuilder implements ContainerService, Asse}// Regular user must have role- if (!auth.hasResourceRole(ClientRole.READ_ASSETS.getValue(), auth.getClientId())) {+ if (!auth.hasResourceRole(ClientRole.READ_ASSETS.getValue(), Constants.KEYCLOAK_CLIENT_ID)) {return false;}diff --git a/manager/src/main/java/org/openremote/manager/security/ManagerKeycloakIdentityProvider.java b/manager/src/main/java/org/openremote/manager/security/ManagerKeycloakIdentityProvider.javaindex 0cd371228..9243c9b90 100644--- a/manager/src/main/java/org/openremote/manager/security/ManagerKeycloakIdentityProvider.java+++ b/manager/src/main/java/org/openremote/manager/security/ManagerKeycloakIdentityProvider.java@@ -1130,7 +1130,7 @@ public class ManagerKeycloakIdentityProvider extends KeycloakIdentityProvider im// User must have roleif (requiredRoles != null) {for (ClientRole requiredRole : requiredRoles) {- if (!auth.hasResourceRole(requiredRole.getValue(), auth.getClientId())) {+ if (!auth.hasResourceRole(requiredRole.getValue(), Constants.KEYCLOAK_CLIENT_ID)) {return false;}}diff --git a/manager/src/main/java/org/openremote/manager/security/UserResourceImpl.java b/manager/src/main/java/org/openremote/manager/security/UserResourceImpl.javaindex 455ba1a61..6623ca683 100644--- a/manager/src/main/java/org/openremote/manager/security/UserResourceImpl.java+++ b/manager/src/main/java/org/openremote/manager/security/UserResourceImpl.java@@ -44,8 +44,8 @@ public class UserResourceImpl extends ManagerWebResource implements UserResource@Overridepublic User[] query(RequestParams requestParams, UserQuery query) {AuthContext authContext = getAuthContext();- boolean isAdmin = authContext.hasResourceRole(ClientRole.READ_ADMIN.getValue(), authContext.getClientId());- boolean isRestricted = !isAdmin && authContext.hasResourceRole(ClientRole.READ_USERS.getValue(), authContext.getClientId());+ boolean isAdmin = authContext.hasResourceRole(ClientRole.READ_ADMIN.getValue(), Constants.KEYCLOAK_CLIENT_ID);+ boolean isRestricted = !isAdmin && authContext.hasResourceRole(ClientRole.READ_USERS.getValue(), Constants.KEYCLOAK_CLIENT_ID);if (!isAdmin && !isRestricted) {throw new ForbiddenException("Insufficient permissions to read users");diff --git a/manager/src/main/java/org/openremote/manager/syslog/SyslogService.java b/manager/src/main/java/org/openremote/manager/syslog/SyslogService.javaindex 011d7490e..50b4f8519 100644--- a/manager/src/main/java/org/openremote/manager/syslog/SyslogService.java+++ b/manager/src/main/java/org/openremote/manager/syslog/SyslogService.java@@ -81,7 +81,7 @@ public class SyslogService extends Handler implements ContainerService {if (clientEventService != null) {clientEventService.addSubscriptionAuthorizer((realm, auth, subscription) ->- subscription.isEventType(SyslogEvent.class) && auth != null && (auth.isSuperUser() || auth.hasResourceRole(Constants.READ_LOGS_ROLE, auth.getClientId())));+ subscription.isEventType(SyslogEvent.class) && auth != null && (auth.isSuperUser() || auth.hasResourceRole(Constants.READ_LOGS_ROLE, Constants.KEYCLOAK_CLIENT_ID)));}if (container.hasService(ManagerWebService.class)) {diff --git a/manager/src/main/java/org/openremote/manager/system/StatusResourceImpl.java b/manager/src/main/java/org/openremote/manager/system/StatusResourceImpl.javaindex d151074b7..b106fa4c1 100644--- a/manager/src/main/java/org/openremote/manager/system/StatusResourceImpl.java+++ b/manager/src/main/java/org/openremote/manager/system/StatusResourceImpl.java@@ -50,11 +50,11 @@ public class StatusResourceImpl implements StatusResource {authServerUrl = identityService.getIdentityProvider().getFrontendUrl();}- try(InputStream resourceStream = StatusResourceImpl.class.getClassLoader().getResourceAsStream("system.properties")) {+ try(InputStream resourceStream = StatusResourceImpl.class.getClassLoader().getResourceAsStream("version.properties")) {versionProps.load(resourceStream);} catch (IOException e) {- LOG.log(Level.SEVERE, "Failed to load manager version properties file: system.properties");- throw new IllegalStateException("Missing manager system.properties file");+ LOG.log(Level.SEVERE, "Failed to load manager version properties file: version.properties");+ throw new IllegalStateException("Missing manager version.properties file");}String version = versionProps.getProperty("version");diff --git a/manager/src/main/resources/system.properties b/manager/src/main/resources/system.propertiesdeleted file mode 100644index 317fe995b..000000000--- a/manager/src/main/resources/system.properties+++ /dev/null@@ -1 +0,0 @@-version=3.0.0\ No newline at end of filediff --git a/manager/src/main/resources/version.properties b/manager/src/main/resources/version.propertiesnew file mode 100644index 000000000..de55ab654--- /dev/null+++ b/manager/src/main/resources/version.properties@@ -0,0 +1 @@+version=0.1.0diff --git a/model/build.gradle b/model/build.gradleindex 960506028..99e0ec812 100644--- a/model/build.gradle+++ b/model/build.gradle@@ -1,4 +1,6 @@apply plugin: "java-library"+apply plugin: "maven-publish"+apply plugin: "signing"compileJava.options.compilerArgs.add '-parameters'compileTestJava.options.compilerArgs.add '-parameters'@@ -30,14 +32,77 @@ dependencies {api "io.swagger.core.v3:swagger-annotations:$swaggerVersion"- // Custom build from https://github.com/richturner/mbknor-jackson-jsonSchema- api files("libs/mbknor-jackson-jsonschema_2.12-1.0.40-SNAPSHOT.jar")- api "org.scala-lang:scala-library:2.12.10"- api "io.github.classgraph:classgraph:4.8.21"+ // Custom build until PR is merged from https://github.com/richturner/mbknor-jackson-jsonSchema - resolved by jitpack+ api "com.github.richturner:mbknor-jackson-jsonSchema:v1.0.40-SNAPSHOT"//api "com.kjetland:mbknor-jackson-jsonschema_2.12:1.0.39"+ api "org.scala-lang:scala-library:2.12.10"+ api "io.github.classgraph:classgraph:$classgraphVersion"}jar {from sourceSets.main.allJavaarchivesBaseName = "openremote-${project.name}"}++javadoc {+ failOnError = false+}++java {+ withJavadocJar()+ withSourcesJar()+}++publishing {+ publications {+ maven(MavenPublication) {+ group = "io.openremote"+ artifactId = "openremote-${project.name}"+ from components.java+ pom {+ name = 'OpenRemote Model'+ description = 'Provides core model classes used within OpenRemote; add maven {url "https://jitpack.io"} and maven {url "https://repo.osgeo.org/repository/release/"} and maven {url "https://pkgs.dev.azure.com/OpenRemote/OpenRemote/_packaging/OpenRemote/maven/v1"} to resolve all dependencies'+ url = 'https://github.com/openremote/openremote'+ licenses {+ license {+ name = 'GNU Affero General Public License v3.0'+ url = 'https://www.gnu.org/licenses/agpl-3.0.en.html'+ }+ }+ developers {+ developer {+ id = 'developers'+ name = 'Developers'+ email = '[email protected]'+ organization = 'OpenRemote'+ organizationUrl = 'https://openremote.io'+ }+ }+ scm {+ connection = 'scm:git:git://github.com/openremote/openremote.git'+ developerConnection = 'scm:git:ssh://github.com:openremote/openremote.git'+ url = 'https://github.com/openremote/openremote/tree/master'+ }+ }+ }+ }++ repositories {+ maven {+ if (!version.endsWith('-LOCAL')) {+ credentials {+ username findProperty("publishUsername")+ password findProperty("publishPassword")+ }+ }+ url = version.endsWith('-LOCAL') ? layout.buildDirectory.dir('repo') : version.endsWith('-SNAPSHOT') ? findProperty("snapshotsRepoUrl") : findProperty("releasesRepoUrl")+ }+ }+}++signing {+ def signingKey = findProperty("signingKey")+ def signingPassword = findProperty("signingPassword")+ useInMemoryPgpKeys(signingKey, signingPassword)+ sign publishing.publications.maven+}diff --git a/project.gradle b/project.gradleindex 1599cb84f..7d129855f 100644--- a/project.gradle+++ b/project.gradle@@ -8,6 +8,12 @@ import static org.jetbrains.gradle.ext.ShortenCommandLine.MANIFESTimport org.jetbrains.gradle.ext.Applicationimport org.jetbrains.gradle.ext.JUnit++// Configure versions in gradle.properties (putting a gradle.properties file+// in a subproject only overrides root properties of same name for the actual+// subproject, not for its children!)+version = hasProperty("openremoteVersion") ? openremoteVersion : "0.0.0"+// Ensure git hook creation task is executedif (project == rootProject) {@@ -143,9 +149,6 @@ repositories {}mavenCentral()jcenter()- maven {- url "https://oss.sonatype.org/content/repositories/snapshots/"- }maven {url "https://pkgs.dev.azure.com/OpenRemote/OpenRemote/_packaging/OpenRemote/maven/v1"}@@ -209,9 +212,9 @@ def getYarnInstallTask() {// Gets the list of runtime JAR dependencies; can be used in custom project deployment installDist task to populate// extensions directory-def getDeploymentJars() {+def getDeploymentJars(Project project = project) {if (project.configurations.find { it.name == "runtimeClasspath" } == null) {- return null;+ return []}// Get all dependencies that are already part of the openremote manager and exclude these from the libs dir@@ -240,11 +243,6 @@ if (project.convention.findPlugin(JavaPluginConvention)) {sourceSets.test.java.outputDir = new File(buildDir, "classes/test")}-// Configure versions in gradle.properties (putting a gradle.properties file-// in a subproject only overrides root properties of same name for the actual-// subproject, not for its children!)-version = hasProperty("openremoteVersion") ? openremoteVersion : projectVersion-// Add UI tasksext.npmCommand = {cmd ->@@ -314,3 +312,5 @@ plugins.withType(JavaPlugin).whenPluginAdded {// JAR/ZIP base name is the fully qualified subproject namearchivesBaseName = "${rootProject.name}${path.replaceAll(":", "-")}"}++// POM generatordiff --git a/test/build.gradle b/test/build.gradleindex 7733fd332..75eaed5e6 100644--- a/test/build.gradle+++ b/test/build.gradle@@ -8,6 +8,8 @@ plugins {apply plugin: "java-library"apply plugin: "java-test-fixtures"apply plugin: "groovy"+apply plugin: "maven-publish"+apply plugin: "signing"dependencies {@@ -21,7 +23,7 @@ dependencies {testRuntimeOnly "net.bytebuddy:byte-buddy:$byteBuddyVersion" // allows mocking of classes (in addition to interfaces)testRuntimeOnly "org.objenesis:objenesis:$objenesisVersion" // allows mocking of classes without default constructor (together with ByteBuddy or CGLIB)- api("com.github.calimero:calimero-server:$calimeroVersion") {+ testImplementation("com.github.calimero:calimero-server:$calimeroVersion") {// Libraries should not depend on a logging implementation and/or alpha versions!exclude group: "org.slf4j"}@@ -70,3 +72,61 @@ test {}}}++javadoc {+ failOnError = false+}++publishing {+ publications {+ maven(MavenPublication) {+ group = "io.openremote"+ artifactId = "openremote-${project.name}"+ from components.java+ pom {+ name = 'OpenRemote Test Fixtures'+ description = 'Provides test fixtures for writing backend integration tests; add maven {url "https://jitpack.io"} and maven {url "https://repo.osgeo.org/repository/release/"} and maven {url "https://pkgs.dev.azure.com/OpenRemote/OpenRemote/_packaging/OpenRemote/maven/v1"} to resolve all dependencies'+ url = 'https://github.com/openremote/openremote'+ licenses {+ license {+ name = 'GNU Affero General Public License v3.0'+ url = 'https://www.gnu.org/licenses/agpl-3.0.en.html'+ }+ }+ developers {+ developer {+ id = 'developers'+ name = 'Developers'+ email = '[email protected]'+ organization = 'OpenRemote'+ organizationUrl = 'https://openremote.io'+ }+ }+ scm {+ connection = 'scm:git:git://github.com/openremote/openremote.git'+ developerConnection = 'scm:git:ssh://github.com:openremote/openremote.git'+ url = 'https://github.com/openremote/openremote/tree/master'+ }+ }+ }+ }++ repositories {+ maven {+ if (!version.endsWith('-LOCAL')) {+ credentials {+ username findProperty("publishUsername")+ password findProperty("publishPassword")+ }+ }+ url = version.endsWith('-LOCAL') ? layout.buildDirectory.dir('repo') : version.endsWith('-SNAPSHOT') ? findProperty("snapshotsRepoUrl") : findProperty("releasesRepoUrl")+ }+ }+}++signing {+ def signingKey = findProperty("signingKey")+ def signingPassword = findProperty("signingPassword")+ useInMemoryPgpKeys(signingKey, signingPassword)+ sign publishing.publications.maven+}diff --git a/test/src/test/java/org/openremote/test/setup/KeycloakTestSetup.java b/test/src/test/java/org/openremote/test/setup/KeycloakTestSetup.javaindex 3b1f15fbb..f8c0b2d41 100644--- a/test/src/test/java/org/openremote/test/setup/KeycloakTestSetup.java+++ b/test/src/test/java/org/openremote/test/setup/KeycloakTestSetup.java@@ -112,7 +112,7 @@ public class KeycloakTestSetup extends AbstractKeycloakSetup {keycloakProvider.updateUserRoles(realmBuilding.getName(),serviceUser.getId(),- serviceUser.getUsername(),+ Constants.KEYCLOAK_CLIENT_ID,Stream.of(ClientRole.READ_ASSETS, ClientRole.WRITE_ASSETS, ClientRole.WRITE_ATTRIBUTES).map(ClientRole::getValue).toArray(String[]::new));}