Compare commits
No commits in common. "a10s" and "c8s" have entirely different histories.
1
.gitignore
vendored
1
.gitignore
vendored
@ -1 +1,2 @@
|
||||
SOURCES/jboss-jaxrs-api_2.0_spec-1.0.0.Final.tar.gz
|
||||
/jboss-jaxrs-api_2.0_spec-1.0.0.Final.tar.gz
|
||||
|
||||
@ -1,38 +0,0 @@
|
||||
From 54324baab4e5b79aa1a3481d107bcda850dee926 Mon Sep 17 00:00:00 2001
|
||||
From: Chris Kelley <ckelley@redhat.com>
|
||||
Date: Fri, 3 Feb 2023 20:01:09 +0000
|
||||
Subject: [PATCH] Update to use jakarta.xml.bind package
|
||||
|
||||
---
|
||||
src/main/java/javax/ws/rs/core/Link.java | 8 ++++----
|
||||
1 file changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/src/main/java/javax/ws/rs/core/Link.java b/src/main/java/javax/ws/rs/core/Link.java
|
||||
index 7265551..433ede9 100644
|
||||
--- a/src/main/java/javax/ws/rs/core/Link.java
|
||||
+++ b/src/main/java/javax/ws/rs/core/Link.java
|
||||
@@ -47,9 +47,9 @@ import java.util.Map.Entry;
|
||||
|
||||
import javax.ws.rs.ext.RuntimeDelegate;
|
||||
|
||||
-import javax.xml.bind.annotation.XmlAnyAttribute;
|
||||
-import javax.xml.bind.annotation.XmlAttribute;
|
||||
-import javax.xml.bind.annotation.adapters.XmlAdapter;
|
||||
+import jakarta.xml.bind.annotation.XmlAnyAttribute;
|
||||
+import jakarta.xml.bind.annotation.XmlAttribute;
|
||||
+import jakarta.xml.bind.annotation.adapters.XmlAdapter;
|
||||
import javax.xml.namespace.QName;
|
||||
|
||||
/**
|
||||
@@ -500,7 +500,7 @@ public abstract class Link {
|
||||
}
|
||||
|
||||
/**
|
||||
- * <p>An implementation of JAXB {@link javax.xml.bind.annotation.adapters.XmlAdapter}
|
||||
+ * <p>An implementation of JAXB {@link jakarta.xml.bind.annotation.adapters.XmlAdapter}
|
||||
* that maps the JAX-RS {@link javax.ws.rs.core.Link} type to a value that can be
|
||||
* marshalled and unmarshalled by JAXB. The following example shows how to use
|
||||
* this adapter on a JAXB bean class:</p>
|
||||
--
|
||||
2.39.0
|
||||
|
||||
@ -4,44 +4,42 @@
|
||||
|
||||
Name: jboss-jaxrs-2.0-api
|
||||
Version: 1.0.0
|
||||
Release: 27%{?dist}
|
||||
Release: 6%{?dist}
|
||||
Summary: JAX-RS 2.0: The Java API for RESTful Web Services
|
||||
# ASL 2.0 src/main/java/javax/ws/rs/core/GenericEntity.java
|
||||
License: (CDDL-1.0 or GPL-2.0-only WITH Classpath-exception-2.0) and Apache-2.0
|
||||
License: (CDDL or GPLv2 with exceptions) and ASL 2.0
|
||||
URL: https://github.com/jboss/jboss-jaxrs-api_spec
|
||||
Source0: https://github.com/jboss/jboss-jaxrs-api_spec/archive/%{oname}-%{namedversion}.tar.gz
|
||||
Patch1: 0001-Update-to-use-jakarta.xml.bind-package.patch
|
||||
|
||||
BuildRequires: maven-local
|
||||
BuildRequires: mvn(org.apache.felix:maven-bundle-plugin)
|
||||
BuildRequires: mvn(org.jboss:jboss-parent:pom:)
|
||||
BuildRequires: mvn(jakarta.xml.bind:jakarta.xml.bind-api)
|
||||
|
||||
BuildArch: noarch
|
||||
%if 0%{?fedora} || 0%{?rhel} >= 10
|
||||
ExclusiveArch: %{java_arches} noarch
|
||||
%endif
|
||||
|
||||
%description
|
||||
JSR 339: JAX-RS 2.0: The Java API for RESTful Web Services.
|
||||
|
||||
%package javadoc
|
||||
Summary: Javadoc for %{name}
|
||||
|
||||
%description javadoc
|
||||
This package contains javadoc for %{name}.
|
||||
|
||||
%prep
|
||||
%setup -q -n jboss-jaxrs-api_spec-%{oname}-%{namedversion}
|
||||
%patch1 -p1
|
||||
|
||||
# Unneeded plugin
|
||||
%pom_remove_plugin :maven-source-plugin
|
||||
|
||||
# Fix JDK11 build, add missing javax.xml.bind
|
||||
%pom_add_dep jakarta.xml.bind:jakarta.xml.bind-api
|
||||
|
||||
%mvn_file :%{oname} %{name}
|
||||
|
||||
# remove after upgrading narayana
|
||||
%mvn_alias ":jboss-jaxrs-api_2.0_spec" "org.jboss.resteasy:jaxrs-api"
|
||||
|
||||
%build
|
||||
%mvn_build -j
|
||||
|
||||
%mvn_build
|
||||
|
||||
%install
|
||||
%mvn_install
|
||||
@ -49,70 +47,10 @@ JSR 339: JAX-RS 2.0: The Java API for RESTful Web Services.
|
||||
%files -f .mfiles
|
||||
%license LICENSE
|
||||
|
||||
%files javadoc -f .mfiles-javadoc
|
||||
%license LICENSE
|
||||
|
||||
%changelog
|
||||
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 1.0.0-27
|
||||
- Bump release for June 2024 mass rebuild
|
||||
|
||||
* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.0-26
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||
|
||||
* Sat Jan 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.0-25
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||
|
||||
* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.0-24
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
|
||||
|
||||
* Fri Feb 03 2023 Chris Kelley <ckelley@redhat.com> - 1.0.0-23
|
||||
- Remove dependency on jaxb-api2 compat package
|
||||
|
||||
* Fri Jan 20 2023 Marian Koncek <mkoncek@redhat.com> - 1.0.0-22
|
||||
- Depend on compat versions of activation and XML bind
|
||||
|
||||
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.0-21
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
|
||||
|
||||
* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.0-20
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
||||
|
||||
* Fri Jul 08 2022 Jiri Vanek <jvanek@redhat.com> - 1.0.0-19
|
||||
- Rebuilt for Drop i686 JDKs
|
||||
|
||||
* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 1.0.0-18
|
||||
- Rebuilt for java-17-openjdk as system jdk
|
||||
|
||||
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.0-17
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
||||
|
||||
* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.0-16
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
||||
|
||||
* Fri Jun 04 2021 Dogtag PKI Team <pki-devel@redhat.com> - 1.0.0-15
|
||||
- Drop jboss-jaxrs-2.0-api-javadoc
|
||||
|
||||
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.0-14
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||
|
||||
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.0-13
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Thu Jul 23 2020 Markku Korkeala <markku.korkeala@iki.fi> - 1.0.0-12
|
||||
- Fix JDK11 build by adding dependency for javax.xml.bind.
|
||||
|
||||
* Fri Jul 10 2020 Jiri Vanek <jvanek@redhat.com> - 1.0.0-11
|
||||
- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
|
||||
|
||||
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.0-10
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||
|
||||
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.0-9
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.0-8
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||
|
||||
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.0-7
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||
|
||||
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.0-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user