Compare commits

...

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

11 changed files with 56 additions and 178 deletions

17
.gitignore vendored
View File

@ -1,16 +1 @@
/results_*
/*.src.rpm
/jackson-modules-base-2.9.8.tar.gz
/jackson-modules-base-2.10.0.tar.gz
/jackson-modules-base-2.10.1.tar.gz
/jackson-modules-base-2.10.2.tar.gz
/jackson-modules-base-2.10.3.tar.gz
/jackson-modules-base-2.10.4.tar.gz
/jackson-modules-base-2.11.0.tar.gz
/jackson-modules-base-2.11.1.tar.gz
/jackson-modules-base-2.11.2.tar.gz
/jackson-modules-base-2.11.3.tar.gz
/jackson-modules-base-2.11.4.tar.gz
/jackson-modules-base-2.14.1.tar.gz
/jackson-modules-base-2.14.2.tar.gz
SOURCES/jackson-modules-base-2.14.1.tar.gz

View File

@ -1 +1 @@
4322635aa05711b1a3841703d81e8b77f1b95413 jackson-modules-base-2.14.2.tar.gz
11b1d5daee50c58f13038bfd92ae28ad86ad428a SOURCES/jackson-modules-base-2.14.1.tar.gz

View File

@ -0,0 +1,26 @@
From 45cad535d09c0b67719a1ebe14353636515596f7 Mon Sep 17 00:00:00 2001
From: Chris Kelley <ckelley@redhat.com>
Date: Thu, 8 Sep 2022 12:44:54 +0100
Subject: [PATCH] Expose javax.security.auth from JDK internals
---
pom.xml | 3 +++
1 file changed, 3 insertions(+)
diff --git a/pom.xml b/pom.xml
index e72b4934..cafe56de 100644
--- a/pom.xml
+++ b/pom.xml
@@ -97,6 +97,9 @@ not datatype, data format, or JAX-RS provider modules.
<excludes>
<exclude>com/fasterxml/jackson/**/failing/*.java</exclude>
</excludes>
+ <argLine>
+ --add-opens=java.base/javax.security.auth=ALL-UNNAMED
+ </argLine>
</configuration>
</plugin>
</plugins>
--
2.38.1

View File

@ -1,13 +1,14 @@
%bcond_with jp_minimal
Name: jackson-modules-base
Version: 2.14.2
Version: 2.14.1
Release: 2%{?dist}
Summary: Jackson modules: Base
License: Apache-2.0
URL: https://github.com/FasterXML/jackson-modules-base
Source0: %{url}/archive/%{name}-%{version}.tar.gz
Patch1: 0001-Expose-javax.security.auth-from-JDK-internals.patch
BuildRequires: maven-local
BuildRequires: mvn(cglib:cglib)
@ -16,26 +17,36 @@ BuildRequires: mvn(com.fasterxml.jackson.core:jackson-core) >= %{version}
BuildRequires: mvn(com.fasterxml.jackson.core:jackson-databind) >= %{version}
BuildRequires: mvn(com.fasterxml.jackson:jackson-base:pom:) >= %{version}
BuildRequires: mvn(com.google.code.maven-replacer-plugin:replacer)
BuildRequires: mvn(jakarta.activation:jakarta.activation-api:2)
BuildRequires: mvn(jakarta.xml.bind:jakarta.xml.bind-api:4)
BuildRequires: mvn(jakarta.activation:jakarta.activation-api)
BuildRequires: mvn(javax.xml.bind:jaxb-api)
BuildRequires: mvn(junit:junit)
BuildRequires: mvn(org.apache.felix:maven-bundle-plugin)
BuildRequires: mvn(org.mockito:mockito-all)
BuildRequires: mvn(org.ow2.asm:asm)
BuildArch: noarch
%if 0%{?fedora}
ExclusiveArch: %{java_arches} noarch
%endif
%description
Jackson "base" modules: modules that build directly on databind,
and are not data-type, data format, or JAX-RS provider modules.
%package -n jackson-module-jaxb-annotations
Summary: Support for using JAXB annotations as an alternative to "native" Jackson annotations
%package -n pki-%{name}
Summary: Jackson modules: Base
Obsoletes: %{name} < %{version}-%{release}
Conflicts: %{name} < %{version}-%{release}
Provides: %{name} = %{version}-%{release}
%description -n jackson-module-jaxb-annotations
%description -n pki-%{name}
Jackson "base" modules: modules that build directly on databind,
and are not data-type, data format, or JAX-RS provider modules.
%package -n pki-jackson-module-jaxb-annotations
Summary: Support for using JAXB annotations as an alternative to "native" Jackson annotations
Obsoletes: jackson-module-jaxb-annotations < %{version}-%{release}
Conflicts: jackson-module-jaxb-annotations < %{version}-%{release}
Provides: jackson-module-jaxb-annotations = %{version}-%{release}
%description -n pki-jackson-module-jaxb-annotations
This Jackson extension module provides support for using JAXB (javax.xml.bind)
annotations as an alternative to native Jackson annotations. It is most often
used to make it easier to reuse existing data beans that used with JAXB
@ -43,9 +54,7 @@ framework to read and write XML.
%prep
%setup -q -n %{name}-%{name}-%{version}
%pom_change_dep jakarta.activation:jakarta.activation-api jakarta.activation:jakarta.activation-api:2 jaxb
%pom_change_dep jakarta.xml.bind:jakarta.xml.bind-api jakarta.xml.bind:jakarta.xml.bind-api:4 jaxb
%patch1 -p1
%pom_remove_dep -r org.glassfish.jaxb:jaxb-runtime
%pom_remove_plugin "de.jjohannes:gradle-module-metadata-maven-plugin"
@ -53,6 +62,9 @@ framework to read and write XML.
# no need for Java 9 module stuff
%pom_remove_plugin -r :moditect-maven-plugin
# move to "old" glassfish-jaxb-api artifactId
%pom_change_dep -r jakarta.xml.bind:jakarta.xml.bind-api javax.xml.bind:jaxb-api
# Disable bundling of asm
%pom_remove_plugin ":maven-shade-plugin" afterburner mrbean paranamer
%pom_xpath_remove "pom:properties/pom:osgi.private" mrbean paranamer
@ -86,29 +98,23 @@ cp -p mrbean/src/main/resources/META-INF/{LICENSE,NOTICE} .
# This test fails since mockito was upgraded to 2.x
rm osgi/src/test/java/com/fasterxml/jackson/module/osgi/InjectOsgiServiceTest.java
%mvn_file ":{*}" jackson-modules/@1 @1
%mvn_file ":{*}" jackson-modules/@1
%build
%mvn_build -f -s -j
%mvn_build -s -j
%install
%mvn_install
%files -f .mfiles-jackson-modules-base
%files -n pki-%{name} -f .mfiles-jackson-modules-base
%doc README.md release-notes
%license LICENSE NOTICE
%files -n jackson-module-jaxb-annotations -f .mfiles-jackson-module-jaxb-annotations
%files -n pki-jackson-module-jaxb-annotations -f .mfiles-jackson-module-jaxb-annotations
%doc jaxb/README.md jaxb/release-notes
%license LICENSE NOTICE
%changelog
* Thu Dec 07 2023 Red Hat PKI Team <rhcs-maint@redhat.com> - 2.14.2-2
- Remove patch for java 11
* Mon Feb 27 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

View File

@ -1,7 +0,0 @@
# 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 +0,0 @@
SHA512 (jackson-modules-base-2.14.2.tar.gz) = 17033d9d9174079fad5b8a1dfc645909358340af193bb9ec3dcc4dc8f9b3d8e8097900921c0a268f1399b9d68639304d6087b298ee4d790f1f65fd66f8eb550a

View File

@ -1,25 +0,0 @@
[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

@ -1,24 +0,0 @@
#!/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

@ -1,27 +0,0 @@
[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

@ -1,26 +0,0 @@
---
- name: Install jackson-modules-base
dnf:
name: >
pki-jackson-module-jaxb-annotations
- 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

View File

@ -1,29 +0,0 @@
- 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