Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bring back optional dependencies #1723

Merged
merged 2 commits into from
Oct 17, 2023
Merged

Bring back optional dependencies #1723

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4306ffd
Make some dependencies optional again
rafalh Sep 5, 2023
cf2734a
Remove unused alpn-api optional dependency
rafalh Sep 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
15 changes: 6 additions & 9 deletions hermes-client/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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'

Expand Down
4 changes: 0 additions & 4 deletions hermes-frontend/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
3 changes: 0 additions & 3 deletions integration/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ project.configurations {
transitive = true
visible = true
}
alpnboot
}

dependencies {
Expand Down Expand Up @@ -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 {
Expand Down
Loading