diff --git a/.bumpversion.cfg b/.bumpversion.cfg new file mode 100644 index 0000000..bd3e310 --- /dev/null +++ b/.bumpversion.cfg @@ -0,0 +1,29 @@ +[bumpversion] +current_version = 1.1.0 +commit = True +parse = (?P\d+)\.(?P\d+)\.(?P\d+)(-(?P[a-z]+))? +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 diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2d58d12..ff46627 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -9,6 +9,7 @@ variables: -DdeployAtEnd=true -Dsonar.host.url=$SONAR_URL -Dsonar.token=$SONAR_TOKEN + -Dsonar.projectKey=EasyDrop -Dhttps.protocols=TLSv1.2 -Dorg.slf4j.simpleLogger.showDateTime=true -Djava.awt.headless=true @@ -24,6 +25,7 @@ stages: - build - test - analyze + - document build: stage: build @@ -42,3 +44,16 @@ analyze: script: - echo "Starting Code Analysis..." - mvn $MVN_OPTS verify sonar:sonar -Pcoverage + +document: + stage: document + script: + - echo "Starting Doc Generation..." + - apt-get update && apt-get install -y graphviz + - mvn clean compile + - mvn $MVN_OPTS generate-resources -Pgenerate-docs + - cp target/generated-docs/easydrop.png uml.png + artifacts: + paths: + - uml.png + name: UML diff --git a/Dockerfile b/Dockerfile index be36152..dd13896 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.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..b353220 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@ # EasyDrop -![Version](https://img.shields.io/badge/version-1.0.2-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) +![Version](https://img.shields.io/badge/version-1.1.0-orange) +![Pipeline](https://gitlab.ms-ds.org/marvinscham/EasyDrop/badges/main/pipeline.svg) +[![Coverage](https://sonar.ms-ds.org/api/project_badges/measure?project=EasyDrop&metric=coverage&token=sqb_3448cb054f57db92cf53dac5016cdcc73e9c2317)](https://sonar.ms-ds.org/dashboard?id=EasyDrop) [![JAMANN](https://img.shields.io/badge/Auszahlung-Letzte%20Woche-brightgreen)](https://www.youtube.com/watch?v=rmV2Ztoh6LY) ## Description @@ -44,4 +44,4 @@ To run it on a fixed schedule, install a cron job, e.g. ## Contributing 👷‍♂️👷‍♀️ -Contribution guidelines are available in the [project wiki](https://gitlab.fbe-adswen.rwu.de/team1/sandbox2/-/wikis/Richtlinien/Development) +Contribution guidelines are available in the [project wiki](https://gitlab.ms-ds.org/marvinscham/EasyDrop/-/wikis/Richtlinien/Development) diff --git a/docker-compose.yml b/docker-compose.yml index eef5ad4..a675d36 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 volumes: - ./config:/config - type: bind diff --git a/pom.xml b/pom.xml index d46004e..5861fb2 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ de.rwu easydrop jar - 1.0.2 + 1.1.0 EasyDrop http://maven.apache.org