Skip to content

Commit

Permalink
Merge branch 'dev' into intellij-avro-generation
Browse files Browse the repository at this point in the history
* dev: (56 commits)
  chore(version): update to 0.24.0
  chore(deps): update java deps
  fix(ui): fixing logo not showing on login form (tchiotludo#1449)
  fix(ui): fixing data download inconsistencies on JSON and CSV format (tchiotludo#1442)
  chore(docs): add GrtGaz as AKHQ user (tchiotludo#1439)
  feat(ui): download all messages in a topic to a csv file (tchiotludo#1384)
  fix(ui): clicking on Empty Topic button display blank screen (tchiotludo#1429)
  chore(landing): add baloise logo (tchiotludo#1427)
  fix(ui): don't disabled empty for compact,delete topic
  chore(deps): update all java deps
  fix(topicdata): Use the partition leader from partition info (tchiotludo#1388)
  fix(ui):  harmonize utc labels (tchiotludo#1403)
  fix(ui): fix produce multi / tombstone not working and forms layout issue (tchiotludo#1396)
  fix(auth): fix regex header string for long strim (tchiotludo#1402)
  fix(webserver): reduce default micronaut log to warn  (tchiotludo#1406)
  chore(webserver): warn if security group is wet without a jwt secret (tchiotludo#1412)
  chore(deps): update micronaut (tchiotludo#1405)
  feat(docs): list of available roles in documentation (tchiotludo#1394)
  chore(deps): update all java deps
  fix(ui): handle sche subject with special chars (tchiotludo#1354)
  ...

# Conflicts:
#	build.gradle
#	gradle.properties
#	helm/akhq/Chart.yaml
#	src/test/java/org/akhq/controllers/KsqlDbControllerTest.java
#	src/test/java/org/akhq/repositories/KsqlDbRepositoryTest.java
  • Loading branch information
markush81 committed Apr 7, 2023
2 parents 8d0cb88 + a0d2ec6 commit 5f52a80
Show file tree
Hide file tree
Showing 8 changed files with 13 additions and 14 deletions.
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ Kestra is an infinitely scalable orchestration and scheduling platform, creating
* [BPCE-IT](https://www.bpce-it.fr/)
* [Decathlon](https://www.decathlon.fr/)
* [Depop](https://www.depop.com)
* [Doximity](https://www.doximity.com)
* [Fresha](https://www.fresha.com/)
* [Galeries Lafayette](https://www.galerieslafayette.com/)
* [GetYourGuide](https://www.getyourguide.com)
Expand Down
8 changes: 3 additions & 5 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins {
// micronaut
id "com.github.johnrengelman.shadow" version "8.1.0"
id "com.github.johnrengelman.shadow" version "8.1.1"
id "io.micronaut.application" version "3.7.5"

// akhq
Expand All @@ -16,7 +16,7 @@ plugins {
}

group "org.akhq"
version "0.23.0"
version "0.24.0"
mainClassName = "org.akhq.App"
sourceCompatibility = 11

Expand Down Expand Up @@ -48,7 +48,6 @@ configurations.all {
}
}


/**********************************************************************************************************************\
* IntelliJ IDEA
**********************************************************************************************************************/
Expand Down Expand Up @@ -140,7 +139,7 @@ dependencies {
// Password hashing
implementation group: "org.mindrot", name: "jbcrypt", version: "0.4"

implementation group: 'org.codehaus.groovy', name: 'groovy-all', version: '3.0.16'
implementation group: 'org.codehaus.groovy', name: 'groovy-all', version: '3.0.17'
// api

// client
Expand Down Expand Up @@ -255,4 +254,3 @@ shadowJar {
processResources.dependsOn ":client:installFrontend"
processResources.dependsOn ":client:assembleFrontend"
processResources.dependsOn ":client:copyClientResources"

2 changes: 1 addition & 1 deletion client/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "akhq-front-end",
"version": "0.23.0",
"version": "0.24.0",
"private": true,
"homepage": "./ui",
"dependencies": {
Expand Down
4 changes: 2 additions & 2 deletions client/src/containers/Login/Login.jsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';

import logo from '../../images/logo.svg';
import { ReactComponent as Logo } from '../../images/logo.svg';
import { uriCurrentUser, uriLogin, uriOidc } from '../../utils/endpoints';
import { organizeRoles } from '../../utils/converters';
import { login } from '../../utils/api';
Expand Down Expand Up @@ -172,7 +172,7 @@ class Login extends Form {
>
<div>
<h3 className="logo">
<img src={logo} alt="" />
<Logo />
</h3>
</div>
{formEnabled && this._renderForm()}
Expand Down
4 changes: 2 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
micronautVersion=3.8.7
confluentVersion=7.3.2
micronautVersion=3.8.8
confluentVersion=7.3.3
kafkaVersion=3.4.0
kafkaScalaVersion=2.13
lombokVersion=1.18.26
4 changes: 2 additions & 2 deletions helm/akhq/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
apiVersion: v1
appVersion: "0.23.0"
appVersion: "0.24.0"
description: Kafka GUI for Apache Kafka to manage topics, topics data, consumers group, schema registry, connect and more...
name: akhq
version: 0.3.1
version: 0.24.0
keywords:
- kafka
- confluent
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ class KsqlDbControllerTest extends AbstractTest {
void info() {
KsqlDbServerInfo serverInfo = this.retrieve(HttpRequest.GET(BASE_URL + "/info"), KsqlDbServerInfo.class);
assertNotNull(serverInfo.getKafkaClusterId());
assertEquals("7.3.2", serverInfo.getServerVersion());
assertEquals("7.3.3", serverInfo.getServerVersion());
assertEquals("ksql", serverInfo.getKsqlServiceId());
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ void cleanup() {
void getServerInfo() {
KsqlDbServerInfo serverInfo = repository.getServerInfo(KafkaTestCluster.CLUSTER_ID, "ksqldb");
assertNotNull(serverInfo.getKafkaClusterId());
assertEquals("7.3.2", serverInfo.getServerVersion());
assertEquals("7.3.3", serverInfo.getServerVersion());
assertEquals("ksql", serverInfo.getKsqlServiceId());
}

Expand Down

0 comments on commit 5f52a80

Please sign in to comment.