Skip to content

Commit

Permalink
Fixed timescale-provider project configuration
Browse files Browse the repository at this point in the history
  • Loading branch information
tcalmant authored and timothyjward committed Jan 11, 2024
1 parent c725383 commit 910327e
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 33 deletions.
27 changes: 2 additions & 25 deletions southbound/history/timescale-provider/integration-test.bndrun
Original file line number Diff line number Diff line change
Expand Up @@ -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)',\
Expand All @@ -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)',\
Expand All @@ -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)',\
Expand Down
18 changes: 10 additions & 8 deletions southbound/history/timescale-provider/tests.bnd
Original file line number Diff line number Diff line change
@@ -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.*, \
*

0 comments on commit 910327e

Please sign in to comment.