Import from CS git

This commit is contained in:
eabdullin 2025-08-20 09:09:37 +00:00
parent 7142de2f26
commit 4e778bacd6
4 changed files with 7 additions and 32 deletions

2
.gitignore vendored
View File

@ -1 +1 @@
SOURCES/jackson-parent-2.14.tar.gz
SOURCES/jackson-parent-2.19.1.tar.gz

View File

@ -1 +1 @@
f57009f702b5fd1d3392713e390b42b8eb33a5ef SOURCES/jackson-parent-2.14.tar.gz
fce2d8deffa8ca90c996f74cd77d1e36122626a4 SOURCES/jackson-parent-2.19.1.tar.gz

View File

@ -1,26 +0,0 @@
From a8d816d5bef36665831245f6fd14f87892cafe07 Mon Sep 17 00:00:00 2001
From: Dinesh Prasanth M K <dmoluguw@redhat.com>
Date: Wed, 13 Nov 2019 13:32:09 -0500
Subject: [PATCH] Sneak in version.junit value to avoid build failures
Signed-off-by: Dinesh Prasanth M K <dmoluguw@redhat.com>
---
pom.xml | 3 +++
1 file changed, 3 insertions(+)
diff --git a/pom.xml b/pom.xml
index 23844cc..bf5bb9f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -55,6 +55,8 @@
<maven.compiler.target>${javac.target.version}</maven.compiler.target>
<javac.debuglevel>lines,source,vars</javac.debuglevel>
+ <!-- Versions for other dependencies -->
+ <version.junit>4</version.junit>
<!--
| For automatically generating PackageVersion.java. Your child pom.xml must define
--
2.41.0

View File

@ -1,5 +1,5 @@
Name: jackson-parent
Version: 2.14
Version: 2.19.1
Release: 1%{?dist}
Summary: Parent pom for all Jackson components
License: Apache-2.0
@ -10,8 +10,6 @@ Source0: %{url}/archive/%{name}-%{version}.tar.gz
# reported @ https://github.com/FasterXML/jackson-parent/issues/1
Source1: http://www.apache.org/licenses/LICENSE-2.0.txt
Patch0: 0001-Sneak-in-version.junit-value-to-avoid-build-failures.patch
BuildRequires: maven-local
BuildRequires: mvn(com.fasterxml:oss-parent:pom:)
@ -25,7 +23,6 @@ Project for parent pom for all Jackson components.
%prep
%setup -q -n %{name}-%{name}-%{version}
%patch -P 0 -p1
cp -p %{SOURCE1} LICENSE
sed -i 's/\r//' LICENSE
@ -41,6 +38,10 @@ sed -i 's/\r//' LICENSE
%license LICENSE
%changelog
* Thu Jul 31 2025 Red Hat PKI Team <rhcs-maint@redhat.com> - 2.19.1-1
- Rebase to version 2.19.1
- Resolves: RHEL-103106
* Tue Nov 21 2023 Red Hat PKI Team <rhcs-maint@redhat.com> - 2.14-1
- Rebase to upstream version 2.14