From e4c6fdc36b3ceaa9f912cf284052459963d96076 Mon Sep 17 00:00:00 2001 From: Martin Weise <martin.weise@tuwien.ac.at> Date: Thu, 1 Jun 2023 10:58:31 +0200 Subject: [PATCH] Updated to version 1.3.0 --- .gitlab-ci.yml | 2 +- dbrepo-analyse-service/app.py | 4 +-- dbrepo-container-service/pom.xml | 2 +- dbrepo-container-service/report/pom.xml | 4 +-- dbrepo-container-service/rest-service/pom.xml | 4 +-- dbrepo-container-service/services/pom.xml | 4 +-- dbrepo-database-service/pom.xml | 2 +- dbrepo-database-service/report/pom.xml | 2 +- dbrepo-database-service/rest-service/pom.xml | 4 +-- dbrepo-database-service/services/pom.xml | 4 +-- dbrepo-identifier-service/api/pom.xml | 2 +- dbrepo-identifier-service/pom.xml | 2 +- dbrepo-identifier-service/report/pom.xml | 2 +- .../rest-service/pom.xml | 4 +-- dbrepo-identifier-service/services/pom.xml | 6 ++--- dbrepo-metadata-db/api/pom.xml | 4 +-- dbrepo-metadata-db/entities/pom.xml | 4 +-- dbrepo-metadata-db/oai/pom.xml | 4 +-- dbrepo-metadata-db/pom.xml | 2 +- dbrepo-metadata-db/querystore/pom.xml | 6 ++--- dbrepo-metadata-db/test/pom.xml | 4 +-- dbrepo-metadata-service/pom.xml | 2 +- dbrepo-metadata-service/report/pom.xml | 2 +- dbrepo-metadata-service/rest-service/pom.xml | 4 +-- dbrepo-metadata-service/services/pom.xml | 4 +-- dbrepo-query-service/api/pom.xml | 2 +- dbrepo-query-service/pom.xml | 2 +- dbrepo-query-service/report/pom.xml | 4 +-- dbrepo-query-service/rest-service/pom.xml | 4 +-- .../ViewIdxRepositoryIntegrationTest.java | 2 -- dbrepo-query-service/services/pom.xml | 6 ++--- dbrepo-semantics-service/pom.xml | 2 +- dbrepo-semantics-service/report/pom.xml | 4 +-- dbrepo-semantics-service/rest-service/pom.xml | 4 +-- dbrepo-semantics-service/services/pom.xml | 4 +-- dbrepo-table-service/pom.xml | 2 +- dbrepo-table-service/report/pom.xml | 4 +-- dbrepo-table-service/rest-service/pom.xml | 4 +-- dbrepo-table-service/services/pom.xml | 4 +-- dbrepo-ui/.env.example | 1 - dbrepo-ui/Dockerfile | 1 - dbrepo-ui/config.js | 3 +-- dbrepo-ui/layouts/default.vue | 8 ------ dbrepo-ui/nuxt.config.js | 3 +-- dbrepo-ui/pages/index.vue | 25 +++++++++++++++--- dbrepo-ui/pages/signup.vue | 23 ---------------- dbrepo-ui/static/covfefe.gif | Bin 1722 -> 0 bytes dbrepo-user-service/pom.xml | 2 +- dbrepo-user-service/report/pom.xml | 4 +-- dbrepo-user-service/rest-service/pom.xml | 4 +-- dbrepo-user-service/services/pom.xml | 4 +-- 51 files changed, 95 insertions(+), 115 deletions(-) delete mode 100644 dbrepo-ui/static/covfefe.gif diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e5d50a84d5..1ff3d25850 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 2f4601669a..9fdf40ed41 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 af6a4ebfd8..c17167494d 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 a3d0645d2e..d65ecb0a3f 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 6b8f4db7bf..f64c4da5dc 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 e9aa0a9424..5365536399 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 3d3fbd8fce..d694d035a9 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 dcdbc726d1..f6090d5b73 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 5af62c37cf..e6b1ca623e 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 db437866d6..00258baa4f 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 eaf60df4a5..01a432603d 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 cb8d587faa..07fe813de2 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 64e24ab39f..3fafe6f604 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 b89e9ddd04..89ed56a1ca 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 49d0779ee2..d1eae1c8a0 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 62b1552f74..778642d657 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 4b9abe2a8b..4be0196332 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 9ecf40bc6f..7b376d445d 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 6d3b7f7774..cccf8f2178 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 37ae21126f..a657745247 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 3865218a9d..86e3a3e778 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 e6acaea732..261784bc3f 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 a77c159939..49cb9b5a7c 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 050c5ca7d7..6f20602af8 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 d112379f5c..47ffbca203 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 a4c9dc32f9..b6ceecccd5 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 8decc97e39..095adfeb17 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 50a488e8c7..f4ffdae5cf 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 9982045b83..a1ac4541b8 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 292a52bdc7..647886a824 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 09f0b1b954..5e543b828a 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 aeb1451ea6..3eed3ff468 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 b55b44b7a2..d8ee5dded0 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 9891e5ae43..b2ca890c1f 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 48080b7e88..b1ee2e0ce7 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 7f444e593f..a044da6517 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 8c2d1db5ea..91abe5c9ed 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 a1de368fd2..9476a5da67 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 0b937f235d..05c0764c19 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 c6d247fe18..5f48135221 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 ecc3d12c3a..dd9376661c 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 b7ad7a38e5..b52f145167 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 44edd4a29c..3b7022d06f 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 77cc36bb2a..042164ae95 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 d372b82f29..4dab1948f0 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 469907ca6a..6cfd8b1eb6 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 GIT binary patch literal 0 HcmV?d00001 literal 1722 zcmZ?wbhEHbEM-VyXlDR{2or_~V}@`OhHzsLcNC9?z{m*!#sA!Xt|7tBjsdPldIrpl z3=9m4KUr9r7#J9IK%oH2CJY?^85lWaJT@#i*vuiU6?0<4!o%$X%3gCkHZD5aEn%E> z=fuXv$NLqWyY5IVSmMd3%FZEiQYeLCidyn1lbf5K9i60+c<zqnfo1+3*1mikTA!B( zwz^DyXLD-Gf=kN{XPdQpZC!F@ap=l8QAvlTm)8Vruj~0$dLUq4dh4=Y%MhL8Gg&wr zc(tZ4yWLa3`D%{#mKU+z2Bqs{W|Zijn_2z(-`XADQyZFGzDw!ZR1~_*&D7?8@;hYn z(>6mx@i})aGGDHnFTZK(%bmrcb5~09`R07jKC>&b@OocwK&JnRIliC$etcPQY0i3E zesvj<ZI0KM3r5HC*{B9S4q5zs>A5`?-yRs(7yoBpFs0$qd&V=@ZFz(Lmc3iERoP_C z?=@wc9zUISO*1_2{p6Rv+vfRX_qxw3xxSG7Uh?C>snaUXM{W<!Y?G`|h~V@!o8CA_ zkX??EElc8BP0hiS1ql*W91naHq9hXIBUk>I*UiQ%Ce=J)<&!(*|1O@mP$D$*>B9aG zf((}f(gh`h+P&^=d61X4vFt|A0^iE{Q@mqSpG@V{n<ASoaP7;Ic>TVWQ+$=!mfvYj z>yr>-%w$`hFnjJ!7xgJQ_aZ~xV_$Nnl-IrM3|~;6=k}tlLAGnL!!FHLqON^m&ojCN zeYIXLF=P^5nL8sWYU!fHvQsL~GiA#c_byy$a(mIGvt{!Wdf)ypUBVE4=$G;`)|2J} z)A>G$rp@%X?RepE=n?0N`ASMlmo2ZHSCZYixX<j_)ct1N^QW8F{d`*Ab?U@q=N)mY z(!1~ZMQCi_*U0&1?tHsfsdKoyZl|yBSXn0B<M?-l;vSZL%b(9W_35k5?&Efx2F0J! zqzY!w(W}_tU@ax3zb(y7=lP-5S&_Min4+z(AC^0Pd&O?9-X4t*k2ZI`&Ywb4iUR&{ zUDexn@8hjaPKD22NrkKmJE>j7llFR9`v<1<&B^IjN1pZtPh;P7yrWg~(M6BhTa279 zzD+IM-<|a5%2h*m?kSPay?oM~L*ltj=hkN)kIT4Z^~)q&wAg2b@Bdr9FYoZoY+3Vs z*CIcSCD#+*Kly%^wYaR}_zSkWb&v0vzS~jM8XdLnF?(p8#<dC4=T<y;p!8#X@|?>) z%i9Dp`R*NKUm9D!v@1^b*B0maZCcZO--oYv^?kf=(F<+9EHy8cpC`XNuUdbt^yB(| oQ}NfbjB`c5l<_Ty55KZK<?EghvzLFrKWNwg_v4AQhya5%0RO|wH2?qr diff --git a/dbrepo-user-service/pom.xml b/dbrepo-user-service/pom.xml index 1b5fd796af..30e36bcba0 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 fc1e116c6a..2555a8836e 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 c805699d3f..866460b9a9 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 ff14aaa547..606fcdf708 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> -- GitLab