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

Added versioning of java code

parent 0a9b2cf4
Branches
Tags
3 merge requests!231CI: Remove build for log-service,!228Better error message handling in the frontend,!223Release of version 1.4.0
Showing
with 39 additions and 30 deletions
......@@ -5,6 +5,7 @@ variables:
TRIVY_CACHE_DIR: ".trivycache/"
DOCKER_HOST: "unix:///var/run/dind/docker.sock"
TESTCONTAINERS_RYUK_DISABLED: "false"
VERSION: "1.4.0"
image: debian:12-slim
......@@ -513,7 +514,7 @@ release-1.4:
script:
- "ifconfig eth0 mtu 1450 up"
- "apk add make"
- "TAG=1.4 make release"
- "TAG=${VERSION} make release"
build-api-latest:
stage: build
......@@ -547,8 +548,12 @@ build-api-1.3:
- release-v1.3
- release-v1.4
script:
- apk add bash git
- apk add bash git maven
- git fetch && git checkout release-v1.3
- mvn -f ./dbrepo-metadata-service versions:set -DnewVersion=1.3 -DgenerateBackupPoms=false
- mvn -f ./dbrepo-metadata-service versions:commit
- mvn -f ./dbrepo-data-service versions:set -DnewVersion=1.3 -DgenerateBackupPoms=false
- mvn -f ./dbrepo-data-service versions:commit
- bash .docs/.swagger/generate.sh
- mkdir -p ./swagger/1.3
- cp -r ./site/* ./swagger/1.3/
......@@ -570,8 +575,12 @@ build-api-1.4:
- release-v1.3
- release-v1.4
script:
- apk add bash git
- apk add bash git maven
- git fetch && git checkout release-v1.4
- mvn -f ./dbrepo-metadata-service versions:set -DnewVersion=${VERSION} -DgenerateBackupPoms=false
- mvn -f ./dbrepo-metadata-service versions:commit
- mvn -f ./dbrepo-data-service versions:set -DnewVersion=${VERSION} -DgenerateBackupPoms=false
- mvn -f ./dbrepo-data-service versions:commit
- bash .docs/.swagger/generate.sh
- mkdir -p ./swagger/1.4
- cp -r ./site/* ./swagger/1.4/
......
......@@ -10,7 +10,7 @@
<groupId>at.tuwien</groupId>
<artifactId>dbrepo-data-service</artifactId>
<version>1.3.0</version>
<version>latest</version>
<name>dbrepo-data-service</name>
<description>
This service is responsible for the database-specific CRUD operations.
......
......@@ -6,11 +6,11 @@
<parent>
<groupId>at.tuwien</groupId>
<artifactId>dbrepo-data-service</artifactId>
<version>1.3.0</version>
<version>latest</version>
</parent>
<artifactId>report</artifactId>
<version>1.3.0</version>
<version>latest</version>
<name>dbrepo-data-service-report</name>
<description>
This module is only intended for the pipeline coverage report. See the detailed report in the
......
......@@ -6,11 +6,11 @@
<parent>
<groupId>at.tuwien</groupId>
<artifactId>dbrepo-data-service</artifactId>
<version>1.3.0</version>
<version>latest</version>
</parent>
<artifactId>rest-service</artifactId>
<version>1.3.0</version>
<version>latest</version>
<name>dbrepo-data-service-rest-service</name>
<properties>
......
......@@ -6,11 +6,11 @@
<parent>
<groupId>at.tuwien</groupId>
<artifactId>dbrepo-data-service</artifactId>
<version>1.3.0</version>
<version>latest</version>
</parent>
<artifactId>services</artifactId>
<version>1.3.0</version>
<version>latest</version>
<name>dbrepo-data-service-services</name>
<build>
......
......@@ -6,11 +6,11 @@
<parent>
<groupId>at.tuwien</groupId>
<artifactId>dbrepo-metadata-service</artifactId>
<version>1.3.0</version>
<version>latest</version>
</parent>
<artifactId>dbrepo-metadata-service-api</artifactId>
<version>1.3.0</version>
<version>latest</version>
<name>dbrepo-metadata-service-api</name>
<dependencies/>
......
......@@ -6,11 +6,11 @@
<parent>
<groupId>at.tuwien</groupId>
<artifactId>dbrepo-metadata-service</artifactId>
<version>1.3.0</version>
<version>latest</version>
</parent>
<artifactId>dbrepo-metadata-service-entities</artifactId>
<version>1.3.0</version>
<version>latest</version>
<name>dbrepo-metadata-service-entity</name>
<dependencies/>
......
......@@ -6,11 +6,11 @@
<parent>
<groupId>at.tuwien</groupId>
<artifactId>dbrepo-metadata-service</artifactId>
<version>1.3.0</version>
<version>latest</version>
</parent>
<artifactId>dbrepo-metadata-service-oai</artifactId>
<version>1.3.0</version>
<version>latest</version>
<name>dbrepo-metadata-service-oai</name>
<dependencies/>
......
......@@ -10,7 +10,7 @@
<groupId>at.tuwien</groupId>
<artifactId>dbrepo-metadata-service</artifactId>
<version>1.3.0</version>
<version>latest</version>
<name>dbrepo-metadata-service</name>
<description>Service that manages the metadata</description>
......
......@@ -6,11 +6,11 @@
<parent>
<groupId>at.tuwien</groupId>
<artifactId>dbrepo-metadata-service</artifactId>
<version>1.3.0</version>
<version>latest</version>
</parent>
<artifactId>dbrepo-metadata-service-querystore</artifactId>
<version>1.3.0</version>
<version>latest</version>
<name>dbrepo-metadata-service-querystore</name>
<dependencies/>
......
......@@ -6,7 +6,7 @@
<parent>
<artifactId>dbrepo-metadata-service</artifactId>
<groupId>at.tuwien</groupId>
<version>1.3.0</version>
<version>latest</version>
</parent>
<artifactId>dbrepo-metadata-service-report</artifactId>
......
......@@ -6,11 +6,11 @@
<parent>
<artifactId>dbrepo-metadata-service</artifactId>
<groupId>at.tuwien</groupId>
<version>1.3.0</version>
<version>latest</version>
</parent>
<artifactId>dbrepo-metadata-service-repositories</artifactId>
<version>1.3.0</version>
<version>latest</version>
<name>dbrepo-metadata-service-repositories</name>
<dependencies>
......
......@@ -6,11 +6,11 @@
<parent>
<artifactId>dbrepo-metadata-service</artifactId>
<groupId>at.tuwien</groupId>
<version>1.3.0</version>
<version>latest</version>
</parent>
<artifactId>dbrepo-metadata-service-rest-service</artifactId>
<version>1.3.0</version>
<version>latest</version>
<name>dbrepo-metadata-service-rest</name>
<dependencies>
......
......@@ -16,7 +16,7 @@ import java.util.List;
@Configuration
public class SwaggerConfig {
@Value("${app.version:unknown}")
@Value("${app.version}")
private String version;
@Bean
......@@ -40,7 +40,7 @@ public class SwaggerConfig {
.url("http://localhost:9099"),
new Server()
.description("Sandbox")
.url("https://dbrepo2.tuwien.ac.at")));
.url("https://test.dbrepo.tuwien.ac.at")));
}
@Bean
......
......@@ -6,11 +6,11 @@
<parent>
<artifactId>dbrepo-metadata-service</artifactId>
<groupId>at.tuwien</groupId>
<version>1.3.0</version>
<version>latest</version>
</parent>
<artifactId>dbrepo-metadata-service-services</artifactId>
<version>1.3.0</version>
<version>latest</version>
<name>dbrepo-metadata-service-services</name>
<dependencies>
......
......@@ -6,11 +6,11 @@
<parent>
<groupId>at.tuwien</groupId>
<artifactId>dbrepo-metadata-service</artifactId>
<version>1.3.0</version>
<version>latest</version>
</parent>
<artifactId>dbrepo-metadata-service-test</artifactId>
<version>1.3.0</version>
<version>latest</version>
<name>dbrepo-metadata-service-test</name>
<dependencies>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment