RWU/EasyDrop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'release/1.1.0' into dev

Browse Source
This commit is contained in:
Marvin Scham
2023-09-23 00:16:13 +02:00
parent 59774a0af4 63e4ac5be2
commit 00e9740950
5 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.bumpversion.cfg
View File

@@ -1,5 +1,5 @@
[bumpversion] [bumpversion]
current_version = 1.1.0-beta current_version = 1.1.0
commit = True commit = True
parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(-(?P<release>[a-z]+))? parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(-(?P<release>[a-z]+))?
serialize = serialize =

2
Dockerfile
View File

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

8
README.md
View File

@@ -1,8 +1,8 @@
# EasyDrop # EasyDrop
![Version](https://img.shields.io/badge/version-1.1.0-beta-orange) ![Version](https://img.shields.io/badge/version-1.1.0-orange)
![Pipeline](https://gitlab.fbe-adswen.rwu.de/team1/sandbox2/badges/main/pipeline.svg) ![Pipeline](https://gitlab.ms-ds.org/marvinscham/EasyDrop/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) [![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) [![JAMANN](https://img.shields.io/badge/Auszahlung-Letzte%20Woche-brightgreen)](https://www.youtube.com/watch?v=rmV2Ztoh6LY)
## Description ## Description
@@ -44,4 +44,4 @@ To run it on a fixed schedule, install a cron job, e.g.
## Contributing 👷‍♂️👷‍♀️ ## 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)

2
docker-compose.yml
View File

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

2
pom.xml
View File

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