From 56e84aa4071ae83ad3cd022e2dce913139af5e56 Mon Sep 17 00:00:00 2001 From: Marvin Scham Date: Fri, 22 Sep 2023 20:56:32 +0200 Subject: [PATCH 1/4] #56 Added document CI stage --- .gitlab-ci.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2d58d12..dc5b748 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -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 From 086dd7dcf83e3f887bb235ede075db903b279079 Mon Sep 17 00:00:00 2001 From: Marvin Scham Date: Fri, 22 Sep 2023 21:01:02 +0200 Subject: [PATCH 2/4] Added versioning config --- .bumpversion.cfg | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 .bumpversion.cfg diff --git a/.bumpversion.cfg b/.bumpversion.cfg new file mode 100644 index 0000000..66029d1 --- /dev/null +++ b/.bumpversion.cfg @@ -0,0 +1,31 @@ +[bumpversion] +current_version = 1.0.2 +commit = True + +parse = (?P\d+)\.(?P\d+)\.(?P\d+)(-(?P[a-z]+))? +commit = True +serialize = + {major}.{minor}.{patch}-{release} + {major}.{minor}.{patch} + +[bumpversion:part:release] +optional_value = gamma +values = + beta + gamma + +[bumpversion:file:pom.xml] +search = {current_version} +replace = {new_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 From b28bcc3a55ac5a4050ac41fac99215dfc52145c0 Mon Sep 17 00:00:00 2001 From: Marvin Scham Date: Fri, 22 Sep 2023 21:01:49 +0200 Subject: [PATCH 3/4] Fixed duplication in versioning cfg --- .bumpversion.cfg | 1 - 1 file changed, 1 deletion(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 66029d1..a766390 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -3,7 +3,6 @@ current_version = 1.0.2 commit = True parse = (?P\d+)\.(?P\d+)\.(?P\d+)(-(?P[a-z]+))? -commit = True serialize = {major}.{minor}.{patch}-{release} {major}.{minor}.{patch} From e1b781b7cc9e18fa61e80ec9f7202e78354d7ea1 Mon Sep 17 00:00:00 2001 From: Marvin Scham Date: Fri, 22 Sep 2023 21:01:54 +0200 Subject: [PATCH 4/4] =?UTF-8?q?Bump=20version:=201.0.2=20=E2=86=92=201.1.0?= =?UTF-8?q?-beta?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .bumpversion.cfg | 3 +-- Dockerfile | 2 +- README.md | 2 +- docker-compose.yml | 2 +- pom.xml | 2 +- 5 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index a766390..5f72817 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,7 +1,6 @@ [bumpversion] -current_version = 1.0.2 +current_version = 1.1.0-beta commit = True - parse = (?P\d+)\.(?P\d+)\.(?P\d+)(-(?P[a-z]+))? serialize = {major}.{minor}.{patch}-{release} diff --git a/Dockerfile b/Dockerfile index be36152..3dcef2a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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"] diff --git a/README.md b/README.md index 274862d..e532078 100644 --- a/README.md +++ b/README.md @@ -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) diff --git a/docker-compose.yml b/docker-compose.yml index eef5ad4..deb6be6 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -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 diff --git a/pom.xml b/pom.xml index d46004e..7c36a9c 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ de.rwu easydrop jar - 1.0.2 + 1.1.0-beta EasyDrop http://maven.apache.org