Skip to content

Commit 2fc9236

Browse files
author
Gerald Unterrainer
committed
Merge branch 'master' into develop
2 parents b95c642 + 4e93c40 commit 2fc9236

File tree

2 files changed

+22
-18
lines changed

2 files changed

+22
-18
lines changed

.github/workflows/main.yml

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
2+
name: Bump version
3+
on:
4+
push:
5+
branches:
6+
- '**'
7+
pull_request:
8+
jobs:
9+
build:
10+
runs-on: ubuntu-latest
11+
steps:
12+
- uses: actions/checkout@master
13+
- name: Bump version and push tag
14+
uses: anothrNick/github-tag-action@master
15+
env:
16+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
17+
RELEASE_BRANCHES: master
18+
DEFAULT_BUMP: patch
19+
WITH_V: false

pom.xml

+3-18
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44

55
<parent>
66
<groupId>info.unterrainer.commons</groupId>
7-
<artifactId>parent-pom</artifactId>
8-
<version>0.1.5</version>
7+
<artifactId>parent-javalin-pom</artifactId>
8+
<version>0.0.4</version>
99
</parent>
1010

1111
<properties>
@@ -17,7 +17,7 @@
1717

1818
<modelVersion>4.0.0</modelVersion>
1919
<artifactId>http-server</artifactId>
20-
<version>0.2.1</version>
20+
<version>0.2.3</version>
2121
<name>HttpServer</name>
2222
<packaging>jar</packaging>
2323

@@ -37,11 +37,6 @@
3737
<artifactId>serialization</artifactId>
3838
<version>0.1.2</version>
3939
</dependency>
40-
<dependency>
41-
<groupId>io.javalin</groupId>
42-
<artifactId>javalin</artifactId>
43-
<version>3.13.4</version>
44-
</dependency>
4540
<dependency>
4641
<groupId>javax.persistence</groupId>
4742
<artifactId>javax.persistence-api</artifactId>
@@ -57,16 +52,6 @@
5752
<artifactId>antlr4-runtime</artifactId>
5853
<version>4.8-1</version>
5954
</dependency>
60-
<dependency>
61-
<groupId>org.eclipse.jetty</groupId>
62-
<artifactId>jetty-http</artifactId>
63-
<version>9.4.38.v20210224</version>
64-
</dependency>
65-
<dependency>
66-
<groupId>org.eclipse.jetty</groupId>
67-
<artifactId>jetty-server</artifactId>
68-
<version>9.4.38.v20210224</version>
69-
</dependency>
7055
<dependency>
7156
<groupId>org.keycloak</groupId>
7257
<artifactId>keycloak-common</artifactId>

0 commit comments

Comments
 (0)