Compare commits

...

No commits in common. "c8-beta-stream-10.6" and "stream-pki-deps-10.6-rhel-8.9.0" have entirely different histories.

6 changed files with 15 additions and 18 deletions

3
.gitignore vendored
View File

@ -1 +1,2 @@
SOURCES/jackson-parent-2.14.tar.gz
SOURCES/jackson-parent-2.10.tar.gz
/jackson-parent-2.10.tar.gz

View File

@ -1 +1 @@
f57009f702b5fd1d3392713e390b42b8eb33a5ef SOURCES/jackson-parent-2.14.tar.gz
b8a210847e21604cd9193fb2b33da74822ed1f27 jackson-parent-2.10.tar.gz

View File

@ -1,4 +1,4 @@
From a8d816d5bef36665831245f6fd14f87892cafe07 Mon Sep 17 00:00:00 2001
From c3d210fb688b8891b789873708ccdb862735e413 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
@ -9,18 +9,19 @@ Signed-off-by: Dinesh Prasanth M K <dmoluguw@redhat.com>
1 file changed, 3 insertions(+)
diff --git a/pom.xml b/pom.xml
index 23844cc..bf5bb9f 100644
index faf065a..f4a3cee 100644
--- a/pom.xml
+++ b/pom.xml
@@ -55,6 +55,8 @@
<maven.compiler.target>${javac.target.version}</maven.compiler.target>
@@ -63,6 +63,9 @@
<javac.target.version>1.7</javac.target.version>
<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
| packageVersion.dir and packageVersion.package, and must set the phase of the
--
2.41.0
2.23.0

View File

@ -1,8 +1,8 @@
Name: jackson-parent
Version: 2.14
Version: 2.10
Release: 1%{?dist}
Summary: Parent pom for all Jackson components
License: Apache-2.0
License: ASL 2.0
URL: https://github.com/FasterXML/jackson-parent
Source0: %{url}/archive/%{name}-%{version}.tar.gz
@ -16,16 +16,13 @@ BuildRequires: maven-local
BuildRequires: mvn(com.fasterxml:oss-parent:pom:)
BuildArch: noarch
%if 0%{?fedora}
ExclusiveArch: %{java_arches} noarch
%endif
%description
Project for parent pom for all Jackson components.
%prep
%setup -q -n %{name}-%{name}-%{version}
%patch -P 0 -p1
%patch0 -p1
cp -p %{SOURCE1} LICENSE
sed -i 's/\r//' LICENSE
@ -41,9 +38,6 @@ sed -i 's/\r//' LICENSE
%license LICENSE
%changelog
* Tue Nov 21 2023 Red Hat PKI Team <rhcs-maint@redhat.com> - 2.14-1
- Rebase to upstream version 2.14
* Tue Nov 12 2019 Red Hat PKI Team <rhcs-maint@redhat.com> - 2.10-1
- Update to latest upstream release

1
sources Normal file
View File

@ -0,0 +1 @@
SHA512 (jackson-parent-2.10.tar.gz) = ff26f188574853c836d09f749b93c3167c3c182679b5c70b491e895f738e0fb00a7ff72368032dadeafc2e1eabd91be1ff319b8bac6deb78b265337f10926b43