Merge branch 'feature/#56-Auto-generate-PlantUML' into dev

This commit is contained in:
Marvin Scham
2023-09-22 21:03:47 +02:00
6 changed files with 44 additions and 4 deletions

29
.bumpversion.cfg Normal file
View File

@@ -0,0 +1,29 @@
[bumpversion]
current_version = 1.1.0-beta
commit = True
parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(-(?P<release>[a-z]+))?
serialize =
{major}.{minor}.{patch}-{release}
{major}.{minor}.{patch}
[bumpversion:part:release]
optional_value = gamma
values =
beta
gamma
[bumpversion:file:pom.xml]
search = <version>{current_version}</version>
replace = <version>{new_version}</version>
[bumpversion:file:docker-compose.yml]
search = image: easydrop:{current_version}
replace = image: easydrop:{new_version}
[bumpversion:file:Dockerfile]
search = /app/target/easydrop-{current_version}.jar
replace = /app/target/easydrop-{new_version}.jar
[bumpversion:file:README.md]
search = version-{current_version}-orange
replace = version-{new_version}-orange

View File

@@ -24,6 +24,7 @@ stages:
- build
- test
- analyze
- document
build:
stage: build
@@ -42,3 +43,13 @@ analyze:
script:
- echo "Starting Code Analysis..."
- mvn $MVN_OPTS verify sonar:sonar -Pcoverage
document:
stage: document
script:
- echo "Starting Doc Generation..."
- mvn $MVN_OPTS generate-resources -Pgenerate-docs
artifacts:
paths:
- target/generated-docs/easydrop.png
name: Easydrop-UML.png

View File

@@ -21,7 +21,7 @@ RUN mvn -B package -DskipTests
FROM openjdk:17-jdk-slim
# Copy the jar file from the build stage
COPY --from=build /app/target/easydrop-1.0.2.jar /easydrop.jar
COPY --from=build /app/target/easydrop-1.1.0-beta.jar /easydrop.jar
# Execute the application when the docker container starts.
ENTRYPOINT ["java", "-jar", "/easydrop.jar"]

View File

@@ -1,6 +1,6 @@
# EasyDrop
![Version](https://img.shields.io/badge/version-1.0.2-orange)
![Version](https://img.shields.io/badge/version-1.1.0-beta-orange)
![Pipeline](https://gitlab.fbe-adswen.rwu.de/team1/sandbox2/badges/main/pipeline.svg)
[![Coverage](https://sonar.fbe-adswen.rwu.de/api/project_badges/measure?project=de.rwu%3Aeasydrop&metric=coverage&token=sqb_2fe80aed361468170aaef32a0ff96d596456cdd1)](https://sonar.fbe-adswen.rwu.de/dashboard?id=de.rwu%3Aeasydrop)
[![JAMANN](https://img.shields.io/badge/Auszahlung-Letzte%20Woche-brightgreen)](https://www.youtube.com/watch?v=rmV2Ztoh6LY)

View File

@@ -6,7 +6,7 @@ services:
build:
context: .
dockerfile: Dockerfile
image: easydrop:1.0.2
image: easydrop:1.1.0-beta
volumes:
- ./config:/config
- type: bind

View File

@@ -5,7 +5,7 @@
<groupId>de.rwu</groupId>
<artifactId>easydrop</artifactId>
<packaging>jar</packaging>
<version>1.0.2</version>
<version>1.1.0-beta</version>
<name>EasyDrop</name>
<url>http://maven.apache.org</url>