rpms/jackson-core
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Change compilation source/target to Java 11

Browse Source
This commit is contained in:
Chris Kelley 2021-12-06 16:31:36 +00:00
parent 3c09cbd4dd
commit 64a2aa1489
2 changed files with 43 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
0001-Change-compilation-source-target-to-Java-11.patch Normal file
View File

@ -0,0 +1,37 @@
From b4fe5240180fef12bbd168686b3ac0ce3240acf8 Mon Sep 17 00:00:00 2001
From: Chris Kelley <ckelley@redhat.com>
Date: Mon, 6 Dec 2021 12:11:57 +0000
Subject: [PATCH] Change compilation source/target to Java 11
---
pom.xml | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/pom.xml b/pom.xml
index 13d68726..17463201 100644
--- a/pom.xml
+++ b/pom.xml
@@ -36,12 +36,15 @@
<properties>
<!-- 04-Mar-2019, tatu: Retain Java6/JDK1.6 compatibility for annotations for Jackson 2.x,
but use Moditect to get JDK9+ module info support; need newer bundle plugin as well
- -->
- <javac.src.version>1.6</javac.src.version>
- <javac.target.version>1.6</javac.target.version>
+ -->
+ <!-- 06-Dec-2021, ckelley: Java 6 compilation is no longer supported in Fedora 36+, we must drop
+ the Java 1.6 compatibility in order to use Java 17. Use Java 11 for now, then switch to
+ Java 17 after default JDK is switched to Java 17.
+ -->
+ <javac.src.version>11</javac.src.version>
+ <javac.target.version>11</javac.target.version>
- <maven.compiler.source>1.6</maven.compiler.source>
- <maven.compiler.target>1.6</maven.compiler.target>
+ <maven.compiler.release>11</maven.compiler.release>
<osgi.export>com.fasterxml.jackson.core;version=${project.version},
com.fasterxml.jackson.core.*;version=${project.version}
--
2.33.1

7
jackson-core.spec
View File

@ -1,11 +1,12 @@
Name: jackson-core
Version: 2.11.4
Release: 4%{?dist}
Release: 5%{?dist}
Summary: Core part of Jackson
License: ASL 2.0
URL: https://github.com/FasterXML/jackson-core
Source0: %{url}/archive/%{name}-%{version}.tar.gz
Patch1: 0001-Change-compilation-source-target-to-Java-11.patch
BuildRequires: maven-local
BuildRequires: mvn(com.fasterxml.jackson:jackson-base:pom:) >= %{version}
@ -20,6 +21,7 @@ as basic shared abstractions.
%prep
%setup -q -n %{name}-%{name}-%{version}
%patch1 -p1
# Remove plugins unnecessary for RPM builds
%pom_remove_plugin ":maven-enforcer-plugin"
@ -43,6 +45,9 @@ sed -i 's/\r//' LICENSE NOTICE
%license LICENSE NOTICE
%changelog
* Mon Dec 06 2021 Dogtag PKI Team <pki-devel@redhat.com> - 2.11.4-5
- Drop Java 1.6 support, compile with Java 11
* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.11.4-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild