Skip to content

Commit 9d8a30f

Browse files
committed
upgraded testcontainers-redis
1 parent 71971cd commit 9d8a30f

File tree

3 files changed

+40
-47
lines changed

3 files changed

+40
-47
lines changed

.github/workflows/gradle.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ on:
1212
jobs:
1313
build:
1414

15-
runs-on: ubuntu-latest
15+
runs-on: ubuntu-18.04
1616

1717
steps:
1818
- uses: actions/checkout@v2
@@ -31,5 +31,5 @@ jobs:
3131
- name: Upload coverage to Codecov
3232
uses: codecov/codecov-action@v1
3333
with:
34-
token: ${{ secrets.CODECOV_TOKEN }} # not required for public repos
34+
token: ${{ secrets.CODECOV_TOKEN }}
3535

build.gradle

Lines changed: 37 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,60 +1,43 @@
11
plugins {
2-
id 'org.springframework.boot' version '2.4.5'
3-
id 'io.spring.dependency-management' version '1.0.11.RELEASE'
4-
id 'io.freefair.lombok' version '6.0.0-m2'
52
id 'java-library'
63
id 'maven-publish'
74
id 'signing'
5+
id 'jacoco'
6+
id 'org.jreleaser' version '0.4.0'
87
id 'io.github.gradle-nexus.publish-plugin' version '1.1.0'
9-
id 'net.researchgate.release' version '2.8.1'
108
id 'com.github.ben-manes.versions' version '0.38.0'
11-
id 'com.github.breadmoirai.github-release' version '2.2.12'
12-
id 'jacoco'
139
}
1410

1511
group = 'com.redislabs'
1612
description = 'Kafka Connect source and sink connectors for Redis Enterprise'
17-
sourceCompatibility = '1.8'
18-
targetCompatibility = '1.8'
19-
20-
java {
21-
withJavadocJar()
22-
withSourcesJar()
23-
}
2413

2514
repositories {
2615
mavenCentral()
2716
maven {
2817
name = "GitHubPackages"
29-
url = uri("https://maven.pkg.github.com/redis-developer/testcontainers-redis")
18+
url = uri("https://maven.pkg.github.com/redis-developer/registry")
3019
credentials {
3120
username = project.findProperty("github.username") ?: System.getenv("GITHUB_USERNAME")
3221
password = project.findProperty("github.token") ?: System.getenv("GITHUB_TOKEN")
3322
}
3423
}
3524
}
3625

37-
bootJar {
38-
enabled = false
39-
}
40-
41-
jar {
42-
enabled = true
43-
}
44-
4526
dependencies {
46-
compileOnly 'org.projectlombok:lombok'
47-
annotationProcessor 'org.projectlombok:lombok'
27+
compileOnly 'org.projectlombok:lombok:1.18.20'
28+
annotationProcessor 'org.projectlombok:lombok:1.18.20'
4829
implementation 'org.apache.kafka:connect-api:2.8.0'
4930
implementation 'com.github.jcustenborder.kafka.connect:connect-utils:0.4.164'
5031
implementation 'com.redislabs:spring-batch-redis:2.13.0'
51-
testImplementation 'com.redislabs:testcontainers-redis:1.1.4'
32+
testImplementation 'com.redislabs:testcontainers-redis:1.1.6'
5233
testImplementation 'org.testcontainers:junit-jupiter:1.15.3-REDISLABS'
5334
testImplementation 'io.projectreactor:reactor-test:3.4.6'
5435
testImplementation 'org.mockito:mockito-core:2.21.0'
55-
testImplementation 'org.junit.jupiter:junit-jupiter-api'
56-
testImplementation 'org.junit.jupiter:junit-jupiter-engine'
57-
testImplementation 'org.junit.jupiter:junit-jupiter-params'
36+
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.7.2'
37+
testImplementation 'org.junit.jupiter:junit-jupiter-engine:5.7.2'
38+
testImplementation 'org.junit.jupiter:junit-jupiter-params:5.7.2'
39+
testImplementation 'org.projectlombok:lombok:1.18.20'
40+
testAnnotationProcessor 'org.projectlombok:lombok:1.18.20'
5841
testImplementation 'com.github.jcustenborder.kafka.connect:connect-utils-testing:0.4.164'
5942
}
6043

@@ -110,19 +93,6 @@ tasks.withType(Sign) {
11093
onlyIf { isReleaseVersion }
11194
}
11295

113-
nexusPublishing {
114-
repositories {
115-
sonatype()
116-
}
117-
}
118-
119-
githubRelease {
120-
token = project.hasProperty('github.token') ? project.property('github.token') : ''
121-
owner "RedisLabs-Field-Engineering"
122-
repo "redis-enterprise-kafka"
123-
body changelog()
124-
}
125-
12696
def isNonStable = { String version ->
12797
def nonStableKeyword = ['PREVIEW'].any { it -> version.toUpperCase().contains(it) }
12898
def stableKeyword = ['RELEASE', 'FINAL', 'GA', 'JRE8'].any { it -> version.toUpperCase().contains(it) }
@@ -147,7 +117,29 @@ jacocoTestReport {
147117

148118
check.dependsOn jacocoTestReport
149119

150-
afterReleaseBuild.dependsOn ":githubRelease"
151-
afterReleaseBuild.dependsOn ":publishToSonatype"
152-
afterReleaseBuild.dependsOn ":closeAndReleaseSonatypeStagingRepository"
153-
afterReleaseBuild.dependsOn ":publishToMavenLocal"
120+
121+
nexusPublishing {
122+
repositories {
123+
sonatype()
124+
}
125+
}
126+
127+
128+
jreleaser {
129+
project {
130+
name = 'redis-enterprise-kafka'
131+
description = 'Redis Enterprise Kafka Connector'
132+
longDescription = 'Kafka Connect source and sink connectors for Redis Enterprise'
133+
website = 'https://github.com/RedisLabs-Field-Engineering/redis-enterprise-kafka'
134+
authors = ['Julien Ruaux']
135+
tags = ['redis', 'enterprise', 'kafka']
136+
license = 'Apache-2.0'
137+
}
138+
release {
139+
github {
140+
username = 'jruaux'
141+
owner = 'RedisLabs-Field-Engineering'
142+
overwrite = true
143+
}
144+
}
145+
}

src/test/java/com/redislabs/kafkaconnect/RedisEnterpriseSourceTaskIT.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ public void teardown() {
3838
task.stop();
3939
}
4040

41+
@SuppressWarnings("unchecked")
4142
@ParameterizedTest
4243
@MethodSource("redisServers")
4344
public void pollRetrievesStreamMessages(RedisServer redis) throws InterruptedException {

0 commit comments

Comments
 (0)