Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package jackson-bom for openSUSE:Factory checked in at 2021-10-21 23:55:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/jackson-bom (Old) and /work/SRC/openSUSE:Factory/.jackson-bom.new.1890 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "jackson-bom" Thu Oct 21 23:55:16 2021 rev:6 rq:926591 version:2.13.0 Changes: -------- --- /work/SRC/openSUSE:Factory/jackson-bom/jackson-bom.changes 2021-04-27 21:34:33.135972935 +0200 +++ /work/SRC/openSUSE:Factory/.jackson-bom.new.1890/jackson-bom.changes 2021-10-21 23:55:21.528020316 +0200 @@ -1,0 +2,34 @@ +Wed Oct 20 06:07:26 UTC 2021 - Fridrich Strba <[email protected]> + +- Update to version 2.13.0 + * 2.13.0 (30-Sep-2021) + + #39: Configure moditect plugin with + '<jvmVersion>11</jvmVersion>' + + #43: jackson-bom manages the version of 'junit:junit' + + [datatype-hibernate#39]: Drop 'jackson-datatype-hibernate3' + (support for Hibernate 3.x datatypes) + + [jackson-jarx-providers#146] due to addition of new Jakarta + artifacts - (Jakarta-JSONP, Jakarta-xmlbind-annotations, + Jakarta-rs-providers) - removed "jakarta" classifier variants + of JAXB/JSON-P/JAX-RS modules + * 2.12.3 (12-Apr-2021) + + Add version for 'jackson-datatype-jakarta-jsonp' module + (introduced after 2.12.2) + + Add (beta) version for 'jackson-dataformat-toml' + * 2.12.2 (03-Mar-2021) + + #40: Jakarta 9 artifact versions are missing from jackson-bom + * 2.12.0 (29-Nov-2020) + + Add another execution of 'maven-replacer-plugin' for + "prepare-package" phase + to help with IDE import. + + Add default settings for 'gradle-module-metadata-maven-plugin' + (gradle metadata) + + Add default settings for 'build-helper-maven-plugin' + (LICENSE inclusion) + + Drop 'jackson-module-scala_2.10' entry (not released for + Jackson 2.12 or later) + * 2.11.2 + + Add override for 'version.plugin.bundle' (for 5.1.1) to help + build on JDK 15+ + +------------------------------------------------------------------- Old: ---- jackson-bom-2.10.5.tar.gz New: ---- jackson-bom-2.13.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ jackson-bom.spec ++++++ --- /var/tmp/diff_new_pack.fMp2bI/_old 2021-10-21 23:55:21.964020539 +0200 +++ /var/tmp/diff_new_pack.fMp2bI/_new 2021-10-21 23:55:21.968020542 +0200 @@ -17,7 +17,7 @@ Name: jackson-bom -Version: 2.10.5 +Version: 2.13.0 Release: 0 Summary: Bill of materials POM for Jackson projects License: Apache-2.0 ++++++ jackson-bom-2.10.5.tar.gz -> jackson-bom-2.13.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jackson-bom-jackson-bom-2.10.5/.github/workflows/main.yml new/jackson-bom-jackson-bom-2.13.0/.github/workflows/main.yml --- old/jackson-bom-jackson-bom-2.10.5/.github/workflows/main.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/jackson-bom-jackson-bom-2.13.0/.github/workflows/main.yml 2021-09-30 21:40:52.000000000 +0200 @@ -0,0 +1,44 @@ +name: Build and Deploy Snapshot +on: + push: + branches: + - master + - "3.0" + - "2.13" + paths-ignore: + - "README.md" +jobs: + build: + runs-on: ${{ matrix.os }} + strategy: + fail-fast: false + matrix: + java_version: ['8', '14'] + os: ['ubuntu-20.04'] + env: + JAVA_OPTS: "-XX:+TieredCompilation -XX:TieredStopAtLevel=1" + steps: + - uses: actions/checkout@v2 + - name: Set up JDK + uses: actions/setup-java@v2 + with: + distribution: "adopt" + java-version: ${{ matrix.java_version }} + server-id: sonatype-nexus-snapshots + server-username: CI_DEPLOY_USERNAME + server-password: CI_DEPLOY_PASSWORD + - uses: actions/[email protected] + with: + path: ~/.m2/repository + key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} + restore-keys: | + ${{ runner.os }}-maven- + - name: Build + run: ./mvnw -V -B -ff -ntp verify + - name: Deploy snapshot + if: github.event_name != 'pull_request' && matrix.java_version == '8' + env: + CI_DEPLOY_USERNAME: ${{ secrets.CI_DEPLOY_USERNAME }} + CI_DEPLOY_PASSWORD: ${{ secrets.CI_DEPLOY_PASSWORD }} + # MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }} + run: ./mvnw -V -B -ff -DskipTests -ntp source:jar deploy diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jackson-bom-jackson-bom-2.10.5/.mvn/wrapper/MavenWrapperDownloader.java new/jackson-bom-jackson-bom-2.13.0/.mvn/wrapper/MavenWrapperDownloader.java --- old/jackson-bom-jackson-bom-2.10.5/.mvn/wrapper/MavenWrapperDownloader.java 1970-01-01 01:00:00.000000000 +0100 +++ new/jackson-bom-jackson-bom-2.13.0/.mvn/wrapper/MavenWrapperDownloader.java 2021-09-30 21:40:52.000000000 +0200 @@ -0,0 +1,117 @@ +/* + * Copyright 2007-present the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +import java.net.*; +import java.io.*; +import java.nio.channels.*; +import java.util.Properties; + +public class MavenWrapperDownloader { + + private static final String WRAPPER_VERSION = "0.5.6"; + /** + * Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided. + */ + private static final String DEFAULT_DOWNLOAD_URL = "https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/"; + + WRAPPER_VERSION + "/maven-wrapper-" + WRAPPER_VERSION + ".jar"; + + /** + * Path to the maven-wrapper.properties file, which might contain a downloadUrl property to + * use instead of the default one. + */ + private static final String MAVEN_WRAPPER_PROPERTIES_PATH = + ".mvn/wrapper/maven-wrapper.properties"; + + /** + * Path where the maven-wrapper.jar will be saved to. + */ + private static final String MAVEN_WRAPPER_JAR_PATH = + ".mvn/wrapper/maven-wrapper.jar"; + + /** + * Name of the property which should be used to override the default download url for the wrapper. + */ + private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl"; + + public static void main(String args[]) { + System.out.println("- Downloader started"); + File baseDirectory = new File(args[0]); + System.out.println("- Using base directory: " + baseDirectory.getAbsolutePath()); + + // If the maven-wrapper.properties exists, read it and check if it contains a custom + // wrapperUrl parameter. + File mavenWrapperPropertyFile = new File(baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH); + String url = DEFAULT_DOWNLOAD_URL; + if(mavenWrapperPropertyFile.exists()) { + FileInputStream mavenWrapperPropertyFileInputStream = null; + try { + mavenWrapperPropertyFileInputStream = new FileInputStream(mavenWrapperPropertyFile); + Properties mavenWrapperProperties = new Properties(); + mavenWrapperProperties.load(mavenWrapperPropertyFileInputStream); + url = mavenWrapperProperties.getProperty(PROPERTY_NAME_WRAPPER_URL, url); + } catch (IOException e) { + System.out.println("- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'"); + } finally { + try { + if(mavenWrapperPropertyFileInputStream != null) { + mavenWrapperPropertyFileInputStream.close(); + } + } catch (IOException e) { + // Ignore ... + } + } + } + System.out.println("- Downloading from: " + url); + + File outputFile = new File(baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH); + if(!outputFile.getParentFile().exists()) { + if(!outputFile.getParentFile().mkdirs()) { + System.out.println( + "- ERROR creating output directory '" + outputFile.getParentFile().getAbsolutePath() + "'"); + } + } + System.out.println("- Downloading to: " + outputFile.getAbsolutePath()); + try { + downloadFileFromURL(url, outputFile); + System.out.println("Done"); + System.exit(0); + } catch (Throwable e) { + System.out.println("- Error downloading"); + e.printStackTrace(); + System.exit(1); + } + } + + private static void downloadFileFromURL(String urlString, File destination) throws Exception { + if (System.getenv("MVNW_USERNAME") != null && System.getenv("MVNW_PASSWORD") != null) { + String username = System.getenv("MVNW_USERNAME"); + char[] password = System.getenv("MVNW_PASSWORD").toCharArray(); + Authenticator.setDefault(new Authenticator() { + @Override + protected PasswordAuthentication getPasswordAuthentication() { + return new PasswordAuthentication(username, password); + } + }); + } + URL website = new URL(urlString); + ReadableByteChannel rbc; + rbc = Channels.newChannel(website.openStream()); + FileOutputStream fos = new FileOutputStream(destination); + fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE); + fos.close(); + rbc.close(); + } + +} Binary files old/jackson-bom-jackson-bom-2.10.5/.mvn/wrapper/maven-wrapper.jar and new/jackson-bom-jackson-bom-2.13.0/.mvn/wrapper/maven-wrapper.jar differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jackson-bom-jackson-bom-2.10.5/.mvn/wrapper/maven-wrapper.properties new/jackson-bom-jackson-bom-2.13.0/.mvn/wrapper/maven-wrapper.properties --- old/jackson-bom-jackson-bom-2.10.5/.mvn/wrapper/maven-wrapper.properties 1970-01-01 01:00:00.000000000 +0100 +++ new/jackson-bom-jackson-bom-2.13.0/.mvn/wrapper/maven-wrapper.properties 2021-09-30 21:40:52.000000000 +0200 @@ -0,0 +1,2 @@ +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip +wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jackson-bom-jackson-bom-2.10.5/.travis.yml new/jackson-bom-jackson-bom-2.13.0/.travis.yml --- old/jackson-bom-jackson-bom-2.10.5/.travis.yml 2020-07-21 03:32:47.000000000 +0200 +++ new/jackson-bom-jackson-bom-2.13.0/.travis.yml 2021-09-30 21:40:52.000000000 +0200 @@ -2,21 +2,6 @@ jdk: - openjdk8 - - openjdk11 + - openjdk14 -# Below this line is configuration for deploying to the Sonatype OSS repo -# https://knowm.org/configure-travis-ci-to-deploy-snapshots/ -before_install: "git clone -b travis `git config --get remote.origin.url` target/travis" -after_success: "mvn deploy --settings target/travis/settings.xml" - -# whitelist -branches: - only: - - master - - "2.10" - -# pwd for same account as one releasing real versions via Sonatype OSS repo -env: - global: - - secure: "Zl7mEwIgiEwLjWkWIdRne4Dt/FtnLKjwzM7Dmkv8/nHIukgxqduAWI6K4jfWBLcRWxlSrcTWxAwq0v/sqyn5/gsXiX/TNpt2R8j2STiSxtlxU6pw8J5XWfjhL5ReiO3uVWjUG77ouWUhv/kMeOdn4uo1YsmJ9lTh+E18W8CsOVI/XUwJytAGVx+vMz5VMDm+42JE6a01ERCCkmtgS32jwZSSQq2dwDh2X/RtSRPsMvKT1jbDSpA+2YQyJABNBVdl4c/Aw6pOjuQLuN0UocZ6FaFNZpHzrA6cSB3/D30TEO9MUdPfsbWAJVO5dnO7AGm3/hk6vfk7LRVDIVdpQioFqwsrXSo2Vf6aOtw4Z9GYEkaBfLCVqy5tP0xgONafkKYi2Kn+hgjvYNx3mrhGoRV5ZyM3b4tj3RwUhQGUBcoOrbleOKD7W9kjH8U7cK+77iAO7ODSVQbw78HWvYK57SOuuZD/OyIWbnvOC5C4jEUY8Rf9u2Km8oFawewCQ8uFc0JlK+O8ddG+9KrwEjLMzI9valE7k9I9N4vyWgm8qtiOKcKnIxMFMy/FdzX/mB406uTzp+5LX93g88cc8Itrz3IyHy9DUNsCVpnGFllYlzJDbQXaJFElIyq/OE52CLrn85ixDcGslchzEqi04wTe7BOx86m4Mj7uST6AAyn12fOUaeo=" - - secure: "qDfOx34obulZw3QWovdtwW5wkzEfIXA5franVgppjgGf1y57mvkGZTJNhMbjny348AnYxStNlsESBrausS3Gx3OKfqXhqZhbmzv9wZbBnhtzh3aplndhsU5apldz6rBXXM+yyK1qPLgc/DQW3fZVP82Lk3AFSCm/K3GaqLXfHsQ2xzigliyK5YqTKe0g7BUaQl3HLo3nDji/wXU3lFeRyLHIeE3jN2+ZafCOiL+hgu6uNAyiRagY008koBf/KqDvTLOIYGzKK6RLltJdh4GtZryHSVvWzRUDd6E5Grv1TQB2HpM4NCt0Y2ZuiLizSjNpykw1AtpmC1tvAYkOQ0fElmShQtHx4UuGrjiRtOqJl3zFKNo+aCPnnCtl9bvPR8bWFq66/lqay/PMPqr/4BBUb/hJZJzWyXdbpKKSFGTdRPa/rKavOUrdcXjjQXKiynZGt+B9x5/CIQnkocc1cYTV12Kvex8BSZcmiCnXdNKyWUV2d9HnpcieBq1YOO+QqalOWQc4c1ZTbSOQAg/b6BpWz7ctLM/UoUXP7SWXANoJM1/Yq85qm2o+IG3oBD+MlYrkQ8nXTqUHqAlhiNZDtjUfS3XmcaCcI9xvZNczDTY0EpVgsAsbDnbfQtEy+ioc1p5xuNHZQB9lemWNohg6SFNjT8gz0YdybckPv2spJDqB8G4=" +script: mvn -B clean verify diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jackson-bom-jackson-bom-2.10.5/README.md new/jackson-bom-jackson-bom-2.13.0/README.md --- old/jackson-bom-jackson-bom-2.10.5/README.md 2020-07-21 03:32:47.000000000 +0200 +++ new/jackson-bom-jackson-bom-2.13.0/README.md 2021-09-30 21:40:52.000000000 +0200 @@ -14,7 +14,7 @@ <parent> <groupId>com.fasterxml.jackson</groupId> <artifactId>jackson-bom</artifactId> - <version>2.10.0</version> + <version>2.12.1</version> </parent> ``` @@ -26,7 +26,7 @@ <dependency> <groupId>com.fasterxml.jackson</groupId> <artifactId>jackson-bom</artifactId> - <version>2.9.0</version> + <version>2.12.1</version> <scope>import</scope> <type>pom</type> </dependency> @@ -45,3 +45,21 @@ are only/mostly relevant for Jackson components, but not to things that depend on Jackson in general. Use of `jackson-base` is not recommended for libraries that are not meant to be coupled with Jackson release cycle and settings. + +## Support + +### Community support + +Jackson components are supported by the Jackson community through mailing lists, Gitter forum, +Github issues. See [Participation, Contributing](../../../jackson#participation-contributing) +for full details. + +### Enterprise support + +Available as part of the Tidelift Subscription. + +The maintainers of `jackson-bom` and thousands of other packages are working with Tidelift to deliver +commercial support and maintenance for the open source dependencies you use to build your applications. +Save time, reduce risk, and improve code health, while paying the maintainers of the exact dependencies +you use. +[Learn more.](https://tidelift.com/subscription/pkg/maven-com-fasterxml-jackson-jackson-bom?utm_source=maven-com-fasterxml-jackson-jackson-bom&utm_medium=referral&utm_campaign=enterprise&utm_term=repo) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jackson-bom-jackson-bom-2.10.5/SECURITY.md new/jackson-bom-jackson-bom-2.13.0/SECURITY.md --- old/jackson-bom-jackson-bom-2.10.5/SECURITY.md 1970-01-01 01:00:00.000000000 +0100 +++ new/jackson-bom-jackson-bom-2.13.0/SECURITY.md 2021-09-30 21:40:52.000000000 +0200 @@ -0,0 +1,14 @@ +# Security Policy + +Last Updated: 2020-03-21 + +## Reporting a Vulnerability + +In unlikely event of finding a security vulnerability directly relating to `jackson-bom` +package -- unlikely, as there is no code in this package, just dependencies -- +the recommended mechanism for reporting possible security vulnerabilities follows +so-called "Coordinated Disclosure Plan" (see [definition of DCP](https://vuls.cert.org/confluence/display/Wiki/Coordinated+Vulnerability+Disclosure+Guidance) +for general idea). The first step is to file a [Tidelift security contact](https://tidelift.com/security): +Tidelift will route all reports via their system to maintainers of relevant package(s), and start the +process that will evaluate concern and issue possible fixes, send update notices and so on. +Note that you do not need to be a Tidelift subscriber to file a security contact. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jackson-bom-jackson-bom-2.10.5/base/pom.xml new/jackson-bom-jackson-bom-2.13.0/base/pom.xml --- old/jackson-bom-jackson-bom-2.10.5/base/pom.xml 2020-07-21 03:32:47.000000000 +0200 +++ new/jackson-bom-jackson-bom-2.13.0/base/pom.xml 2021-09-30 21:40:52.000000000 +0200 @@ -4,14 +4,23 @@ <parent> <groupId>com.fasterxml.jackson</groupId> <artifactId>jackson-bom</artifactId> - <version>2.10.5</version> + <version>2.13.0</version> </parent> <artifactId>jackson-base</artifactId> + <name>Jackson Base</name> <packaging>pom</packaging> <description>Parent pom for components of Jackson dataprocessor: includes base settings as well as consistent set of dependencies across components. NOTE: NOT to be used by components outside of Jackson: application code should only rely on `jackson-bom` </description> + <licenses> + <license> + <name>The Apache Software License, Version 2.0</name> + <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> + <distribution>repo</distribution> + </license> + </licenses> + <properties> <moditect.sourceGroup>${project.groupId}</moditect.sourceGroup> <moditect.sourceArtifact>${project.artifactId}</moditect.sourceArtifact> @@ -22,23 +31,24 @@ <dependency> <!-- all components use junit for testing --> <groupId>junit</groupId> <artifactId>junit</artifactId> + <version>${version.junit}</version> <scope>test</scope> </dependency> </dependencies> - <dependencyManagement> - <dependencies> - <!-- JPMS Libraries--> - <dependency> - <groupId>javax.activation</groupId> - <artifactId>javax.activation-api</artifactId> - <version>${javax.activation.version}</version> - </dependency> - </dependencies> + <dependencyManagement> + <dependencies> + <!-- JPMS Libraries--> + <dependency> + <groupId>javax.activation</groupId> + <artifactId>javax.activation-api</artifactId> + <version>${javax.activation.version}</version> + </dependency> + </dependencies> - </dependencyManagement> + </dependencyManagement> - <build> + <build> <pluginManagement> <plugins> <!-- Verify existence of certain settings @@ -111,7 +121,12 @@ </links> </configuration> </plugin> - <!-- Set up replacer but do not invoke (it's pom, after all) --> + <!-- Bind replacer execution (defined in `jackson-parent` for 2.x) + to "generate-sources" phase (see + https://avajava.com/tutorials/lessons/what-are-the-phases-of-the-maven-default-lifecycle.html + ) by default; but do not trigger it (project still needs to add plugin + in build section) + --> <plugin> <groupId>com.google.code.maven-replacer-plugin</groupId> <artifactId>replacer</artifactId> @@ -134,22 +149,76 @@ <goal>add-module-info</goal> </goals> <configuration> - <overwriteExistingFiles>true</overwriteExistingFiles> - <module> + <overwriteExistingFiles>true</overwriteExistingFiles> + <module> <moduleInfoFile>src/moditect/module-info.java</moduleInfoFile> - </module> + </module> </configuration> </execution> </executions> + <!-- 22-Feb-2021, tatu: For Jackson 2.13+, put `module-info.class` + under "META-INF/versions/11" (instead of root, /); helps pre-Java9 + libraries, frameworks, as well as avoids warnings by tooling + --> + <configuration> + <jvmVersion>11</jvmVersion> + </configuration> </plugin> - </plugins> - </pluginManagement> + <plugin> + <groupId>de.jjohannes</groupId> + <artifactId>gradle-module-metadata-maven-plugin</artifactId> + <version>0.2.0</version> + <executions> + <execution> + <goals> + <goal>gmm</goal> + </goals> + </execution> + </executions> + <configuration> + <platformDependencies> + <dependency> + <groupId>com.fasterxml.jackson</groupId> + <artifactId>jackson-bom</artifactId> + <version>${project.version}</version> + </dependency> + </platformDependencies> + </configuration> + </plugin> + + <!-- 03-Nov-2020, tatu: For 2.12, defaults for better LICENSE inclusion --> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + <executions> + <execution> + <id>add-resource</id> + <phase>generate-resources</phase> + <goals> + <goal>add-resource</goal> + </goals> + <configuration> + <resources> + <resource> + <directory>${project.basedir}</directory> + <targetPath>META-INF</targetPath> + <includes> + <include>LICENSE</include> + </includes> + </resource> + </resources> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </pluginManagement> - <!-- And one more odd thing... we actually MUST disable checks just for this + <!-- And one more odd thing... we actually MUST disable checks just for this pom (but not on something that extends i) --> - <plugins> + <plugins> <plugin> <artifactId>maven-enforcer-plugin</artifactId> <executions> @@ -163,10 +232,11 @@ <!-- 12-Oct-2019, tatu: Copied from https://github.com/stephenc/git-timestamp-maven-plugin/blob/master/pom.xml#L327-L337 --> + <!-- 01-Aug-2020, tatu: Upgrade 1.6.6 -> 1.6.8 --> <plugin> <groupId>org.sonatype.plugins</groupId> <artifactId>nexus-staging-maven-plugin</artifactId> - <version>1.6.6</version> + <version>1.6.8</version> <extensions>true</extensions> <configuration> <serverId>sonatype-nexus-staging</serverId> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jackson-bom-jackson-bom-2.10.5/mvnw new/jackson-bom-jackson-bom-2.13.0/mvnw --- old/jackson-bom-jackson-bom-2.10.5/mvnw 1970-01-01 01:00:00.000000000 +0100 +++ new/jackson-bom-jackson-bom-2.13.0/mvnw 2021-09-30 21:40:52.000000000 +0200 @@ -0,0 +1,310 @@ +#!/bin/sh +# ---------------------------------------------------------------------------- +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# ---------------------------------------------------------------------------- + +# ---------------------------------------------------------------------------- +# Maven Start Up Batch script +# +# Required ENV vars: +# ------------------ +# JAVA_HOME - location of a JDK home dir +# +# Optional ENV vars +# ----------------- +# M2_HOME - location of maven2's installed home dir +# MAVEN_OPTS - parameters passed to the Java VM when running Maven +# e.g. to debug Maven itself, use +# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +# MAVEN_SKIP_RC - flag to disable loading of mavenrc files +# ---------------------------------------------------------------------------- + +if [ -z "$MAVEN_SKIP_RC" ] ; then + + if [ -f /etc/mavenrc ] ; then + . /etc/mavenrc + fi + + if [ -f "$HOME/.mavenrc" ] ; then + . "$HOME/.mavenrc" + fi + +fi + +# OS specific support. $var _must_ be set to either true or false. +cygwin=false; +darwin=false; +mingw=false +case "`uname`" in + CYGWIN*) cygwin=true ;; + MINGW*) mingw=true;; + Darwin*) darwin=true + # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home + # See https://developer.apple.com/library/mac/qa/qa1170/_index.html + if [ -z "$JAVA_HOME" ]; then + if [ -x "/usr/libexec/java_home" ]; then + export JAVA_HOME="`/usr/libexec/java_home`" + else + export JAVA_HOME="/Library/Java/Home" + fi + fi + ;; +esac + +if [ -z "$JAVA_HOME" ] ; then + if [ -r /etc/gentoo-release ] ; then + JAVA_HOME=`java-config --jre-home` + fi +fi + +if [ -z "$M2_HOME" ] ; then + ## resolve links - $0 may be a link to maven's home + PRG="$0" + + # need this for relative symlinks + while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG="`dirname "$PRG"`/$link" + fi + done + + saveddir=`pwd` + + M2_HOME=`dirname "$PRG"`/.. + + # make it fully qualified + M2_HOME=`cd "$M2_HOME" && pwd` + + cd "$saveddir" + # echo Using m2 at $M2_HOME +fi + +# For Cygwin, ensure paths are in UNIX format before anything is touched +if $cygwin ; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --unix "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --unix "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --unix "$CLASSPATH"` +fi + +# For Mingw, ensure paths are in UNIX format before anything is touched +if $mingw ; then + [ -n "$M2_HOME" ] && + M2_HOME="`(cd "$M2_HOME"; pwd)`" + [ -n "$JAVA_HOME" ] && + JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`" +fi + +if [ -z "$JAVA_HOME" ]; then + javaExecutable="`which javac`" + if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then + # readlink(1) is not available as standard on Solaris 10. + readLink=`which readlink` + if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then + if $darwin ; then + javaHome="`dirname \"$javaExecutable\"`" + javaExecutable="`cd \"$javaHome\" && pwd -P`/javac" + else + javaExecutable="`readlink -f \"$javaExecutable\"`" + fi + javaHome="`dirname \"$javaExecutable\"`" + javaHome=`expr "$javaHome" : '\(.*\)/bin'` + JAVA_HOME="$javaHome" + export JAVA_HOME + fi + fi +fi + +if [ -z "$JAVACMD" ] ; then + if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + else + JAVACMD="`which java`" + fi +fi + +if [ ! -x "$JAVACMD" ] ; then + echo "Error: JAVA_HOME is not defined correctly." >&2 + echo " We cannot execute $JAVACMD" >&2 + exit 1 +fi + +if [ -z "$JAVA_HOME" ] ; then + echo "Warning: JAVA_HOME environment variable is not set." +fi + +CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher + +# traverses directory structure from process work directory to filesystem root +# first directory with .mvn subdirectory is considered project base directory +find_maven_basedir() { + + if [ -z "$1" ] + then + echo "Path not specified to find_maven_basedir" + return 1 + fi + + basedir="$1" + wdir="$1" + while [ "$wdir" != '/' ] ; do + if [ -d "$wdir"/.mvn ] ; then + basedir=$wdir + break + fi + # workaround for JBEAP-8937 (on Solaris 10/Sparc) + if [ -d "${wdir}" ]; then + wdir=`cd "$wdir/.."; pwd` + fi + # end of workaround + done + echo "${basedir}" +} + +# concatenates all lines of a file +concat_lines() { + if [ -f "$1" ]; then + echo "$(tr -s '\n' ' ' < "$1")" + fi +} + +BASE_DIR=`find_maven_basedir "$(pwd)"` +if [ -z "$BASE_DIR" ]; then + exit 1; +fi + +########################################################################################## +# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +# This allows using the maven wrapper in projects that prohibit checking in binary data. +########################################################################################## +if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found .mvn/wrapper/maven-wrapper.jar" + fi +else + if [ "$MVNW_VERBOSE" = true ]; then + echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..." + fi + if [ -n "$MVNW_REPOURL" ]; then + jarUrl="$MVNW_REPOURL/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" + else + jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"; + fi + while IFS="=" read key value; do + case "$key" in (wrapperUrl) jarUrl="$value"; break ;; + esac + done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties" + if [ "$MVNW_VERBOSE" = true ]; then + echo "Downloading from: $jarUrl" + fi + wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" + if $cygwin; then + wrapperJarPath=`cygpath --path --windows "$wrapperJarPath"` + fi + + if command -v wget > /dev/null; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found wget ... using wget" + fi + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + wget "$jarUrl" -O "$wrapperJarPath" + else + wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath" + fi + elif command -v curl > /dev/null; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found curl ... using curl" + fi + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + curl -o "$wrapperJarPath" "$jarUrl" -f + else + curl --user $MVNW_USERNAME:$MVNW_PASSWORD -o "$wrapperJarPath" "$jarUrl" -f + fi + + else + if [ "$MVNW_VERBOSE" = true ]; then + echo "Falling back to using Java to download" + fi + javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java" + # For Cygwin, switch paths to Windows format before running javac + if $cygwin; then + javaClass=`cygpath --path --windows "$javaClass"` + fi + if [ -e "$javaClass" ]; then + if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then + if [ "$MVNW_VERBOSE" = true ]; then + echo " - Compiling MavenWrapperDownloader.java ..." + fi + # Compiling the Java class + ("$JAVA_HOME/bin/javac" "$javaClass") + fi + if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then + # Running the downloader + if [ "$MVNW_VERBOSE" = true ]; then + echo " - Running MavenWrapperDownloader.java ..." + fi + ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR") + fi + fi + fi +fi +########################################################################################## +# End of extension +########################################################################################## + +export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"} +if [ "$MVNW_VERBOSE" = true ]; then + echo $MAVEN_PROJECTBASEDIR +fi +MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" + +# For Cygwin, switch paths to Windows format before running java +if $cygwin; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --path --windows "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --windows "$CLASSPATH"` + [ -n "$MAVEN_PROJECTBASEDIR" ] && + MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"` +fi + +# Provide a "standardized" way to retrieve the CLI args that will +# work with both Windows and non-Windows executions. +MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@" +export MAVEN_CMD_LINE_ARGS + +WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +exec "$JAVACMD" \ + $MAVEN_OPTS \ + -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ + "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ + ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jackson-bom-jackson-bom-2.10.5/mvnw.cmd new/jackson-bom-jackson-bom-2.13.0/mvnw.cmd --- old/jackson-bom-jackson-bom-2.10.5/mvnw.cmd 1970-01-01 01:00:00.000000000 +0100 +++ new/jackson-bom-jackson-bom-2.13.0/mvnw.cmd 2021-09-30 21:40:52.000000000 +0200 @@ -0,0 +1,182 @@ +@REM ---------------------------------------------------------------------------- +@REM Licensed to the Apache Software Foundation (ASF) under one +@REM or more contributor license agreements. See the NOTICE file +@REM distributed with this work for additional information +@REM regarding copyright ownership. The ASF licenses this file +@REM to you under the Apache License, Version 2.0 (the +@REM "License"); you may not use this file except in compliance +@REM with the License. You may obtain a copy of the License at +@REM +@REM http://www.apache.org/licenses/LICENSE-2.0 +@REM +@REM Unless required by applicable law or agreed to in writing, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. +@REM ---------------------------------------------------------------------------- + +@REM ---------------------------------------------------------------------------- +@REM Maven Start Up Batch script +@REM +@REM Required ENV vars: +@REM JAVA_HOME - location of a JDK home dir +@REM +@REM Optional ENV vars +@REM M2_HOME - location of maven2's installed home dir +@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands +@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending +@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven +@REM e.g. to debug Maven itself, use +@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files +@REM ---------------------------------------------------------------------------- + +@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on' +@echo off +@REM set title of command window +title %0 +@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on' +@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO% + +@REM set %HOME% to equivalent of $HOME +if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%") + +@REM Execute a user defined script before this one +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre +@REM check for pre script, once with legacy .bat ending and once with .cmd ending +if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat" +if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd" +:skipRcPre + +@setlocal + +set ERROR_CODE=0 + +@REM To isolate internal variables from possible post scripts, we use another setlocal +@setlocal + +@REM ==== START VALIDATION ==== +if not "%JAVA_HOME%" == "" goto OkJHome + +echo. +echo Error: JAVA_HOME not found in your environment. >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +:OkJHome +if exist "%JAVA_HOME%\bin\java.exe" goto init + +echo. +echo Error: JAVA_HOME is set to an invalid directory. >&2 +echo JAVA_HOME = "%JAVA_HOME%" >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +@REM ==== END VALIDATION ==== + +:init + +@REM Find the project base dir, i.e. the directory that contains the folder ".mvn". +@REM Fallback to current working directory if not found. + +set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR% +IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir + +set EXEC_DIR=%CD% +set WDIR=%EXEC_DIR% +:findBaseDir +IF EXIST "%WDIR%"\.mvn goto baseDirFound +cd .. +IF "%WDIR%"=="%CD%" goto baseDirNotFound +set WDIR=%CD% +goto findBaseDir + +:baseDirFound +set MAVEN_PROJECTBASEDIR=%WDIR% +cd "%EXEC_DIR%" +goto endDetectBaseDir + +:baseDirNotFound +set MAVEN_PROJECTBASEDIR=%EXEC_DIR% +cd "%EXEC_DIR%" + +:endDetectBaseDir + +IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig + +@setlocal EnableExtensions EnableDelayedExpansion +for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a +@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS% + +:endReadAdditionalConfig + +SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" +set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar" +set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"; + +FOR /F "tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( + IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B +) + +@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +@REM This allows using the maven wrapper in projects that prohibit checking in binary data. +if exist %WRAPPER_JAR% ( + if "%MVNW_VERBOSE%" == "true" ( + echo Found %WRAPPER_JAR% + ) +) else ( + if not "%MVNW_REPOURL%" == "" ( + SET DOWNLOAD_URL="%MVNW_REPOURL%/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" + ) + if "%MVNW_VERBOSE%" == "true" ( + echo Couldn't find %WRAPPER_JAR%, downloading it ... + echo Downloading from: %DOWNLOAD_URL% + ) + + powershell -Command "&{"^ + "$webclient = new-object System.Net.WebClient;"^ + "if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^ + "$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^ + "}"^ + "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"^ + "}" + if "%MVNW_VERBOSE%" == "true" ( + echo Finished downloading %WRAPPER_JAR% + ) +) +@REM End of extension + +@REM Provide a "standardized" way to retrieve the CLI args that will +@REM work with both Windows and non-Windows executions. +set MAVEN_CMD_LINE_ARGS=%* + +%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %* +if ERRORLEVEL 1 goto error +goto end + +:error +set ERROR_CODE=1 + +:end +@endlocal & set ERROR_CODE=%ERROR_CODE% + +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost +@REM check for post script, once with legacy .bat ending and once with .cmd ending +if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat" +if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd" +:skipRcPost + +@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on' +if "%MAVEN_BATCH_PAUSE%" == "on" pause + +if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE% + +exit /B %ERROR_CODE% diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jackson-bom-jackson-bom-2.10.5/pom.xml new/jackson-bom-jackson-bom-2.13.0/pom.xml --- old/jackson-bom-jackson-bom-2.10.5/pom.xml 2020-07-21 03:32:47.000000000 +0200 +++ new/jackson-bom-jackson-bom-2.13.0/pom.xml 2021-09-30 21:40:52.000000000 +0200 @@ -6,31 +6,54 @@ <groupId>com.fasterxml.jackson</groupId> <artifactId>jackson-parent</artifactId> <!-- note: does NOT change for every version of bom --> - <version>2.10</version> + <version>2.13</version> </parent> <artifactId>jackson-bom</artifactId> - <version>2.10.5</version> + <name>Jackson BOM</name> + <description>Bill of Materials pom for getting full, complete set of compatible versions +of Jackson components maintained by FasterXML.com + </description> + <version>2.13.0</version> <packaging>pom</packaging> <modules> - <module>base</module> <!-- "It's all about the base 'bout the base..." --> + <module>base</module> <!-- "It's all about that base 'bout that base..." --> </modules> + <organization> + <name>FasterXML</name> + <url>http://fasterxml.com/</url> + </organization> + <licenses> + <license> + <name>Apache License, Version 2.0</name> + <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> + <distribution>repo</distribution> + </license> + </licenses> + <developers> + <developer> + <id>cowtowncoder</id> + <name>Tatu Saloranta</name> + <email>[email protected]</email> + </developer> + </developers> + <url>https://github.com/FasterXML/jackson-bom</url> <scm> <connection>scm:git:[email protected]:FasterXML/jackson-bom.git</connection> <developerConnection>scm:git:[email protected]:FasterXML/jackson-bom.git</developerConnection> - <url>http://github.com/FasterXML/jackson-bom</url> - <tag>jackson-bom-2.10.5</tag> + <url>https://github.com/FasterXML/jackson-bom</url> + <tag>jackson-bom-2.13.0</tag> </scm> <properties> - <jackson.version>2.10.5</jackson.version> + <jackson.version>2.13.0</jackson.version> <!-- 25-Sep-2019, tatu: With Jackson 2.x we will release full patch-level versions of annotations BUT they are all identical, content-wise. - Given this, annotations could EITHER be `2.10.0` OR `${jackson.version}`. + Given this, annotations could EITHER be `2.11.0` OR `${jackson.version}`. Based on dev feedback, with 2.10 we will do latter. It apparently is less confusing than alternative. --> @@ -40,6 +63,7 @@ <jackson.version.dataformat>${jackson.version}</jackson.version.dataformat> <jackson.version.datatype>${jackson.version}</jackson.version.datatype> <jackson.version.jaxrs>${jackson.version}</jackson.version.jaxrs> + <jackson.version.jakarta.rs>${jackson.version}</jackson.version.jakarta.rs> <jackson.version.jacksonjr>${jackson.version}</jackson.version.jacksonjr> <jackson.version.module>${jackson.version}</jackson.version.module> @@ -105,6 +129,11 @@ <artifactId>jackson-dataformat-smile</artifactId> <version>${jackson.version.dataformat}</version> </dependency> + <dependency> <!-- Officially added in 2.13.0, beta in 2.12.3 --> + <groupId>com.fasterxml.jackson.dataformat</groupId> + <artifactId>jackson-dataformat-toml</artifactId> + <version>${jackson.version.dataformat}</version> + </dependency> <dependency> <groupId>com.fasterxml.jackson.dataformat</groupId> <artifactId>jackson-dataformat-xml</artifactId> @@ -127,11 +156,16 @@ <artifactId>jackson-datatype-guava</artifactId> <version>${jackson.version.datatype}</version> </dependency> + + <!-- 25-Feb-2021, tatu: as per [datatype-hibernate#139], h3 dropped from 2.13 --> + <!-- <dependency> <groupId>com.fasterxml.jackson.datatype</groupId> <artifactId>jackson-datatype-hibernate3</artifactId> <version>${jackson.version.datatype}</version> </dependency> + --> + <dependency> <groupId>com.fasterxml.jackson.datatype</groupId> <artifactId>jackson-datatype-hibernate4</artifactId> @@ -142,11 +176,21 @@ <artifactId>jackson-datatype-hibernate5</artifactId> <version>${jackson.version.datatype}</version> </dependency> + <dependency> <!-- Added in 2.13 --> + <groupId>com.fasterxml.jackson.datatype</groupId> + <artifactId>jackson-datatype-hibernate5-jakarta</artifactId> + <version>${jackson.version.datatype}</version> + </dependency> <dependency> <groupId>com.fasterxml.jackson.datatype</groupId> <artifactId>jackson-datatype-hppc</artifactId> <version>${jackson.version.datatype}</version> </dependency> + <dependency> <!-- since 2.12.2 --> + <groupId>com.fasterxml.jackson.datatype</groupId> + <artifactId>jackson-datatype-jakarta-jsonp</artifactId> + <version>${jackson.version.datatype}</version> + </dependency> <dependency> <groupId>com.fasterxml.jackson.datatype</groupId> <artifactId>jackson-datatype-jaxrs</artifactId> @@ -159,6 +203,11 @@ <artifactId>jackson-datatype-joda</artifactId> <version>${jackson.version.datatype}</version> </dependency> + <dependency> <!-- since 2.11 --> + <groupId>com.fasterxml.jackson.datatype</groupId> + <artifactId>jackson-datatype-joda-money</artifactId> + <version>${jackson.version.datatype}</version> + </dependency> <dependency> <groupId>com.fasterxml.jackson.datatype</groupId> <artifactId>jackson-datatype-jdk8</artifactId> @@ -217,6 +266,38 @@ <version>${jackson.version.jaxrs}</version> </dependency> + <!-- Jakarta-RS (2.13+) --> + <dependency> + <groupId>com.fasterxml.jackson.jakarta.rs</groupId> + <artifactId>jackson-jakarta-rs-base</artifactId> + <version>${jackson.version.jakarta.rs}</version> + </dependency> + <dependency> + <groupId>com.fasterxml.jackson.jakarta.rs</groupId> + <artifactId>jackson-jakarta-rs-cbor-provider</artifactId> + <version>${jackson.version.jakarta.rs}</version> + </dependency> + <dependency> + <groupId>com.fasterxml.jackson.jakarta.rs</groupId> + <artifactId>jackson-jakarta-rs-json-provider</artifactId> + <version>${jackson.version.jakarta.rs}</version> + </dependency> + <dependency> + <groupId>com.fasterxml.jackson.jakarta.rs</groupId> + <artifactId>jackson-jakarta-rs-smile-provider</artifactId> + <version>${jackson.version.jakarta.rs}</version> + </dependency> + <dependency> + <groupId>com.fasterxml.jackson.jakarta.rs</groupId> + <artifactId>jackson-jakarta-rs-xml-provider</artifactId> + <version>${jackson.version.jakarta.rs}</version> + </dependency> + <dependency> + <groupId>com.fasterxml.jackson.jakarta.rs</groupId> + <artifactId>jackson-jakarta-rs-yaml-provider</artifactId> + <version>${jackson.version.jakarta.rs}</version> + </dependency> + <!-- Jackson Jr. --> <dependency> <groupId>com.fasterxml.jackson.jr</groupId> @@ -225,6 +306,11 @@ </dependency> <dependency> <groupId>com.fasterxml.jackson.jr</groupId> + <artifactId>jackson-jr-annotation-support</artifactId> + <version>${jackson.version.jacksonjr}</version> + </dependency> + <dependency> + <groupId>com.fasterxml.jackson.jr</groupId> <artifactId>jackson-jr-objects</artifactId> <version>${jackson.version.jacksonjr}</version> </dependency> @@ -247,6 +333,11 @@ </dependency> <dependency> <groupId>com.fasterxml.jackson.module</groupId> + <artifactId>jackson-module-blackbird</artifactId> + <version>${jackson.version.module}</version> + </dependency> + <dependency> + <groupId>com.fasterxml.jackson.module</groupId> <artifactId>jackson-module-guice</artifactId> <version>${jackson.version.module}</version> </dependency> @@ -255,6 +346,11 @@ <artifactId>jackson-module-jaxb-annotations</artifactId> <version>${jackson.version.module}</version> </dependency> + <dependency> <!-- 2.13+: Jakarta-bind too [modules-base#130] --> + <groupId>com.fasterxml.jackson.module</groupId> + <artifactId>jackson-module-jakarta-xmlbind-annotations</artifactId> + <version>${jackson.version.module}</version> + </dependency> <dependency> <groupId>com.fasterxml.jackson.module</groupId> <artifactId>jackson-module-jsonSchema</artifactId> @@ -270,6 +366,11 @@ <artifactId>jackson-module-mrbean</artifactId> <version>${jackson.version.module}</version> </dependency> + <dependency> <!-- Added in 2.13.0 --> + <groupId>com.fasterxml.jackson.module</groupId> + <artifactId>jackson-module-no-ctor-deser</artifactId> + <version>${jackson.version.module}</version> + </dependency> <dependency> <groupId>com.fasterxml.jackson.module</groupId> <artifactId>jackson-module-osgi</artifactId> @@ -288,11 +389,7 @@ <!-- Language Modules --> - <dependency> - <groupId>com.fasterxml.jackson.module</groupId> - <artifactId>jackson-module-scala_2.10</artifactId> - <version>${jackson.version.module.scala}</version> - </dependency> + <!-- 21-Nov-2020, tatu: Scala 2.10 support dropped in Jackson 2.12 --> <dependency> <groupId>com.fasterxml.jackson.module</groupId> <artifactId>jackson-module-scala_2.11</artifactId> @@ -312,4 +409,15 @@ </dependencies> </dependencyManagement> + <!-- Alas, need to include snapshot reference since otherwise can not find + snapshot of parent... --> + <repositories> + <repository> + <id>sonatype-nexus-snapshots</id> + <name>Sonatype Nexus Snapshots</name> + <url>https://oss.sonatype.org/content/repositories/snapshots</url> + <releases><enabled>false</enabled></releases> + <snapshots><enabled>true</enabled></snapshots> + </repository> + </repositories> </project> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jackson-bom-jackson-bom-2.10.5/release-notes/VERSION new/jackson-bom-jackson-bom-2.13.0/release-notes/VERSION --- old/jackson-bom-jackson-bom-2.10.5/release-notes/VERSION 2020-07-21 03:32:47.000000000 +0200 +++ new/jackson-bom-jackson-bom-2.13.0/release-notes/VERSION 1970-01-01 01:00:00.000000000 +0100 @@ -1,7 +0,0 @@ -2.10 - -- Remove `Automatic-Module-Name`, to avoid collision with Moditect-added `module-info` - -2.10.5 - -- Add missing version for `jackson-datatype-eclipse-collections` diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jackson-bom-jackson-bom-2.10.5/release-notes/VERSION-2.x new/jackson-bom-jackson-bom-2.13.0/release-notes/VERSION-2.x --- old/jackson-bom-jackson-bom-2.10.5/release-notes/VERSION-2.x 1970-01-01 01:00:00.000000000 +0100 +++ new/jackson-bom-jackson-bom-2.13.0/release-notes/VERSION-2.x 2021-09-30 21:40:52.000000000 +0200 @@ -0,0 +1,62 @@ +Project: jackson-bom / jackson-base + +Contains "Bill-of-Materials" for all Jackson components for main component +("jackson-bom"), as well as parent pom ("jackson-base") for Jackson components +themselves. Only former should be extended by anything other than official +Jackson components (core, modules) + +------------------------------------------------------------------------ +=== Releases (note: only includes patches with actual changes) +------------------------------------------------------------------------ + +2.13.0 (30-Sep-2021) + +#39: Configure moditect plugin with `<jvmVersion>11</jvmVersion>` +#43: jackson-bom manages the version of `junit:junit` + (reported by Andy W, wilkinsona@github) +- [datatype-hibernate#39]: Drop `jackson-datatype-hibernate3` (support for + Hibernate 3.x datatypes) +- [jackson-jarx-providers#146] due to addition of new Jakarta artifacts - + (Jakarta-JSONP, Jakarta-xmlbind-annotations, Jakarta-rs-providers) - + removed "jakarta" classifier variants of JAXB/JSON-P/JAX-RS modules + (effectively undo's #40 from 2.12.0) + +2.12.5 (27-Aug-2021) +2.12.4 (06-Jul-2021) + +No changes since 2.12.3 + +2.12.3 (12-Apr-2021) + +- Add version for `jackson-datatype-jakarta-jsonp` module (introduced after 2.12.2) +- Add (beta) version for `jackson-dataformat-toml) + +2.12.2 (03-Mar-2021) + +#40: Jakarta 9 artifact versions are missing from jackson-bom + (reported by Christopher T (ctubbsii@github)) + +2.12.1 (08-Jan-2021) + +No changes since 2.12.0 + +2.12.0 (29-Nov-2020) + +- Add another execution of `maven-replacer-plugin` for "prepare-package" phase + to help with IDE import. +- Add default settings for `gradle-module-metadata-maven-plugin` (gradle metadata) +- Add default settings for `build-helper-maven-plugin` (LICENSE inclusion) +- Drop `jackson-module-scala_2.10` entry (not released for Jackson 2.12 or later) + +2.11.2 + +- Add missing version for `jackson-datatype-eclipse-collections` +- Add override for `version.plugin.bundle` (for 5.1.1) to help build on JDK 15+ + +2.11 (26-Apr-2020) + +No changes since 2.10 + +2.10 + +- Remove `Automatic-Module-Name`, to avoid collision with Moditect-added `module-info`
