Skip to content

Commit

Permalink
Merge branch 'master' into tatu/3.0/3406-FAIL_ON_TRAILING-defaults
Browse files Browse the repository at this point in the history
  • Loading branch information
cowtowncoder authored Jan 25, 2025
2 parents 2633426 + d7b2b6d commit 05b6d11
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
5 changes: 2 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<!-- This module was also published with a richer model, Gradle metadata, -->
<!-- which should be used instead. Do not delete the following line which -->
<!-- is to indicate to Gradle or any Gradle module metadata file consumer -->
Expand All @@ -17,7 +17,6 @@
<artifactId>jackson-databind</artifactId>
<version>3.0.0-SNAPSHOT</version>
<name>jackson-databind</name>

<description>General data-binding functionality for Jackson: works on core streaming API</description>
<url>https://github.com/FasterXML/jackson</url>
<inceptionYear>2008</inceptionYear>
Expand Down Expand Up @@ -54,7 +53,7 @@
<version.android.sdk.signature>0.10.0</version.android.sdk.signature>

<version.bytebuddy>1.15.10</version.bytebuddy>
<version.mockito>5.14.2</version.mockito>
<version.mockito>5.15.2</version.mockito>

<!-- Can not use default, since group id != Java package name here -->
<osgi.export>tools.jackson.databind.*;version=${project.version}</osgi.export>
Expand Down
2 changes: 1 addition & 1 deletion release-notes/VERSION
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Project: jackson-databind
Versions: 3.x (for earlier see VERSION-2.x)

------------------------------------------------------------------------
=== Releases ===
=== Releases ===
------------------------------------------------------------------------

3.0.0 (not yet released)
Expand Down

0 comments on commit 05b6d11

Please sign in to comment.