Skip to content
Snippets Groups Projects
Commit b4e700a9 authored by Martin Weise's avatar Martin Weise
Browse files

Bumped versions:

parent 4c1280a1
No related branches found
No related tags found
3 merge requests!235Master,!233Master,!229Bumped versions:
Show whitespace changes
Inline Side-by-side
Showing
with 88 additions and 95 deletions
.gitlab-ci.yml
+ 14
− 0
View file @ b4e700a9
......@@ -156,6 +156,7 @@ scan-analyse-service:
stage: scan
only:
refs:
- dev
- master
allow_failure: true
script:
......@@ -176,6 +177,7 @@ scan-authentication-service:
stage: scan
only:
refs:
- dev
- master
allow_failure: true
script:
......@@ -196,6 +198,7 @@ scan-broker-service:
stage: scan
only:
refs:
- dev
- master
allow_failure: true
script:
......@@ -216,6 +219,7 @@ scan-gateway-service:
stage: scan
only:
refs:
- dev
- master
allow_failure: true
script:
......@@ -236,6 +240,7 @@ scan-metadata-service:
stage: scan
only:
refs:
- dev
- master
allow_failure: true
script:
......@@ -256,6 +261,7 @@ scan-data-service:
stage: scan
only:
refs:
- dev
- master
allow_failure: true
script:
......@@ -276,6 +282,7 @@ scan-search-db:
stage: scan
only:
refs:
- dev
- master
allow_failure: true
script:
......@@ -296,6 +303,7 @@ scan-search-dashboard:
stage: scan
only:
refs:
- dev
- master
allow_failure: true
script:
......@@ -316,6 +324,7 @@ scan-search-db-init:
stage: scan
only:
refs:
- dev
- master
allow_failure: true
script:
......@@ -336,6 +345,7 @@ scan-data-db:
stage: scan
only:
refs:
- dev
- master
allow_failure: true
script:
......@@ -356,6 +366,7 @@ scan-metadata-db:
stage: scan
only:
refs:
- dev
- master
allow_failure: true
script:
......@@ -376,6 +387,7 @@ scan-ui:
stage: scan
only:
refs:
- dev
- master
allow_failure: true
script:
......@@ -396,6 +408,7 @@ scan-storage-service:
stage: scan
only:
refs:
- dev
- master
allow_failure: true
script:
......@@ -416,6 +429,7 @@ scan-storage-service-init:
stage: scan
only:
refs:
- dev
- master
allow_failure: true
script:
......
dbrepo-data-service/Dockerfile
+ 1
− 3
View file @ b4e700a9
......@@ -20,11 +20,9 @@ COPY ./report ./report
RUN mvn clean package -DskipTests
###### THIRD STAGE ######
FROM openjdk:17-alpine as runtime
FROM eclipse-temurin:17-jdk as runtime
MAINTAINER Martin Weise <martin.weise@tuwien.ac.at>
RUN apk --no-cache add curl bash
ENV METADATA_DB=fda
ENV METADATA_HOST=metadata-db
ENV METADATA_JDBC_EXTRA_ARGS=""
......
dbrepo-data-service/pom.xml
+ 27
− 12
View file @ b4e700a9
......@@ -5,16 +5,16 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.0.6</version>
<version>3.0.13</version>
</parent>
<groupId>at.tuwien</groupId>
<artifactId>dbrepo-data-service</artifactId>
<version>latest</version>
<name>dbrepo-data-service</name>
<description>
This service is responsible for the database-specific CRUD operations.
</description>
<version>1.4.1</version>
<description>This service is responsible for the database-specific CRUD operations.</description>
<url>https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/</url>
<developers>
<developer>
......@@ -22,6 +22,26 @@
<email>martin.weise@tuwien.ac.at</email>
<organization>TU Wien</organization>
</developer>
<developer>
<name>Moritz Staudinger</name>
<email>moritz.staudinger@tuwien.ac.at</email>
<organization>TU Wien</organization>
</developer>
<developer>
<name>Tobias Grantner</name>
<email>tobias.grantner@tuwien.ac.at</email>
<organization>TU Wien</organization>
</developer>
<developer>
<name>Sotirios Tsepelakis</name>
<email>sotirios.tsepelakis@tuwien.ac.at</email>
<organization>TU Wien</organization>
</developer>
<developer>
<name>Geoffrey Karnbach</name>
<email>geoffrey.karnbach@tuwien.ac.at</email>
<organization>TU Wien</organization>
</developer>
</developers>
<packaging>pom</packaging>
......@@ -35,14 +55,14 @@
<java.version>17</java.version>
<spring-cloud.version>4.0.2</spring-cloud.version>
<mapstruct.version>1.5.5.Final</mapstruct.version>
<jacoco.version>0.8.10</jacoco.version>
<jacoco.version>0.8.11</jacoco.version>
<jwt.version>4.3.0</jwt.version>
<opencsv.version>5.7.1</opencsv.version>
<super-csv.version>2.4.0</super-csv.version>
<jsql.version>4.6</jsql.version>
<springdoc-openapi.version>2.1.0</springdoc-openapi.version>
<hsqldb.version>2.7.2</hsqldb.version>
<testcontainers.version>1.18.3</testcontainers.version>
<testcontainers.version>1.19.1</testcontainers.version>
<opensearch-testcontainer.version>2.0.0</opensearch-testcontainer.version>
<opensearch-client.version>1.1.0</opensearch-client.version>
<opensearch-rest-client.version>2.8.0</opensearch-rest-client.version>
......@@ -199,11 +219,6 @@
<version>${testcontainers.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>${jacoco.version}</version>
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>rabbitmq</artifactId>
......
dbrepo-data-service/report/pom.xml
+ 2
− 6
View file @ b4e700a9
......@@ -6,21 +6,17 @@
<parent>
<groupId>at.tuwien</groupId>
<artifactId>dbrepo-data-service</artifactId>
<version>latest</version>
<version>1.4.1</version>
</parent>
<artifactId>report</artifactId>
<version>latest</version>
<name>dbrepo-data-service-report</name>
<version>1.4.1</version>
<description>
This module is only intended for the pipeline coverage report. See the detailed report in the
respective modules
</description>
<properties>
<jacoco.version>0.8.7</jacoco.version>
</properties>
<dependencies>
<dependency>
<groupId>at.tuwien</groupId>
......
dbrepo-data-service/rest-service/pom.xml
+ 2
− 2
View file @ b4e700a9
......@@ -6,12 +6,12 @@
<parent>
<groupId>at.tuwien</groupId>
<artifactId>dbrepo-data-service</artifactId>
<version>latest</version>
<version>1.4.1</version>
</parent>
<artifactId>rest-service</artifactId>
<version>latest</version>
<name>dbrepo-data-service-rest-service</name>
<version>1.4.1</version>
<properties>
<jacoco.version>0.8.7</jacoco.version>
......
dbrepo-data-service/services/pom.xml
+ 2
− 2
View file @ b4e700a9
......@@ -6,12 +6,12 @@
<parent>
<groupId>at.tuwien</groupId>
<artifactId>dbrepo-data-service</artifactId>
<version>latest</version>
<version>1.4.1</version>
</parent>
<artifactId>services</artifactId>
<version>latest</version>
<name>dbrepo-data-service-services</name>
<version>1.4.1</version>
<build>
<plugins>
......
dbrepo-metadata-service/Dockerfile
+ 1
− 3
View file @ b4e700a9
......@@ -29,11 +29,9 @@ COPY ./test ./test
RUN mvn clean install -DskipTests
###### SECOND STAGE ######
FROM openjdk:17-alpine as runtime
FROM eclipse-temurin:17-jdk as runtime
MAINTAINER Martin Weise <martin.weise@tuwien.ac.at>
RUN apk --no-cache add curl bash
ENV ADMIN_MAIL="noreply@localhost"
ENV BASE_URL="http://localhost"
ENV GRANT_PRIVILEGES="SELECT, CREATE, CREATE VIEW, CREATE ROUTINE, CREATE TEMPORARY TABLES, LOCK TABLES, INDEX, TRIGGER, INSERT, UPDATE, DELETE"
......
dbrepo-metadata-service/api/pom.xml
+ 2
− 2
View file @ b4e700a9
......@@ -6,12 +6,12 @@
<parent>
<groupId>at.tuwien</groupId>
<artifactId>dbrepo-metadata-service</artifactId>
<version>latest</version>
<version>1.4.1</version>
</parent>
<artifactId>dbrepo-metadata-service-api</artifactId>
<version>latest</version>
<name>dbrepo-metadata-service-api</name>
<version>1.4.1</version>
<dependencies/>
......
dbrepo-metadata-service/entities/pom.xml
+ 2
− 2
View file @ b4e700a9
......@@ -6,12 +6,12 @@
<parent>
<groupId>at.tuwien</groupId>
<artifactId>dbrepo-metadata-service</artifactId>
<version>latest</version>
<version>1.4.1</version>
</parent>
<artifactId>dbrepo-metadata-service-entities</artifactId>
<version>latest</version>
<name>dbrepo-metadata-service-entity</name>
<version>1.4.1</version>
<dependencies/>
......
dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/table/columns/TableColumn.java
+ 0
− 4
View file @ b4e700a9
......@@ -109,15 +109,11 @@ public class TableColumn implements Comparable<TableColumn> {
@ElementCollection(fetch = FetchType.LAZY, targetClass = String.class)
@CollectionTable(name = "mdb_columns_enums", joinColumns = @JoinColumn(name = "column_id"))
@Column(name = "value", nullable = false)
@JoinColumn(name = "column_id")
@OnDelete(action = OnDeleteAction.CASCADE)
private List<String> enums;
@ElementCollection(fetch = FetchType.LAZY, targetClass = String.class)
@CollectionTable(name = "mdb_columns_sets", joinColumns = @JoinColumn(name = "column_id"))
@Column(name = "value", nullable = false)
@JoinColumn(name = "column_id")
@OnDelete(action = OnDeleteAction.CASCADE)
private List<String> sets;
@Column
......
dbrepo-metadata-service/oai/pom.xml
+ 2
− 2
View file @ b4e700a9
......@@ -6,12 +6,12 @@
<parent>
<groupId>at.tuwien</groupId>
<artifactId>dbrepo-metadata-service</artifactId>
<version>latest</version>
<version>1.4.1</version>
</parent>
<artifactId>dbrepo-metadata-service-oai</artifactId>
<version>latest</version>
<name>dbrepo-metadata-service-oai</name>
<version>1.4.1</version>
<dependencies/>
......
dbrepo-metadata-service/pom.xml
+ 20
− 39
View file @ b4e700a9
......@@ -5,13 +5,14 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.0.6</version>
<version>3.0.13</version>
</parent>
<groupId>at.tuwien</groupId>
<artifactId>dbrepo-metadata-service</artifactId>
<version>latest</version>
<name>dbrepo-metadata-service</name>
<version>1.4.1</version>
<description>Service that manages the metadata</description>
<url>https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/</url>
......@@ -31,6 +32,16 @@
<email>tobias.grantner@tuwien.ac.at</email>
<organization>TU Wien</organization>
</developer>
<developer>
<name>Sotirios Tsepelakis</name>
<email>sotirios.tsepelakis@tuwien.ac.at</email>
<organization>TU Wien</organization>
</developer>
<developer>
<name>Geoffrey Karnbach</name>
<email>geoffrey.karnbach@tuwien.ac.at</email>
<organization>TU Wien</organization>
</developer>
</developers>
<packaging>pom</packaging>
......@@ -50,14 +61,15 @@
<java.version>17</java.version>
<spring-cloud.version>4.0.2</spring-cloud.version>
<mapstruct.version>1.5.5.Final</mapstruct.version>
<rabbitmq.version>5.16.0</rabbitmq.version>
<rabbitmq.version>5.20.0</rabbitmq.version>
<jackson-datatype.version>2.15.0</jackson-datatype.version>
<commons.version>2.11.0</commons.version>
<jacoco.version>0.8.10</jacoco.version>
<guava.version>33.0.0-jre</guava.version>
<jacoco.version>0.8.11</jacoco.version>
<jwt.version>4.3.0</jwt.version>
<c3p0.version>0.9.5.5</c3p0.version>
<c3p0-hibernate.version>6.2.2.Final</c3p0-hibernate.version>
<apache-jena.version>4.8.0</apache-jena.version>
<apache-jena.version>4.10.0</apache-jena.version>
<opencsv.version>5.7.1</opencsv.version>
<super-csv.version>2.4.0</super-csv.version>
<jsql-parser.version>4.6</jsql-parser.version>
......@@ -65,11 +77,11 @@
<springdoc-openapi.version>2.1.0</springdoc-openapi.version>
<testcontainers.version>1.19.1</testcontainers.version>
<opensearch-testcontainer.version>2.0.0</opensearch-testcontainer.version>
<keycloak-testcontainer.version>2.5.0</keycloak-testcontainer.version>
<keycloak-testcontainer.version>3.2.0</keycloak-testcontainer.version>
<opensearch-client.version>1.1.0</opensearch-client.version>
<opensearch-rest-client.version>2.8.0</opensearch-rest-client.version>
<jackson.version>2.15.2</jackson.version>
<minio.version>8.5.6</minio.version>
<minio.version>8.5.7</minio.version>
</properties>
<dependencies>
......@@ -181,7 +193,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>31.1-jre</version>
<version>${guava.version}</version>
</dependency>
<!-- SQL Parser -->
<dependency>
......@@ -274,16 +286,6 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-vintage-engine</artifactId>
</exclusion>
<exclusion>
<groupId>org.junit.vintage</groupId>
<artifactId>junit-vintage-engine</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.h2database</groupId>
......@@ -389,27 +391,6 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<version>3.7.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
<version>3.0.0</version>
</plugin>
<plugin>
<groupId>com.soebes.maven.plugins</groupId>
<artifactId>doxygen-maven-plugin</artifactId>
<version>1.1.0</version>
<configuration>
<haveDot>false</haveDot>
<quiet>false</quiet>
<projectName>This is a Test Project (basicReportTest)</projectName>
<outputDirectory>docs</outputDirectory>
</configuration>
</plugin>
</plugins>
</build>
......
dbrepo-metadata-service/querystore/pom.xml
+ 2
− 2
View file @ b4e700a9
......@@ -6,12 +6,12 @@
<parent>
<groupId>at.tuwien</groupId>
<artifactId>dbrepo-metadata-service</artifactId>
<version>latest</version>
<version>1.4.1</version>
</parent>
<artifactId>dbrepo-metadata-service-querystore</artifactId>
<version>latest</version>
<name>dbrepo-metadata-service-querystore</name>
<version>1.4.1</version>
<dependencies/>
......
dbrepo-metadata-service/report/pom.xml
+ 2
− 5
View file @ b4e700a9
......@@ -6,15 +6,12 @@
<parent>
<artifactId>dbrepo-metadata-service</artifactId>
<groupId>at.tuwien</groupId>
<version>latest</version>
<version>1.4.1</version>
</parent>
<artifactId>dbrepo-metadata-service-report</artifactId>
<name>dbrepo-metadata-service-report</name>
<properties>
<jacoco.version>0.8.7</jacoco.version>
</properties>
<version>1.4.1</version>
<dependencies>
<dependency>
......
dbrepo-metadata-service/repositories/pom.xml
+ 2
− 2
View file @ b4e700a9
......@@ -6,12 +6,12 @@
<parent>
<artifactId>dbrepo-metadata-service</artifactId>
<groupId>at.tuwien</groupId>
<version>latest</version>
<version>1.4.1</version>
</parent>
<artifactId>dbrepo-metadata-service-repositories</artifactId>
<version>latest</version>
<name>dbrepo-metadata-service-repositories</name>
<version>1.4.1</version>
<dependencies>
<dependency>
......
dbrepo-metadata-service/rest-service/pom.xml
+ 2
− 2
View file @ b4e700a9
......@@ -6,12 +6,12 @@
<parent>
<artifactId>dbrepo-metadata-service</artifactId>
<groupId>at.tuwien</groupId>
<version>latest</version>
<version>1.4.1</version>
</parent>
<artifactId>dbrepo-metadata-service-rest-service</artifactId>
<version>latest</version>
<name>dbrepo-metadata-service-rest</name>
<version>1.4.1</version>
<dependencies>
<dependency>
......
dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/ActuatorComponentTest.java
+ 0
− 2
View file @ b4e700a9
......@@ -3,14 +3,12 @@ package at.tuwien.endpoints;
import at.tuwien.BaseUnitTest;
import at.tuwien.annotations.MockAmqp;
import at.tuwien.annotations.MockOpensearch;
import at.tuwien.repository.sdb.DatabaseIdxRepository;
import lombok.extern.log4j.Log4j2;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.test.mock.mockito.MockBean;
import org.springframework.test.context.junit.jupiter.SpringExtension;
import org.springframework.test.web.servlet.MockMvc;
......
dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/repository/DatabaseIdxRepositoryIntegrationTest.java
+ 3
− 0
View file @ b4e700a9
......@@ -74,6 +74,9 @@ public class DatabaseIdxRepositoryIntegrationTest extends BaseUnitTest {
@Container
private static MariaDBContainer<?> mariaDBContainer = MariaDbContainerConfig.getContainer();
/**
* @apiNote Must be the same image tag as version in pom.xml properties -> opensearch-rest-client.version
*/
@Container
private static final OpensearchContainer opensearchContainer = new OpensearchContainer(DockerImageName.parse("opensearchproject/opensearch:2.10.0"));
......
dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/MetadataServiceIntegrationTest.java
+ 0
− 3
View file @ b4e700a9
......@@ -11,11 +11,9 @@ import at.tuwien.repository.mdb.*;
import lombok.extern.log4j.Log4j2;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.junit.jupiter.SpringExtension;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
......@@ -25,7 +23,6 @@ import static org.junit.jupiter.api.Assertions.*;
@Log4j2
@SpringBootTest
@DirtiesContext(classMode = DirtiesContext.ClassMode.BEFORE_EACH_TEST_METHOD)
@ExtendWith(SpringExtension.class)
@MockAmqp
@MockOpensearch
public class MetadataServiceIntegrationTest extends BaseUnitTest {
......
dbrepo-metadata-service/services/pom.xml
+ 2
− 2
View file @ b4e700a9
......@@ -6,12 +6,12 @@
<parent>
<artifactId>dbrepo-metadata-service</artifactId>
<groupId>at.tuwien</groupId>
<version>latest</version>
<version>1.4.1</version>
</parent>
<artifactId>dbrepo-metadata-service-services</artifactId>
<version>latest</version>
<name>dbrepo-metadata-service-services</name>
<version>1.4.1</version>
<dependencies>
<dependency>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment