Compare commits

...

No commits in common. "c8-stream-10.6" and "c9s" have entirely different histories.

10 changed files with 285 additions and 53 deletions

3
.gitignore vendored
View File

@ -1 +1,2 @@
SOURCES/jackson-jaxrs-providers-2.14.2.tar.gz
/jackson-jaxrs-providers-*.tar.gz
/*.src.rpm

View File

@ -1 +1 @@
bce208cbb7a24c4e22258d0611e82e6fe7d52f93 SOURCES/jackson-jaxrs-providers-2.14.2.tar.gz
bb9ccf74b89240bd497d323357e8b9f205d24a26 jackson-jaxrs-providers-2.14.1.tar.gz

7
gating.yaml Normal file
View File

@ -0,0 +1,7 @@
# recipients: rhcs-team
--- !Policy
product_versions:
- rhel-9
decision_context: osci_compose_gate
rules:
- !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}

View File

@ -1,18 +1,15 @@
%bcond_without jp_minimal
Name: jackson-jaxrs-providers
Version: 2.14.2
Release: 1%{?dist}
Summary: Jackson JAX-RS providers
License: Apache-2.0
Name: jackson-jaxrs-providers
Version: 2.14.1
Release: 2%{?dist}
Summary: Jackson JAX-RS providers
License: Apache-2.0
URL: https://github.com/FasterXML/jackson-jaxrs-providers
Source0: %{url}/archive/%{name}-%{version}.tar.gz
URL: https://github.com/FasterXML/jackson-jaxrs-providers
Source0: %{url}/archive/%{name}-%{version}.tar.gz
BuildArch: noarch
%if 0%{?fedora}
ExclusiveArch: %{java_arches} noarch
%endif
BuildRequires: maven-local
BuildRequires: mvn(com.fasterxml.jackson.core:jackson-core) >= %{version}
@ -33,6 +30,17 @@ BuildRequires: mvn(org.glassfish.jersey.core:jersey-server)
BuildRequires: mvn(org.jboss.resteasy:resteasy-jaxrs)
%endif
%description
This is a multi-module project that contains Jackson-based JAX-RS providers for
following data formats: JSON, Smile (binary JSON), XML, CBOR (another kind of
binary JSON), YAML.
%package -n pki-%{name}
Summary: Jackson JAX-RS providers
Obsoletes: %{name} < %{version}-%{release}
Conflicts: %{name} < %{version}-%{release}
Provides: %{name} = %{version}-%{release}
%if %{with jp_minimal}
Obsoletes: jackson-jaxrs-cbor-provider < 2.10.0-1
Obsoletes: jackson-jaxrs-smile-provider < 2.10.0-1
@ -40,68 +48,90 @@ Obsoletes: jackson-jaxrs-xml-provider < 2.10.0-1
Obsoletes: jackson-jaxrs-yaml-provider < 2.10.0-1
%endif
%description
%description -n pki-%{name}
This is a multi-module project that contains Jackson-based JAX-RS providers for
following data formats: JSON, Smile (binary JSON), XML, CBOR (another kind of
binary JSON), YAML.
%package -n jackson-jaxrs-json-provider
%package -n pki-jackson-jaxrs-json-provider
Summary: Jackson-JAXRS-JSON
Obsoletes: jackson-jaxrs-json-provider < %{version}-%{release}
Conflicts: jackson-jaxrs-json-provider < %{version}-%{release}
Provides: jackson-jaxrs-json-provider = %{version}-%{release}
%description -n jackson-jaxrs-json-provider
%description -n pki-jackson-jaxrs-json-provider
Functionality to handle JSON input/output for JAX-RS implementations
(like Jersey and RESTeasy) using standard Jackson data binding.
%if %{without jp_minimal}
%package -n jackson-jaxrs-cbor-provider
%package -n pki-jackson-jaxrs-cbor-provider
Summary: Jackson-JAXRS-CBOR
Obsoletes: jackson-jaxrs-cbor-provider < %{version}-%{release}
Conflicts: jackson-jaxrs-cbor-provider < %{version}-%{release}
Provides: jackson-jaxrs-cbor-provider = %{version}-%{release}
%description -n jackson-jaxrs-cbor-provider
%description -n pki-jackson-jaxrs-cbor-provider
Functionality to handle CBOR encoded input/output for JAX-RS implementations
(like Jersey and RESTeasy) using standard Jackson data binding.
%package -n jackson-jaxrs-smile-provider
%package -n pki-jackson-jaxrs-smile-provider
Summary: Jackson-JAXRS-Smile
Obsoletes: jackson-jaxrs-smile-provider < %{version}-%{release}
Conflicts: jackson-jaxrs-smile-provider < %{version}-%{release}
Provides: jackson-jaxrs-smile-provider = %{version}-%{release}
%description -n jackson-jaxrs-smile-provider
%description -n pki-jackson-jaxrs-smile-provider
Functionality to handle Smile (binary JSON) input/output for
JAX-RS implementations (like Jersey and RESTeasy) using standard
Jackson data binding.
%package -n jackson-jaxrs-xml-provider
%package -n pki-jackson-jaxrs-xml-provider
Summary: Jackson-JAXRS-XML
Obsoletes: jackson-jaxrs-xml-provider < %{version}-%{release}
Conflicts: jackson-jaxrs-xml-provider < %{version}-%{release}
Provides: jackson-jaxrs-xml-provider = %{version}-%{release}
%description -n jackson-jaxrs-xml-provider
%description -n pki-jackson-jaxrs-xml-provider
Functionality to handle Smile XML input/output for JAX-RS implementations
(like Jersey and RESTeasy) using standard Jackson data binding.
%package -n jackson-jaxrs-yaml-provider
%package -n pki-jackson-jaxrs-yaml-provider
Summary: Jackson-JAXRS-YAML
Obsoletes: jackson-jaxrs-yaml-provider < %{version}-%{release}
Conflicts: jackson-jaxrs-yaml-provider < %{version}-%{release}
Provides: jackson-jaxrs-yaml-provider = %{version}-%{release}
%description -n jackson-jaxrs-yaml-provider
%description -n pki-jackson-jaxrs-yaml-provider
Functionality to handle YAML input/output for JAX-RS implementations
(like Jersey and RESTeasy) using standard Jackson data binding.
%endif
%package datatypes
%package -n pki-%{name}-datatypes
Summary: Functionality for reading/writing core JAX-RS helper types
Obsoletes: %{name}-datatypes < %{version}-%{release}
Conflicts: %{name}-datatypes < %{version}-%{release}
Provides: %{name}-datatypes = %{version}-%{release}
%description datatypes
%description -n pki-%{name}-datatypes
Functionality for reading/writing core JAX-RS helper types.
%package parent
%package -n pki-%{name}-parent
Summary: Parent for Jackson JAX-RS providers
Obsoletes: %{name}-parent < %{version}-%{release}
Conflicts: %{name}-parent < %{version}-%{release}
Provides: %{name}-parent = %{version}-%{release}
%description parent
%description -n pki-%{name}-parent
Parent POM for Jackson JAX-RS providers.
%if %{without jp_minimal}
%package javadoc
%package -n pki-%{name}-javadoc
Summary: Javadoc for %{name}
Obsoletes: %{name}-javadoc < %{version}-%{release}
Conflicts: %{name}-javadoc < %{version}-%{release}
Provides: %{name}-javadoc = %{version}-%{release}
%description javadoc
%description -n pki-%{name}-javadoc
This package contains API documentation for %{name}.
%endif
%prep
%setup -q -n %{name}-%{name}-%{version}
@ -121,7 +151,6 @@ sed -i 's/\r//' LICENSE NOTICE
%pom_remove_plugin :maven-jar-plugin yaml
%pom_remove_plugin :maven-jar-plugin datatypes
%pom_change_dep jakarta.xml.bind:jakarta.xml.bind-api jakarta.xml.bind:jakarta.xml.bind-api:4
# Replace jakarta-ws-rs with jboss-jaxrs-2.0-api
%pom_change_dep javax.ws.rs:javax.ws.rs-api org.jboss.spec.javax.ws.rs:jboss-jaxrs-api_2.0_spec
@ -146,7 +175,7 @@ rm json/src/test/java/com/fasterxml/jackson/jaxrs/json/resteasy/RestEasyProvider
%build
%if %{with jp_minimal}
%mvn_build -s -f -j
%mvn_build -s -f
%else
%mvn_build -s
%endif
@ -154,45 +183,108 @@ rm json/src/test/java/com/fasterxml/jackson/jaxrs/json/resteasy/RestEasyProvider
%install
%mvn_install
%files -f .mfiles-jackson-jaxrs-base
%files -n pki-%{name} -f .mfiles-jackson-jaxrs-base
%doc README.md release-notes/*
%license LICENSE NOTICE
%files -n jackson-jaxrs-json-provider -f .mfiles-jackson-jaxrs-json-provider
%files -n pki-jackson-jaxrs-json-provider -f .mfiles-jackson-jaxrs-json-provider
%if %{without jp_minimal}
%files -n jackson-jaxrs-cbor-provider -f .mfiles-jackson-jaxrs-cbor-provider
%files -n jackson-jaxrs-smile-provider -f .mfiles-jackson-jaxrs-smile-provider
%files -n jackson-jaxrs-xml-provider -f .mfiles-jackson-jaxrs-xml-provider
%files -n jackson-jaxrs-yaml-provider -f .mfiles-jackson-jaxrs-yaml-provider
%files -n pki-jackson-jaxrs-cbor-provider -f .mfiles-jackson-jaxrs-cbor-provider
%files -n pki-jackson-jaxrs-smile-provider -f .mfiles-jackson-jaxrs-smile-provider
%files -n pki-jackson-jaxrs-xml-provider -f .mfiles-jackson-jaxrs-xml-provider
%files -n pki-jackson-jaxrs-yaml-provider -f .mfiles-jackson-jaxrs-yaml-provider
%endif
%files datatypes -f .mfiles-jackson-datatype-jaxrs
%files -n pki-%{name}-datatypes -f .mfiles-jackson-datatype-jaxrs
%license LICENSE NOTICE
%files parent -f .mfiles-jackson-jaxrs-providers
%files -n pki-%{name}-parent -f .mfiles-jackson-jaxrs-providers
%license LICENSE NOTICE
%if %{without jp_minimal}
%files javadoc -f .mfiles-javadoc
%files -n pki-%{name}-javadoc -f .mfiles-javadoc
%license LICENSE NOTICE
%endif
%changelog
* Wed Nov 22 2023 Red Hat PKI Team <rhcs-maint@redhat.com> - 2.14.2-1
- Rebase to upstream version 2.14.2
* Wed Nov 23 2022 Chris Kelley <ckelley@redhat.com> - 2.14.1-1
- Update to version 2.14.1
- Resolves: #2070122
* Wed Jul 31 2019 Red Hat PKI Team <rhcs-maint@redhat.com> - 2.9.9-1
- Update to latest upstream release
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 2.11.4-7
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688
* Wed Jun 30 2021 Red Hat PKI Team <rhcs-maint@redhat.com> - 2.11.4-6
- Replace jakarta-ws-rs with jboss-jaxrs-2.0-api
* Wed Apr 28 2021 Red Hat PKI Team <rhcs-maint@redhat.com> - 2.11.4-5
- Add Obsoletes and Conflicts
* Thu Apr 22 2021 Red Hat PKI Team <rhcs-maint@redhat.com> - 2.11.4-4
- Rename subpackages to pki-jackson
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 2.11.4-3
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.11.4-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Mon Jan 18 2021 Fabio Valentini <decathorpe@gmail.com> - 2.11.4-1
- Update to version 2.11.4.
* Wed Oct 14 2020 Fabio Valentini <decathorpe@gmail.com> - 2.11.3-1
- Update to version 2.11.3.
* Sat Aug 08 2020 Fabio Valentini <decathorpe@gmail.com> - 2.11.2-1
- Update to version 2.11.2.
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.11.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Fri Jul 10 2020 Jiri Vanek <jvanek@redhat.com> - 2.11.1-2
- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
* Mon Jul 06 2020 Fabio Valentini <decathorpe@gmail.com> - 2.11.1-1
- Update to version 2.11.1.
* Mon May 25 2020 Fabio Valentini <decathorpe@gmail.com> - 2.11.0-1
- Update to version 2.11.0.
* Fri May 08 2020 Fabio Valentini <decathorpe@gmail.com> - 2.10.4-1
- Update to version 2.10.4.
* Tue Mar 03 2020 Fabio Valentini <decathorpe@gmail.com> - 2.10.3-1
- Update to version 2.10.3.
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.10.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Fri Jan 17 2020 Fabio Valentini <decathorpe@gmail.com> - 2.10.2-1
- Update to version 2.10.2.
* Wed Nov 13 2019 Fabio Valentini <decathorpe@gmail.com> - 2.10.1-1
- Update to version 2.10.1.
* Tue Nov 12 2019 Alexander Scheel <ascheel@redhat.com> - 2.10.0-2
- Minimize build dependencies.
* Sun Oct 27 2019 Fabio Valentini <decathorpe@gmail.com> - 2.10.0-1
- Update to version 2.10.0.
- Build with minimized dependencies.
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.9.8-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Wed Feb 06 2019 Mat Booth <mat.booth@redhat.com> - 2.9.8-1
- Update to latest upstream release
* Thu Aug 02 2018 Fraser Tweedale <ftweedal@redhat.com> - 2.9.4-3.1
- Fix circular dependency on resteasy
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.9.4-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Fri Jul 27 2018 Fraser Tweedale <ftweedal@redhat.com> - 2.9.4-3
- Disable cbor, smile, xml and yaml subpackages, and tests
* Fri Sep 07 2018 Mat Booth <mat.booth@redhat.com> - 2.9.4-4
- Allow conditional building of modules that have extra deps
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.9.4-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.9.4-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild

1
sources Normal file
View File

@ -0,0 +1 @@
SHA512 (jackson-jaxrs-providers-2.14.1.tar.gz) = 047a35c649498648663e66a1326c4900753c0ba4c3bc5a87ffc39161faf60428fa5012ec7d15c7f53d7635ebc8e7ddb7efe2bcce5cfcf09d2e883f488be2ea8e

View File

@ -0,0 +1,25 @@
[DEFAULT]
pki_server_database_password=Secret.123
[CA]
pki_admin_email=caadmin@example.com
pki_admin_name=caadmin
pki_admin_nickname=caadmin
pki_admin_password=Secret.123
pki_admin_uid=caadmin
pki_client_database_password=Secret.123
pki_client_database_purge=False
pki_client_pkcs12_password=Secret.123
pki_ds_base_dn=dc=ca,dc=pki,dc=example,dc=com
pki_ds_database=ca
pki_ds_password=Secret.123
pki_security_domain_name=EXAMPLE
pki_ca_signing_nickname=ca_signing
pki_ocsp_signing_nickname=ca_ocsp_signing
pki_audit_signing_nickname=ca_audit_signing
pki_sslserver_nickname=sslserver
pki_subsystem_nickname=subsystem

View File

@ -0,0 +1,24 @@
#!/bin/bash -ex
# This command needs to be executed as it pulls the machine name
# dynamically.
dscreate create-template /tmp/test_dir/ds.inf
sed -i \
-e "s/;instance_name = .*/instance_name = localhost/g" \
-e "s/;root_password = .*/root_password = Secret.123/g" \
-e "s/;suffix = .*/suffix = dc=example,dc=com/g" \
-e "s/;self_sign_cert = .*/self_sign_cert = False/g" \
/tmp/test_dir/ds.inf
dscreate from-file /tmp/test_dir/ds.inf
ldapadd -h $HOSTNAME -x -D "cn=Directory Manager" -w Secret.123 << EOF
dn: dc=example,dc=com
objectClass: domain
dc: example
dn: dc=pki,dc=example,dc=com
objectClass: domain
dc: pki
EOF

View File

@ -0,0 +1,27 @@
[DEFAULT]
pki_server_database_password=Secret.123
[KRA]
pki_admin_email=kraadmin@example.com
pki_admin_name=kraadmin
pki_admin_nickname=kraadmin
pki_admin_password=Secret.123
pki_admin_uid=kraadmin
pki_client_database_password=Secret.123
pki_client_database_purge=False
pki_client_pkcs12_password=Secret.123
pki_ds_base_dn=dc=kra,dc=pki,dc=example,dc=com
pki_ds_database=kra
pki_ds_password=Secret.123
pki_security_domain_name=EXAMPLE
pki_security_domain_user=caadmin
pki_security_domain_password=Secret.123
pki_storage_nickname=kra_storage
pki_transport_nickname=kra_transport
pki_audit_signing_nickname=kra_audit_signing
pki_sslserver_nickname=sslserver
pki_subsystem_nickname=subsystem

View File

@ -0,0 +1,26 @@
---
- name: Install jackson-jaxrs-providers
dnf:
name: >
pki-jackson-jaxrs*
- name: Install required packages
dnf:
name: >
389-ds-base, pki-ca, pki-kra
- name: Creates directory
file: path=/tmp/test_files state=directory
- name: Copying templates to /tmp folder
copy : src=. dest=/tmp/test_dir
- name: Setup DS Service
shell: sh /tmp/test_dir/ds-create.sh
- name: Install CA subsystem
shell: pkispawn -f /tmp/test_dir/ca.cfg -s CA -v
- name: Install KRA subsystem
shell: pkispawn -f /tmp/test_dir/kra.cfg -s KRA -v

29
tests/tests.yml Normal file
View File

@ -0,0 +1,29 @@
- hosts: localhost
remote_user: root
tags:
- classic
roles:
- role: Test_Setup
- role: standard-test-basic
tests:
- verify_spawn_ca:
dir: .
run: "curl http://localhost:8080/ca/admin/ca/getStatus | grep '<Status>running</Status>'"
- verify_spawn_kra:
dir: .
run: "curl http://localhost:8080/kra/admin/kra/getStatus | grep '<Status>running</Status>'"
- destroy_kra:
dir: .
run: "pkidestroy -i pki-tomcat -s KRA && sleep 5"
- verify_destroy_kra:
dir: .
run: "curl http://localhost:8080/kra/admin/kra/getStatus | grep 'HTTP Status 404'"
- destroy_ca:
dir: .
run: "pkidestroy -i pki-tomcat -s CA"
- verify_destroy_ca:
dir: .
run: "curl http://localhost:8080/ca/admin/ca/getStatus &> testfile.log || true && grep 'Connection refused' testfile.log"
required_packages:
- pki-ca
- pki-kra