diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e5d50a84d5f4f3daacf4d3d6a8f8164211769f45..1ff3d25850e2308251ee322a12065fd253a89a45 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -663,4 +663,4 @@ release-version: script: - cp .env.unix.example .env - docker login -p "${DOCKER_PASSWORD}" -u "${DOCKER_USERNAME}" - - TAG=1.2 make release + - TAG=1.3 make release diff --git a/dbrepo-analyse-service/app.py b/dbrepo-analyse-service/app.py index 2f4601669a25dff818eb0d4f1bbed1504c69784d..9fdf40ed41ecbb98e99069d607bc5797e9aaa9cb 100644 --- a/dbrepo-analyse-service/app.py +++ b/dbrepo-analyse-service/app.py @@ -32,7 +32,7 @@ dictConfig({ app = Flask(__name__) metrics = PrometheusMetrics(app) -metrics.info('app_info', 'Application info', version='1.2.0') +metrics.info('app_info', 'Application info', version='1.3.0') app.config["SWAGGER"] = {"openapi": "3.0.1", "title": "Swagger UI", "uiversion": 3} swagger_config = { @@ -61,7 +61,7 @@ template = { "info": { "title": "Database Repository Analyse Service API", "description": "Service that analyses data structures", - "version": "1.2.0", + "version": "1.3.0", "contact": { "name": "Prof. Andreas Rauber", "email": "andreas.rauber@tuwien.ac.at" diff --git a/dbrepo-container-service/pom.xml b/dbrepo-container-service/pom.xml index af6a4ebfd8ae611ab48bb19839fd59f593100ae8..c17167494db72c163d1304779485e5cf338e92f0 100644 --- a/dbrepo-container-service/pom.xml +++ b/dbrepo-container-service/pom.xml @@ -10,7 +10,7 @@ <groupId>at.tuwien</groupId> <artifactId>dbrepo-container-service</artifactId> - <version>1.2.0</version> + <version>1.3.0</version> <name>dbrepo-container-service</name> <description>Service that manages the containers</description> diff --git a/dbrepo-container-service/report/pom.xml b/dbrepo-container-service/report/pom.xml index a3d0645d2e1564d1449e547e10bb0d423944da5d..d65ecb0a3ffa4a65269a30d190b133c3a35c486d 100644 --- a/dbrepo-container-service/report/pom.xml +++ b/dbrepo-container-service/report/pom.xml @@ -6,11 +6,11 @@ <parent> <groupId>at.tuwien</groupId> <artifactId>dbrepo-container-service</artifactId> - <version>1.2.0</version> + <version>1.3.0</version> </parent> <artifactId>report</artifactId> - <version>1.2.0</version> + <version>1.3.0</version> <name>dbrepo-container-service-report</name> <description> This module is only intended for the pipeline coverage report. See the detailed report in the diff --git a/dbrepo-container-service/rest-service/pom.xml b/dbrepo-container-service/rest-service/pom.xml index 6b8f4db7bfe77cb6b24631dab152c1eefcd4fdf7..f64c4da5dcff45774a247541d7e20570b5cf040c 100644 --- a/dbrepo-container-service/rest-service/pom.xml +++ b/dbrepo-container-service/rest-service/pom.xml @@ -6,11 +6,11 @@ <parent> <groupId>at.tuwien</groupId> <artifactId>dbrepo-container-service</artifactId> - <version>1.2.0</version> + <version>1.3.0</version> </parent> <artifactId>rest-service</artifactId> - <version>1.2.0</version> + <version>1.3.0</version> <name>dbrepo-container-service-rest-service</name> <properties> diff --git a/dbrepo-container-service/services/pom.xml b/dbrepo-container-service/services/pom.xml index e9aa0a94247aa3fe72a999e95a0c5fe882d9e306..53655363998cecea5a53234fc8ffe47e01e4836c 100644 --- a/dbrepo-container-service/services/pom.xml +++ b/dbrepo-container-service/services/pom.xml @@ -6,11 +6,11 @@ <parent> <artifactId>dbrepo-container-service</artifactId> <groupId>at.tuwien</groupId> - <version>1.2.0</version> + <version>1.3.0</version> </parent> <artifactId>services</artifactId> - <version>1.2.0</version> + <version>1.3.0</version> <name>dbrepo-container-service-services</name> <build> diff --git a/dbrepo-database-service/pom.xml b/dbrepo-database-service/pom.xml index 3d3fbd8fce3388dee50debfc501c3bc3b82ef177..d694d035a95e4122a827f9a099729427a7acffd5 100644 --- a/dbrepo-database-service/pom.xml +++ b/dbrepo-database-service/pom.xml @@ -10,7 +10,7 @@ <groupId>at.tuwien</groupId> <artifactId>dbrepo-database-service</artifactId> - <version>1.2.0</version> + <version>1.3.0</version> <name>dbrepo-database-service</name> <description>Service that manages the databases</description> diff --git a/dbrepo-database-service/report/pom.xml b/dbrepo-database-service/report/pom.xml index dcdbc726d195a15425608a1aa7271608fb6597c6..f6090d5b73651ea0af5aa46aa3c3d7a0821d72d4 100644 --- a/dbrepo-database-service/report/pom.xml +++ b/dbrepo-database-service/report/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>at.tuwien</groupId> <artifactId>dbrepo-database-service</artifactId> - <version>1.2.0</version> + <version>1.3.0</version> </parent> <artifactId>report</artifactId> diff --git a/dbrepo-database-service/rest-service/pom.xml b/dbrepo-database-service/rest-service/pom.xml index 5af62c37cfa1bbd41d52d2ebb21c881b14a82faa..e6b1ca623e2dc297dd15b5ad319c4a8d91a355ec 100644 --- a/dbrepo-database-service/rest-service/pom.xml +++ b/dbrepo-database-service/rest-service/pom.xml @@ -6,11 +6,11 @@ <parent> <artifactId>dbrepo-database-service</artifactId> <groupId>at.tuwien</groupId> - <version>1.2.0</version> + <version>1.3.0</version> </parent> <artifactId>rest-service</artifactId> - <version>1.2.0</version> + <version>1.3.0</version> <name>dbrepo-database-service-rest-service</name> <properties> diff --git a/dbrepo-database-service/services/pom.xml b/dbrepo-database-service/services/pom.xml index db437866d6ba9ac22d179e86cdc114a5f8072f5c..00258baa4fc5574bc719764c7361b566418cdb2a 100644 --- a/dbrepo-database-service/services/pom.xml +++ b/dbrepo-database-service/services/pom.xml @@ -6,11 +6,11 @@ <parent> <artifactId>dbrepo-database-service</artifactId> <groupId>at.tuwien</groupId> - <version>1.2.0</version> + <version>1.3.0</version> </parent> <artifactId>services</artifactId> - <version>1.2.0</version> + <version>1.3.0</version> <name>dbrepo-database-service-services</name> </project> \ No newline at end of file diff --git a/dbrepo-identifier-service/api/pom.xml b/dbrepo-identifier-service/api/pom.xml index eaf60df4a5337cd2079c2f2bb155fda95d11b0a8..01a432603d1497cb95ad8983bce9d8fc74bf6a0a 100644 --- a/dbrepo-identifier-service/api/pom.xml +++ b/dbrepo-identifier-service/api/pom.xml @@ -6,7 +6,7 @@ <parent> <artifactId>dbrepo-identifier-service</artifactId> <groupId>at.tuwien</groupId> - <version>1.2.0</version> + <version>1.3.0</version> </parent> <artifactId>api</artifactId> diff --git a/dbrepo-identifier-service/pom.xml b/dbrepo-identifier-service/pom.xml index cb8d587faa108c1b6bb45cf95f0fd69097ccebd8..07fe813de20df93f19cc15894d164db2c717507d 100644 --- a/dbrepo-identifier-service/pom.xml +++ b/dbrepo-identifier-service/pom.xml @@ -10,7 +10,7 @@ <groupId>at.tuwien</groupId> <artifactId>dbrepo-identifier-service</artifactId> - <version>1.2.0</version> + <version>1.3.0</version> <name>dbrepo-identifier-service</name> <description>Service that manages the identifiers</description> diff --git a/dbrepo-identifier-service/report/pom.xml b/dbrepo-identifier-service/report/pom.xml index 64e24ab39f048d10fc060e841fb7b8dbe6c74daa..3fafe6f6041986c3070809c66c3d80db51576a0d 100644 --- a/dbrepo-identifier-service/report/pom.xml +++ b/dbrepo-identifier-service/report/pom.xml @@ -6,7 +6,7 @@ <parent> <artifactId>dbrepo-identifier-service</artifactId> <groupId>at.tuwien</groupId> - <version>1.2.0</version> + <version>1.3.0</version> </parent> <artifactId>report</artifactId> diff --git a/dbrepo-identifier-service/rest-service/pom.xml b/dbrepo-identifier-service/rest-service/pom.xml index b89e9ddd04152eb87ef7a578dce76ee639e0ae33..89ed56a1ca9110f0a67e184aa756acb88391d438 100644 --- a/dbrepo-identifier-service/rest-service/pom.xml +++ b/dbrepo-identifier-service/rest-service/pom.xml @@ -6,11 +6,11 @@ <parent> <artifactId>dbrepo-identifier-service</artifactId> <groupId>at.tuwien</groupId> - <version>1.2.0</version> + <version>1.3.0</version> </parent> <artifactId>rest-service</artifactId> - <version>1.2.0</version> + <version>1.3.0</version> <name>dbrepo-identifier-service-rest</name> <dependencies> diff --git a/dbrepo-identifier-service/services/pom.xml b/dbrepo-identifier-service/services/pom.xml index 49d0779ee23409e3fab477b6ef2981eeec1b13b7..d1eae1c8a06679bc1a45418de81a7c2344621a8e 100644 --- a/dbrepo-identifier-service/services/pom.xml +++ b/dbrepo-identifier-service/services/pom.xml @@ -7,18 +7,18 @@ <dependency> <groupId>at.tuwien</groupId> <artifactId>api</artifactId> - <version>1.2.0</version> + <version>1.3.0</version> <scope>compile</scope> </dependency> </dependencies> <parent> <artifactId>dbrepo-identifier-service</artifactId> <groupId>at.tuwien</groupId> - <version>1.2.0</version> + <version>1.3.0</version> </parent> <artifactId>services</artifactId> - <version>1.2.0</version> + <version>1.3.0</version> <name>dbrepo-identifier-service-services</name> <build> diff --git a/dbrepo-metadata-db/api/pom.xml b/dbrepo-metadata-db/api/pom.xml index 62b1552f746369c85423d0427ae1af6bfd03f67c..778642d6576efccb5160ca3ce4e117c05cbd4214 100644 --- a/dbrepo-metadata-db/api/pom.xml +++ b/dbrepo-metadata-db/api/pom.xml @@ -6,11 +6,11 @@ <parent> <groupId>at.tuwien</groupId> <artifactId>dbrepo-metadata-db</artifactId> - <version>1.2.0</version> + <version>1.3.0</version> </parent> <artifactId>dbrepo-metadata-db-api</artifactId> - <version>1.2.0</version> + <version>1.3.0</version> <name>dbrepo-metadata-db-api</name> <dependencies/> diff --git a/dbrepo-metadata-db/entities/pom.xml b/dbrepo-metadata-db/entities/pom.xml index 4b9abe2a8b9f6f76bd1405ce9d38707e40a9dfbb..4be01963321c88ffc3c4d003052d72d537d74073 100644 --- a/dbrepo-metadata-db/entities/pom.xml +++ b/dbrepo-metadata-db/entities/pom.xml @@ -6,11 +6,11 @@ <parent> <groupId>at.tuwien</groupId> <artifactId>dbrepo-metadata-db</artifactId> - <version>1.2.0</version> + <version>1.3.0</version> </parent> <artifactId>dbrepo-metadata-db-entites</artifactId> - <version>1.2.0</version> + <version>1.3.0</version> <name>dbrepo-metadata-db-entity</name> <dependencies/> diff --git a/dbrepo-metadata-db/oai/pom.xml b/dbrepo-metadata-db/oai/pom.xml index 9ecf40bc6fef5a523110bda2bb73b16d7883509b..7b376d445ddf95f5979b61206eece81e0a6c9c6c 100644 --- a/dbrepo-metadata-db/oai/pom.xml +++ b/dbrepo-metadata-db/oai/pom.xml @@ -6,11 +6,11 @@ <parent> <groupId>at.tuwien</groupId> <artifactId>dbrepo-metadata-db</artifactId> - <version>1.2.0</version> + <version>1.3.0</version> </parent> <artifactId>dbrepo-metadata-db-oai</artifactId> - <version>1.2.0</version> + <version>1.3.0</version> <name>dbrepo-metadata-db-oai</name> <dependencies/> diff --git a/dbrepo-metadata-db/pom.xml b/dbrepo-metadata-db/pom.xml index 6d3b7f77747b6fd5c02275fd9892ff8cb71fb4c1..cccf8f2178cd6466e0b04f757816004303a4c40a 100644 --- a/dbrepo-metadata-db/pom.xml +++ b/dbrepo-metadata-db/pom.xml @@ -10,7 +10,7 @@ <groupId>at.tuwien</groupId> <artifactId>dbrepo-metadata-db</artifactId> - <version>1.2.0</version> + <version>1.3.0</version> <name>dbrepo-metadata-db</name> <description>Demo project for Spring Boot</description> diff --git a/dbrepo-metadata-db/querystore/pom.xml b/dbrepo-metadata-db/querystore/pom.xml index 37ae21126fe1b49b7545bed69010fd65bab39752..a65774524737eabc7500f304c246b8c28c5783b1 100644 --- a/dbrepo-metadata-db/querystore/pom.xml +++ b/dbrepo-metadata-db/querystore/pom.xml @@ -6,18 +6,18 @@ <parent> <groupId>at.tuwien</groupId> <artifactId>dbrepo-metadata-db</artifactId> - <version>1.2.0</version> + <version>1.3.0</version> </parent> <artifactId>dbrepo-metadata-db-querystore</artifactId> - <version>1.2.0</version> + <version>1.3.0</version> <name>dbrepo-metadata-db-querystore</name> <dependencies> <dependency> <groupId>at.tuwien</groupId> <artifactId>dbrepo-metadata-db-api</artifactId> - <version>1.2.0</version> + <version>1.3.0</version> <scope>compile</scope> </dependency> </dependencies> diff --git a/dbrepo-metadata-db/test/pom.xml b/dbrepo-metadata-db/test/pom.xml index 3865218a9dbac2e0ab3374b928a1a4326d9b70b0..86e3a3e778d2a6d0343211ca16c35c3fe31f0f79 100644 --- a/dbrepo-metadata-db/test/pom.xml +++ b/dbrepo-metadata-db/test/pom.xml @@ -6,11 +6,11 @@ <parent> <groupId>at.tuwien</groupId> <artifactId>dbrepo-metadata-db</artifactId> - <version>1.2.0</version> + <version>1.3.0</version> </parent> <artifactId>dbrepo-metadata-db-test</artifactId> - <version>1.2.0</version> + <version>1.3.0</version> <name>dbrepo-metadata-db-test</name> <dependencies> diff --git a/dbrepo-metadata-service/pom.xml b/dbrepo-metadata-service/pom.xml index e6acaea7329e7a9cc7f4e5606461b8faef53aa7a..261784bc3f666e7ab4a831ce26edbd99a6baf06b 100644 --- a/dbrepo-metadata-service/pom.xml +++ b/dbrepo-metadata-service/pom.xml @@ -10,7 +10,7 @@ <groupId>at.tuwien</groupId> <artifactId>dbrepo-metadata-service</artifactId> - <version>1.2.0</version> + <version>1.3.0</version> <name>dbrepo-metadata-service</name> <description>Service that manages the metadata</description> diff --git a/dbrepo-metadata-service/report/pom.xml b/dbrepo-metadata-service/report/pom.xml index a77c1599398e3795f4ecc0a0d3f554287767d010..49cb9b5a7ca985f86565de91e58fc9b98193daf7 100644 --- a/dbrepo-metadata-service/report/pom.xml +++ b/dbrepo-metadata-service/report/pom.xml @@ -6,7 +6,7 @@ <parent> <artifactId>dbrepo-metadata-service</artifactId> <groupId>at.tuwien</groupId> - <version>1.2.0</version> + <version>1.3.0</version> </parent> <artifactId>report</artifactId> diff --git a/dbrepo-metadata-service/rest-service/pom.xml b/dbrepo-metadata-service/rest-service/pom.xml index 050c5ca7d7b172f8ae73b7d2968c6e896d8f7f49..6f20602af8937cfa31188f8c63828567ca87bfac 100644 --- a/dbrepo-metadata-service/rest-service/pom.xml +++ b/dbrepo-metadata-service/rest-service/pom.xml @@ -6,11 +6,11 @@ <parent> <artifactId>dbrepo-metadata-service</artifactId> <groupId>at.tuwien</groupId> - <version>1.2.0</version> + <version>1.3.0</version> </parent> <artifactId>rest-service</artifactId> - <version>1.2.0</version> + <version>1.3.0</version> <name>dbrepo-metadata-service-rest</name> <dependencies> diff --git a/dbrepo-metadata-service/services/pom.xml b/dbrepo-metadata-service/services/pom.xml index d112379f5c9ad5bb9673d050dac61646262d86cb..47ffbca20359ffd188390ec4781463b969df0048 100644 --- a/dbrepo-metadata-service/services/pom.xml +++ b/dbrepo-metadata-service/services/pom.xml @@ -6,11 +6,11 @@ <parent> <artifactId>dbrepo-metadata-service</artifactId> <groupId>at.tuwien</groupId> - <version>1.2.0</version> + <version>1.3.0</version> </parent> <artifactId>services</artifactId> - <version>1.2.0</version> + <version>1.3.0</version> <name>dbrepo-metadata-service-services</name> <dependencies /> diff --git a/dbrepo-query-service/api/pom.xml b/dbrepo-query-service/api/pom.xml index a4c9dc32f9819c0b64ab11ca0d0c4f701326889c..b6ceecccd5e2262c920fa5b587b6214d9dde1522 100644 --- a/dbrepo-query-service/api/pom.xml +++ b/dbrepo-query-service/api/pom.xml @@ -6,7 +6,7 @@ <parent> <artifactId>dbrepo-query-service</artifactId> <groupId>at.tuwien</groupId> - <version>1.2.0</version> + <version>1.3.0</version> </parent> <artifactId>api</artifactId> diff --git a/dbrepo-query-service/pom.xml b/dbrepo-query-service/pom.xml index 8decc97e39f11bd4a30f4e9f2638522f9b0f2c47..095adfeb17d64c98ef2f078fa41c0c3973cf5e19 100644 --- a/dbrepo-query-service/pom.xml +++ b/dbrepo-query-service/pom.xml @@ -10,7 +10,7 @@ <groupId>at.tuwien</groupId> <artifactId>dbrepo-query-service</artifactId> - <version>1.2.0</version> + <version>1.3.0</version> <name>dbrepo-query-service</name> <description> The query service provides an interface to insert data into the tables created by the table service. It diff --git a/dbrepo-query-service/report/pom.xml b/dbrepo-query-service/report/pom.xml index 50a488e8c7f8ede488a405ade55c995d482da490..f4ffdae5cffeac96924b4309061725c106fec4b8 100644 --- a/dbrepo-query-service/report/pom.xml +++ b/dbrepo-query-service/report/pom.xml @@ -6,11 +6,11 @@ <parent> <artifactId>dbrepo-query-service</artifactId> <groupId>at.tuwien</groupId> - <version>1.2.0</version> + <version>1.3.0</version> </parent> <artifactId>report</artifactId> - <version>1.2.0</version> + <version>1.3.0</version> <name>dbrepo-query-service-report</name> <description> This module is only intended for the pipeline coverage report. See the detailed report in the diff --git a/dbrepo-query-service/rest-service/pom.xml b/dbrepo-query-service/rest-service/pom.xml index 9982045b839e457cc6110a566a74d4324218781b..a1ac4541b8f35812385018b0557bedc5bb33247c 100644 --- a/dbrepo-query-service/rest-service/pom.xml +++ b/dbrepo-query-service/rest-service/pom.xml @@ -6,11 +6,11 @@ <parent> <artifactId>dbrepo-query-service</artifactId> <groupId>at.tuwien</groupId> - <version>1.2.0</version> + <version>1.3.0</version> </parent> <artifactId>rest-service</artifactId> - <version>1.2.0</version> + <version>1.3.0</version> <name>dbrepo-query-service-rest</name> <dependencies> diff --git a/dbrepo-query-service/rest-service/src/test/java/at/tuwien/repository/ViewIdxRepositoryIntegrationTest.java b/dbrepo-query-service/rest-service/src/test/java/at/tuwien/repository/ViewIdxRepositoryIntegrationTest.java index 292a52bdc72cf19190ea43133f6be46dd29d555d..647886a82434d0176e77399905ae3173f8565c80 100644 --- a/dbrepo-query-service/rest-service/src/test/java/at/tuwien/repository/ViewIdxRepositoryIntegrationTest.java +++ b/dbrepo-query-service/rest-service/src/test/java/at/tuwien/repository/ViewIdxRepositoryIntegrationTest.java @@ -7,12 +7,10 @@ import at.tuwien.config.ReadyConfig; import at.tuwien.entities.database.View; import at.tuwien.exception.*; import at.tuwien.gateway.BrokerServiceGateway; -import at.tuwien.listener.MessageQueueListener; import at.tuwien.listener.impl.RabbitMqListenerImpl; import at.tuwien.repository.elastic.ViewIdxRepository; import at.tuwien.repository.jpa.*; import at.tuwien.service.ViewService; -import at.tuwien.test.BaseTest; import com.rabbitmq.client.Channel; import at.tuwien.config.DockerConfig; import lombok.extern.log4j.Log4j2; diff --git a/dbrepo-query-service/services/pom.xml b/dbrepo-query-service/services/pom.xml index 09f0b1b954ba6912c64d9490735d1de943b81a5d..5e543b828a02d5e083752547a91632838ae1f167 100644 --- a/dbrepo-query-service/services/pom.xml +++ b/dbrepo-query-service/services/pom.xml @@ -6,18 +6,18 @@ <parent> <artifactId>dbrepo-query-service</artifactId> <groupId>at.tuwien</groupId> - <version>1.2.0</version> + <version>1.3.0</version> </parent> <artifactId>services</artifactId> - <version>1.2.0</version> + <version>1.3.0</version> <name>dbrepo-query-service-services</name> <dependencies> <dependency> <groupId>at.tuwien</groupId> <artifactId>api</artifactId> - <version>1.2.0</version> + <version>1.3.0</version> </dependency> </dependencies> diff --git a/dbrepo-semantics-service/pom.xml b/dbrepo-semantics-service/pom.xml index aeb1451ea6f218c90236479793cf9a96cd8e3193..3eed3ff468a3e1d41e2444bc07b74db768f4c8d1 100644 --- a/dbrepo-semantics-service/pom.xml +++ b/dbrepo-semantics-service/pom.xml @@ -10,7 +10,7 @@ <groupId>at.tuwien</groupId> <artifactId>dbrepo-semantics-service</artifactId> - <version>1.2.0</version> + <version>1.3.0</version> <name>dbrepo-semantics-service</name> <description>Service that manages the tables</description> diff --git a/dbrepo-semantics-service/report/pom.xml b/dbrepo-semantics-service/report/pom.xml index b55b44b7a2fc3fe0bc11fdcdb531b90c028c0415..d8ee5dded0ab744a1c12ea86d7e549cda654d89c 100644 --- a/dbrepo-semantics-service/report/pom.xml +++ b/dbrepo-semantics-service/report/pom.xml @@ -6,11 +6,11 @@ <parent> <groupId>at.tuwien</groupId> <artifactId>dbrepo-semantics-service</artifactId> - <version>1.2.0</version> + <version>1.3.0</version> </parent> <artifactId>report</artifactId> - <version>1.2.0</version> + <version>1.3.0</version> <name>dbrepo-semantics-service-report</name> <description> This module is only intended for the pipeline coverage report. See the detailed report in the diff --git a/dbrepo-semantics-service/rest-service/pom.xml b/dbrepo-semantics-service/rest-service/pom.xml index 9891e5ae43720227fd1948d299515eed74d4527f..b2ca890c1faa5e04191bbeb49f9faf97feb973a3 100644 --- a/dbrepo-semantics-service/rest-service/pom.xml +++ b/dbrepo-semantics-service/rest-service/pom.xml @@ -6,11 +6,11 @@ <parent> <groupId>at.tuwien</groupId> <artifactId>dbrepo-semantics-service</artifactId> - <version>1.2.0</version> + <version>1.3.0</version> </parent> <artifactId>rest-service</artifactId> - <version>1.2.0</version> + <version>1.3.0</version> <name>dbrepo-semantics-service-rest-service</name> <properties> diff --git a/dbrepo-semantics-service/services/pom.xml b/dbrepo-semantics-service/services/pom.xml index 48080b7e8864638e30805ead13f673ef884c44b4..b1ee2e0ce76f472221cf2c97e9fec25665d9768f 100644 --- a/dbrepo-semantics-service/services/pom.xml +++ b/dbrepo-semantics-service/services/pom.xml @@ -6,11 +6,11 @@ <parent> <artifactId>dbrepo-semantics-service</artifactId> <groupId>at.tuwien</groupId> - <version>1.2.0</version> + <version>1.3.0</version> </parent> <artifactId>services</artifactId> - <version>1.2.0</version> + <version>1.3.0</version> <name>dbrepo-semantics-service-services</name> <build> diff --git a/dbrepo-table-service/pom.xml b/dbrepo-table-service/pom.xml index 7f444e593faf1d45b31bd5b3037f6bd156f09f68..a044da6517ab1c9faa02e61d019ab66831c47709 100644 --- a/dbrepo-table-service/pom.xml +++ b/dbrepo-table-service/pom.xml @@ -10,7 +10,7 @@ <groupId>at.tuwien</groupId> <artifactId>dbrepo-table-service</artifactId> - <version>1.2.0</version> + <version>1.3.0</version> <name>dbrepo-table-service</name> <description>Service that manages the tables</description> diff --git a/dbrepo-table-service/report/pom.xml b/dbrepo-table-service/report/pom.xml index 8c2d1db5eae41755b2937509b54218e2d0afdf8c..91abe5c9ed29e4ddf21ab5046e4feb47ecaba6f5 100644 --- a/dbrepo-table-service/report/pom.xml +++ b/dbrepo-table-service/report/pom.xml @@ -6,11 +6,11 @@ <parent> <groupId>at.tuwien</groupId> <artifactId>dbrepo-table-service</artifactId> - <version>1.2.0</version> + <version>1.3.0</version> </parent> <artifactId>report</artifactId> - <version>1.2.0</version> + <version>1.3.0</version> <name>dbrepo-table-service-report</name> <description> This module is only intended for the pipeline coverage report. See the detailed report in the diff --git a/dbrepo-table-service/rest-service/pom.xml b/dbrepo-table-service/rest-service/pom.xml index a1de368fd29b00d2c46a24a8782e3230fb7ca138..9476a5da67e8244136b6501909cd256557228b0c 100644 --- a/dbrepo-table-service/rest-service/pom.xml +++ b/dbrepo-table-service/rest-service/pom.xml @@ -6,11 +6,11 @@ <parent> <groupId>at.tuwien</groupId> <artifactId>dbrepo-table-service</artifactId> - <version>1.2.0</version> + <version>1.3.0</version> </parent> <artifactId>rest-service</artifactId> - <version>1.2.0</version> + <version>1.3.0</version> <name>dbrepo-table-service-rest-service</name> <properties> diff --git a/dbrepo-table-service/services/pom.xml b/dbrepo-table-service/services/pom.xml index 0b937f235d8771979dafb9abd4c8090f52d61ac2..05c0764c19c40d88cd04e7cab60234893dea8b5e 100644 --- a/dbrepo-table-service/services/pom.xml +++ b/dbrepo-table-service/services/pom.xml @@ -6,11 +6,11 @@ <parent> <artifactId>dbrepo-table-service</artifactId> <groupId>at.tuwien</groupId> - <version>1.2.0</version> + <version>1.3.0</version> </parent> <artifactId>services</artifactId> - <version>1.2.0</version> + <version>1.3.0</version> <name>dbrepo-table-service-services</name> <build> diff --git a/dbrepo-ui/.env.example b/dbrepo-ui/.env.example index c6d247fe1847baa4328456c02f75578325fbb24e..5f4813522109d92e9cd5e74e265bca3ef15d40e4 100644 --- a/dbrepo-ui/.env.example +++ b/dbrepo-ui/.env.example @@ -9,7 +9,6 @@ ELASTIC_USERNAME="elastic" ELASTIC_PASSWORD="elastic" LOGO="/logo.png" SEARCH="http://localhost:3001/retrieve" -SANDBOX=false SHARED_FILESYSTEM="/tmp" TITLE="Database Repository" VERSION="latest" diff --git a/dbrepo-ui/Dockerfile b/dbrepo-ui/Dockerfile index ecc3d12c3acc403751201d32d6daee1040123cb7..dd9376661c93c19faff1345d745cefab57173097 100644 --- a/dbrepo-ui/Dockerfile +++ b/dbrepo-ui/Dockerfile @@ -46,7 +46,6 @@ EXPOSE 9100 ENV BROKER_USERNAME="fda" ENV BROKER_PASSWORD="fda" -ENV SANDBOX=false ENV SEARCH="http://search-db:9200" ENV SHARED_FILESYSTEM="/tmp" ENV LOGO="/logo.png" diff --git a/dbrepo-ui/config.js b/dbrepo-ui/config.js index b7ad7a38e54e96150c74353410fe787adfa46fe6..b52f1451678aeb73c662a57ebd1009d627ce7b5c 100644 --- a/dbrepo-ui/config.js +++ b/dbrepo-ui/config.js @@ -3,7 +3,6 @@ const config = {} config.api = process.env.API || 'http://localhost' config.baseUrl = process.env.BASE_URL || 'http://localhost' config.search = process.env.SEARCH || 'http://localhost/retrieve' -config.sandbox = process.env.SANDBOX || false config.title = process.env.TITLE || 'Database Repository' config.icon = process.env.ICON || '/favicon.ico' config.brokerUsername = process.env.BROKER_USERNAME || 'fda' @@ -16,7 +15,7 @@ config.tokenMax = process.env.TOKEN_MAX || 5 config.elasticPassword = process.env.ELASTIC_PASSWORD || 'elastic' config.clientId = process.env.DBREPO_CLIENT_ID || 'dbrepo-client' config.clientSecret = process.env.DBREPO_CLIENT_SECRET || 'MUwRc7yfXSJwX8AdRMWaQC3Nep1VjwgG' -config.defaultPublisher = process.env.DEFAULT_PID_PUBLISHER || 'Technische Universität Wien' +config.defaultPublisher = process.env.DEFAULT_PID_PUBLISHER || 'Example University' config.doiUrl = process.env.DOI_URL || 'https://doi.org' config.gitHash = process.env.GIT_HASH || 'deadbeef' diff --git a/dbrepo-ui/layouts/default.vue b/dbrepo-ui/layouts/default.vue index 44edd4a29c34e41e304c0c5f0c319222ddac6b68..3b7022d06f6caf05a5e2265aaee50edc65587379 100644 --- a/dbrepo-ui/layouts/default.vue +++ b/dbrepo-ui/layouts/default.vue @@ -192,14 +192,6 @@ export default { } return this.roles.includes('list-ontologies') }, - sandbox () { - if (this.$config.sandbox === undefined) { - console.debug('env sandbox not found, default to', false) - return false - } - console.debug('env sandbox found', this.$config.sandbox) - return this.$config.sandbox - }, logo () { return this.$config.logo } diff --git a/dbrepo-ui/nuxt.config.js b/dbrepo-ui/nuxt.config.js index 77cc36bb2a9ed4a7dbc5dfb7548882452034e9cb..042164ae9553a851379b410cedcb69691c846d1e 100644 --- a/dbrepo-ui/nuxt.config.js +++ b/dbrepo-ui/nuxt.config.js @@ -1,6 +1,6 @@ import path from 'path' import colors from 'vuetify/es5/util/colors' -import { api, icon, search, clientSecret, title, sandbox, logo, version, defaultPublisher, doiUrl, baseUrl, gitHash, clientId } from './config' +import { api, icon, search, clientSecret, title, logo, version, defaultPublisher, doiUrl, baseUrl, gitHash, clientId } from './config' const proxy = {} @@ -88,7 +88,6 @@ export default { proxy, publicRuntimeConfig: { - sandbox, version, logo, clientId, diff --git a/dbrepo-ui/pages/index.vue b/dbrepo-ui/pages/index.vue index d372b82f294da97240e8f2a8a25c198adc55146d..4dab1948f0b93aa9d4c4a0761cfff3b58a6a2d0d 100644 --- a/dbrepo-ui/pages/index.vue +++ b/dbrepo-ui/pages/index.vue @@ -6,7 +6,7 @@ <div class="text--primary"> <ul> <li> - <a href="https://dbrepo-docs.ossdip.at/" target="_blank">Online Documentation</a> + <a href="https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/" target="_blank">Online Documentation</a> </li> <li> <a href="https://doi.org/10.2218/ijdc.v17i1.825" target="_blank">System Description</a> @@ -34,13 +34,29 @@ </v-card-actions> </v-card> <v-card class="mt-4" flat tile> + <v-card-text> + <div>Release Notes</div> + <p class="text-h4 text--primary"> + 1.3 + </p> + <p> + <a href="">Detailed + Changelog</a> + </p> + <div class="text--primary"> + This release fixes bugs related to versioning, increases tasks for developers and data stewards. It enables + organizations to federate identities with thei own OAuth2 identitiy provider with Keycloak. + </div> + </v-card-text> + <v-divider class="mx-4"/> <v-card-text> <div>Release Notes</div> <p class="text-h4 text--primary"> 1.2 </p> <p> - <a href="https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/blob/master/CHANGELOG.md">Detailed + <a + href="https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/blob/ac45842d27fcce47a99683330dc8ea1b8321c3be/CHANGELOG.md">Detailed Changelog</a> </p> <div class="text--primary"> @@ -48,14 +64,15 @@ model for giving users access to databases, improved the query store handling. </div> </v-card-text> - <v-divider class="mx-4" /> + <v-divider class="mx-4"/> <v-card-text> <div>Release Notes</div> <p class="text-h4 text--primary"> 1.1 </p> <p> - <a href="https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/blob/master/CHANGELOG.md">Detailed + <a + href="https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/blob/70b4d1e6398934d88e0080cb89f8cf87c68bf6eb/CHANGELOG">Detailed Changelog</a> </p> <div class="text--primary"> diff --git a/dbrepo-ui/pages/signup.vue b/dbrepo-ui/pages/signup.vue index 469907ca6a276796460295e3ec5dcf06ceefd0ac..6cfd8b1eb6605813a343f415af015c840887aeeb 100644 --- a/dbrepo-ui/pages/signup.vue +++ b/dbrepo-ui/pages/signup.vue @@ -66,26 +66,6 @@ label="Repeat Password *" /> </v-col> </v-row> - <v-row v-if="sandbox" dense> - <v-col sm="6"> - <v-checkbox - v-model="consent" - required - name="consent" - :rules="[v => !!v || $t('Required')]" - label="I understand the warning and do not use production data" /> - </v-col> - </v-row> - <v-row v-if="sandbox" dense> - <v-col sm="6"> - <v-checkbox - v-model="privacy" - required - name="privacy" - :rules="[v => !!v || $t('Required')]" - label="I have read and accept the privacy statement" /> - </v-col> - </v-row> </v-card-text> <v-card-text> <v-btn @@ -128,9 +108,6 @@ export default { loadingColor () { return this.error ? 'red lighten-2' : 'primary' }, - sandbox () { - return this.$config.sandbox - }, mailVerify () { return this.$config.mailVerify } diff --git a/dbrepo-ui/static/covfefe.gif b/dbrepo-ui/static/covfefe.gif deleted file mode 100644 index bd9df63a8c023d791e774b45812dcb2db1c64617..0000000000000000000000000000000000000000 Binary files a/dbrepo-ui/static/covfefe.gif and /dev/null differ diff --git a/dbrepo-user-service/pom.xml b/dbrepo-user-service/pom.xml index 1b5fd796af2b2d3b59f92f8201b35b50fea34ba0..30e36bcba0c122d7376c44e8cd372668f0294f72 100644 --- a/dbrepo-user-service/pom.xml +++ b/dbrepo-user-service/pom.xml @@ -10,7 +10,7 @@ <groupId>at.tuwien</groupId> <artifactId>dbrepo-user-service</artifactId> - <version>1.2.0</version> + <version>1.3.0</version> <name>dbrepo-user-service</name> <description> The query service provides an interface to insert data into the tables created by the table service. It diff --git a/dbrepo-user-service/report/pom.xml b/dbrepo-user-service/report/pom.xml index fc1e116c6a94ef847292fe2e72329c5fc0e3c8bb..2555a8836e2385b118e95ebf55545c25bdb4296b 100644 --- a/dbrepo-user-service/report/pom.xml +++ b/dbrepo-user-service/report/pom.xml @@ -6,11 +6,11 @@ <parent> <artifactId>dbrepo-user-service</artifactId> <groupId>at.tuwien</groupId> - <version>1.2.0</version> + <version>1.3.0</version> </parent> <artifactId>report</artifactId> - <version>1.2.0</version> + <version>1.3.0</version> <name>dbrepo-user-service-report</name> <description> This module is only intended for the pipeline coverage report. See the detailed report in the diff --git a/dbrepo-user-service/rest-service/pom.xml b/dbrepo-user-service/rest-service/pom.xml index c805699d3fddcc5295693ea8182bd42aa47977f4..866460b9a9a780799cea903104f4fefb9c9414c4 100644 --- a/dbrepo-user-service/rest-service/pom.xml +++ b/dbrepo-user-service/rest-service/pom.xml @@ -6,11 +6,11 @@ <parent> <artifactId>dbrepo-user-service</artifactId> <groupId>at.tuwien</groupId> - <version>1.2.0</version> + <version>1.3.0</version> </parent> <artifactId>rest-service</artifactId> - <version>1.2.0</version> + <version>1.3.0</version> <name>dbrepo-user-service-rest</name> <dependencies> diff --git a/dbrepo-user-service/services/pom.xml b/dbrepo-user-service/services/pom.xml index ff14aaa5473b2aba218690ddf511fc05d915fc52..606fcdf70802e7c696625274561730ff739349de 100644 --- a/dbrepo-user-service/services/pom.xml +++ b/dbrepo-user-service/services/pom.xml @@ -6,11 +6,11 @@ <parent> <artifactId>dbrepo-user-service</artifactId> <groupId>at.tuwien</groupId> - <version>1.2.0</version> + <version>1.3.0</version> </parent> <artifactId>services</artifactId> - <version>1.2.0</version> + <version>1.3.0</version> <name>dbrepo-user-service-services</name> </project>