Skip to content

Commit 6b19f47

Browse files
author
Gerald Unterrainer
committed
Merge branch 'develop'
2 parents e9a8fc5 + 3d6b7aa commit 6b19f47

File tree

2 files changed

+12
-9
lines changed

2 files changed

+12
-9
lines changed

.travis.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@
2222
# script-phase. So you cannot even source from there directly. That's why the source
2323
# command is IN the deploy.sh script.
2424

25+
branches:
26+
only:
27+
- master
2528
language: java
2629
jdk:
2730
- openjdk14

pom.xml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>info.unterrainer.commons</groupId>
77
<artifactId>parent-javalin-pom</artifactId>
8-
<version>0.0.9</version>
8+
<version>0.0.11</version>
99
</parent>
1010

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

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

2424
<dependencies>
2525
<dependency>
2626
<groupId>com.squareup.okio</groupId>
2727
<artifactId>okio</artifactId>
28-
<version>1.17.2</version>
28+
<version>2.10.0</version>
2929
</dependency>
3030
<dependency>
3131
<groupId>info.unterrainer.commons</groupId>
3232
<artifactId>jre-utils</artifactId>
33-
<version>0.2.5</version>
33+
<version>0.2.6</version>
3434
</dependency>
3535
<dependency>
3636
<groupId>info.unterrainer.commons</groupId>
3737
<artifactId>rdb-utils</artifactId>
38-
<version>0.1.13</version>
38+
<version>0.1.14</version>
3939
</dependency>
4040
<dependency>
4141
<groupId>info.unterrainer.commons</groupId>
4242
<artifactId>serialization</artifactId>
43-
<version>0.1.3</version>
43+
<version>0.1.6</version>
4444
</dependency>
4545
<dependency>
4646
<groupId>javax.persistence</groupId>
@@ -55,17 +55,17 @@
5555
<dependency>
5656
<groupId>org.antlr</groupId>
5757
<artifactId>antlr4-runtime</artifactId>
58-
<version>4.8-1</version>
58+
<version>4.9.3</version>
5959
</dependency>
6060
<dependency>
6161
<groupId>org.keycloak</groupId>
6262
<artifactId>keycloak-common</artifactId>
63-
<version>11.0.2</version>
63+
<version>15.0.2</version>
6464
</dependency>
6565
<dependency>
6666
<groupId>org.keycloak</groupId>
6767
<artifactId>keycloak-core</artifactId>
68-
<version>11.0.2</version>
68+
<version>15.0.2</version>
6969
</dependency>
7070
</dependencies>
7171

0 commit comments

Comments
 (0)