Skip to content

Commit a80a4c1

Browse files
tchiotludotchiotludo
committed
chore(deps): update all java deps and remove bintray
1 parent cf2598a commit a80a4c1

17 files changed

+100
-127
lines changed

‎build.gradle‎

Lines changed: 68 additions & 85 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,15 @@
1-
2-
31
plugins {
42
// micronaut
5-
id "io.spring.dependency-management" version "1.0.10.RELEASE"
6-
id "com.github.johnrengelman.shadow" version "6.0.0"
7-
id "application"
8-
id "java"
9-
id "net.ltgt.apt-eclipse" version "0.21"
10-
id "net.ltgt.apt-idea" version "0.21"
11-
id "com.gorylenko.gradle-git-properties" version "2.2.3"
3+
id "com.github.johnrengelman.shadow" version "7.0.0"
4+
id "io.micronaut.application" version "1.5.0"
125

136
// akhq
14-
id 'com.adarshr.test-logger' version '2.1.0'
15-
id 'org.gradle.test-retry' version '1.1.9'
16-
id 'com.github.psxpaul.execfork' version '0.1.13'
17-
id "com.github.ben-manes.versions" version "0.28.0"
18-
id "com.commercehub.gradle.plugin.avro" version "0.21.0"
7+
id "com.gorylenko.gradle-git-properties" version "2.3.1"
8+
id 'com.adarshr.test-logger' version '3.0.0'
9+
id 'org.gradle.test-retry' version '1.2.1'
10+
id 'com.github.psxpaul.execfork' version '0.1.15'
11+
id "com.github.ben-manes.versions" version "0.38.0"
12+
id "com.github.davidmc24.gradle.plugin.avro" version "1.2.0"
1913
}
2014

2115
group "org.akhq"
@@ -26,61 +20,40 @@ sourceCompatibility = 11
2620
repositories {
2721
mavenLocal()
2822
mavenCentral()
29-
jcenter()
30-
maven { url 'http://packages.confluent.io/maven/' }
31-
maven { url "https://oss.sonatype.org/content/repositories/snapshots" }
23+
maven { url 'https://packages.confluent.io/maven/' }
3224
maven { url 'https://jitpack.io' }
3325
}
3426

35-
idea {
36-
module {
37-
downloadJavadoc = false
38-
downloadSources = true
39-
}
40-
}
4127

4228
configurations.all {
43-
exclude group: 'org.slf4j', module: 'slf4j-log4j12'
44-
exclude group: 'org.apache.logging.log4j', module: 'log4j-slf4j-impl'
45-
exclude group: 'org.apache.logging.log4j', module: 'log4j-core'
46-
exclude group: 'org.apache.logging.log4j', module: 'log4j-api'
29+
exclude group: 'org.slf4j', module: 'slf4j-log4j12'
30+
exclude group: 'org.apache.logging.log4j', module: 'log4j-slf4j-impl'
31+
exclude group: 'org.apache.logging.log4j', module: 'log4j-core'
32+
exclude group: 'org.apache.logging.log4j', module: 'log4j-api'
33+
34+
resolutionStrategy {
35+
force("org.apache.kafka:kafka-clients:" + kafkaVersion)
36+
force("org.apache.kafka:kafka-streams:" + kafkaVersion)
37+
force("org.apache.kafka:kafka_" + kafkaScalaVersion + ":" + kafkaVersion)
38+
}
4739
}
4840

49-
5041
/**********************************************************************************************************************\
5142
* Micronaut
5243
**********************************************************************************************************************/
53-
dependencyManagement {
54-
imports {
55-
mavenBom "io.micronaut:micronaut-bom:$micronautVersion"
44+
micronaut {
45+
runtime("netty")
46+
testRuntime("junit5")
47+
processing {
48+
incremental(true)
49+
annotations("org.akhq.*")
5650
}
5751
}
5852

59-
configurations {
60-
developmentOnly
61-
}
62-
63-
run.classpath += configurations.developmentOnly
64-
test.classpath += configurations.developmentOnly
65-
run.jvmArgs('-noverify',
66-
'-XX:TieredStopAtLevel=1',
67-
'-Dmicronaut.environments=dev',
68-
'-Dmicronaut.io.watch.restart=true'
69-
)
70-
71-
tasks.withType(JavaCompile){
72-
options.encoding = "UTF-8"
73-
options.compilerArgs.add('-parameters')
74-
}
75-
7653
/**********************************************************************************************************************\
7754
* Dependencies
7855
**********************************************************************************************************************/
7956
dependencies {
80-
// strimzi
81-
implementation group: 'io.strimzi', name: 'kafka-oauth-common', version: '0.7.0'
82-
implementation group: 'io.strimzi', name: 'kafka-oauth-client', version: '0.7.0'
83-
8457
// lombok
8558
annotationProcessor "org.projectlombok:lombok:" + lombokVersion
8659
compileOnly 'org.projectlombok:lombok:' + lombokVersion
@@ -95,7 +68,7 @@ dependencies {
9568
implementation "io.micronaut:micronaut-http-client"
9669
implementation "io.micronaut:micronaut-http-server-netty"
9770
implementation "io.swagger.core.v3:swagger-annotations"
98-
runtimeOnly "ch.qos.logback:logback-classic:1.2.3"
71+
runtimeOnly 'ch.qos.logback:logback-classic:1.3.0-alpha5'
9972
implementation "io.micronaut.security:micronaut-security-annotations"
10073
implementation "io.micronaut.security:micronaut-security-jwt"
10174
implementation "io.micronaut.security:micronaut-security-ldap"
@@ -108,25 +81,56 @@ dependencies {
10881
implementation group: "org.apache.kafka", name: "kafka-clients", version: kafkaVersion
10982
implementation group: "io.confluent", name: "kafka-schema-registry-client", version: confluentVersion
11083
implementation group: "io.confluent", name: "kafka-avro-serializer", version: confluentVersion
84+
implementation 'org.sourcelab:kafka-connect-client:3.1.1'
85+
86+
// strimzi
87+
implementation group: 'io.strimzi', name: 'kafka-oauth-common', version: '0.7.2'
88+
implementation group: 'io.strimzi', name: 'kafka-oauth-client', version: '0.7.2'
11189

11290
// log
11391
implementation group: 'org.slf4j', name: 'jul-to-slf4j', version: '1.8.+'
11492
implementation group: 'org.slf4j', name: 'log4j-over-slf4j', version: '1.8.+'
11593

11694
// utils
11795
implementation group: 'org.codehaus.httpcache4j.uribuilder', name: 'uribuilder', version: '2.0.0'
96+
implementation 'com.google.guava:guava:30.1.1-jre'
97+
implementation 'com.google.code.gson:gson:2.8.6'
98+
implementation 'com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.12.3'
99+
100+
// avro
101+
implementation 'org.apache.avro:avro:1.10.2'
102+
118103

119104
// protobuf
120-
implementation group: "com.google.protobuf", name: "protobuf-java", version: "3.13.0"
121-
implementation group: "com.google.protobuf", name: "protobuf-java-util", version: "3.13.0"
105+
implementation group: "com.google.protobuf", name: "protobuf-java", version: "3.15.8"
106+
implementation group: "com.google.protobuf", name: "protobuf-java-util", version: "3.15.8"
122107

123108
// Password hashing
124109
implementation group: "org.mindrot", name: "jbcrypt", version: "0.4"
125110

126-
// api
127111

128112
// client
129113
implementation project(":client")
114+
}
115+
116+
/**********************************************************************************************************************\
117+
* Test
118+
**********************************************************************************************************************/
119+
test {
120+
useJUnitPlatform()
121+
122+
testLogging {
123+
exceptionFormat = 'full'
124+
}
125+
126+
retry {
127+
maxRetries = 5
128+
maxFailures = 15
129+
}
130+
}
131+
132+
dependencies {
133+
testImplementation 'ch.qos.logback:logback-classic:1.3.0-alpha5'
130134

131135
// micronaut test
132136
testAnnotationProcessor "org.projectlombok:lombok:" + lombokVersion
@@ -138,9 +142,9 @@ dependencies {
138142
testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine"
139143

140144
// test
141-
testImplementation "org.apache.kafka:kafka_2.12:" + kafkaVersion
142-
// force jackson version compatible with kafka
143-
145+
testImplementation "org.apache.kafka:kafka-clients:" + kafkaVersion + ":test"
146+
testImplementation "org.apache.kafka:kafka_" + kafkaScalaVersion + ":" + kafkaVersion
147+
testImplementation "org.apache.kafka:kafka_" + kafkaScalaVersion + ":" + kafkaVersion + ":test"
144148
testImplementation "io.confluent:kafka-schema-registry:" + confluentVersion
145149
testImplementation "io.confluent:kafka-schema-registry:" + confluentVersion + ":tests"
146150
testImplementation "org.apache.kafka:connect-runtime:" + kafkaVersion
@@ -152,33 +156,12 @@ dependencies {
152156
testImplementation group: 'commons-codec', name: 'commons-codec', version: '1.14'
153157
testImplementation 'org.hamcrest:hamcrest:2.2'
154158
testImplementation 'org.hamcrest:hamcrest-library:2.2'
155-
implementation 'org.apache.avro:avro:1.10.0'
156-
implementation 'org.sourcelab:kafka-connect-client:3.1.0'
157-
implementation 'com.google.guava:guava:29.0-jre'
158-
implementation 'com.google.code.gson:gson:2.8.6'
159-
implementation 'com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.11.2'
160-
testImplementation 'org.mockito:mockito-junit-jupiter:3.5.7'
159+
testImplementation 'org.mockito:mockito-junit-jupiter:3.9.0'
161160
testImplementation 'com.salesforce.kafka.test:kafka-junit5:3.2.2'
162-
testImplementation 'com.fasterxml.jackson.core:jackson-core:2.11.2'
163-
testImplementation 'com.fasterxml.jackson.core:jackson-annotations:2.11.2'
164-
testImplementation 'com.fasterxml.jackson.core:jackson-databind:2.11.2'
165-
testImplementation 'org.codehaus.jackson:jackson-mapper-lgpl:1.9.13'
166-
}
167-
168-
/**********************************************************************************************************************\
169-
* Test
170-
**********************************************************************************************************************/
171-
test {
172-
useJUnitPlatform()
173-
174-
testLogging {
175-
exceptionFormat = 'full'
176-
}
177-
178-
retry {
179-
maxRetries = 5
180-
maxFailures = 15
181-
}
161+
testImplementation 'com.fasterxml.jackson.core:jackson-core:2.12.3'
162+
testImplementation 'com.fasterxml.jackson.core:jackson-annotations:2.12.3'
163+
testImplementation 'com.fasterxml.jackson.core:jackson-databind:2.12.3'
164+
testImplementation 'org.codehaus.jackson:jackson-mapper-lgpl:1.9.11'
182165
}
183166

184167
testlogger {

‎client/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
plugins {
2-
id 'org.siouan.frontend-jdk11' version '4.0.1'
2+
id 'org.siouan.frontend-jdk11' version '5.1.0'
33
}
44

55
repositories {

‎gradle.properties‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
micronautVersion=2.1.3
2-
confluentVersion=5.5.1
3-
kafkaVersion=2.6.0
4-
lombokVersion=1.18.16
1+
micronautVersion=2.5.0
2+
confluentVersion=6.1.1
3+
kafkaVersion=2.8.0
4+
kafkaScalaVersion=2.13
5+
lombokVersion=1.18.20

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

‎settings.gradle‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,10 @@
11
pluginManagement {
22
repositories {
33
gradlePluginPortal()
4-
jcenter()
5-
maven {
6-
name "JCenter Gradle Plugins"
7-
url "https://dl.bintray.com/gradle/gradle-plugins"
8-
}
4+
mavenCentral()
95
}
106
}
117

12-
138
rootProject.name = 'akhq'
149

1510
include 'client'

‎src/main/java/org/akhq/controllers/StaticFilter.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import com.google.common.io.CharStreams;
44
import io.micronaut.context.annotation.Value;
5+
import io.micronaut.core.annotation.Nullable;
56
import io.micronaut.core.async.publisher.Publishers;
67
import io.micronaut.http.HttpRequest;
78
import io.micronaut.http.HttpResponse;
@@ -19,15 +20,13 @@
1920
import java.io.InputStreamReader;
2021
import java.io.Reader;
2122
import java.util.Objects;
22-
import javax.annotation.Nullable;
2323

2424
@Filter("/ui/**")
2525
public class StaticFilter implements HttpServerFilter {
2626
@Nullable
2727
@Value("${micronaut.server.context-path}")
2828
protected String basePath;
2929

30-
@SuppressWarnings("deprecation")
3130
@Override
3231
public Publisher<MutableHttpResponse<?>> doFilter(HttpRequest<?> request, ServerFilterChain chain) {
3332
return Publishers

‎src/main/java/org/akhq/modules/BasicAuthAuthenticationProvider.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package org.akhq.modules;
22

3-
import edu.umd.cs.findbugs.annotations.Nullable;
3+
import io.micronaut.core.annotation.Nullable;
44
import io.micronaut.http.HttpRequest;
55
import io.micronaut.security.authentication.*;
66
import io.reactivex.Flowable;

‎src/main/java/org/akhq/modules/OidcUserDetailsMapper.java‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,21 @@
22

33
import io.micronaut.context.annotation.Replaces;
44
import io.micronaut.context.annotation.Requires;
5+
import io.micronaut.core.annotation.NonNull;
56
import io.micronaut.core.util.StringUtils;
67
import io.micronaut.security.authentication.UserDetails;
78
import io.micronaut.security.config.AuthenticationModeConfiguration;
89
import io.micronaut.security.oauth2.configuration.OpenIdAdditionalClaimsConfiguration;
9-
import io.micronaut.security.oauth2.endpoint.token.response.*;
10+
import io.micronaut.security.oauth2.endpoint.token.response.DefaultOpenIdUserDetailsMapper;
11+
import io.micronaut.security.oauth2.endpoint.token.response.OpenIdClaims;
12+
import io.micronaut.security.oauth2.endpoint.token.response.OpenIdTokenResponse;
1013
import org.akhq.configs.Oidc;
1114
import org.akhq.utils.UserGroupUtils;
1215

13-
import javax.annotation.Nonnull;
14-
import javax.inject.Inject;
15-
import javax.inject.Singleton;
1616
import java.util.*;
1717
import java.util.stream.Collectors;
18+
import javax.inject.Inject;
19+
import javax.inject.Singleton;
1820

1921
/**
2022
* An OpenID user details mapper that is configurable in the akhq config.
@@ -121,7 +123,7 @@ protected Set<String> getOidcGroups(Oidc.Provider provider, OpenIdClaims openIdC
121123
* @param openIdClaims The OpenID claims
122124
* @return A user details object
123125
*/
124-
@Nonnull
126+
@NonNull
125127
@Override
126128
public UserDetails createUserDetails(String providerName, OpenIdTokenResponse tokenResponse, OpenIdClaims openIdClaims) {
127129
String username = getUsername(providerName, tokenResponse, openIdClaims);

‎src/main/java/org/akhq/modules/SecuredAnnotationRuleWithDefault.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package org.akhq.modules;
22

3-
import edu.umd.cs.findbugs.annotations.Nullable;
43
import io.micronaut.context.annotation.Replaces;
4+
import io.micronaut.core.annotation.Nullable;
55
import io.micronaut.http.HttpRequest;
66
import io.micronaut.security.rules.SecuredAnnotationRule;
77
import io.micronaut.security.rules.SecurityRule;

‎src/main/java/org/akhq/repositories/ConfigRepository.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
import org.akhq.modules.AbstractKafkaWrapper;
66
import org.apache.kafka.clients.admin.ConfigEntry;
77
import org.apache.kafka.common.config.ConfigResource;
8-
import org.checkerframework.checker.nullness.qual.Nullable;
98

109
import java.util.*;
1110
import java.util.concurrent.ExecutionException;
@@ -87,7 +86,7 @@ private void update(String clusterId, ConfigResource.Type type, String name, Lis
8786
}
8887

8988
public static List<Config> updatedConfigs(Map<String, String> request, List<Config> configs, boolean html) {
90-
Function<Config, @Nullable String> configFn = html ?
89+
Function<Config, String> configFn = html ?
9190
(Config config) -> "configs[" + config.getName() + "]" :
9291
Config::getName;
9392

0 commit comments

Comments
 (0)