From 7f5b7e2e387a041072c8e77ec4082cc57b3b0562 Mon Sep 17 00:00:00 2001
From: Sergey Ponomarev <stokito@gmail.com>
Date: Fri, 1 May 2026 14:31:18 +0300
Subject: [PATCH] [build] Use fixed versions for jxmpp and minidns

---
 ...ltime.smack.java-common-conventions.gradle |  4 +--
 build.gradle                                  | 28 ++-----------------
 smack-android/build.gradle                    |  6 ++--
 3 files changed, 8 insertions(+), 30 deletions(-)

diff --git a/build-logic/src/main/groovy/org.igniterealtime.smack.java-common-conventions.gradle b/build-logic/src/main/groovy/org.igniterealtime.smack.java-common-conventions.gradle
index bcb548d9fc..047ee3cc9d 100644
--- a/build-logic/src/main/groovy/org.igniterealtime.smack.java-common-conventions.gradle
+++ b/build-logic/src/main/groovy/org.igniterealtime.smack.java-common-conventions.gradle
@@ -29,8 +29,8 @@ ext {
 	builtDate = (new java.text.SimpleDateFormat("yyyy-MM-dd")).format(new Date())
 	oneLineDesc = 'An Open Source XMPP (Jabber) client library'
 
-	jxmppVersion = '[1.1.0, 1.1.999]'
-	miniDnsVersion = '[1.1.0-alpha3, 1.1.999]'
+	jxmppVersion = '1.1.0'
+	miniDnsVersion = '1.1.1'
 	junitVersion = '5.12.2'
 	commonsIoVersion = '2.17.0'
 	bouncyCastleVersion = '1.73'
diff --git a/build.gradle b/build.gradle
index a8d973206f..34ac0ee9d0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,6 +3,7 @@ plugins {
 	// have a ideaProject task, so let's add one.
 	id 'idea'
 
+	id 'org.igniterealtime.smack.java-common-conventions'
 	id 'org.igniterealtime.smack.javadoc-conventions'
 }
 
@@ -32,12 +33,10 @@ tasks.register('javadocAll', Javadoc) {
 	}
 
 	doFirst {
-		def staticJxmppVersion = getResolvedVersion('org.jxmpp:jxmpp-core')
-		def staticMiniDnsVersion = getResolvedVersion('org.minidns:minidns-core')
 		options.links = [
 			"https://docs.oracle.com/en/java/javase/${javaMajor}/docs/api/",
-			"https://jxmpp.org/releases/${staticJxmppVersion}/javadoc/",
-			"https://minidns.org/releases/${staticMiniDnsVersion}/javadoc/",
+			"https://jxmpp.org/releases/${jxmppVersion}/javadoc/",
+			"https://minidns.org/releases/${miniDnsVersion}/javadoc/",
 		] as String[]
 	}
 
@@ -94,24 +93,3 @@ task inttestFull {
 		omemoSignalIntTest,
 	]}
 }
-
-def getResolvedVersion(queriedProject = 'smack-core', component) {
-	def configuration = project(queriedProject)
-		.configurations
-		.compileClasspath
-
-	def artifact = configuration
-		.resolvedConfiguration
-		.resolvedArtifacts
-		.findAll {
-			// 'it' is of type ResolvedArtifact, 'id' of
-			// Component*Artifact*Identifier, and we check the
-			// ComponentIdentifier.
-			it.id.getComponentIdentifier() instanceof org.gradle.api.artifacts.component.ModuleComponentIdentifier
-		}
-	    .find {
-			it.id.getComponentIdentifier().toString().startsWith(component + ':')
-		}
-
-	artifact.getModuleVersion().getId().getVersion()
-}
diff --git a/smack-android/build.gradle b/smack-android/build.gradle
index ef158e137d..fb3a05c9df 100644
--- a/smack-android/build.gradle
+++ b/smack-android/build.gradle
@@ -14,13 +14,13 @@ smack-extensions and smack-experimental."""
 // sourceSet.test of the core subproject
 dependencies {
 	implementation project(':smack-xmlparser-xpp3')
-	// Depend on minidns-android21 as optional dependency, even if may
+	// Depend on minidns-android23 as optional dependency, even if may
 	// not need it. Can't hurt to have it in the programm path with
 	// the correct MiniDNS version as it won't hurt even if the
-	// Android version is smaller then 21. Note that we deliberatly do
+	// Android version is smaller then 23. Note that we deliberately do
 	// not add this to smack-minidns, as this dependency may also be
 	// used in non-Android projects.
-	implementation "org.minidns:minidns-android21:$miniDnsVersion"
+	implementation "org.minidns:minidns-android23:$miniDnsVersion"
 
 	api project(':smack-core')
 	api project(':smack-im')