From a672098d08bbc5d30b621976da961735eb59df56 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 27 Oct 2023 15:41:55 +0000 Subject: [PATCH 1/3] Bump org.testcontainers:postgresql from 1.17.6 to 1.19.1 Bumps [org.testcontainers:postgresql](https://github.com/testcontainers/testcontainers-java) from 1.17.6 to 1.19.1. - [Release notes](https://github.com/testcontainers/testcontainers-java/releases) - [Changelog](https://github.com/testcontainers/testcontainers-java/blob/main/CHANGELOG.md) - [Commits](https://github.com/testcontainers/testcontainers-java/compare/1.17.6...1.19.1) --- updated-dependencies: - dependency-name: org.testcontainers:postgresql dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .../features/timescale-history-provider-feature/pom.xml | 2 +- northbound/sensorthings/rest.gateway/pom.xml | 2 +- southbound/history/timescale-provider/pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/distribution/features/timescale-history-provider-feature/pom.xml b/distribution/features/timescale-history-provider-feature/pom.xml index cf3152614..7ef30e905 100644 --- a/distribution/features/timescale-history-provider-feature/pom.xml +++ b/distribution/features/timescale-history-provider-feature/pom.xml @@ -46,7 +46,7 @@ org.testcontainers postgresql - 1.17.6 + 1.19.1 test diff --git a/northbound/sensorthings/rest.gateway/pom.xml b/northbound/sensorthings/rest.gateway/pom.xml index c0893b1b1..da07c4dee 100644 --- a/northbound/sensorthings/rest.gateway/pom.xml +++ b/northbound/sensorthings/rest.gateway/pom.xml @@ -162,7 +162,7 @@ org.testcontainers postgresql - 1.17.6 + 1.19.1 test diff --git a/southbound/history/timescale-provider/pom.xml b/southbound/history/timescale-provider/pom.xml index 0bb2e87b8..bbc6c2b3e 100644 --- a/southbound/history/timescale-provider/pom.xml +++ b/southbound/history/timescale-provider/pom.xml @@ -94,7 +94,7 @@ org.testcontainers postgresql - 1.17.6 + 1.19.1 test From c72538393de3710c95c813c8f534e6ff6b92f351 Mon Sep 17 00:00:00 2001 From: Thomas Calmant Date: Fri, 27 Oct 2023 18:01:21 +0200 Subject: [PATCH 2/3] Fixed rest.gateway project configuration --- .../rest.gateway/integration-test.bndrun | 6 +++--- northbound/sensorthings/rest.gateway/tests.bnd | 18 ++++++++++-------- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/northbound/sensorthings/rest.gateway/integration-test.bndrun b/northbound/sensorthings/rest.gateway/integration-test.bndrun index 66f7eebde..76587e690 100644 --- a/northbound/sensorthings/rest.gateway/integration-test.bndrun +++ b/northbound/sensorthings/rest.gateway/integration-test.bndrun @@ -27,7 +27,7 @@ com.fasterxml.jackson.datatype.jackson-datatype-jsr310;version='[2.14.0,2.14.1)',\ com.fasterxml.jackson.jakarta.rs.jackson-jakarta-rs-base;version='[2.14.0,2.14.1)',\ com.fasterxml.jackson.jakarta.rs.jackson-jakarta-rs-json-provider;version='[2.14.0,2.14.1)',\ - com.sun.jna;version='[5.8.0,5.8.1)',\ + com.sun.jna;version='[5.12.1,5.12.2)',\ io.dropwizard.metrics.core;version='[4.2.19,4.2.20)',\ jakarta.activation-api;version='[2.1.0,2.1.1)',\ jakarta.annotation-api;version='[2.1.1,2.1.2)',\ @@ -48,7 +48,7 @@ org.apache.aries.component-dsl.component-dsl;version='[1.2.2,1.2.3)',\ org.apache.aries.spifly.dynamic.framework.extension;version='[1.3.6,1.3.7)',\ org.apache.aries.typedevent.bus;version='[0.0.2,0.0.3)',\ - org.apache.commons.commons-compress;version='[1.22.0,1.22.1)',\ + org.apache.commons.commons-compress;version='[1.24.0,1.24.1)',\ org.apache.felix.cm.json;version='[2.0.0,2.0.1)',\ org.apache.felix.configadmin;version='[1.9.24,1.9.25)',\ org.apache.felix.configurator;version='[1.0.18,1.0.19)',\ @@ -64,7 +64,7 @@ org.eclipse.jetty.server;version='[11.0.12,11.0.13)',\ org.eclipse.jetty.servlet;version='[11.0.12,11.0.13)',\ org.eclipse.jetty.util;version='[11.0.12,11.0.13)',\ - org.eclipse.parsson.jakarta.json;version='[1.1.1,1.1.2)',\ + org.eclipse.parsson.jakarta.json;version='[1.1.5,1.1.6)',\ org.eclipse.sensinact.gateway.core.annotation;version='[0.0.2,0.0.3)',\ org.eclipse.sensinact.gateway.core.api;version='[0.0.2,0.0.3)',\ org.eclipse.sensinact.gateway.core.emf-api;version='[0.0.2,0.0.3)',\ diff --git a/northbound/sensorthings/rest.gateway/tests.bnd b/northbound/sensorthings/rest.gateway/tests.bnd index 8b2677f9d..8970c72ad 100644 --- a/northbound/sensorthings/rest.gateway/tests.bnd +++ b/northbound/sensorthings/rest.gateway/tests.bnd @@ -1,19 +1,21 @@ -includeresource: \ - @postgresql-1.17.6.jar, \ - @jdbc-1.17.6.jar, \ - @database-commons-1.17.6.jar, \ - @testcontainers-1.17.6.jar, \ - @docker-java-api-3.2.13.jar, \ - @docker-java-transport-zerodep-3.2.13.jar, \ - @docker-java-transport-3.2.13.jar,\ + @postgresql-1.19.1.jar, \ + @jdbc-1.19.1.jar, \ + @database-commons-1.19.1.jar, \ + @testcontainers-1.19.1.jar, \ + @docker-java-api-3.3.3.jar, \ + @docker-java-transport-zerodep-3.3.3.jar, \ + @docker-java-transport-3.3.3.jar,\ @duct-tape-1.0.8.jar Import-Package: \ + !android.os.*,\ !com.github.dockerjava.zerodep.*,\ !com.google.appengine.*,\ !com.google.apphosting.*,\ + !com.google.cloud.*,\ !io.r2dbc.*,\ - !javax.annotation, \ + !javax.annotation.*, \ !org.conscrypt, \ !org.testcontainers.r2dbc.*, \ * From 910327e2c9469e3b3694197d8134b7e4dfed7cb8 Mon Sep 17 00:00:00 2001 From: Thomas Calmant Date: Fri, 27 Oct 2023 18:05:24 +0200 Subject: [PATCH 3/3] Fixed timescale-provider project configuration --- .../integration-test.bndrun | 27 ++----------------- .../history/timescale-provider/tests.bnd | 18 +++++++------ 2 files changed, 12 insertions(+), 33 deletions(-) diff --git a/southbound/history/timescale-provider/integration-test.bndrun b/southbound/history/timescale-provider/integration-test.bndrun index 79999adda..359ca7615 100644 --- a/southbound/history/timescale-provider/integration-test.bndrun +++ b/southbound/history/timescale-provider/integration-test.bndrun @@ -17,7 +17,7 @@ com.fasterxml.jackson.core.jackson-annotations;version='[2.14.0,2.14.1)',\ com.fasterxml.jackson.core.jackson-core;version='[2.14.0,2.14.1)',\ com.fasterxml.jackson.core.jackson-databind;version='[2.14.0,2.14.1)',\ - com.sun.jna;version='[5.8.0,5.8.1)',\ + com.sun.jna;version='[5.12.1,5.12.2)',\ io.dropwizard.metrics.core;version='[4.2.19,4.2.20)',\ junit-jupiter-api;version='[5.9.0,5.9.1)',\ junit-jupiter-engine;version='[5.9.0,5.9.1)',\ @@ -29,7 +29,7 @@ net.bytebuddy.byte-buddy-agent;version='[1.12.13,1.12.14)',\ org.apache.aries.component-dsl.component-dsl;version='[1.2.2,1.2.3)',\ org.apache.aries.typedevent.bus;version='[0.0.2,0.0.3)',\ - org.apache.commons.commons-compress;version='[1.22.0,1.22.1)',\ + org.apache.commons.commons-compress;version='[1.24.0,1.24.1)',\ org.apache.felix.configadmin;version='[1.9.24,1.9.25)',\ org.apache.felix.scr;version='[2.2.2,2.2.3)',\ org.apache.servicemix.bundles.junit;version='[4.13.2,4.13.3)',\ @@ -48,29 +48,6 @@ org.eclipse.sensinact.gateway.southbound.history.timescale-provider-tests;version='[0.0.2,0.0.3)',\ org.gecko.emf.osgi.api;version='[4.6.2,4.6.3)',\ org.gecko.emf.osgi.component;version='[4.6.2,4.6.3)',\ - org.mockito.junit-jupiter;version='[4.7.0,4.7.1)',\ - org.mockito.mockito-core;version='[4.7.0,4.7.1)',\ - org.objenesis;version='[3.2.0,3.2.1)',\ - org.opentest4j;version='[1.2.0,1.2.1)',\ - org.osgi.service.component;version='[1.5.0,1.5.1)',\ - org.osgi.service.typedevent;version='[1.0.0,1.0.1)',\ - org.osgi.test.common;version='[1.2.1,1.2.2)',\ - org.osgi.test.junit5;version='[1.2.1,1.2.2)',\ - org.osgi.test.junit5.cm;version='[1.2.1,1.2.2)',\ - org.osgi.util.converter;version='[1.0.9,1.0.10)',\ - org.osgi.util.function;version='[1.1.0,1.1.1)',\ - org.osgi.util.promise;version='[1.3.0,1.3.1)',\ - org.osgi.util.pushstream;version='[1.0.2,1.0.3)',\ - org.postgresql.jdbc;version='[42.5.1,42.5.2)',\ - slf4j.api;version='[1.7.36,1.7.37)',\ - slf4j.simple;version='[1.7.36,1.7.37)',\ - tx-control-provider-jdbc-local;version='[1.0.1,1.0.2)',\ - tx-control-service-local;version='[1.0.1,1.0.2)' - org.gecko.emf.osgi.api;version='[4.6.0,4.6.1)',\ - org.gecko.emf.osgi.component;version='[4.6.0,4.6.1)',\ -======= - org.gecko.emf.osgi.component;version='[5.0.0,5.0.1)',\ ->>>>>>> branch 'model_push' of git@github.com:eclipse/org.eclipse.sensinact.gateway.git org.mockito.junit-jupiter;version='[4.7.0,4.7.1)',\ org.mockito.mockito-core;version='[4.7.0,4.7.1)',\ org.objenesis;version='[3.2.0,3.2.1)',\ diff --git a/southbound/history/timescale-provider/tests.bnd b/southbound/history/timescale-provider/tests.bnd index 8b2677f9d..8970c72ad 100644 --- a/southbound/history/timescale-provider/tests.bnd +++ b/southbound/history/timescale-provider/tests.bnd @@ -1,19 +1,21 @@ -includeresource: \ - @postgresql-1.17.6.jar, \ - @jdbc-1.17.6.jar, \ - @database-commons-1.17.6.jar, \ - @testcontainers-1.17.6.jar, \ - @docker-java-api-3.2.13.jar, \ - @docker-java-transport-zerodep-3.2.13.jar, \ - @docker-java-transport-3.2.13.jar,\ + @postgresql-1.19.1.jar, \ + @jdbc-1.19.1.jar, \ + @database-commons-1.19.1.jar, \ + @testcontainers-1.19.1.jar, \ + @docker-java-api-3.3.3.jar, \ + @docker-java-transport-zerodep-3.3.3.jar, \ + @docker-java-transport-3.3.3.jar,\ @duct-tape-1.0.8.jar Import-Package: \ + !android.os.*,\ !com.github.dockerjava.zerodep.*,\ !com.google.appengine.*,\ !com.google.apphosting.*,\ + !com.google.cloud.*,\ !io.r2dbc.*,\ - !javax.annotation, \ + !javax.annotation.*, \ !org.conscrypt, \ !org.testcontainers.r2dbc.*, \ *