Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
232b53b781 | ||
|
|
d2584da797 |
19
.gitignore
vendored
19
.gitignore
vendored
@ -1,3 +1,16 @@
|
||||
/pki-*.tar.gz
|
||||
/pki-*/
|
||||
/*.jar
|
||||
jackson-annotations-2.16.1.jar
|
||||
jackson-core-2.16.1.jar
|
||||
jackson-databind-2.16.1.jar
|
||||
jackson-jaxrs-base-2.16.1.jar
|
||||
jackson-jaxrs-json-provider-2.16.1.jar
|
||||
jackson-module-jaxb-annotations-2.16.1.jar
|
||||
jakarta.activation-api-2.1.2.jar
|
||||
jakarta.annotation-api-1.3.5.jar
|
||||
jakarta.xml.bind-api-4.0.1.jar
|
||||
jboss-jaxrs-2.0-api-1.0.0.Final.jar
|
||||
jboss-logging-3.5.3.Final.jar
|
||||
pki-11.9.0.tar.gz
|
||||
resteasy-client-3.0.26.Final.jar
|
||||
resteasy-jackson2-provider-3.0.26.Final.jar
|
||||
resteasy-jaxrs-3.0.26.Final.jar
|
||||
resteasy-servlet-initializer-3.0.26.Final.jar
|
||||
|
||||
@ -1,107 +0,0 @@
|
||||
From 30906c897e80181758ffd9281f0f0b9f179b686a Mon Sep 17 00:00:00 2001
|
||||
From: Marco Fargetta <mfargett@redhat.com>
|
||||
Date: Thu, 16 Jul 2026 18:25:48 +0200
|
||||
Subject: [PATCH] Fix bundled jackson version mismatch
|
||||
|
||||
New versions of jackson (>2.20) uses a major.minor version for the
|
||||
jackson-annotations package but it keep the same major.minor.update
|
||||
for the other modules. Since the cmake script will retrieve the
|
||||
version from the jackson-annotations the compilation is failing when
|
||||
2.21.4 is bundled.
|
||||
|
||||
This change will consider the jackson-annotation separately from the
|
||||
other modules.
|
||||
---
|
||||
base/CMakeLists.txt | 57 +++++++++++++++++++++++++++++----------------
|
||||
1 file changed, 37 insertions(+), 20 deletions(-)
|
||||
|
||||
diff --git a/base/CMakeLists.txt b/base/CMakeLists.txt
|
||||
index 08444e3641..6ed1e16ceb 100644
|
||||
--- a/base/CMakeLists.txt
|
||||
+++ b/base/CMakeLists.txt
|
||||
@@ -404,30 +404,15 @@ if (EXISTS "${CMAKE_SOURCE_DIR}/base/common/lib")
|
||||
COMMAND ls ${CMAKE_SOURCE_DIR}/base/common/lib
|
||||
COMMAND sed -n "s/^jackson-annotations-\\(.*\\)\\.jar\$/\\1/p"
|
||||
OUTPUT_STRIP_TRAILING_WHITESPACE
|
||||
- OUTPUT_VARIABLE JACKSON_VERSION
|
||||
+ OUTPUT_VARIABLE JACKSON_ANNOTATIONS_VERSION
|
||||
)
|
||||
endif (EXISTS "${CMAKE_SOURCE_DIR}/base/common/lib")
|
||||
|
||||
-if (JACKSON_VERSION)
|
||||
+if (JACKSON_ANNOTATIONS_VERSION)
|
||||
# use imported JARs
|
||||
|
||||
- set(JACKSON_ANNOTATIONS_JAR "${CMAKE_SOURCE_DIR}/base/common/lib/jackson-annotations-${JACKSON_VERSION}.jar")
|
||||
- set(JACKSON_ANNOTATIONS_LINK "jackson-annotations-${JACKSON_VERSION}.jar")
|
||||
-
|
||||
- set(JACKSON_CORE_JAR "${CMAKE_SOURCE_DIR}/base/common/lib/jackson-core-${JACKSON_VERSION}.jar")
|
||||
- set(JACKSON_CORE_LINK "jackson-core-${JACKSON_VERSION}.jar")
|
||||
-
|
||||
- set(JACKSON_DATABIND_JAR "${CMAKE_SOURCE_DIR}/base/common/lib/jackson-databind-${JACKSON_VERSION}.jar")
|
||||
- set(JACKSON_DATABIND_LINK "jackson-databind-${JACKSON_VERSION}.jar")
|
||||
-
|
||||
- set(JACKSON_JAXRS_BASE_JAR "${CMAKE_SOURCE_DIR}/base/common/lib/jackson-jaxrs-base-${JACKSON_VERSION}.jar")
|
||||
- set(JACKSON_JAXRS_BASE_LINK "jackson-jaxrs-base-${JACKSON_VERSION}.jar")
|
||||
-
|
||||
- set(JACKSON_JAXRS_JSON_PROVIDER_JAR "${CMAKE_SOURCE_DIR}/base/common/lib/jackson-jaxrs-json-provider-${JACKSON_VERSION}.jar")
|
||||
- set(JACKSON_JAXRS_JSON_PROVIDER_LINK "jackson-jaxrs-json-provider-${JACKSON_VERSION}.jar")
|
||||
-
|
||||
- set(JACKSON_MODULE_JAXB_ANNOTATIONS_JAR "${CMAKE_SOURCE_DIR}/base/common/lib/jackson-module-jaxb-annotations-${JACKSON_VERSION}.jar")
|
||||
- set(JACKSON_MODULE_JAXB_ANNOTATIONS_LINK "jackson-module-jaxb-annotations-${JACKSON_VERSION}.jar")
|
||||
+ set(JACKSON_ANNOTATIONS_JAR "${CMAKE_SOURCE_DIR}/base/common/lib/jackson-annotations-${JACKSON_ANNOTATIONS_VERSION}.jar")
|
||||
+ set(JACKSON_ANNOTATIONS_LINK "jackson-annotations-${JACKSON_ANNOTATIONS_VERSION}.jar")
|
||||
|
||||
else()
|
||||
# use system JARs
|
||||
@@ -440,6 +425,38 @@ else()
|
||||
)
|
||||
set(JACKSON_ANNOTATIONS_LINK "../../../..${JACKSON_ANNOTATIONS_JAR}")
|
||||
|
||||
+endif (JACKSON_ANNOTATIONS_VERSION)
|
||||
+
|
||||
+if (EXISTS "${CMAKE_SOURCE_DIR}/base/common/lib")
|
||||
+ execute_process(
|
||||
+ COMMAND ls ${CMAKE_SOURCE_DIR}/base/common/lib
|
||||
+ COMMAND sed -n "s/^jackson-core-\\(.*\\)\\.jar\$/\\1/p"
|
||||
+ OUTPUT_STRIP_TRAILING_WHITESPACE
|
||||
+ OUTPUT_VARIABLE JACKSON_CORE_VERSION
|
||||
+ )
|
||||
+endif (EXISTS "${CMAKE_SOURCE_DIR}/base/common/lib")
|
||||
+
|
||||
+if (JACKSON_CORE_VERSION)
|
||||
+ # use imported JARs
|
||||
+
|
||||
+ set(JACKSON_CORE_JAR "${CMAKE_SOURCE_DIR}/base/common/lib/jackson-core-${JACKSON_CORE_VERSION}.jar")
|
||||
+ set(JACKSON_CORE_LINK "jackson-core-${JACKSON_CORE_VERSION}.jar")
|
||||
+
|
||||
+ set(JACKSON_DATABIND_JAR "${CMAKE_SOURCE_DIR}/base/common/lib/jackson-databind-${JACKSON_CORE_VERSION}.jar")
|
||||
+ set(JACKSON_DATABIND_LINK "jackson-databind-${JACKSON_CORE_VERSION}.jar")
|
||||
+
|
||||
+ set(JACKSON_JAXRS_BASE_JAR "${CMAKE_SOURCE_DIR}/base/common/lib/jackson-jaxrs-base-${JACKSON_CORE_VERSION}.jar")
|
||||
+ set(JACKSON_JAXRS_BASE_LINK "jackson-jaxrs-base-${JACKSON_CORE_VERSION}.jar")
|
||||
+
|
||||
+ set(JACKSON_JAXRS_JSON_PROVIDER_JAR "${CMAKE_SOURCE_DIR}/base/common/lib/jackson-jaxrs-json-provider-${JACKSON_CORE_VERSION}.jar")
|
||||
+ set(JACKSON_JAXRS_JSON_PROVIDER_LINK "jackson-jaxrs-json-provider-${JACKSON_CORE_VERSION}.jar")
|
||||
+
|
||||
+ set(JACKSON_MODULE_JAXB_ANNOTATIONS_JAR "${CMAKE_SOURCE_DIR}/base/common/lib/jackson-module-jaxb-annotations-${JACKSON_CORE_VERSION}.jar")
|
||||
+ set(JACKSON_MODULE_JAXB_ANNOTATIONS_LINK "jackson-module-jaxb-annotations-${JACKSON_CORE_VERSION}.jar")
|
||||
+
|
||||
+else()
|
||||
+ # use system JARs
|
||||
+
|
||||
find_file(JACKSON_CORE_JAR
|
||||
NAMES
|
||||
jackson-core.jar
|
||||
@@ -483,7 +500,7 @@ else()
|
||||
)
|
||||
set(JACKSON_MODULE_JAXB_ANNOTATIONS_LINK "../../../..${JACKSON_MODULE_JAXB_ANNOTATIONS_JAR}")
|
||||
|
||||
-endif (JACKSON_VERSION)
|
||||
+endif (JACKSON_CORE_VERSION)
|
||||
|
||||
if (EXISTS "${CMAKE_SOURCE_DIR}/base/common/lib")
|
||||
execute_process(
|
||||
--
|
||||
2.55.0
|
||||
|
||||
@ -1,74 +0,0 @@
|
||||
From 19540347037ee6f16db00f1b401d64fa695dadf1 Mon Sep 17 00:00:00 2001
|
||||
From: Marco Fargetta <mfargett@redhat.com>
|
||||
Date: Wed, 21 Jan 2026 10:41:43 +0100
|
||||
Subject: [PATCH 1/2] Fix python pylint error in EST upgrade script
|
||||
|
||||
---
|
||||
base/server/upgrade/11.9.0/01-EnableEST.py | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/base/server/upgrade/11.9.0/01-EnableEST.py b/base/server/upgrade/11.9.0/01-EnableEST.py
|
||||
index d877485fb6..e886aca39d 100644
|
||||
--- a/base/server/upgrade/11.9.0/01-EnableEST.py
|
||||
+++ b/base/server/upgrade/11.9.0/01-EnableEST.py
|
||||
@@ -202,7 +202,7 @@ class EnableEST(pki.server.upgrade.PKIServerUpgradeScriptlet):
|
||||
logger.info('Group %s already exist', group_id)
|
||||
return
|
||||
except subprocess.CalledProcessError:
|
||||
- logger.info("Group %s has to be created.")
|
||||
+ logger.info("Group '%s' will be created.", group_id)
|
||||
|
||||
subsystem.add_group(
|
||||
group_id,
|
||||
--
|
||||
2.52.0
|
||||
|
||||
|
||||
From a7f4fd64c9a25f742c6d5320bb20404b10bd73d5 Mon Sep 17 00:00:00 2001
|
||||
From: Marco Fargetta <mfargett@redhat.com>
|
||||
Date: Thu, 22 Jan 2026 15:52:27 +0100
|
||||
Subject: [PATCH 2/2] Fix CMake build with tomcat10
|
||||
|
||||
CMake build had tomcat-9 library hard-coded and has been removed to get
|
||||
it from the `build.sh`.
|
||||
|
||||
The `build.sh` test to identify the tomcat version to use was not
|
||||
working with dotted version (e.g. 10.2) and it has been fixed.
|
||||
---
|
||||
base/server/CMakeLists.txt | 2 +-
|
||||
build.sh | 6 +-----
|
||||
2 files changed, 2 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/base/server/CMakeLists.txt b/base/server/CMakeLists.txt
|
||||
index f62b2bfa05..9fb6c7a98a 100644
|
||||
--- a/base/server/CMakeLists.txt
|
||||
+++ b/base/server/CMakeLists.txt
|
||||
@@ -29,7 +29,7 @@ javac(pki-server-classes
|
||||
OUTPUT_DIR
|
||||
${CMAKE_CURRENT_BINARY_DIR}/classes
|
||||
DEPENDS
|
||||
- pki-common-jar pki-tools-jar pki-tomcat-jar pki-tomcat-9.0-jar
|
||||
+ pki-common-jar pki-tools-jar pki-tomcat-jar pki-${APP_SERVER}-jar
|
||||
)
|
||||
|
||||
add_dependencies(java pki-server-classes)
|
||||
diff --git a/build.sh b/build.sh
|
||||
index 62876a45c9..ed858a6beb 100755
|
||||
--- a/build.sh
|
||||
+++ b/build.sh
|
||||
@@ -204,11 +204,7 @@ get_tomcat_app_server() {
|
||||
app_server=$def_app_server
|
||||
fi
|
||||
else
|
||||
- if [ $ver -ge $rhel_cutoff ]; then
|
||||
- app_server=$app_server_10
|
||||
- else
|
||||
- app_server=$def_app_server
|
||||
- fi
|
||||
+ echo "$rhel_cutoff $ver" | tr " " "\n" | sort -V -C && app_server=$app_server_10 || app_server=$def_app_server
|
||||
fi
|
||||
|
||||
echo $app_server
|
||||
--
|
||||
2.52.0
|
||||
|
||||
@ -1,9 +0,0 @@
|
||||
#!/bin/sh
|
||||
|
||||
REPO=$1
|
||||
|
||||
if [ "$REPO" == "" ]; then
|
||||
REPO="pki-10.6"
|
||||
fi
|
||||
|
||||
fedpkg copr-build --nowait $REPO
|
||||
@ -1,4 +0,0 @@
|
||||
addFilter('W: spelling-error')
|
||||
addFilter('W: dangling-symlink')
|
||||
addFilter('W: no-manual-page-for-binary')
|
||||
addFilter('W: log-files-without-logrotate')
|
||||
@ -14,7 +14,7 @@ Name: dogtag-pki
|
||||
# Downstream release number:
|
||||
# - development/stabilization (unsupported): 0.<n> where n >= 1
|
||||
# - GA/update (supported): <n> where n >= 1
|
||||
%global release_number 4
|
||||
%global release_number 3
|
||||
|
||||
# Development phase:
|
||||
# - development (unsupported): alpha<n> where n >= 1
|
||||
@ -42,13 +42,13 @@ Source: https://github.com/dogtagpki/pki/archive/v%{version}%{?phase:-}%{?phase}
|
||||
|
||||
Source1: jakarta.activation-api-2.1.2.jar
|
||||
Source2: jakarta.annotation-api-1.3.5.jar
|
||||
Source3: jakarta.xml.bind-api-2.3.3.jar
|
||||
Source4: jackson-annotations-2.21.jar
|
||||
Source5: jackson-core-2.21.4.jar
|
||||
Source6: jackson-databind-2.21.4.jar
|
||||
Source7: jackson-module-jaxb-annotations-2.21.4.jar
|
||||
Source8: jackson-jaxrs-base-2.21.4.jar
|
||||
Source9: jackson-jaxrs-json-provider-2.21.4.jar
|
||||
Source3: jakarta.xml.bind-api-4.0.1.jar
|
||||
Source4: jackson-annotations-2.16.1.jar
|
||||
Source5: jackson-core-2.16.1.jar
|
||||
Source6: jackson-databind-2.16.1.jar
|
||||
Source7: jackson-module-jaxb-annotations-2.16.1.jar
|
||||
Source8: jackson-jaxrs-base-2.16.1.jar
|
||||
Source9: jackson-jaxrs-json-provider-2.16.1.jar
|
||||
Source10: jboss-jaxrs-2.0-api-1.0.0.Final.jar
|
||||
Source11: jboss-logging-3.5.3.Final.jar
|
||||
Source12: resteasy-jaxrs-3.0.26.Final.jar
|
||||
@ -64,8 +64,6 @@ Source15: resteasy-servlet-initializer-3.0.26.Final.jar
|
||||
# Patch: pki-VERSION-RELEASE.patch
|
||||
#Patch1: FixBuild.patch
|
||||
|
||||
Patch: 0001-Fix-bundled-jackson-version-mismatch.patch
|
||||
|
||||
%if 0%{?java_arches:1}
|
||||
ExclusiveArch: %{java_arches}
|
||||
%else
|
||||
@ -603,13 +601,13 @@ Requires: mvn(org.jboss.resteasy:resteasy-jackson2-provider)
|
||||
%else
|
||||
Provides: bundled(jakarta-activation) = 2.1.2
|
||||
Provides: bundled(jakarta-annotations) = 1.3.5
|
||||
Provides: bundled(jaxb-api) = 2.3.3
|
||||
Provides: bundled(jaxb-api) = 4.0.1
|
||||
|
||||
Provides: bundled(jackson-annotations) = 2.21
|
||||
Provides: bundled(jackson-core) = 2.21.4
|
||||
Provides: bundled(jackson-databind) = 2.21.4
|
||||
Provides: bundled(jackson-modules-base) = 2.21.4
|
||||
Provides: bundled(jackson-jaxrs-providers) = 2.21.4
|
||||
Provides: bundled(jackson-annotations) = 2.16.1
|
||||
Provides: bundled(jackson-core) = 2.16.1
|
||||
Provides: bundled(jackson-databind) = 2.16.1
|
||||
Provides: bundled(jackson-modules-base) = 2.16.1
|
||||
Provides: bundled(jackson-jaxrs-providers) = 2.16.1
|
||||
|
||||
Provides: bundled(jboss-jaxrs-2.0-api) = 1.0.0
|
||||
Provides: bundled(jboss-logging) = 3.5.3
|
||||
@ -1150,23 +1148,21 @@ then
|
||||
jakarta.xml.bind-api-$JAXB_API_VERSION.jar
|
||||
fi
|
||||
|
||||
JACKSON_ANNOTATIONS_VERSION=$(rpm -q jackson-annotations | sed -n 's/^jackson-annotations-\([^-]*\)-.*$/\1/p')
|
||||
echo "JACKSON_ANNOTATIONS_VERSION: $JACKSON_ANNOTATIONS_VERSION"
|
||||
JACKSON_CORE_VERSION=$(rpm -q jackson-core | sed -n 's/^jackson-core-\([^-]*\)-.*$/\1/p')
|
||||
echo "JACKSON_CORE_VERSION: $JACKSON_CORE_VERSION"
|
||||
JACKSON_VERSION=$(rpm -q jackson-annotations | sed -n 's/^jackson-annotations-\([^-]*\)-.*$/\1/p')
|
||||
echo "JACKSON_VERSION: $JACKSON_VERSION"
|
||||
|
||||
cp /usr/share/java/jackson-annotations.jar \
|
||||
jackson-annotations-$JACKSON_ANNOTATIONS_VERSION.jar
|
||||
jackson-annotations-$JACKSON_VERSION.jar
|
||||
cp /usr/share/java/jackson-core.jar \
|
||||
jackson-core-$JACKSON_CORE_VERSION.jar
|
||||
jackson-core-$JACKSON_VERSION.jar
|
||||
cp /usr/share/java/jackson-databind.jar \
|
||||
jackson-databind-$JACKSON_CORE_VERSION.jar
|
||||
jackson-databind-$JACKSON_VERSION.jar
|
||||
cp /usr/share/java/jackson-jaxrs-providers/jackson-jaxrs-base.jar \
|
||||
jackson-jaxrs-base-$JACKSON_CORE_VERSION.jar
|
||||
jackson-jaxrs-base-$JACKSON_VERSION.jar
|
||||
cp /usr/share/java/jackson-jaxrs-providers/jackson-jaxrs-json-provider.jar \
|
||||
jackson-jaxrs-json-provider-$JACKSON_CORE_VERSION.jar
|
||||
jackson-jaxrs-json-provider-$JACKSON_VERSION.jar
|
||||
cp /usr/share/java/jackson-modules/jackson-module-jaxb-annotations.jar \
|
||||
jackson-module-jaxb-annotations-$JACKSON_CORE_VERSION.jar
|
||||
jackson-module-jaxb-annotations-$JACKSON_VERSION.jar
|
||||
|
||||
JAXRS_VERSION=$(rpm -q jboss-jaxrs-2.0-api | sed -n 's/^jboss-jaxrs-2.0-api-\([^-]*\)-.*$/\1.Final/p')
|
||||
echo "JAXRS_VERSION: $JAXRS_VERSION"
|
||||
@ -1199,14 +1195,14 @@ then
|
||||
|
||||
/usr/bin/javax2jakarta -profile=EE jboss-jaxrs-api_2.0_spec-$JAXRS_VERSION.jar jboss-jaxrs-api_2.0_spec-$JAXRS_VERSION.jar
|
||||
|
||||
/usr/bin/javax2jakarta -profile=EE jackson-jaxrs-json-provider-$JACKSON_CORE_VERSION.jar jackson-jaxrs-json-provider-$JACKSON_CORE_VERSION.jar
|
||||
/usr/bin/javax2jakarta -profile=EE jackson-jaxrs-json-provider-$JACKSON_VERSION.jar jackson-jaxrs-json-provider-$JACKSON_VERSION.jar
|
||||
|
||||
/usr/bin/javax2jakarta -profile=EE jackson-annotations-$JACKSON_ANNOTATIONS_VERSION.jar jackson-annotations-$JACKSON_ANNOTATIONS_VERSION.jar
|
||||
/usr/bin/javax2jakarta -profile=EE jackson-core-$JACKSON_CORE_VERSION.jar jackson-core-$JACKSON_CORE_VERSION.jar
|
||||
/usr/bin/javax2jakarta -profile=EE jackson-databind-$JACKSON_CORE_VERSION.jar jackson-databind-$JACKSON_CORE_VERSION.jar
|
||||
/usr/bin/javax2jakarta -profile=EE jackson-jaxrs-base-$JACKSON_CORE_VERSION.jar jackson-jaxrs-base-$JACKSON_CORE_VERSION.jar
|
||||
/usr/bin/javax2jakarta -profile=EE jackson-jaxrs-json-provider-$JACKSON_CORE_VERSION.jar jackson-jaxrs-json-provider-$JACKSON_CORE_VERSION.jar
|
||||
/usr/bin/javax2jakarta -profile=EE jackson-module-jaxb-annotations-$JACKSON_CORE_VERSION.jar jackson-module-jaxb-annotations-$JACKSON_CORE_VERSION.jar
|
||||
/usr/bin/javax2jakarta -profile=EE jackson-annotations-$JACKSON_VERSION.jar jackson-annotations-$JACKSON_VERSION.jar
|
||||
/usr/bin/javax2jakarta -profile=EE jackson-core-$JACKSON_VERSION.jar jackson-core-$JACKSON_VERSION.jar
|
||||
/usr/bin/javax2jakarta -profile=EE jackson-databind-$JACKSON_VERSION.jar jackson-databind-$JACKSON_VERSION.jar
|
||||
/usr/bin/javax2jakarta -profile=EE jackson-jaxrs-base-$JACKSON_VERSION.jar jackson-jaxrs-base-$JACKSON_VERSION.jar
|
||||
/usr/bin/javax2jakarta -profile=EE jackson-jaxrs-json-provider-$JACKSON_VERSION.jar jackson-jaxrs-json-provider-$JACKSON_VERSION.jar
|
||||
/usr/bin/javax2jakarta -profile=EE jackson-module-jaxb-annotations-$JACKSON_VERSION.jar jackson-module-jaxb-annotations-$JACKSON_VERSION.jar
|
||||
|
||||
/usr/bin/javax2jakarta -profile=EE jakarta.activation-api-$JAKARTA_ACTIVATION_API_VERSION.jar jakarta.activation-api-$JAKARTA_ACTIVATION_API_VERSION.jar
|
||||
/usr/bin/javax2jakarta -profile=EE jakarta.annotation-api-$JAKARTA_ANNOTATION_API_VERSION.jar jakarta.annotation-api-$JAKARTA_ANNOTATION_API_VERSION.jar
|
||||
@ -2176,11 +2172,6 @@ fi
|
||||
|
||||
################################################################################
|
||||
%changelog
|
||||
* Thu Jul 16 2026 Red Hat PKI Team <rhcs-maint@redhat.com> - 11.9.0-4
|
||||
- Update jackson bundled to 2.21.4
|
||||
- Resolves: RHEL-188290
|
||||
- Resolves: RHEL-190906
|
||||
|
||||
* Fri Mar 13 2026 Red Hat PKI Team <rhcs-maint@redhat.com> - 11.9.0-3
|
||||
- Revert to tomcat 9
|
||||
- Resolves: RHEL-155406
|
||||
|
||||
@ -1,8 +0,0 @@
|
||||
# recipients: rhcs-team
|
||||
--- !Policy
|
||||
product_versions:
|
||||
- rhel-10
|
||||
decision_context: osci_compose_gate
|
||||
rules:
|
||||
- !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}
|
||||
- !PassingTestCaseRule {test_case_name: idm-ci.brew-build.tier1.functional}
|
||||
@ -1,8 +0,0 @@
|
||||
---
|
||||
specname:
|
||||
match: suffix
|
||||
runpath:
|
||||
allowed_paths:
|
||||
- /usr/lib64/tps
|
||||
inspections:
|
||||
javabytecode: off
|
||||
16
sources
16
sources
@ -1,16 +1,16 @@
|
||||
SHA512 (jackson-annotations-2.21.jar) = 309a3f043442db5db62eaf6b14669382de0c888af89481a6b06b45d3db357bba4ed1ed81d6c0d179acadd20006ecb00870f5a03abb9a74bec112de46e0d749c8
|
||||
SHA512 (jackson-core-2.21.4.jar) = ed572753dc158dbfddd1440653824ba22b5882098d41197bada8a5bebbfca180139feb9204fb50f97a07eed76fdffe2708c743d6a78d29adb1788332d6b0266a
|
||||
SHA512 (jackson-databind-2.21.4.jar) = bc3eab8960b21792926e4ca96bdb511900d5e514734ba45d6ce3fe6af5afbe1226082916b808664ee5ee584d1aaeba7ddce9c2ee5a82e302eb9313fc469582bb
|
||||
SHA512 (jackson-jaxrs-base-2.21.4.jar) = 979d3c305d43085344b485bcea6a4dca33203e8e1d35bfa92781fbb87dd6218c79fde3dcc13e18e46bfe7ea13f9151cf8ebab8829f225bc0ef334447b373b8f1
|
||||
SHA512 (jackson-jaxrs-json-provider-2.21.4.jar) = 15dfae511a05cd83710927d0e0d77f7fc9fff1c448c1611ee43fef22412885fa3c5f74abe933a0161a8f21041f881262427041e7d12569f0807ceeb285c4293e
|
||||
SHA512 (jackson-module-jaxb-annotations-2.21.4.jar) = a521db56176e5bace4561c9e03cc99542fa7bfc5a35a6d0394a9734ab9b0aacfdc7b265be268c25569af9bfda8bf266241fcefe57099cb665652189042ecf52f
|
||||
SHA512 (jackson-annotations-2.16.1.jar) = b5f05c0aeb994c8f694cf080ffb1f8cbd3baff34f52479a618fef6c91b82c8a1cb09801ab24c898b9db698863ea7da615d8991c8741172d21d540345156a200a
|
||||
SHA512 (jackson-core-2.16.1.jar) = 3abac44446ae99aa89c4c7bb50e4a07eb297f4c8d76931e330da6830ffcd9ea94520a7dda1b8d9b00fce64e3838cc7ecf8e490eb478276155d8c286b80f5586c
|
||||
SHA512 (jackson-databind-2.16.1.jar) = adbdcfae96dcfc56669c811a6c8e99a711d372cd1950e39122fe785dfec043a62c92c4a8cf495589db10424ce10517607808cbd4d1ec184ce41c20bb96cc476c
|
||||
SHA512 (jackson-jaxrs-base-2.16.1.jar) = ed33efbd356366099807321f00a6c6b0a63492c2ccceaab47c01a5431606e2235e5063a5e03127da0667ae336159d4bef1b041edb8af8fe6842c6db2c4051b8a
|
||||
SHA512 (jackson-jaxrs-json-provider-2.16.1.jar) = 159858d45522a41573a9e2317376bb99bc536b6cc18aa0666e2364d1a8653615ced5f7381eb09c90a610ffb47f04978705138f11abe4a211ded855093ac05953
|
||||
SHA512 (jackson-module-jaxb-annotations-2.16.1.jar) = ab298afa23a4a99935d960581735d005a83dcea7a516c14263c692717b789ff8445ea7b4144d200fc58853ad705a1b947113f06df141526e194e388b9b3f9420
|
||||
SHA512 (jakarta.activation-api-2.1.2.jar) = ad77a91afab8dbbde66861ce71367abf660ac21ceee7a2b0829104ceb2add62bf48c0f688e13aedc3ab8acd1967a215ead7291057b88e26295e5f60cb5694e72
|
||||
SHA512 (jakarta.annotation-api-1.3.5.jar) = 989a0d1e993c37d00c9860026a4298c65274547b386b4f8053f914e1d614a1a4beba1d9c0dfe09b151d35b2119fea2d41be55d62551b6373830e255602eb3bfe
|
||||
SHA512 (jakarta.xml.bind-api-2.3.3.jar) = 9f31e8efd0b2efcac18d8272bb13030851b540b4a4232900b0bac2df8004634d9089edbefed13932aa8b8d3511ad230f1d88a6e52ab2176c2f228ffafe4a81af
|
||||
SHA512 (jakarta.xml.bind-api-4.0.1.jar) = 4730c1129719e166488888f4b14edd0a4f180d67b6772b4f58fc24d747da48f84463b2a01437200f07806525662a77251a3ce83375886b7c83f2b0e34ef21add
|
||||
SHA512 (jboss-jaxrs-2.0-api-1.0.0.Final.jar) = 39a29f9259e7ceb9018447c49d4a18be31aa88775ed7999eff20b2a8f1d8daa25da520c09d0a1c53bf7f417106a64cb2d4f374038ae44511cb60dac1db714495
|
||||
SHA512 (jboss-logging-3.5.3.Final.jar) = 2f604d0318a9f10b5c867dbff4ac7a3a608a41a9383cb3fc2ef6364f28396144ead96a0526ae3dea4336109042ead81b9b9318b13e9964b2c57a26794981f5cb
|
||||
SHA512 (pki-11.9.0.tar.gz) = 94395202644d8f0ae97a2af05d547ab4fed2df78ae688074018c779c6da7c78da3ee6a2a350ce91d866290b87ff8ce56ce773c7801d663b8847bffe0090d9aa1
|
||||
SHA512 (resteasy-client-3.0.26.Final.jar) = 9f3ea65f9cb045cc2e6f4c06f9b63f8d1f78b36ae419ca8367ce11cdd82e6fe35a2d5847634d71a306e0f6d8e3a69db5930c179cf635f105a8f064becb14f2a2
|
||||
SHA512 (resteasy-jackson2-provider-3.0.26.Final.jar) = 11e76fc901f4299dacfb67f4784988511933ef170d05d2dce3cbceb5d7857827faec0f4fc7618dea0ba51267bc0ea5bc185e41a5a539e35c688b8e4d433b1792
|
||||
SHA512 (resteasy-jaxrs-3.0.26.Final.jar) = 7beb8391d7fcfb96be8ffab674613167001f99a3fb3c4661c037949a52f2658db8028d8a2f3319df06dd3f2deb8152f4cad5f681d401a8deeea9b19ad5aba266
|
||||
SHA512 (resteasy-servlet-initializer-3.0.26.Final.jar) = 47a57c0137263d45628d53cceb4a9a6a87209150aaa559b56c5085e6b7b40be8f488c8fcc8ecf8f3882fc981c6d25ba2c750db7254eebea9b2faa5087a72453c
|
||||
SHA512 (pki-11.9.0.tar.gz) = 94395202644d8f0ae97a2af05d547ab4fed2df78ae688074018c779c6da7c78da3ee6a2a350ce91d866290b87ff8ce56ce773c7801d663b8847bffe0090d9aa1
|
||||
|
||||
@ -1,55 +0,0 @@
|
||||
#!/bin/sh -e
|
||||
|
||||
download() {
|
||||
PKG_NAME=$1
|
||||
SUFFIX=$2
|
||||
|
||||
ssh "${OPTIONS[@]}" $SOURCE dnf install -y $PKG_NAME
|
||||
VERSION=$(ssh "${OPTIONS[@]}" $SOURCE rpm -q $PKG_NAME | sed -n "s/^$PKG_NAME-\\([^-]*\\)-.*$/\\1/p")
|
||||
|
||||
if [ "$VERSION" == "" ]
|
||||
then
|
||||
echo "$PKG_NAME not found"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
echo "Downloading $PKG_NAME-$VERSION"
|
||||
|
||||
FILES=$(ssh "${OPTIONS[@]}" $SOURCE rpm -ql $PKG_NAME | sed -n -e "/^\/usr\/share\/java\/.*\.jar$/p")
|
||||
for FILE in $FILES
|
||||
do
|
||||
FILENAME=$(basename $FILE)
|
||||
NAME=$(echo $FILENAME | sed 's/\.jar$//')
|
||||
echo "Downloading $FILE to $NAME-$VERSION$SUFFIX.jar"
|
||||
scp "${OPTIONS[@]}" $SOURCE:$FILE $NAME-$VERSION$SUFFIX.jar
|
||||
done
|
||||
}
|
||||
|
||||
SOURCE=$1
|
||||
|
||||
if [ "$SOURCE" == "" ]
|
||||
then
|
||||
echo "Usage: source-download.sh <username>@<hostname>"
|
||||
exit 0
|
||||
fi
|
||||
|
||||
OPTIONS=(-i /usr/share/qa-tools/1minutetip/1minutetip)
|
||||
|
||||
download jakarta-activation
|
||||
download jakarta-annotations
|
||||
download jaxb-api
|
||||
|
||||
download jackson-annotations
|
||||
download jackson-core
|
||||
download jackson-databind
|
||||
download jackson-module-jaxb-annotations
|
||||
download jackson-jaxrs-providers
|
||||
download jackson-jaxrs-json-provider
|
||||
|
||||
download jboss-jaxrs-2.0-api .Final
|
||||
download jboss-logging .Final
|
||||
|
||||
download pki-resteasy-core .Final
|
||||
download pki-resteasy-client .Final
|
||||
download pki-resteasy-jackson2-provider .Final
|
||||
download pki-resteasy-servlet-initializer .Final
|
||||
@ -1,14 +0,0 @@
|
||||
#!/bin/sh
|
||||
|
||||
COMMAND=$1
|
||||
|
||||
if [ "$COMMAND" == "" ]
|
||||
then
|
||||
echo "Usage: source-import.sh <command>"
|
||||
exit 0
|
||||
fi
|
||||
|
||||
FILES=$(ls *.tar.gz)
|
||||
FILES+=($(ls *.jar))
|
||||
|
||||
$COMMAND new-sources "${FILES[@]}"
|
||||
@ -1,12 +0,0 @@
|
||||
#!/bin/sh
|
||||
|
||||
SOURCE=$1
|
||||
TARGET=`basename $1`
|
||||
|
||||
cp $SOURCE $TARGET
|
||||
sha512sum --tag $TARGET > sources
|
||||
|
||||
for FILENAME in $(ls *.jar)
|
||||
do
|
||||
sha512sum --tag $FILENAME >> sources
|
||||
done
|
||||
@ -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
|
||||
@ -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 ldap://$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
|
||||
@ -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
|
||||
@ -1,21 +0,0 @@
|
||||
---
|
||||
|
||||
- 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
|
||||
@ -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\"'"
|
||||
- verify_spawn_kra:
|
||||
dir: .
|
||||
run: "curl http://localhost:8080/kra/admin/kra/getStatus | grep '\"Status\" : \"running\"'"
|
||||
- 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 -i 'failed' testfile.log"
|
||||
required_packages:
|
||||
- pki-ca
|
||||
- pki-kra
|
||||
Loading…
Reference in New Issue
Block a user