From 0597df753ad33d547c3cf6507e9f92ceef4659c6 Mon Sep 17 00:00:00 2001
From: Martin Weise <martin.weise@tuwien.ac.at>
Date: Thu, 18 Jan 2024 08:21:29 +0100
Subject: [PATCH] Added versioning of java code
---
.gitlab-ci.yml | 15 ++++++++++++---
dbrepo-data-service/pom.xml | 2 +-
dbrepo-data-service/report/pom.xml | 4 ++--
dbrepo-data-service/rest-service/pom.xml | 4 ++--
dbrepo-data-service/services/pom.xml | 4 ++--
dbrepo-metadata-service/api/pom.xml | 4 ++--
dbrepo-metadata-service/entities/pom.xml | 4 ++--
dbrepo-metadata-service/oai/pom.xml | 4 ++--
dbrepo-metadata-service/pom.xml | 2 +-
dbrepo-metadata-service/querystore/pom.xml | 4 ++--
dbrepo-metadata-service/report/pom.xml | 2 +-
dbrepo-metadata-service/repositories/pom.xml | 4 ++--
dbrepo-metadata-service/rest-service/pom.xml | 4 ++--
.../main/java/at/tuwien/config/SwaggerConfig.java | 4 ++--
dbrepo-metadata-service/services/pom.xml | 4 ++--
dbrepo-metadata-service/test/pom.xml | 4 ++--
16 files changed, 39 insertions(+), 30 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2bf9697d53..8267c84f97 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -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/
diff --git a/dbrepo-data-service/pom.xml b/dbrepo-data-service/pom.xml
index 114544101a..f71aeaff4a 100644
--- a/dbrepo-data-service/pom.xml
+++ b/dbrepo-data-service/pom.xml
@@ -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.
diff --git a/dbrepo-data-service/report/pom.xml b/dbrepo-data-service/report/pom.xml
index a26aa7a50a..5d55e85d8d 100644
--- a/dbrepo-data-service/report/pom.xml
+++ b/dbrepo-data-service/report/pom.xml
@@ -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
diff --git a/dbrepo-data-service/rest-service/pom.xml b/dbrepo-data-service/rest-service/pom.xml
index b7bd407440..b4cf918e77 100644
--- a/dbrepo-data-service/rest-service/pom.xml
+++ b/dbrepo-data-service/rest-service/pom.xml
@@ -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>
diff --git a/dbrepo-data-service/services/pom.xml b/dbrepo-data-service/services/pom.xml
index dbb1b898d0..c448fb01eb 100644
--- a/dbrepo-data-service/services/pom.xml
+++ b/dbrepo-data-service/services/pom.xml
@@ -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>
diff --git a/dbrepo-metadata-service/api/pom.xml b/dbrepo-metadata-service/api/pom.xml
index 63e76bec78..207d7dab8d 100644
--- a/dbrepo-metadata-service/api/pom.xml
+++ b/dbrepo-metadata-service/api/pom.xml
@@ -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/>
diff --git a/dbrepo-metadata-service/entities/pom.xml b/dbrepo-metadata-service/entities/pom.xml
index a91ce44bf3..fcde833705 100644
--- a/dbrepo-metadata-service/entities/pom.xml
+++ b/dbrepo-metadata-service/entities/pom.xml
@@ -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/>
diff --git a/dbrepo-metadata-service/oai/pom.xml b/dbrepo-metadata-service/oai/pom.xml
index c4e04a3e1d..82913d5295 100644
--- a/dbrepo-metadata-service/oai/pom.xml
+++ b/dbrepo-metadata-service/oai/pom.xml
@@ -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/>
diff --git a/dbrepo-metadata-service/pom.xml b/dbrepo-metadata-service/pom.xml
index 4c8525eb7f..f3d440e7cf 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.3.0</version>
+ <version>latest</version>
<name>dbrepo-metadata-service</name>
<description>Service that manages the metadata</description>
diff --git a/dbrepo-metadata-service/querystore/pom.xml b/dbrepo-metadata-service/querystore/pom.xml
index fc125dea5e..bfead37257 100644
--- a/dbrepo-metadata-service/querystore/pom.xml
+++ b/dbrepo-metadata-service/querystore/pom.xml
@@ -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/>
diff --git a/dbrepo-metadata-service/report/pom.xml b/dbrepo-metadata-service/report/pom.xml
index f3793ae9da..bc0bbd3a78 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.3.0</version>
+ <version>latest</version>
</parent>
<artifactId>dbrepo-metadata-service-report</artifactId>
diff --git a/dbrepo-metadata-service/repositories/pom.xml b/dbrepo-metadata-service/repositories/pom.xml
index 06dbfd1a3f..730f0782c8 100644
--- a/dbrepo-metadata-service/repositories/pom.xml
+++ b/dbrepo-metadata-service/repositories/pom.xml
@@ -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>
diff --git a/dbrepo-metadata-service/rest-service/pom.xml b/dbrepo-metadata-service/rest-service/pom.xml
index 024ea3282f..bc152de450 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.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>
diff --git a/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/config/SwaggerConfig.java b/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/config/SwaggerConfig.java
index 7907a04f77..3b5bca0c35 100644
--- a/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/config/SwaggerConfig.java
+++ b/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/config/SwaggerConfig.java
@@ -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
diff --git a/dbrepo-metadata-service/services/pom.xml b/dbrepo-metadata-service/services/pom.xml
index 5fd908ca79..5fcb23cc55 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.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>
diff --git a/dbrepo-metadata-service/test/pom.xml b/dbrepo-metadata-service/test/pom.xml
index 91e8127487..6d9e3d6e0e 100644
--- a/dbrepo-metadata-service/test/pom.xml
+++ b/dbrepo-metadata-service/test/pom.xml
@@ -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>
--
GitLab