From 4e9f8c7b03d523face2b7576c9a813531bac9467 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Harabie=C5=84?= <rafal.harabien@allegro.com>
Date: Tue, 17 Oct 2023 15:53:06 +0200
Subject: [PATCH] Bring back optional dependencies (#1723)

* Make some dependencies optional again

Make dependencies back optional. They were made required when Spring Boot 2.7 support was added. Most of those dependencies are related to specific sender implementation and the user is supposed to choose one and provide needed client library.

* Remove unused alpn-api optional dependency
---
 build.gradle                 |  1 -
 hermes-client/build.gradle   | 15 ++++++---------
 hermes-frontend/build.gradle |  4 ----
 integration/build.gradle     |  3 ---
 4 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/build.gradle b/build.gradle
index 9bd9bb73b0..be812a0157 100644
--- a/build.gradle
+++ b/build.gradle
@@ -59,7 +59,6 @@ allprojects {
             wiremock          : '3.0.1',
             spock             : '2.4-M1-groovy-4.0',
             groovy            : '4.0.12',
-            alpn_api          : '1.1.2.v20150522',
             avro              : '1.9.1',
             json2avro         : '0.2.14',
             okhttp            : '3.9.1',
diff --git a/hermes-client/build.gradle b/hermes-client/build.gradle
index 4b1e628bfc..4839a6e378 100644
--- a/hermes-client/build.gradle
+++ b/hermes-client/build.gradle
@@ -3,15 +3,13 @@ plugins {
 }
 
 dependencies {
-    api group: 'io.dropwizard.metrics', name: 'metrics-core', version: versions.dropwizard_metrics
-    api group: 'io.micrometer', name: 'micrometer-core', version: versions.micrometer_metrics
-    api group: 'org.glassfish.jersey.core', name: 'jersey-client', version: versions.jersey
+    compileOnly group: 'io.dropwizard.metrics', name: 'metrics-core', version: versions.dropwizard_metrics
+    compileOnly group: 'io.micrometer', name: 'micrometer-core', version: versions.micrometer_metrics
+    compileOnly group: 'org.glassfish.jersey.core', name: 'jersey-client', version: versions.jersey
     compileOnly group: 'org.glassfish.jersey.inject', name: 'jersey-hk2', version: versions.jersey
-    api group: 'org.springframework', name: 'spring-web', version: versions.spring_web
-    api group: 'org.springframework', name: 'spring-webflux', version: versions.spring_web
-
-    api group: 'com.squareup.okhttp3', name: 'okhttp', version: versions.okhttp
-    compileOnly group: 'org.eclipse.jetty.alpn', name: 'alpn-api', version: versions.alpn_api
+    compileOnly group: 'org.springframework', name: 'spring-web', version: versions.spring_web
+    compileOnly group: 'org.springframework', name: 'spring-webflux', version: versions.spring_web
+    compileOnly group: 'com.squareup.okhttp3', name: 'okhttp', version: versions.okhttp
 
     implementation group: 'net.jodah', name: 'failsafe', version: versions.failsafe
     api group: 'io.projectreactor', name: 'reactor-core', version: '3.4.25'
@@ -29,7 +27,6 @@ dependencies {
     testImplementation group: 'org.springframework', name: 'spring-web', version: versions.spring_web
     testImplementation group: 'org.springframework', name: 'spring-webflux', version: versions.spring_web
     testImplementation group: 'com.squareup.okhttp3', name: 'okhttp', version: versions.okhttp
-    testImplementation group: 'org.eclipse.jetty.alpn', name: 'alpn-api', version: versions.alpn_api
     testImplementation group: 'io.projectreactor.netty', name: 'reactor-netty', version: '1.0.25'
     testImplementation group: 'io.projectreactor', name: 'reactor-test', version: '3.4.25'
 
diff --git a/hermes-frontend/build.gradle b/hermes-frontend/build.gradle
index b31b767a51..5423631ef9 100644
--- a/hermes-frontend/build.gradle
+++ b/hermes-frontend/build.gradle
@@ -20,10 +20,6 @@ dependencies {
     implementation group: 'commons-io', name: 'commons-io', version: '2.4'
     implementation group: 'net.jodah', name: 'failsafe', version: versions.failsafe
 
-    compileOnly group: 'org.eclipse.jetty.alpn', name: 'alpn-api', version: versions.alpn_api
-
-    testImplementation group: 'org.eclipse.jetty.alpn', name: 'alpn-api', version: versions.alpn_api
-
     testImplementation group: 'org.spockframework', name: 'spock-core', version: versions.spock
     testImplementation group: 'org.apache.groovy', name: 'groovy-json', version: versions.groovy
 
diff --git a/integration/build.gradle b/integration/build.gradle
index 073e1d58ad..fd207cdb96 100644
--- a/integration/build.gradle
+++ b/integration/build.gradle
@@ -10,7 +10,6 @@ project.configurations {
         transitive = true
         visible = true
     }
-    alpnboot
 }
 
 dependencies {
@@ -41,8 +40,6 @@ dependencies {
     integration(group: 'org.hornetq', name: 'hornetq-jms-server', version: '2.4.1.Final') {
         exclude module: 'hornetq-native'
     }
-
-    integration group: 'org.eclipse.jetty.alpn', name: 'alpn-api', version: versions.alpn_api
 }
 
 project.sourceSets {