git: 2c8560112485 - 2024Q3 - net/keycloak: Update 25.0.2 → 25.0.4

The branch 2024Q3 has been updated by vvd:

URL: https://cgit.FreeBSD.org/ports/commit/?id=2c856011248534286dbc5b1bd25b68c774b63113

commit 2c856011248534286dbc5b1bd25b68c774b63113
Author:     Matthias Wolf <freebsd@rheinwolf.de>
AuthorDate: 2024-08-27 14:45:10 +0000
Commit:     Vladimir Druzenko <vvd@FreeBSD.org>
CommitDate: 2024-09-13 14:08:24 +0000

    net/keycloak: Update 25.0.2 → 25.0.4
    
    Changelog:
    https://www.keycloak.org/2024/08/keycloak-2504-released.html
    
    Also pet portclippy.
    
    PR:     281093
    (cherry picked from commit e714e43eb316354e67e0edea6b9d8b16fe151c30)
---
 net/keycloak/Makefile  | 19 ++++++++++---------
 net/keycloak/distinfo  |  4 ++--
 net/keycloak/pkg-plist | 14 +++++++-------
 3 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/net/keycloak/Makefile b/net/keycloak/Makefile
index fc174f2b0bc2..ecf49a42aea3 100644
--- a/net/keycloak/Makefile
+++ b/net/keycloak/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	keycloak
-DISTVERSION=	25.0.2
+DISTVERSION=	25.0.4
 CATEGORIES=	net java
 MASTER_SITES=	https://github.com/${PORTNAME}/${PORTNAME}/releases/download/${PORTVERSION}/
 
@@ -16,10 +16,6 @@ USES=		cpe shebangfix
 
 CPE_VENDOR=	redhat
 
-SHEBANG_FILES=	bin/kc.sh \
-		bin/kcadm.sh \
-		bin/kcreg.sh
-
 USE_JAVA=	yes
 JAVA_VERSION=	21+
 JAVA_OS=	native
@@ -28,10 +24,9 @@ JAVA_RUN=	yes
 
 USE_RC_SUBR=	keycloak
 
-KEYCLOAK_USER=	${PORTNAME}
-KEYCLOAK_GROUP=	${PORTNAME}
-USERS=		${KEYCLOAK_USER}
-GROUPS=		${USERS}
+SHEBANG_FILES=	bin/kc.sh \
+		bin/kcadm.sh \
+		bin/kcreg.sh
 
 VAR_DIR?=	/var
 LOG_DIR?=	${VAR_DIR}/log/${PORTNAME}
@@ -49,6 +44,12 @@ SUB_LIST+=	GROUP=${KEYCLOAK_GROUP} \
 		RUN_DIR=${RUN_DIR} \
 		USER=${KEYCLOAK_USER} \
 		GROUP=${KEYCLOAK_GROUP}
+
+KEYCLOAK_USER=	${PORTNAME}
+KEYCLOAK_GROUP=	${PORTNAME}
+USERS=		${KEYCLOAK_USER}
+GROUPS=		${USERS}
+
 PLIST_SUB=	VERSION=${DISTVERSION} \
 		USER=${KEYCLOAK_USER} \
 		GROUP=${KEYCLOAK_GROUP}
diff --git a/net/keycloak/distinfo b/net/keycloak/distinfo
index 7ec4d62c1840..689fd59813f0 100644
--- a/net/keycloak/distinfo
+++ b/net/keycloak/distinfo
@@ -1,3 +1,3 @@
 TIMESTAMP = 1721294958
-SHA256 (keycloak-25.0.2.tar.gz) = c8eb400552174e4b892c4ce9f2114cfee909ef9ebe86f082944b4a0ec47a8825
-SIZE (keycloak-25.0.2.tar.gz) = 146442769
+SHA256 (keycloak-25.0.4.tar.gz) = 3ea8cb05d1efda15b3a9cbd39969cb322ad271e41ab60863cab4add6fd3ff05f
+SIZE (keycloak-25.0.4.tar.gz) = 146492856
diff --git a/net/keycloak/pkg-plist b/net/keycloak/pkg-plist
index c2f5cbbf0f2e..534b7dcf0a3a 100644
--- a/net/keycloak/pkg-plist
+++ b/net/keycloak/pkg-plist
@@ -291,12 +291,12 @@ bin/kcreg
 %%JAVASHAREDIR%%/keycloak/lib/lib/main/org.hibernate.orm.hibernate-core-6.4.8.Final.jar
 %%JAVASHAREDIR%%/keycloak/lib/lib/main/org.hibernate.orm.hibernate-graalvm-6.4.8.Final.jar
 %%JAVASHAREDIR%%/keycloak/lib/lib/main/org.hibernate.quarkus-local-cache-0.3.0.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/org.infinispan.infinispan-cachestore-remote-15.0.5.Final.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/org.infinispan.infinispan-client-hotrod-15.0.5.Final.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/org.infinispan.infinispan-commons-15.0.5.Final.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/org.infinispan.infinispan-core-15.0.5.Final.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/org.infinispan.infinispan-jboss-marshalling-15.0.5.Final.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/org.infinispan.infinispan-multimap-15.0.5.Final.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/org.infinispan.infinispan-cachestore-remote-15.0.7.Final.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/org.infinispan.infinispan-client-hotrod-15.0.7.Final.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/org.infinispan.infinispan-commons-15.0.7.Final.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/org.infinispan.infinispan-core-15.0.7.Final.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/org.infinispan.infinispan-jboss-marshalling-15.0.7.Final.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/org.infinispan.infinispan-multimap-15.0.7.Final.jar
 %%JAVASHAREDIR%%/keycloak/lib/lib/main/org.infinispan.protostream.protostream-5.0.4.Final.jar
 %%JAVASHAREDIR%%/keycloak/lib/lib/main/org.infinispan.protostream.protostream-processor-5.0.4.Final.jar
 %%JAVASHAREDIR%%/keycloak/lib/lib/main/org.infinispan.protostream.protostream-types-5.0.4.Final.jar
@@ -310,7 +310,7 @@ bin/kcreg
 %%JAVASHAREDIR%%/keycloak/lib/lib/main/org.jboss.narayana.jts.narayana-jts-integration-7.0.0.Final.jar
 %%JAVASHAREDIR%%/keycloak/lib/lib/main/org.jboss.slf4j.slf4j-jboss-logmanager-2.0.0.Final.jar
 %%JAVASHAREDIR%%/keycloak/lib/lib/main/org.jboss.threads.jboss-threads-3.5.1.Final.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/org.jgroups.jgroups-5.3.6.Final.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/org.jgroups.jgroups-5.3.10.Final.jar
 %%JAVASHAREDIR%%/keycloak/lib/lib/main/org.jvnet.staxex.stax-ex-2.0.1.jar
 %%JAVASHAREDIR%%/keycloak/lib/lib/main/org.keycloak.keycloak-account-ui-%%VERSION%%.jar
 %%JAVASHAREDIR%%/keycloak/lib/lib/main/org.keycloak.keycloak-admin-ui-%%VERSION%%.jar