Skip to content

Commit

Permalink
Drop java-17-openjdk-headless dependency
Browse files Browse the repository at this point in the history
The runtime dependency on java-17-openjdk-headless has been
removed to allow LDAP SDK to be used with different Java
versions.

The DS test has been updated to use java-17-openjdk-headless.
  • Loading branch information
edewata committed Mar 4, 2024
1 parent 72f6464 commit 0deb72f
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
5 changes: 3 additions & 2 deletions .github/workflows/ds-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,9 @@ jobs:
env:
HOSTNAME: ds.example.com

- name: Install DS package
run: docker exec ds dnf install -y 389-ds-base
- name: Install packages
run: |
docker exec ds dnf install -y 389-ds-base java-17-openjdk-headless
- name: Create DS instance
run: docker exec ds ${SHARED}/tests/bin/ds-create.sh
Expand Down
2 changes: 0 additions & 2 deletions ldapjdk.spec
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@ ExclusiveArch: %{java_arches} noarch
################################################################################

%define java_devel java-17-openjdk-devel
%define java_headless java-17-openjdk-headless
%define java_home %{_jvmdir}/jre-17-openjdk

################################################################################
Expand All @@ -78,7 +77,6 @@ manage, and update the information stored in an LDAP directory.

Summary: LDAP SDK

Requires: %{java_headless}
Requires: mvn(org.slf4j:slf4j-api)
Requires: mvn(org.slf4j:slf4j-jdk14)
Requires: mvn(org.dogtagpki.jss:jss-base) >= 5.5.0
Expand Down

0 comments on commit 0deb72f

Please sign in to comment.