diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2bf9697d531a62339212bc854f8014d0b27e4ec6..8267c84f97801d5911ce9582ab88701e17655dea 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 114544101a3a50d8ccf0aa9c932271bf2988820b..f71aeaff4a27420f3c1faff1941ca7cd6dd089b9 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 a26aa7a50a65977599c864ba6e55190906210e5d..5d55e85d8dc20199f33ffd22d3f01d92e9cf0b47 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 b7bd40744085f5ad0f69a7a30d3be8fd342346a6..b4cf918e7796fe268089ae956ae86494d0f37903 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 dbb1b898d04e0fbd1a507cf6b8b33240c9f15be3..c448fb01ebdf9a3508fd4a85180c532d187a3532 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 63e76bec78e78ce227edd5f1abe767eeb0b098af..207d7dab8df6f3217709ed6e5859d5b95f42d1d7 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 a91ce44bf32969f9feb5005d331050d2e267c9fc..fcde8337055b923f595d6e42d1976c7b88de0306 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 c4e04a3e1d3578269474cf7f0b7d8051fbb2b3b1..82913d529529e843c8062e8aed73c8c6138edba3 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 4c8525eb7f4bfe2d276bdb27dcbab17d2c21688a..f3d440e7cfc5e3e51ca349f07985338fa1f2beaf 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 fc125dea5e6edc9955826f7aff41c594616c68cb..bfead37257bd87829407aa5044446d4b2132ea55 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 f3793ae9da7db256b224477c9b5a9a4962c3541a..bc0bbd3a78b8dd71ac7788ae7e00a76ee54a9ad9 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 06dbfd1a3f09dc818ec4d050b74e9c1998f2a32a..730f0782c8fb14aeac8ba51246ac24b3968528fb 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 024ea3282f562b78bccf8f0a48b12b261dc169a1..bc152de450e081021e95dcaac749ebe251ea1edf 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 7907a04f775e3246d8060d3707309683d953c0d1..3b5bca0c35f7a814051af669cbf5ccc668f9f95b 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 5fd908ca79cd63351f4b969da505711dd151c60f..5fcb23cc55f9636ee70d5321728976ffa43c347b 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 91e81274874fdc3b17700e31d53d905a841b2c6a..6d9e3d6e0efb638413d09784698d21b25ef26ca4 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>