Skip to content
Sign in

Changes

Started 2 yr 2 mo ago
Took 3.5 sec
Package regsitration and Model Package Uri

Signed-off-by: Juergen Albert <j.albert@data-in-motion.biz>
(commit: b36801f)
core/impl/src/main/java/org/eclipse/sensinact/core/model/nexus/ModelNexus.java core/impl/src/main/java/org/eclipse/sensinact/core/command/impl/ResourcePullHandler.java northbound/rest/src/test/java/org/eclipse/sensinact/northbound/rest/integration/notification/ResourceNotificationsTest.java core/impl/src/main/java/org/eclipse/sensinact/core/whiteboard/impl/GetMethod.java core/impl/src/test/java/org/eclipse/sensinact/core/notification/impl/NotificationSenderTest.java northbound/sensorthings/mqtt/src/test/java/org/eclipse/sensinact/gateway/northbound/sensorthings/mqtt/integration/InsecureMqttNotificationsTest.java core/impl/src/test/java/org/eclipse/sensinact/core/integration/notification/SubscribeTest.java core/emf-api/src/main/java/org/eclipse/sensinact/core/emf/twin/SensinactEMFDigitalTwin.java core/impl/src/test/java/org/eclipse/sensinact/core/model/nexus/impl/NexusTest.java core/api/dependency-check.bndrun core/impl/src/main/java/org/eclipse/sensinact/core/twin/impl/SensinactProviderImpl.java core/impl/src/main/java/org/eclipse/sensinact/core/extract/impl/AnnotationMapping.java core/impl/src/main/java/org/eclipse/sensinact/core/notification/impl/ImmediateNotificationAccumulator.java southbound/http/http-device-factory/integration-test.bndrun core/api/src/main/java/org/eclipse/sensinact/core/push/dto/BaseValueDto.java core/emf-api/dependency-check.bndrun northbound/sensorthings/rest.gateway/src/test/java/org/eclipse/sensinact/sensorthings/sensing/rest/integration/ObservationHistoryTest.java northbound/filters/ldap/integration-test.bndrun core/impl/src/test/java/org/eclipse/sensinact/core/model/nexus/impl/SubscriptionTest.java distribution/launcher/export.bndrun southbound/history/timescale-provider/src/main/java/org/eclipse/sensinact/gateway/southbound/history/timescale/TimescaleHistoricalStore.java southbound/history/timescale-provider/src/test/java/org/eclipse/sensinact/gateway/southbound/history/timescale/integration/TimescaleHistoryTest.java core/api/src/main/java/org/eclipse/sensinact/core/command/ResourceCommand.java core/impl/src/test/java/org/eclipse/sensinact/core/extract/impl/AnnotationBasedDtoExtractorTest.java examples/model-based/src/main/java/org/eclipse/sensinact/prototype/resource/ResourceModelProvider.java northbound/sensorthings/mqtt/integration-test.bndrun distribution/features/core-feature/src/main/resources/core-feature.json core/annotation/src/main/java/org/eclipse/sensinact/core/annotation/dto/ModelPackageUri.java southbound/http/http-callback-whiteboard/integration-test.bndrun core/impl/src/main/java/org/eclipse/sensinact/core/impl/SetValueCommand.java core/impl/src/test/java/org/eclipse/sensinact/core/command/impl/GatewayThreadImplTest.java core/impl/src/main/java/org/eclipse/sensinact/core/dto/impl/AbstractUpdateDto.java core/impl/src/main/java/org/eclipse/sensinact/core/model/impl/ModelBuilderImpl.java core/impl/src/main/java/org/eclipse/sensinact/core/whiteboard/impl/ActMethod.java core/impl/src/main/java/org/eclipse/sensinact/core/whiteboard/impl/RegistryKey.java core/impl/src/main/java/org/eclipse/sensinact/core/extract/impl/GenericDtoDataExtractor.java core/annotation/src/main/java/org/eclipse/sensinact/core/annotation/verb/GET.java core/impl/src/test/java/org/eclipse/sensinact/core/twin/impl/SensinactTwinTest.java core/impl/src/main/java/org/eclipse/sensinact/core/model/nexus/emf/EMFUtil.java core/impl/src/main/java/org/eclipse/sensinact/core/command/impl/ActionHandler.java core/impl/src/main/java/org/eclipse/sensinact/core/model/impl/SensinactModelManagerImpl.java southbound/mqtt/mqtt-device-factory/integration-test.bndrun southbound/history/timescale-provider/src/main/java/org/eclipse/sensinact/gateway/southbound/history/timescale/TimescaleDatabaseWorker.java core/api/src/main/java/org/eclipse/sensinact/core/notification/AbstractResourceNotification.java core/impl/src/main/java/org/eclipse/sensinact/core/command/impl/ResourcePushHandler.java core/impl/src/main/java/org/eclipse/sensinact/core/notification/impl/NotificationAccumulatorImpl.java northbound/security/openid-connect/integration-test.bndrun pom.xml northbound/sensorthings/rest.gateway/integration-test.bndrun core/api/src/main/java/org/eclipse/sensinact/core/model/SensinactModelManager.java northbound/websocket/integration-test.bndrun core/annotation/src/main/java/org/eclipse/sensinact/core/annotation/verb/SET.java core/impl/src/main/java/org/eclipse/sensinact/core/model/nexus/emf/compare/EMFCompareUtil.java distribution/launcher/pom.xml core/impl/src/main/java/org/eclipse/sensinact/core/notification/impl/AbstractNotificationAccumulatorImpl.java northbound/query-handler/integration-test.bndrun core/impl/src/main/java/org/eclipse/sensinact/core/whiteboard/impl/AbstractResourceMethod.java core/models/provider/src/main/resources/model/sensinact.ecore core/annotation/src/main/java/org/eclipse/sensinact/core/annotation/verb/UriParam.java northbound/sensorthings/mqtt/pom.xml core/impl/src/main/java/org/eclipse/sensinact/core/whiteboard/impl/SetMethod.java southbound/virtual/virtual-temperature-sensor/integration-test.bndrun core/impl/src/main/java/org/eclipse/sensinact/core/twin/impl/SensinactDigitalTwinImpl.java core/impl/src/main/java/org/eclipse/sensinact/core/whiteboard/impl/SensinactWhiteboard.java southbound/virtual/virtual-temperature-sensor/src/test/java/org/eclipse/sensinact/gateway/southbound/virtual/temperature/integration/TemperatureSensorTest.java distribution/features/core-feature/src/test/java/org/eclipse/sensinact/gateway/feature/integration/core/CoreFeatureTest.java core/impl/integration-test.bndrun core/api/src/main/java/org/eclipse/sensinact/core/twin/SensinactDigitalTwin.java core/api/src/main/java/org/eclipse/sensinact/core/notification/NotificationAccumulator.java core/impl/src/main/java/org/eclipse/sensinact/core/twin/impl/SensinactResourceImpl.java core/impl/src/main/java/org/eclipse/sensinact/core/impl/SetMetadataCommand.java northbound/rest/integration-test.bndrun southbound/history/timescale-provider/integration-test.bndrun core/annotation/src/main/java/org/eclipse/sensinact/core/annotation/verb/ACT.java core/models/provider/src/main/resources/model/sensinact.genmodel core/impl/src/test/java/org/eclipse/sensinact/core/command/impl/WhiteboardImplTest.java
j.albert at
Update the osgi-test version to 1.3.0-SNAPSHOT

This upgrade improves the lifecycle of osgi-test considerably, particularly for configurations. It allows some test tidy-up, as well as preparing for more stable tests with the new OSGi Technology Jakarta REST implementation

Signed-off-by: Tim Ward <timothyjward@apache.org>
(commit: 0a4ee42)
northbound/rest/src/test/java/org/eclipse/sensinact/northbound/rest/integration/ResourceAccessTest.java southbound/history/timescale-provider/src/test/java/org/eclipse/sensinact/gateway/southbound/history/timescale/integration/TimescaleHistoryTest.java northbound/filters/ldap/integration-test.bndrun northbound/filters/ldap/src/test/java/org/eclipse/sensinact/northbound/filters/ldap/integration/LdapFilterTest.java pom.xml core/impl/src/test/java/org/eclipse/sensinact/core/integration/notification/SubscribeTest.java northbound/query-handler/src/test/java/org/eclipse/sensinact/northbound/query/test/integration/ResourceAccessTest.java southbound/virtual/virtual-temperature-sensor/integration-test.bndrun southbound/mqtt/mqtt-device-factory/integration-test.bndrun northbound/sensorthings/rest.gateway/src/test/java/org/eclipse/sensinact/sensorthings/sensing/rest/integration/ObservationHistoryTest.java southbound/history/timescale-provider/integration-test.bndrun core/impl/src/test/java/org/eclipse/sensinact/core/integration/metrics/MetricsTest.java northbound/websocket/src/test/java/org/eclipse/sensinact/northbound/websocket/integration/WebSocketTest.java southbound/http/http-callback-whiteboard/pom.xml southbound/http/http-device-factory/integration-test.bndrun northbound/sensorthings/rest.gateway/src/test/java/org/eclipse/sensinact/sensorthings/sensing/rest/integration/AbstractIntegrationTest.java southbound/virtual/virtual-temperature-sensor/src/test/java/org/eclipse/sensinact/gateway/southbound/virtual/temperature/integration/TemperatureSensorTest.java northbound/rest/src/test/java/org/eclipse/sensinact/northbound/rest/integration/notification/ResourceNotificationsTest.java southbound/http/http-device-factory/src/test/java/org/eclipse/sensinact/gateway/southbound/http/factory/integration/HttpDeviceFactoryTest.java core/impl/integration-test.bndrun southbound/http/http-callback-whiteboard/src/test/java/org/eclipse/sensinact/gateway/southbound/http/callback/integration/HttpCallbackWhiteboardTest.java northbound/websocket/src/test/java/org/eclipse/sensinact/northbound/websocket/integration/SecureWebSocketTest.java northbound/sensorthings/rest.gateway/integration-test.bndrun northbound/query-handler/src/test/java/org/eclipse/sensinact/northbound/query/test/integration/MissingEntityTest.java northbound/rest/src/test/java/org/eclipse/sensinact/northbound/rest/integration/SecureAccessTest.java northbound/filters/ldap/src/test/java/org/eclipse/sensinact/northbound/filters/ldap/integration/LdapComponentTest.java northbound/sensorthings/mqtt/integration-test.bndrun northbound/websocket/integration-test.bndrun southbound/http/http-callback-whiteboard/integration-test.bndrun northbound/query-handler/integration-test.bndrun northbound/query-handler/src/test/java/org/eclipse/sensinact/northbound/query/test/integration/DescriptionsTest.java northbound/rest/src/test/java/org/eclipse/sensinact/northbound/rest/integration/MissingEntityTest.java southbound/history/timescale-provider/tests.bnd southbound/mqtt/mqtt-device-factory/src/test/java/org/eclipse/sensinact/gateway/southbound/mqtt/factory/integration/MqttDeviceFactoryTest.java northbound/security/openid-connect/integration-test.bndrun northbound/rest/integration-test.bndrun core/impl/src/test/java/org/eclipse/sensinact/core/integration/session/AdminServiceTest.java
timothyjward at
Update JUnit and Mockito versions

Signed-off-by: Tim Ward <timothyjward@apache.org>
(commit: 70db733)
northbound/rest/integration-test.bndrun northbound/websocket/integration-test.bndrun southbound/mqtt/mqtt-device-factory/integration-test.bndrun northbound/sensorthings/rest.gateway/integration-test.bndrun northbound/sensorthings/mqtt/integration-test.bndrun southbound/history/timescale-provider/integration-test.bndrun southbound/virtual/virtual-temperature-sensor/integration-test.bndrun northbound/query-handler/integration-test.bndrun northbound/security/openid-connect/integration-test.bndrun core/impl/integration-test.bndrun southbound/http/http-callback-whiteboard/integration-test.bndrun southbound/http/http-device-factory/integration-test.bndrun northbound/filters/ldap/integration-test.bndrun pom.xml
timothyjward at
bumped geckoEMF and EMF

Signed-off-by: Juergen Albert <j.albert@data-in-motion.biz>
(commit: 6ace9f7)
distribution/features/core-feature/src/main/resources/core-feature.json core/emf-api/dependency-check.bndrun southbound/http/http-device-factory/integration-test.bndrun northbound/query-handler/integration-test.bndrun northbound/sensorthings/mqtt/integration-test.bndrun pom.xml core/models/provider/pom.xml southbound/mqtt/mqtt-device-factory/integration-test.bndrun core/impl/pom.xml southbound/virtual/virtual-temperature-sensor/integration-test.bndrun distribution/features/core-feature/pom.xml southbound/http/http-callback-whiteboard/integration-test.bndrun core/models/metadata/pom.xml core/impl/integration-test.bndrun southbound/history/timescale-provider/integration-test.bndrun northbound/filters/ldap/integration-test.bndrun northbound/rest/integration-test.bndrun northbound/sensorthings/rest.gateway/integration-test.bndrun northbound/websocket/integration-test.bndrun
j.albert at
Bumped slf4j to v2.0.11 (Issue #328)

Signed-off-by: David Leangen <osgi@leangen.net>
(commit: 27f4420)
distribution/launcher/export.bndrun southbound/history/timescale-provider/integration-test.bndrun southbound/mqtt/mqtt-device-factory/integration-test.bndrun northbound/sensorthings/rest.gateway/integration-test.bndrun core/impl/integration-test.bndrun northbound/security/openid-connect/integration-test.bndrun southbound/http/http-device-factory/integration-test.bndrun northbound/websocket/integration-test.bndrun southbound/virtual/virtual-temperature-sensor/integration-test.bndrun northbound/sensorthings/mqtt/integration-test.bndrun distribution/features/core-feature/src/test/java/org/eclipse/sensinact/gateway/feature/integration/core/CoreFeatureTest.java northbound/query-handler/integration-test.bndrun southbound/http/http-callback-whiteboard/integration-test.bndrun pom.xml northbound/filters/ldap/integration-test.bndrun northbound/rest/integration-test.bndrun
osgi at
Replace slf4j-simple with logback (v1.4.14)

Fixes #333

Signed-off-by: David Leangen <osgi@leangen.net>
(commit: 8d7cbbe)
northbound/sensorthings/rest.gateway/integration-test.bndrun northbound/filters/ldap/integration-test.bndrun southbound/mqtt/mqtt-device-factory/integration-test.bndrun southbound/http/http-device-factory/pom.xml southbound/device-factory/parser-csv/pom.xml southbound/http/http-device-factory/integration-test.bndrun northbound/sensorthings/filter/pom.xml distribution/launcher/export.bndrun northbound/websocket/pom.xml southbound/http/http-callback-whiteboard/integration-test.bndrun northbound/filters/filters.core/pom.xml northbound/websocket/integration-test.bndrun northbound/query-handler/integration-test.bndrun northbound/sensorthings/mqtt/integration-test.bndrun pom.xml southbound/http/http-callback-whiteboard/pom.xml distribution/features/core-feature/src/test/java/org/eclipse/sensinact/gateway/feature/integration/core/CoreFeatureTest.java northbound/rest/pom.xml northbound/filters/ldap/pom.xml southbound/mqtt/mqtt-device-factory/pom.xml northbound/rest/integration-test.bndrun northbound/security/openid-connect/integration-test.bndrun southbound/virtual/virtual-temperature-sensor/integration-test.bndrun southbound/mqtt/mqtt-client/pom.xml northbound/query-handler/pom.xml southbound/history/timescale-provider/integration-test.bndrun core/impl/integration-test.bndrun
osgi at
Reverted version of JE runtime to JavaSE-11 in all bndrun files.

Signed-off-by: David Leangen <osgi@leangen.net>
(commit: b5c6c79)
southbound/http/http-device-factory/integration-test.bndrun northbound/query-handler/integration-test.bndrun northbound/security/openid-connect/integration-test.bndrun southbound/virtual/virtual-temperature-sensor/integration-test.bndrun northbound/rest/integration-test.bndrun core/impl/integration-test.bndrun southbound/mqtt/mqtt-device-factory/integration-test.bndrun northbound/sensorthings/mqtt/integration-test.bndrun northbound/filters/ldap/integration-test.bndrun southbound/http/http-callback-whiteboard/integration-test.bndrun northbound/websocket/integration-test.bndrun southbound/history/timescale-provider/integration-test.bndrun northbound/sensorthings/rest.gateway/integration-test.bndrun
osgi at
Added ability to configure logging (via logback) for JUnit tests in all projects that currently have tests.

Signed-off-by: David Leangen <osgi@leangen.net>
(commit: a165d94)
core/impl/src/test/resources/logback-test.xml pom.xml southbound/device-factory/device-factory-core/src/test/resources/logback-test.xml northbound/sensorthings/rest.gateway/src/test/resources/logback-test.xml northbound/filters/ldap/src/test/resources/logback-test.xml northbound/query-handler/src/test/resources/logback-test.xml northbound/sensorthings/mqtt/src/test/resources/logback-test.xml southbound/device-factory/parser-json/src/test/resources/logback-test.xml southbound/history/timescale-provider/src/test/resources/logback-test.xml northbound/rest/src/test/resources/logback-test.xml northbound/security/openid-connect/src/test/resources/logback-test.xml southbound/http/http-callback-whiteboard/src/test/resources/logback-test.xml southbound/http/http-device-factory/src/test/resources/logback-test.xml northbound/websocket/src/test/resources/logback-test.xml southbound/device-factory/parser-csv/src/test/resources/logback-test.xml southbound/mqtt/mqtt-device-factory/src/test/resources/logback-test.xml northbound/sensorthings/dto/src/test/resources/logback-test.xml southbound/virtual/virtual-temperature-sensor/src/test/resources/logback-test.xml core/geo-json/src/test/resources/logback-test.xml distribution/launcher/src/test/resources/logback-test.xml northbound/sensorthings/filter/src/test/resources/logback-test.xml southbound/mqtt/mqtt-client/src/test/resources/logback-test.xml
osgi at
Reduce the verbosity of integration test logging

Ensure that the test-logback.xml is used in the integration tests, and that we use the jul-to-slf4j bridge where appropriate

Signed-off-by: Tim Ward <timothyjward@apache.org>
(commit: aa0e8fc)
northbound/query-handler/src/test/resources/logback-test.xml northbound/rest/pom.xml northbound/sensorthings/mqtt/src/test/resources/logback-test.xml northbound/rest/integration-test.bndrun southbound/history/timescale-provider/src/test/resources/logback-test.xml northbound/sensorthings/mqtt/integration-test.bndrun northbound/rest/src/test/resources/logback-test.xml southbound/history/timescale-provider/integration-test.bndrun southbound/virtual/virtual-temperature-sensor/integration-test.bndrun northbound/filters/ldap/src/test/resources/logback-test.xml northbound/query-handler/integration-test.bndrun southbound/mqtt/mqtt-device-factory/integration-test.bndrun southbound/http/http-callback-whiteboard/src/test/resources/logback-test.xml southbound/http/http-device-factory/src/test/resources/logback-test.xml northbound/websocket/integration-test.bndrun southbound/http/http-device-factory/integration-test.bndrun southbound/virtual/virtual-temperature-sensor/src/test/resources/logback-test.xml northbound/security/openid-connect/integration-test.bndrun northbound/security/openid-connect/src/test/resources/logback-test.xml northbound/sensorthings/rest.gateway/pom.xml northbound/sensorthings/rest.gateway/integration-test.bndrun northbound/sensorthings/mqtt/pom.xml northbound/sensorthings/rest.gateway/src/test/resources/logback-test.xml southbound/http/http-callback-whiteboard/integration-test.bndrun northbound/filters/ldap/integration-test.bndrun
timothyjward at
Make the sensiNact build more CI friendly

Since Maven 3.5.0 poms have had the ability to be [CI-friendly](https://maven.apache.org/maven-ci-friendly.html) allowing a more flexible approach to releasing without the need to edit POM files. This also impacts the creation of our feature files, which can now flexibly alter the versions of the bundles they deploy to match what's being built in by CI. The end result should be a much simpler time when we want to tag or release any particular commit.

Signed-off-by: Tim Ward <timothyjward@apache.org>
(commit: 75ebfda)
examples/pom.xml northbound/sensorthings/pom.xml distribution/features/jakarta-servlet-whiteboard-feature/pom.xml southbound/mqtt/pom.xml northbound/sensorthings/rest.gateway/pom.xml distribution/features/gogo-shell-feature/src/main/resources/gogo-shell-feature.json southbound/pom.xml distribution/features/northbound-ogc-sensorthings-mqtt-feature/src/main/resources/northbound-ogc-sensorthings-mqtt-feature.json core/models/pom.xml southbound/http/http-device-factory/pom.xml northbound/security/security-api/pom.xml northbound/sensorthings/rest.api/pom.xml distribution/features/northbound-oidc-authenticator-feature/pom.xml distribution/features/virtual-temperature-sensor-feature/pom.xml sensinact-bom/pom.xml distribution/features/northbound-ogc-sensorthings-feature/pom.xml examples/model-based/pom.xml northbound/gogo-shell/pom.xml northbound/security/pom.xml distribution/features/gogo-shell-feature/pom.xml southbound/history/pom.xml southbound/device-factory/device-factory-core/pom.xml core/impl/pom.xml examples/action/pom.xml core/emf-api/pom.xml northbound/session/pom.xml northbound/pom.xml distribution/features/core-feature/src/main/resources/core-feature.json southbound/device-factory/parser-json/pom.xml distribution/features/jakarta-rest-whiteboard-feature/pom.xml distribution/pom.xml distribution/features/jakarta-servlet-whiteboard-feature/src/main/resources/jakarta-servlet-whiteboard-feature.json southbound/history/timescale-provider/pom.xml southbound/device-factory/parser-csv/pom.xml core/models/metadata/pom.xml distribution/features/virtual-temperature-sensor-feature/src/main/resources/virtual-temperature-sensor-feature.json southbound/mqtt/mqtt-device-factory/pom.xml distribution/launcher/pom.xml distribution/features/northbound-websocket-feature/src/main/resources/northbound-websocket-feature.json southbound/device-factory/pom.xml distribution/features/core-feature/pom.xml northbound/websocket/pom.xml distribution/assembly/pom.xml northbound/security/openid-connect/pom.xml southbound/history/history-api/pom.xml distribution/features/northbound-ogc-sensorthings-feature/src/main/resources/northbound-ogc-sensorthings-feature.json distribution/features/jakarta-rest-whiteboard-feature/src/main/resources/jakarta-rest-whiteboard-feature.json southbound/virtual/virtual-temperature-sensor/pom.xml core/annotation/pom.xml examples/generic/pom.xml examples/push-based/pom.xml northbound/sensorthings/filter/pom.xml pom.xml distribution/test-utils/pom.xml southbound/http/http-callback-whiteboard/pom.xml examples/reflective/pom.xml distribution/features/northbound-oidc-authenticator-feature/src/main/resources/northbound-oidc-authenticator-feature.json distribution/features/northbound-rest-feature/src/main/resources/northbound-rest-feature.json distribution/features/timescale-history-provider-feature/src/main/resources/timescale-history-provider-feature.json northbound/query-handler/pom.xml northbound/session/session-impl/pom.xml northbound/session/session-api/pom.xml southbound/virtual/pom.xml distribution/features/timescale-history-provider-feature/pom.xml distribution/features/northbound-rest-feature/pom.xml northbound/rest/pom.xml northbound/sensorthings/mqtt/pom.xml examples/writable/pom.xml distribution/features/northbound-websocket-feature/pom.xml southbound/http/pom.xml core/models/provider/pom.xml core/geo-json/pom.xml southbound/mqtt/mqtt-client/pom.xml distribution/features/pom.xml northbound/filters/filters.core/pom.xml distribution/features/northbound-ogc-sensorthings-mqtt-feature/pom.xml northbound/sensorthings/dto/pom.xml core/api/pom.xml northbound/filters/pom.xml examples/notification/pom.xml core/pom.xml examples/pull-based/pom.xml northbound/filters/ldap/pom.xml
timothyjward at