Remove unnecessary patch
This commit is contained in:
parent
2ab8ef9a0a
commit
d48e63008b
@ -1,38 +0,0 @@
|
||||
From 70c37460e0a92badd14893a5120d104f0e6fc613 Mon Sep 17 00:00:00 2001
|
||||
From: Chris Kelley <ckelley@redhat.com>
|
||||
Date: Mon, 6 Dec 2021 17:14:26 +0000
|
||||
Subject: [PATCH] Change compilation source/target to Java 11
|
||||
|
||||
---
|
||||
pom.xml | 14 +++++++++-----
|
||||
1 file changed, 9 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/pom.xml b/pom.xml
|
||||
index a95573e..3bbcec5 100644
|
||||
--- a/pom.xml
|
||||
+++ b/pom.xml
|
||||
@@ -35,12 +35,16 @@
|
||||
<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.annotation.*;version=${project.version}</osgi.export>
|
||||
|
||||
--
|
||||
2.33.1
|
||||
|
@ -6,7 +6,6 @@ License: Apache-2.0
|
||||
|
||||
URL: https://github.com/FasterXML/jackson-annotations
|
||||
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-parent:pom:) >= 2.14
|
||||
BuildRequires: mvn(junit:junit)
|
||||
@ -27,7 +26,6 @@ This package contains API documentation for %{name}.
|
||||
|
||||
%prep
|
||||
%setup -q -n %{name}-%{name}-%{version}
|
||||
%patch1 -p1
|
||||
|
||||
%pom_remove_plugin "org.moditect:moditect-maven-plugin"
|
||||
%pom_remove_plugin "org.sonatype.plugins:nexus-staging-maven-plugin"
|
||||
|
Loading…
Reference in New Issue
Block a user