Skip to content

Commit ba5dbfe

Browse files
committed
Merge branch 'develop'
2 parents 2d97e30 + 4cd8f81 commit ba5dbfe

File tree

7 files changed

+8
-63
lines changed

7 files changed

+8
-63
lines changed

.classpath

Lines changed: 0 additions & 38 deletions
This file was deleted.

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,3 +26,5 @@ hs_err_pid*
2626
.settings/
2727

2828
src/main/java/info/unterrainer/commons/udpobserver/Information.java
29+
30+
.classpath

.settings/org.eclipse.core.resources.prefs

Lines changed: 0 additions & 6 deletions
This file was deleted.

.settings/org.eclipse.jdt.core.prefs

Lines changed: 0 additions & 9 deletions
This file was deleted.

.settings/org.eclipse.m2e.core.prefs

Lines changed: 0 additions & 4 deletions
This file was deleted.

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ branches:
2727
- master
2828
language: java
2929
jdk:
30-
- openjdk14
30+
- openjdk18
3131
before_install:
3232
- git clone https://github.com/UnterrainerInformatik/Travis-Scripts.git travis
3333
- source travis/functions.Java.sh

pom.xml

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

1111
<modelVersion>4.0.0</modelVersion>
1212
<groupId>info.unterrainer.commons.udp-observer</groupId>
1313
<artifactId>udp-observer</artifactId>
14-
<version>0.1.11</version>
14+
<version>0.1.12</version>
1515
<name>UdpObserver</name>
1616
<packaging>jar</packaging>
1717

@@ -26,17 +26,17 @@
2626
<dependency>
2727
<groupId>com.fasterxml.jackson.core</groupId>
2828
<artifactId>jackson-annotations</artifactId>
29-
<version>2.11.0</version>
29+
<version>2.13.3</version>
3030
</dependency>
3131
<dependency>
3232
<groupId>com.fasterxml.jackson.core</groupId>
3333
<artifactId>jackson-core</artifactId>
34-
<version>2.11.0</version>
34+
<version>2.13.3</version>
3535
</dependency>
3636
<dependency>
3737
<groupId>com.fasterxml.jackson.core</groupId>
3838
<artifactId>jackson-databind</artifactId>
39-
<version>2.11.0</version>
39+
<version>2.13.3</version>
4040
</dependency>
4141
<dependency>
4242
<groupId>org.apache.commons</groupId>

0 commit comments

Comments
 (0)