diff --git a/java/github-proxy/pom.xml b/java/github-proxy/pom.xml index 3f6054f0e..3cb0a83e3 100644 --- a/java/github-proxy/pom.xml +++ b/java/github-proxy/pom.xml @@ -7,7 +7,7 @@ com.softwareag lora - 1.1.2 + 1.1.2-1 github-proxy diff --git a/java/github-proxy/pom.xml.versionsBackup b/java/github-proxy/pom.xml.versionsBackup deleted file mode 100644 index 2a704ed7f..000000000 --- a/java/github-proxy/pom.xml.versionsBackup +++ /dev/null @@ -1,61 +0,0 @@ - - - 4.0.0 - - - com.softwareag - lora - 1.1.0-SNAPSHOT - - - github-proxy - - - - com.nsn.cumulocity.clients-java - microservice-autoconfigure - - - com.nsn.cumulocity.model - device-capability-model - - - com.squareup.retrofit2 - retrofit - 2.7.2 - - - com.squareup.retrofit2 - converter-jackson - 2.7.2 - - - com.fasterxml.jackson.datatype - jackson-datatype-jsr310 - 2.9.8 - - - org.junit.jupiter - junit-jupiter-engine - 5.1.0 - test - - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - com.nsn.cumulocity.clients-java - microservice-package-maven-plugin - - - - - - \ No newline at end of file diff --git a/java/lora-codec-acs-switch/pom.xml b/java/lora-codec-acs-switch/pom.xml index 290091411..d57d518e7 100644 --- a/java/lora-codec-acs-switch/pom.xml +++ b/java/lora-codec-acs-switch/pom.xml @@ -7,7 +7,7 @@ com.softwareag lora - 1.1.2 + 1.1.2-1 lora-codec-acs-switch diff --git a/java/lora-codec-acs-switch/pom.xml.versionsBackup b/java/lora-codec-acs-switch/pom.xml.versionsBackup deleted file mode 100644 index 8ed7176ae..000000000 --- a/java/lora-codec-acs-switch/pom.xml.versionsBackup +++ /dev/null @@ -1,40 +0,0 @@ - - - 4.0.0 - - - com.softwareag - lora - 1.1.0-SNAPSHOT - - - lora-codec-acs-switch - - - - com.softwareag - lora-codec-ms - ${project.version} - - - org.springframework.boot - spring-boot-starter-test - test - - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - com.nsn.cumulocity.clients-java - microservice-package-maven-plugin - - - - \ No newline at end of file diff --git a/java/lora-codec-atim-th/pom.xml b/java/lora-codec-atim-th/pom.xml index 31d1e9c2d..8ac109363 100644 --- a/java/lora-codec-atim-th/pom.xml +++ b/java/lora-codec-atim-th/pom.xml @@ -7,7 +7,7 @@ com.softwareag lora - 1.1.2 + 1.1.2-1 lora-codec-atim-th diff --git a/java/lora-codec-atim-th/pom.xml.versionsBackup b/java/lora-codec-atim-th/pom.xml.versionsBackup deleted file mode 100644 index 317f52623..000000000 --- a/java/lora-codec-atim-th/pom.xml.versionsBackup +++ /dev/null @@ -1,36 +0,0 @@ - - - 4.0.0 - - - com.softwareag - lora - 1.1.0-SNAPSHOT - - - lora-codec-atim-th - - - - com.softwareag - lora-codec-ms - ${project.version} - - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - com.nsn.cumulocity.clients-java - microservice-package-maven-plugin - - - - - \ No newline at end of file diff --git a/java/lora-codec-atim-tm2d/pom.xml b/java/lora-codec-atim-tm2d/pom.xml index f871891ff..36831f281 100644 --- a/java/lora-codec-atim-tm2d/pom.xml +++ b/java/lora-codec-atim-tm2d/pom.xml @@ -7,7 +7,7 @@ com.softwareag lora - 1.1.2 + 1.1.2-1 lora-codec-atim-tm2d diff --git a/java/lora-codec-atim-tm2d/pom.xml.versionsBackup b/java/lora-codec-atim-tm2d/pom.xml.versionsBackup deleted file mode 100644 index 03f205173..000000000 --- a/java/lora-codec-atim-tm2d/pom.xml.versionsBackup +++ /dev/null @@ -1,37 +0,0 @@ - - - 4.0.0 - - - com.softwareag - lora - 1.1.0-SNAPSHOT - - - lora-codec-atim-tm2d - - - - com.softwareag - lora-codec-ms - ${project.version} - - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - com.nsn.cumulocity.clients-java - microservice-package-maven-plugin - - - - - - \ No newline at end of file diff --git a/java/lora-codec-atim-tmxd/pom.xml b/java/lora-codec-atim-tmxd/pom.xml index ab8d23aae..0d0b4a8fe 100644 --- a/java/lora-codec-atim-tmxd/pom.xml +++ b/java/lora-codec-atim-tmxd/pom.xml @@ -7,7 +7,7 @@ com.softwareag lora - 1.1.2 + 1.1.2-1 lora-codec-atim-tmxd diff --git a/java/lora-codec-atim-tmxd/pom.xml.versionsBackup b/java/lora-codec-atim-tmxd/pom.xml.versionsBackup deleted file mode 100644 index 726ed17be..000000000 --- a/java/lora-codec-atim-tmxd/pom.xml.versionsBackup +++ /dev/null @@ -1,37 +0,0 @@ - - - 4.0.0 - - - com.softwareag - lora - 1.1.0-SNAPSHOT - - - lora-codec-atim-tmxd - - - - com.softwareag - lora-codec-ms - ${project.version} - - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - com.nsn.cumulocity.clients-java - microservice-package-maven-plugin - - - - - - \ No newline at end of file diff --git a/java/lora-codec-axioma/pom.xml b/java/lora-codec-axioma/pom.xml index f9d969296..3bf5eceeb 100644 --- a/java/lora-codec-axioma/pom.xml +++ b/java/lora-codec-axioma/pom.xml @@ -7,7 +7,7 @@ com.softwareag lora - 1.1.2 + 1.1.2-1 lora-codec-axioma diff --git a/java/lora-codec-axioma/pom.xml.versionsBackup b/java/lora-codec-axioma/pom.xml.versionsBackup deleted file mode 100644 index 6dc88fdf9..000000000 --- a/java/lora-codec-axioma/pom.xml.versionsBackup +++ /dev/null @@ -1,37 +0,0 @@ - - - 4.0.0 - - - com.softwareag - lora - 1.1.0-SNAPSHOT - - - lora-codec-axioma - - - - com.softwareag - lora-codec-ms - ${project.version} - - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - com.nsn.cumulocity.clients-java - microservice-package-maven-plugin - - - - - - \ No newline at end of file diff --git a/java/lora-codec-c8y/pom.xml b/java/lora-codec-c8y/pom.xml index 20f9f83bb..953498f72 100644 --- a/java/lora-codec-c8y/pom.xml +++ b/java/lora-codec-c8y/pom.xml @@ -8,7 +8,7 @@ com.softwareag lora - 1.1.2 + 1.1.2-1 lora-codec-c8y diff --git a/java/lora-codec-c8y/pom.xml.versionsBackup b/java/lora-codec-c8y/pom.xml.versionsBackup deleted file mode 100644 index b477456e5..000000000 --- a/java/lora-codec-c8y/pom.xml.versionsBackup +++ /dev/null @@ -1,47 +0,0 @@ - - - - 4.0.0 - - - com.softwareag - lora - 1.1.0-SNAPSHOT - - - lora-codec-c8y - - - - c8y.agents.lpwan.backend - lpwan-backend - 1009.6.0 - - - com.softwareag - lora-codec-ms - ${project.version} - - - org.junit.jupiter - junit-jupiter-engine - 5.1.0 - test - - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - com.nsn.cumulocity.clients-java - microservice-package-maven-plugin - - - - \ No newline at end of file diff --git a/java/lora-codec-cayennelpp/pom.xml b/java/lora-codec-cayennelpp/pom.xml index 6c4e16ae6..5ac389613 100644 --- a/java/lora-codec-cayennelpp/pom.xml +++ b/java/lora-codec-cayennelpp/pom.xml @@ -7,7 +7,7 @@ com.softwareag lora - 1.1.2 + 1.1.2-1 lora-codec-cayennelpp diff --git a/java/lora-codec-cayennelpp/pom.xml.versionsBackup b/java/lora-codec-cayennelpp/pom.xml.versionsBackup deleted file mode 100644 index 4d20b4940..000000000 --- a/java/lora-codec-cayennelpp/pom.xml.versionsBackup +++ /dev/null @@ -1,37 +0,0 @@ - - - 4.0.0 - - - com.softwareag - lora - 1.1.0-SNAPSHOT - - - lora-codec-cayennelpp - - - - com.softwareag - lora-codec-ms - ${project.version} - - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - com.nsn.cumulocity.clients-java - microservice-package-maven-plugin - - - - - - \ No newline at end of file diff --git a/java/lora-codec-elsys/pom.xml b/java/lora-codec-elsys/pom.xml index 1fcb46081..5c3b941b7 100644 --- a/java/lora-codec-elsys/pom.xml +++ b/java/lora-codec-elsys/pom.xml @@ -7,7 +7,7 @@ com.softwareag lora - 1.1.2 + 1.1.2-1 lora-codec-elsys diff --git a/java/lora-codec-elsys/pom.xml.versionsBackup b/java/lora-codec-elsys/pom.xml.versionsBackup deleted file mode 100644 index ed8badef8..000000000 --- a/java/lora-codec-elsys/pom.xml.versionsBackup +++ /dev/null @@ -1,48 +0,0 @@ - - - 4.0.0 - - - com.softwareag - lora - 1.1.0-SNAPSHOT - - - lora-codec-elsys - - - - com.softwareag - lora-codec-ms - ${project.version} - - - org.projectlombok - lombok - provided - - - org.junit.jupiter - junit-jupiter-engine - 5.6.2 - test - - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - com.nsn.cumulocity.clients-java - microservice-package-maven-plugin - - - - - - \ No newline at end of file diff --git a/java/lora-codec-example/pom.xml b/java/lora-codec-example/pom.xml index 57eec8868..3cdcebacb 100644 --- a/java/lora-codec-example/pom.xml +++ b/java/lora-codec-example/pom.xml @@ -7,7 +7,7 @@ com.softwareag lora - 1.1.2 + 1.1.2-1 lora-codec-example diff --git a/java/lora-codec-example/pom.xml.versionsBackup b/java/lora-codec-example/pom.xml.versionsBackup deleted file mode 100644 index 30f14db0c..000000000 --- a/java/lora-codec-example/pom.xml.versionsBackup +++ /dev/null @@ -1,43 +0,0 @@ - - - 4.0.0 - - - com.softwareag - lora - 1.1.0-SNAPSHOT - - - lora-codec-example - - - - com.softwareag - lora-codec-ms - ${project.version} - - - org.junit.jupiter - junit-jupiter-engine - 5.1.0 - test - - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - com.nsn.cumulocity.clients-java - microservice-package-maven-plugin - - - - - - \ No newline at end of file diff --git a/java/lora-codec-lansitec/pom.xml b/java/lora-codec-lansitec/pom.xml index e0d171349..f90c348d7 100644 --- a/java/lora-codec-lansitec/pom.xml +++ b/java/lora-codec-lansitec/pom.xml @@ -7,7 +7,7 @@ com.softwareag lora - 1.1.2 + 1.1.2-1 lora-codec-lansitec diff --git a/java/lora-codec-lansitec/pom.xml.versionsBackup b/java/lora-codec-lansitec/pom.xml.versionsBackup deleted file mode 100644 index 1f506919c..000000000 --- a/java/lora-codec-lansitec/pom.xml.versionsBackup +++ /dev/null @@ -1,43 +0,0 @@ - - - 4.0.0 - - - com.softwareag - lora - 1.1.0-SNAPSHOT - - - lora-codec-lansitec - - - - com.softwareag - lora-codec-ms - ${project.version} - - - org.junit.jupiter - junit-jupiter-engine - 5.6.2 - test - - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - com.nsn.cumulocity.clients-java - microservice-package-maven-plugin - - - - - - \ No newline at end of file diff --git a/java/lora-codec-ms/pom.xml b/java/lora-codec-ms/pom.xml index 95f2ab2ca..413f5ddfc 100644 --- a/java/lora-codec-ms/pom.xml +++ b/java/lora-codec-ms/pom.xml @@ -7,7 +7,7 @@ com.softwareag lora - 1.1.2 + 1.1.2-1 lora-codec-ms diff --git a/java/lora-codec-ms/pom.xml.versionsBackup b/java/lora-codec-ms/pom.xml.versionsBackup deleted file mode 100644 index c81219446..000000000 --- a/java/lora-codec-ms/pom.xml.versionsBackup +++ /dev/null @@ -1,28 +0,0 @@ - - - 4.0.0 - - - com.softwareag - lora - 1.1.0-SNAPSHOT - - - lora-codec-ms - - - - com.softwareag - lora-interface - ${project.version} - - - org.junit.jupiter - junit-jupiter-engine - test - - - - \ No newline at end of file diff --git a/java/lora-codec-nke/pom.xml b/java/lora-codec-nke/pom.xml index 733f3ccd7..8d85687d3 100644 --- a/java/lora-codec-nke/pom.xml +++ b/java/lora-codec-nke/pom.xml @@ -7,7 +7,7 @@ com.softwareag lora - 1.1.2 + 1.1.2-1 lora-codec-nke diff --git a/java/lora-codec-nke/pom.xml.versionsBackup b/java/lora-codec-nke/pom.xml.versionsBackup deleted file mode 100644 index 2e798e053..000000000 --- a/java/lora-codec-nke/pom.xml.versionsBackup +++ /dev/null @@ -1,43 +0,0 @@ - - - 4.0.0 - - - com.softwareag - lora - 1.1.0-SNAPSHOT - - - lora-codec-nke - - - - com.softwareag - lora-codec-ms - ${project.version} - - - org.junit.jupiter - junit-jupiter-engine - 5.6.2 - test - - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - com.nsn.cumulocity.clients-java - microservice-package-maven-plugin - - - - - - \ No newline at end of file diff --git a/java/lora-codec-pyrescom-classair/pom.xml b/java/lora-codec-pyrescom-classair/pom.xml index 742aeab3f..9da935753 100644 --- a/java/lora-codec-pyrescom-classair/pom.xml +++ b/java/lora-codec-pyrescom-classair/pom.xml @@ -7,7 +7,7 @@ com.softwareag lora - 1.1.2 + 1.1.2-1 lora-codec-pyrescom diff --git a/java/lora-codec-pyrescom-classair/pom.xml.versionsBackup b/java/lora-codec-pyrescom-classair/pom.xml.versionsBackup deleted file mode 100644 index 7806e2228..000000000 --- a/java/lora-codec-pyrescom-classair/pom.xml.versionsBackup +++ /dev/null @@ -1,37 +0,0 @@ - - - 4.0.0 - - - com.softwareag - lora - 1.1.0-SNAPSHOT - - - lora-codec-pyrescom - - - - com.softwareag - lora-codec-ms - ${project.version} - - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - com.nsn.cumulocity.clients-java - microservice-package-maven-plugin - - - - - - \ No newline at end of file diff --git a/java/lora-codec-semtech/pom.xml b/java/lora-codec-semtech/pom.xml index 6f0c5957e..7a7ad2696 100644 --- a/java/lora-codec-semtech/pom.xml +++ b/java/lora-codec-semtech/pom.xml @@ -7,7 +7,7 @@ com.softwareag lora - 1.1.2 + 1.1.2-1 lora-codec-semtech diff --git a/java/lora-codec-semtech/pom.xml.versionsBackup b/java/lora-codec-semtech/pom.xml.versionsBackup deleted file mode 100644 index 009b50fc6..000000000 --- a/java/lora-codec-semtech/pom.xml.versionsBackup +++ /dev/null @@ -1,53 +0,0 @@ - - - 4.0.0 - - - com.softwareag - lora - 1.1.0-SNAPSHOT - - - lora-codec-semtech - - - - com.softwareag - lora-codec-ms - ${project.version} - - - org.junit.jupiter - junit-jupiter-engine - 5.1.0 - test - - - com.squareup.retrofit2 - retrofit - 2.9.0 - - - com.squareup.retrofit2 - converter-jackson - 2.9.0 - - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - com.nsn.cumulocity.clients-java - microservice-package-maven-plugin - - - - - - \ No newline at end of file diff --git a/java/lora-codec-senlab/pom.xml b/java/lora-codec-senlab/pom.xml index 5491ceef6..85c28e8e0 100644 --- a/java/lora-codec-senlab/pom.xml +++ b/java/lora-codec-senlab/pom.xml @@ -7,7 +7,7 @@ com.softwareag lora - 1.1.2 + 1.1.2-1 lora-codec-senlab diff --git a/java/lora-codec-senlab/pom.xml.versionsBackup b/java/lora-codec-senlab/pom.xml.versionsBackup deleted file mode 100644 index 663298688..000000000 --- a/java/lora-codec-senlab/pom.xml.versionsBackup +++ /dev/null @@ -1,43 +0,0 @@ - - - 4.0.0 - - - com.softwareag - lora - 1.1.0-SNAPSHOT - - - lora-codec-senlab - - - - com.softwareag - lora-codec-ms - ${project.version} - - - org.junit.jupiter - junit-jupiter-engine - 5.1.0 - test - - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - com.nsn.cumulocity.clients-java - microservice-package-maven-plugin - - - - - - \ No newline at end of file diff --git a/java/lora-interface/pom.xml b/java/lora-interface/pom.xml index acc6e194e..1321613d2 100644 --- a/java/lora-interface/pom.xml +++ b/java/lora-interface/pom.xml @@ -7,7 +7,7 @@ com.softwareag lora - 1.1.2 + 1.1.2-1 lora-interface diff --git a/java/lora-interface/pom.xml.versionsBackup b/java/lora-interface/pom.xml.versionsBackup deleted file mode 100644 index e477bfba9..000000000 --- a/java/lora-interface/pom.xml.versionsBackup +++ /dev/null @@ -1,100 +0,0 @@ - - - 4.0.0 - - - com.softwareag - lora - 1.1.0-SNAPSHOT - - - lora-interface - - - - com.nsn.cumulocity.clients-java - microservice-autoconfigure - - - com.nsn.cumulocity.model - device-capability-model - - - io.github.openfeign - feign-core - - - io.github.openfeign - feign-jackson - - - io.github.openfeign - feign-slf4j - - - com.fasterxml.jackson.datatype - jackson-datatype-joda - - - org.junit.jupiter - junit-jupiter-engine - test - - - org.junit.jupiter - junit-jupiter-api - test - - - org.springframework - spring-test - test - - - org.springframework.security - spring-security-test - test - - - org.springframework.boot - spring-boot-starter-test - test - - - org.assertj - assertj-core - 3.24.2 - test - - - org.projectlombok - lombok - provided - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.13.0 - - - - org.projectlombok - lombok - RELEASE - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - - - - \ No newline at end of file diff --git a/java/lora-ns-actility/pom.xml b/java/lora-ns-actility/pom.xml index 425f975ed..5e39f2248 100644 --- a/java/lora-ns-actility/pom.xml +++ b/java/lora-ns-actility/pom.xml @@ -6,7 +6,7 @@ com.softwareag lora - 1.1.2 + 1.1.2-1 lora-ns-actility diff --git a/java/lora-ns-actility/pom.xml.versionsBackup b/java/lora-ns-actility/pom.xml.versionsBackup deleted file mode 100644 index d74c364de..000000000 --- a/java/lora-ns-actility/pom.xml.versionsBackup +++ /dev/null @@ -1,98 +0,0 @@ - - 4.0.0 - - - com.softwareag - lora - 1.1.0-SNAPSHOT - - - lora-ns-actility - - - - com.softwareag - lora-ns-ms - ${project.version} - - - com.auth0 - java-jwt - 3.16.0 - - - org.junit.jupiter - junit-jupiter-engine - test - - - org.junit.jupiter - junit-jupiter-api - test - - - org.springframework - spring-test - test - - - org.springframework.security - spring-security-test - test - - - org.springframework.boot - spring-boot-starter-test - test - - - org.assertj - assertj-core - 3.24.2 - test - - - io.github.openfeign.form - feign-form - - - io.github.openfeign - feign-okhttp - - - org.openapitools - jackson-databind-nullable - - - com.github.scribejava - scribejava-core - 8.3.3 - - - org.projectlombok - lombok - provided - - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - org.apache.maven.plugins - maven-surefire-plugin - - - com.nsn.cumulocity.clients-java - microservice-package-maven-plugin - - - - - - \ No newline at end of file diff --git a/java/lora-ns-chirpstack/pom.xml b/java/lora-ns-chirpstack/pom.xml index 19242ca68..9f2a107c3 100644 --- a/java/lora-ns-chirpstack/pom.xml +++ b/java/lora-ns-chirpstack/pom.xml @@ -9,7 +9,7 @@ com.softwareag lora - 1.1.2 + 1.1.2-1 lora-ns-chirpstack diff --git a/java/lora-ns-chirpstack/pom.xml.versionsBackup b/java/lora-ns-chirpstack/pom.xml.versionsBackup deleted file mode 100644 index e7be45cfb..000000000 --- a/java/lora-ns-chirpstack/pom.xml.versionsBackup +++ /dev/null @@ -1,120 +0,0 @@ - - - - 4.0.0 - - - - com.softwareag - lora - 1.1.0-SNAPSHOT - - - lora-ns-chirpstack - - - 1.62.2 - 1.6.1 - 0.6.1 - - - - - com.softwareag - lora-ns-ms - ${project.version} - - - io.grpc - grpc-netty-shaded - ${io.grpc.version} - - - io.grpc - grpc-protobuf - ${io.grpc.version} - - - io.grpc - grpc-stub - ${io.grpc.version} - - - com.fasterxml.jackson.datatype - jackson-datatype-joda - 2.13.2 - - - org.junit.jupiter - junit-jupiter-engine - test - - - org.projectlombok - lombok - provided - - - org.hamcrest - hamcrest-core - 2.2 - test - - - org.springframework.boot - spring-boot-starter-test - ${spring-boot-dependencies.version} - test - - - io.rest-assured - rest-assured - test - - - - - - - kr.motd.maven - os-maven-plugin - ${os-maven-plugin.version} - - - - - org.xolstice.maven.plugins - protobuf-maven-plugin - ${protobuf-maven-plugin.version} - - - com.google.protobuf:protoc:3.25.3:exe:${os.detected.classifier} - - grpc-java - - io.grpc:protoc-gen-grpc-java:${io.grpc.version}:exe:${os.detected.classifier} - - - - - - compile - compile-custom - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - com.nsn.cumulocity.clients-java - microservice-package-maven-plugin - - - - - \ No newline at end of file diff --git a/java/lora-ns-generic/pom.xml b/java/lora-ns-generic/pom.xml index 4b541fc9e..0ff9a4c61 100644 --- a/java/lora-ns-generic/pom.xml +++ b/java/lora-ns-generic/pom.xml @@ -9,7 +9,7 @@ com.softwareag lora - 1.1.2 + 1.1.2-1 lora-ns-generic diff --git a/java/lora-ns-generic/pom.xml.versionsBackup b/java/lora-ns-generic/pom.xml.versionsBackup deleted file mode 100644 index d18acaa8a..000000000 --- a/java/lora-ns-generic/pom.xml.versionsBackup +++ /dev/null @@ -1,58 +0,0 @@ - - - - 4.0.0 - - - - com.softwareag - lora - 1.1.0-SNAPSHOT - - - lora-ns-generic - - - - com.softwareag - lora-ns-ms - ${project.version} - - - com.auth0 - java-jwt - 3.16.0 - - - org.junit.jupiter - junit-jupiter-engine - test - - - org.projectlombok - lombok - provided - - - com.fasterxml.jackson.datatype - jackson-datatype-joda - 2.13.2 - - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - com.nsn.cumulocity.clients-java - microservice-package-maven-plugin - - - - - \ No newline at end of file diff --git a/java/lora-ns-kerlink/pom.xml b/java/lora-ns-kerlink/pom.xml index 283b30086..829d0b0b6 100644 --- a/java/lora-ns-kerlink/pom.xml +++ b/java/lora-ns-kerlink/pom.xml @@ -6,7 +6,7 @@ com.softwareag lora - 1.1.2 + 1.1.2-1 lora-ns-kerlink diff --git a/java/lora-ns-kerlink/pom.xml.versionsBackup b/java/lora-ns-kerlink/pom.xml.versionsBackup deleted file mode 100644 index f30c799a3..000000000 --- a/java/lora-ns-kerlink/pom.xml.versionsBackup +++ /dev/null @@ -1,40 +0,0 @@ - - 4.0.0 - - - com.softwareag - lora - 1.1.0-SNAPSHOT - - - lora-ns-kerlink - - - - com.softwareag - lora-ns-ms - ${project.version} - - - com.fasterxml.jackson.datatype - jackson-datatype-joda - 2.13.2 - - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - com.nsn.cumulocity.clients-java - microservice-package-maven-plugin - - - - - \ No newline at end of file diff --git a/java/lora-ns-liveobjects/pom.xml b/java/lora-ns-liveobjects/pom.xml index 9f4625404..c2f8939d5 100644 --- a/java/lora-ns-liveobjects/pom.xml +++ b/java/lora-ns-liveobjects/pom.xml @@ -9,7 +9,7 @@ com.softwareag lora - 1.1.2 + 1.1.2-1 lora-ns-liveobjects diff --git a/java/lora-ns-liveobjects/pom.xml.versionsBackup b/java/lora-ns-liveobjects/pom.xml.versionsBackup deleted file mode 100644 index bc181b034..000000000 --- a/java/lora-ns-liveobjects/pom.xml.versionsBackup +++ /dev/null @@ -1,48 +0,0 @@ - - - - 4.0.0 - - - - com.softwareag - lora - 1.1.0-SNAPSHOT - - - lora-ns-liveobjects - - - - com.softwareag - lora-ns-ms - ${project.version} - - - org.junit.jupiter - junit-jupiter-engine - test - - - org.projectlombok - lombok - provided - - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - com.nsn.cumulocity.clients-java - microservice-package-maven-plugin - - - - - \ No newline at end of file diff --git a/java/lora-ns-loriot/pom.xml b/java/lora-ns-loriot/pom.xml index f4950698f..dc1173a6c 100644 --- a/java/lora-ns-loriot/pom.xml +++ b/java/lora-ns-loriot/pom.xml @@ -6,7 +6,7 @@ com.softwareag lora - 1.1.2 + 1.1.2-1 lora-ns-loriot diff --git a/java/lora-ns-loriot/pom.xml.versionsBackup b/java/lora-ns-loriot/pom.xml.versionsBackup deleted file mode 100644 index 245429d76..000000000 --- a/java/lora-ns-loriot/pom.xml.versionsBackup +++ /dev/null @@ -1,49 +0,0 @@ - - 4.0.0 - - - com.softwareag - lora - 1.1.0-SNAPSHOT - - - lora-ns-loriot - - - - com.softwareag - lora-ns-ms - ${project.version} - - - org.junit.jupiter - junit-jupiter-engine - test - - - com.fasterxml.jackson.datatype - jackson-datatype-joda - - - org.projectlombok - lombok - provided - - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - com.nsn.cumulocity.clients-java - microservice-package-maven-plugin - - - - - \ No newline at end of file diff --git a/java/lora-ns-ms/pom.xml b/java/lora-ns-ms/pom.xml index bce121a2c..d57b0a40b 100644 --- a/java/lora-ns-ms/pom.xml +++ b/java/lora-ns-ms/pom.xml @@ -7,7 +7,7 @@ com.softwareag lora - 1.1.2 + 1.1.2-1 lora-ns-ms diff --git a/java/lora-ns-ms/pom.xml.versionsBackup b/java/lora-ns-ms/pom.xml.versionsBackup deleted file mode 100644 index c5d1f213a..000000000 --- a/java/lora-ns-ms/pom.xml.versionsBackup +++ /dev/null @@ -1,53 +0,0 @@ - - - 4.0.0 - - - com.softwareag - lora - 1.1.0-SNAPSHOT - - - lora-ns-ms - - - - com.softwareag - lora-interface - ${project.version} - - - org.projectlombok - lombok - provided - - - org.springframework.boot - spring-boot-starter-thymeleaf - 2.6.4 - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.8.1 - - 17 - - - org.projectlombok - lombok - 1.18.30 - - - - - - - - \ No newline at end of file diff --git a/java/lora-ns-ms/src/main/java/lora/ns/gateway/LNSGatewayService.java b/java/lora-ns-ms/src/main/java/lora/ns/gateway/LNSGatewayService.java index 65582189f..b2c40d567 100644 --- a/java/lora-ns-ms/src/main/java/lora/ns/gateway/LNSGatewayService.java +++ b/java/lora-ns-ms/src/main/java/lora/ns/gateway/LNSGatewayService.java @@ -26,6 +26,7 @@ import c8y.Position; import c8y.RequiredAvailability; import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; import lora.codec.uplink.C8YData; import lora.common.C8YUtils; import lora.ns.connector.LNSConnector; @@ -37,6 +38,7 @@ @Service @RequiredArgsConstructor +@Slf4j public class LNSGatewayService { private final C8YUtils c8yUtils; @@ -49,7 +51,7 @@ public class LNSGatewayService { private final ContextService contextService; public static final String GATEWAY_ID_TYPE = "LoRa Gateway Id"; - private MicroserviceCredentials createContextWithoutApiKey(MicroserviceCredentials source) { + private MicroserviceCredentials createContextWithoutAppKey(MicroserviceCredentials source) { return new MicroserviceCredentials( source.getTenant(), source.getUsername(), @@ -87,12 +89,14 @@ public void upsertGateways(LNSConnector connector) { locationUpdate.setDateTime(new DateTime()); eventApi.create(locationUpdate); } - inventoryApi.update(mor); - loraContextService.log("Processing data for gateway {}", gateway.getName()); - MicroserviceCredentials noAppKeyContext = createContextWithoutApiKey(contextService.getContext()); if (gateway.getStatus() == ConnectionState.AVAILABLE) { - contextService.runWithinContext(noAppKeyContext, () -> processData(mor, gateway.getData())); + MicroserviceCredentials noAppKeyContext = createContextWithoutAppKey(contextService.getContext()); + log.info("Sending data with no app context -> gateway {} should show as available...", gateway.getGwEUI()); + contextService.callWithinContext(noAppKeyContext, () -> inventoryApi.update(mor)); + } else { + inventoryApi.update(mor); } + loraContextService.log("Processing data for gateway {}", gateway.getName()); processData(mor, gateway.getData()); } } diff --git a/java/lora-ns-objenious/pom.xml b/java/lora-ns-objenious/pom.xml index 77a68a822..48c8998e0 100644 --- a/java/lora-ns-objenious/pom.xml +++ b/java/lora-ns-objenious/pom.xml @@ -6,7 +6,7 @@ com.softwareag lora - 1.1.2 + 1.1.2-1 lora-ns-objenious diff --git a/java/lora-ns-objenious/pom.xml.versionsBackup b/java/lora-ns-objenious/pom.xml.versionsBackup deleted file mode 100644 index d6aa4224d..000000000 --- a/java/lora-ns-objenious/pom.xml.versionsBackup +++ /dev/null @@ -1,58 +0,0 @@ - - 4.0.0 - - - com.softwareag - lora - 1.1.0-SNAPSHOT - - - lora-ns-objenious - - - - com.softwareag - lora-ns-ms - ${project.version} - - - org.junit.jupiter - junit-jupiter-engine - test - - - org.hamcrest - hamcrest-core - 2.2 - test - - - org.springframework.boot - spring-boot-starter-test - ${spring-boot-dependencies.version} - test - - - io.rest-assured - rest-assured - test - - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - com.nsn.cumulocity.clients-java - microservice-package-maven-plugin - - - - - - \ No newline at end of file diff --git a/java/lora-ns-orbiwise/pom.xml b/java/lora-ns-orbiwise/pom.xml index 12ddb259f..3ad9c055a 100644 --- a/java/lora-ns-orbiwise/pom.xml +++ b/java/lora-ns-orbiwise/pom.xml @@ -6,7 +6,7 @@ com.softwareag lora - 1.1.2 + 1.1.2-1 lora-ns-orbiwise diff --git a/java/lora-ns-orbiwise/pom.xml.versionsBackup b/java/lora-ns-orbiwise/pom.xml.versionsBackup deleted file mode 100644 index db62670f1..000000000 --- a/java/lora-ns-orbiwise/pom.xml.versionsBackup +++ /dev/null @@ -1,40 +0,0 @@ - - 4.0.0 - - - com.softwareag - lora - 1.1.0-SNAPSHOT - - - lora-ns-orbiwise - - - - com.softwareag - lora-ns-ms - ${project.version} - - - org.junit.jupiter - junit-jupiter-engine - test - - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - com.nsn.cumulocity.clients-java - microservice-package-maven-plugin - - - - - \ No newline at end of file diff --git a/java/lora-ns-ttn/pom.xml b/java/lora-ns-ttn/pom.xml index fa2bc5097..e513e1e60 100644 --- a/java/lora-ns-ttn/pom.xml +++ b/java/lora-ns-ttn/pom.xml @@ -6,7 +6,7 @@ com.softwareag lora - 1.1.2 + 1.1.2-1 lora-ns-ttn diff --git a/java/pom.xml b/java/pom.xml index 52e124ae3..f034d1da9 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.softwareag lora - 1.1.2 + 1.1.2-1 pom UTF-8