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

Upgrade deps #78

Merged
merged 2 commits into from
Nov 30, 2023
Merged

Upgrade deps #78

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
d27597f
Upgrade deps
charithe Nov 30, 2023
a56e8b7
Use LTS Java version
charithe Nov 30, 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
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ jobs:

steps:
- uses: actions/checkout@v1
- name: Set up JDK 1.8
- name: Set up JDK 1.17
uses: actions/setup-java@v1
with:
java-version: 1.8
java-version: 1.17
- name: Build with Maven
run: mvn -B package --file pom.xml

6 changes: 3 additions & 3 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,18 @@ jobs:
with:
fetch-depth: 0

- name: Set up JDK 1.8
- name: Set up JDK 1.17
uses: actions/setup-java@v1
with:
java-version: 1.8
java-version: 1.17

- name: Build with Maven
run: mvn -B package --file pom.xml

- name: Set up Maven Central
uses: actions/setup-java@v1
with:
java-version: 1.8
java-version: 1.17
server-id: ossrh
server-username: MAVEN_USERNAME
server-password: MAVEN_PASSWORD
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ Kafka Junit provides helpers for starting and tearing down a Kafka broker during
| 4.2.5 | 3.5.0 |
| 4.2.6 | 3.5.0 (Security update) |
| 4.2.7 | 3.5.0 (Security update) |
| 4.2.8 | 3.5.0 (Security update) |
| 4.2.8 | 3.6.0 |

</details>

Expand Down
22 changes: 11 additions & 11 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,19 +47,19 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.version>1.8</java.version>
<kafka.version>3.5.0</kafka.version>
<kafka.version>3.6.0</kafka.version>
<junit.version>4.13.2</junit.version>
<junit.jupiter.version>5.8.2</junit.jupiter.version>
<junit.vintage.version>5.8.2</junit.vintage.version>
<junit.platform.version>1.8.2</junit.platform.version>
<guava.version>32.1.1-jre</guava.version>
<assertj-core.version>3.22.0</assertj-core.version>
<logback-classic.version>1.3.12</logback-classic.version>
<junit.jupiter.version>5.10.1</junit.jupiter.version>
<junit.vintage.version>5.10.1</junit.vintage.version>
<junit.platform.version>1.10.1</junit.platform.version>
<guava.version>32.1.3-jre</guava.version>
<assertj-core.version>3.24.2</assertj-core.version>
<logback-classic.version>1.4.13</logback-classic.version>
<apiguardian-api.version>1.1.2</apiguardian-api.version>
<curator-test.version>5.2.1</curator-test.version>
<slf4j-api.version>1.7.36</slf4j-api.version>
<metrics-core.version>4.2.9</metrics-core.version>
<snappy-java.version>1.1.10.4</snappy-java.version>
<curator-test.version>5.5.0</curator-test.version>
<slf4j-api.version>2.0.9</slf4j-api.version>
<metrics-core.version>4.2.22</metrics-core.version>
<snappy-java.version>1.1.10.5</snappy-java.version>
<repo.url>ssh://git@github.com/charithe/kafka-junit.git</repo.url>
</properties>

Expand Down
4 changes: 2 additions & 2 deletions src/test/java/com/github/charithe/kafka/KafkaJunitExtensionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ void testKafkaServerIsUp(KafkaHelper kafkaHelper) {
new ZKClientConfig(),
"zk-client");
final KafkaZkClient zkClient = new KafkaZkClient(zooKeeperClient, JaasUtils.isZkSaslEnabled(), Time.SYSTEM);
final AdminZkClient adminZkClient = new AdminZkClient(zkClient);
final AdminZkClient adminZkClient = new AdminZkClient(zkClient, scala.Option.empty() );

// Create topic
adminZkClient.createTopic(TOPIC, 1, 1, new Properties(), null, false);
Expand Down Expand Up @@ -98,4 +98,4 @@ void brokerIsStarted(EphemeralKafkaBroker broker) {
assertThat(broker.isRunning()).isTrue();
}
}
}
}
2 changes: 1 addition & 1 deletion src/test/java/com/github/charithe/kafka/KafkaJunitRuleTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ public void testKafkaServerIsUp() {
new ZKClientConfig(),
"zk-client");
final KafkaZkClient zkClient = new KafkaZkClient(zooKeeperClient, JaasUtils.isZkSaslEnabled(), Time.SYSTEM);
final AdminZkClient adminZkClient = new AdminZkClient(zkClient);
final AdminZkClient adminZkClient = new AdminZkClient(zkClient, scala.Option.empty());

// Create topic
adminZkClient.createTopic(TOPIC, 1, 1, new Properties(), null, false);
Expand Down
Loading