New Upstream Snapshot - jackson-annotations
Ready changes
Summary
Merged new upstream version: 2.14.0+git20221130.1.0c8e96a+ds (was: 2.14.0).
Resulting package
Built on 2022-12-17T14:20 (took 8m27s)
The resulting binary packages can be installed (if you have the apt repository enabled) by running one of:
apt install -t fresh-snapshots libjackson2-annotations-java-docapt install -t fresh-snapshots libjackson2-annotations-java
Diff
diff --git a/.gitattributes b/.gitattributes
deleted file mode 100644
index 4cf2927..0000000
--- a/.gitattributes
+++ /dev/null
@@ -1,3 +0,0 @@
-# Do not merge `pom.xml` from older version, as it will typically conflict
-
-pom.xml merge=ours
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
deleted file mode 100644
index c4dcd8b..0000000
--- a/.github/FUNDING.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-tidelift: "maven/com.fasterxml.jackson.core:jackson-annotations"
-github: cowtowncoder
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
deleted file mode 100644
index 4d1bb92..0000000
--- a/.github/ISSUE_TEMPLATE.md
+++ /dev/null
@@ -1,9 +0,0 @@
-We appreciate issues as very valuable contributions, but just to make sure here are things that are important to do before filing an issue:
-
-* Only report issues (and perhaps request new features, FEATURE)
-* Usage questions should be asked on [Jackson-user](https://groups.google.com/g/jackson-user) list -- you are more likely to get help that way (and we will promptly close questions-as-issues)
-* This repo -- `jackson-annotations` -- only defines annotation types, and actual implementation of behavior is within `jackson-databind`, so very often this is NOT THE PLACE TO FILE AN ISSUE.
-* Check to see if this issue has already been reported (quick glance at existing issues): no deep search necessary, just quick sanity check
-* Include version information for Jackson version you use
-* (optional but highly recommended) Verify that the problem occurs with the latest patch of same minor version; and even better, if possible, try using the latest stable patch version
- * For example: if you observe an issue with version `2.4.1`, first upgrade to `2.4.6` to ensure problem has not already been fixed.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
deleted file mode 100644
index 5ace460..0000000
--- a/.github/dependabot.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-version: 2
-updates:
- - package-ecosystem: "github-actions"
- directory: "/"
- schedule:
- interval: "weekly"
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
deleted file mode 100644
index 4f2105c..0000000
--- a/.github/workflows/main.yml
+++ /dev/null
@@ -1,58 +0,0 @@
-name: Build and Deploy Snapshot
-on:
- push:
- branches:
- - master
- - "3.0"
- - "2.14"
- paths-ignore:
- - "README.md"
- - "release-notes/*"
- pull_request:
- branches:
- - master
- - "3.0"
- - "2.14"
- paths-ignore:
- - "README.md"
- - "release-notes/*"
-permissions:
- contents: read
-
-jobs:
- build:
- runs-on: ${{ matrix.os }}
- strategy:
- fail-fast: false
- matrix:
- # Alas, as long as JDK6 is target, cannot run against 14+
- java_version: ['8', '11']
- os: ['ubuntu-20.04']
- env:
- JAVA_OPTS: "-XX:+TieredCompilation -XX:TieredStopAtLevel=1"
- steps:
- - uses: actions/checkout@v3
- - name: Set up JDK
- uses: actions/setup-java@v3
- with:
- distribution: 'temurin'
- java-version: ${{ matrix.java_version }}
- cache: 'maven'
- server-id: sonatype-nexus-snapshots
- server-username: CI_DEPLOY_USERNAME
- server-password: CI_DEPLOY_PASSWORD
- # See https://github.com/actions/setup-java/blob/v2/docs/advanced-usage.md#Publishing-using-Apache-Maven
- # gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }} # Value of the GPG private key to import
- # gpg-passphrase: MAVEN_GPG_PASSPHRASE # env variable for GPG private key passphrase
- - name: Build
- run: ./mvnw -V -B -ff -ntp verify
- - name: Extract project Maven version
- id: projectVersion
- run: echo "version=$(./mvnw org.apache.maven.plugins:maven-help-plugin:3.2.0:evaluate -DforceStdout -Dexpression=project.version -q)" >> $GITHUB_OUTPUT
- - name: Deploy snapshot
- if: github.event_name != 'pull_request' && matrix.java_version == '8' && endsWith(steps.projectVersion.outputs.version, '-SNAPSHOT')
- env:
- CI_DEPLOY_USERNAME: ${{ secrets.CI_DEPLOY_USERNAME }}
- CI_DEPLOY_PASSWORD: ${{ secrets.CI_DEPLOY_PASSWORD }}
- # MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
- run: ./mvnw -B -ff -DskipTests -ntp source:jar deploy
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index f7b0a4a..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,22 +0,0 @@
-# use glob syntax.
-syntax: glob
-*.class
-*~
-*.bak
-*.off
-*.old
-.DS_Store
-
-# building
-target
-
-# Eclipse
-.classpath
-.project
-.settings
-
-# IDEA
-*.iml
-*.ipr
-*.iws
-/.idea/
diff --git a/debian/changelog b/debian/changelog
index 5990a0c..9cf2df5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+jackson-annotations (2.14.0+git20221130.1.0c8e96a+ds-1) UNRELEASED; urgency=low
+
+ * New upstream snapshot.
+
+ -- Debian Janitor <janitor@jelmer.uk> Sat, 17 Dec 2022 14:15:05 -0000
+
jackson-annotations (2.14.0-1) unstable; urgency=medium
* New upstream version 2.14.0.
diff --git a/debian/patches/fix-using-bundle.patch b/debian/patches/fix-using-bundle.patch
index 12b72f2..a4145bb 100644
--- a/debian/patches/fix-using-bundle.patch
+++ b/debian/patches/fix-using-bundle.patch
@@ -1,9 +1,11 @@
From: Markus Koschany <apo@debian.org>
Date: Wed, 11 Oct 2017 23:58:48 +0200
Subject: fix using bundle
---- a/pom.xml
-+++ b/pom.xml
-@@ -75,6 +75,18 @@
+Index: jackson-annotations.git/pom.xml
+===================================================================
+--- jackson-annotations.git.orig/pom.xml
++++ jackson-annotations.git/pom.xml
+@@ -79,6 +79,18 @@
<!-- First: no replacer plugin (no Packaversion.java.in) for this package -->
<plugin>
diff --git a/pom.xml b/pom.xml
index 48919b3..1ec86d6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,14 +10,14 @@
<groupId>com.fasterxml.jackson</groupId>
<!-- this is one of few Jackson modules that depends on parent and NOT jackson-bom -->
<artifactId>jackson-parent</artifactId>
- <version>2.14</version>
+ <version>2.15-SNAPSHOT</version>
</parent>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<name>Jackson-annotations</name>
- <version>2.14.0</version>
- <packaging>bundle</packaging>
+ <version>2.15.0-SNAPSHOT</version>
+ <packaging>jar</packaging>
<description>Core annotations used for value types, used by Jackson data binding package.
</description>
<inceptionYear>2008</inceptionYear>
@@ -34,7 +34,7 @@
<connection>scm:git:git@github.com:FasterXML/jackson-annotations.git</connection>
<developerConnection>scm:git:git@github.com:FasterXML/jackson-annotations.git</developerConnection>
<url>https://github.com/FasterXML/jackson-annotations</url>
- <tag>jackson-annotations-2.14.0</tag>
+ <tag>HEAD</tag>
</scm>
<properties>
@@ -50,7 +50,7 @@
<osgi.export>com.fasterxml.jackson.annotation.*;version=${project.version}</osgi.export>
<!-- for Reproducible Builds -->
- <project.build.outputTimestamp>2022-11-05T20:15:48Z</project.build.outputTimestamp>
+ <project.build.outputTimestamp>2022-11-27T00:00:00Z</project.build.outputTimestamp>
</properties>
<dependencies>
@@ -167,6 +167,31 @@
</executions>
</plugin>
+ <!-- 27-Nov-2022, tatu: Since we don't get defaults from "jackson-base"
+ need to configure Felix-bundle/Maven-jar plugins wrt Reproducible Build
+ -->
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>bundle-manifest</id>
+ <phase>process-classes</phase>
+ <goals>
+ <goal>manifest</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+ </archive>
+ </configuration>
+ </plugin>
</plugins>
</build>
diff --git a/release-notes/VERSION-2.x b/release-notes/VERSION-2.x
index 1d2d192..74f7205 100644
--- a/release-notes/VERSION-2.x
+++ b/release-notes/VERSION-2.x
@@ -11,6 +11,10 @@ NOTE: Annotations module will never contain changes in patch versions,
=== Releases ===
------------------------------------------------------------------------
+2.15.0 (not yet released)
+
+No changes since 2.14
+
2.14.0 (05-Nov-2022)
#204: Allow explicit `JsonSubTypes` repeated names check
diff --git a/src/main/java/com/fasterxml/jackson/annotation/JsonProperty.java b/src/main/java/com/fasterxml/jackson/annotation/JsonProperty.java
index 295517f..08bde4f 100644
--- a/src/main/java/com/fasterxml/jackson/annotation/JsonProperty.java
+++ b/src/main/java/com/fasterxml/jackson/annotation/JsonProperty.java
@@ -8,15 +8,27 @@ import java.lang.annotation.Target;
/**
* Marker annotation that can be used to define a non-static
* method as a "setter" or "getter" for a logical property
- * (depending on its signature),
- * or non-static object field to be used (serialized, deserialized) as
- * a logical property.
+ * accessor (depending on its signature),
+ * or a non-static Object field to be used (serialized, deserialized)
+ * as a logical property (to assign value or get value from)
*<p>
- * Default value ("") indicates that the field name is used
- * as the property name without any modifications, but it
- * can be specified to non-empty value to specify different
- * name. Property name refers to name used externally, as
- * the field name in JSON objects.
+ * Value ("") indicates that the name of field (or, derived name
+ * of an accessor method (setter / getter)) is to be used
+ * as the property name without any modifications; a non-empty value
+ * can be used to specify a different name.
+ * Property name refers to the name used externally, as the property
+ * name in JSON objects (as opposed to internal name of field in
+ * Java Object).
+ *<p>
+ * NOTE: annotation with non-empty Value can NOT be used if declaring multiple
+ * Java fields in a single declaration like:
+ *<pre>
+ * public class POJO {
+ * \@JsonProperty("a")
+ * public int a, b, c;
+ *</pre>
+ * since it would associate same annotation for all fields, leading to name
+ * collision.
*<p>
* Starting with Jackson 2.6 this annotation may also be
* used to change serialization of <code>Enum</code> like so:
Debdiff
[The following lists of changes regard files as different if they have different names, permissions or owners.]
Files in second set of .debs but not in first
-rw-r--r-- root/root /usr/share/maven-repo/com/fasterxml/jackson/core/jackson-annotations/2.15.0-SNAPSHOT/jackson-annotations-2.15.0-SNAPSHOT.pom -rw-r--r-- root/root /usr/share/maven-repo/com/fasterxml/jackson/core/jackson-annotations/debian/jackson-annotations-debian.pom lrwxrwxrwx root/root /usr/share/java/jackson-annotations-2.15.0-SNAPSHOT.jar -> jackson-annotations.jar lrwxrwxrwx root/root /usr/share/maven-repo/com/fasterxml/jackson/core/jackson-annotations/2.15.0-SNAPSHOT/jackson-annotations-2.15.0-SNAPSHOT.jar -> ../../../../../../../java/jackson-annotations.jar lrwxrwxrwx root/root /usr/share/maven-repo/com/fasterxml/jackson/core/jackson-annotations/debian/jackson-annotations-debian.jar -> ../../../../../../../java/jackson-annotations.jar
Files in first set of .debs but not in second
-rw-r--r-- root/root /usr/share/maven-repo/com/fasterxml/jackson/core/jackson-annotations/2.14.0/jackson-annotations-2.14.0.pom -rw-r--r-- root/root /usr/share/maven-repo/com/fasterxml/jackson/core/jackson-annotations/2.x/jackson-annotations-2.x.pom lrwxrwxrwx root/root /usr/share/java/jackson-annotations-2.14.0.jar -> jackson-annotations.jar lrwxrwxrwx root/root /usr/share/maven-repo/com/fasterxml/jackson/core/jackson-annotations/2.14.0/jackson-annotations-2.14.0.jar -> ../../../../../../../java/jackson-annotations.jar lrwxrwxrwx root/root /usr/share/maven-repo/com/fasterxml/jackson/core/jackson-annotations/2.x/jackson-annotations-2.x.jar -> ../../../../../../../java/jackson-annotations.jar
No differences were encountered between the control files of package libjackson2-annotations-java
No differences were encountered between the control files of package libjackson2-annotations-java-doc