Skip to content

Commit 4e9dc9a

Browse files
committed
Merge remote-tracking branch 'origin/release/2.0.0.0' into main
2 parents 6312e7d + 3c86d3c commit 4e9dc9a

107 files changed

Lines changed: 9806 additions & 1186 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

eclipse-formatter-config.xml

Lines changed: 194 additions & 172 deletions
Large diffs are not rendered by default.

pom.xml

Lines changed: 41 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@
55

66
<groupId>dev.dsf</groupId>
77
<artifactId>dsf-process-ping-pong</artifactId>
8-
<version>1.0.1.0</version>
8+
<version>2.0.0.0</version>
99
<packaging>jar</packaging>
1010

1111
<properties>
1212
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1313
<compileSource>17</compileSource>
1414
<compileTarget>17</compileTarget>
1515

16-
<dsf.version>1.2.0</dsf.version>
16+
<dsf.version>1.8.0</dsf.version>
1717
<dsf.location>../dsf</dsf.location>
1818
</properties>
1919

@@ -56,6 +56,26 @@
5656
<scope>provided</scope>
5757
</dependency>
5858

59+
<dependency>
60+
<groupId>com.fasterxml.jackson.datatype</groupId>
61+
<artifactId>jackson-datatype-jsr310</artifactId>
62+
<version>2.19.0</version>
63+
<exclusions>
64+
<exclusion>
65+
<groupId>com.fasterxml.jackson.core</groupId>
66+
<artifactId>jackson-core</artifactId>
67+
</exclusion>
68+
<exclusion>
69+
<groupId>com.fasterxml.jackson.core</groupId>
70+
<artifactId>jackson-databind</artifactId>
71+
</exclusion>
72+
<exclusion>
73+
<groupId>com.fasterxml.jackson.core</groupId>
74+
<artifactId>jackson-annotations</artifactId>
75+
</exclusion>
76+
</exclusions>
77+
</dependency>
78+
5979
<!-- testing -->
6080
<dependency>
6181
<groupId>dev.dsf</groupId>
@@ -115,6 +135,25 @@
115135
<groupId>org.apache.maven.plugins</groupId>
116136
<artifactId>maven-shade-plugin</artifactId>
117137
<version>3.5.0</version>
138+
<executions>
139+
<execution>
140+
<phase>package</phase>
141+
<goals>
142+
<goal>shade</goal>
143+
</goals>
144+
<configuration>
145+
<createDependencyReducedPom>false</createDependencyReducedPom>
146+
<filters>
147+
<filter>
148+
<artifact>com.fasterxml.jackson.datatype:jackson-datatype-jsr310</artifact>
149+
<includes>
150+
<include>**</include>
151+
</includes>
152+
</filter>
153+
</filters>
154+
</configuration>
155+
</execution>
156+
</executions>
118157
</plugin>
119158
<plugin>
120159
<groupId>org.apache.maven.plugins</groupId>

0 commit comments

Comments
 (0)