Merge branch 'dev' into feature/search-avro-schema-subject

* dev:
  chore(deps): update most of java deps
  fix(schema): invalid signature on schema controller
  feat(webserver): html-head don't work any more (tchiotludo#1489)
  feat(schema): improve schema loading on produce screen (tchiotludo#1467)
  feat(core): allow to configure (de)serialiser on consumers/producers (tchiotludo#1432)
  feat(topicdata): list topics even if a broker is unable to serve log information (tchiotludo#1502)
  chore(docs): fix copyright
  feat(acls): introduce new ACL rewrite (tchiotludo#1472)

LICENSE

@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright {yyyy} {name of copyright owner}
+   Copyright 2019 Ludovic Dehon
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

application.example.yml

@@ -186,75 +186,86 @@ akhq:
 
   # Auth & Roles (optional)
   security:
+    roles:
+      topic-read:
+        - resources: [ "TOPIC", "TOPIC_DATA" ]
+          actions: [ "READ" ]
+        - resources: [ "TOPIC" ]
+          actions: [ "READ_CONFIG" ]
+      topic-admin:
+        - resources: [ "TOPIC", "TOPIC_DATA" ]
+          actions: [ "READ", "CREATE", "DELETE" ]
+        - resources: [ "TOPIC" ]
+          actions: [ "UPDATE", "READ_CONFIG", "ALTER_CONFIG" ]
+      connect-rw:
+        - resources: [ "CONNECTOR" ]
+          actions: [ "READ", "CREATE", "UPDATE_STATE" ]
+      connect-admin:
+        - resources: [ "CONNECTOR" ]
+          actions: [ "READ", "CREATE", "UPDATE_STATE", "DELETE" ]
+      registry-read:
+        - resources: [ "SCHEMA" ]
+          actions: [ "READ" ]
+      registry-admin:
+        - resources: [ "SCHEMA" ]
+          actions: [ "READ", "CREATE", "UPDATE", "DELETE", "DELETE_VERSION" ]
+      group-read:
+        - resources: [ "CONSUMER_GROUP" ]
+          actions: [ "READ" ]
+      connect-cluster-read:
+        - resources: [ "CONNECT_CLUSTER" ]
+          actions: [ "READ" ]
+      ksqldb-admin:
+        - resources: [ "KSQLDB" ]
+          actions: [ "READ", "EXECUTE" ]
+
     default-group: admin # Default groups for all the user even unlogged user
     # Groups definition
     groups:
-      admin: # unique key
-        name: admin # Group name
-        roles:  # roles for the group
-          - topic/read
-          - topic/insert
-          - topic/delete
-          - topic/config/update
-          - node/read
-          - node/config/update
-          - topic/data/read
-          - topic/data/insert
-          - topic/data/delete
-          - group/read
-          - group/delete
-          - group/offsets/update
-          - registry/read
-          - registry/insert
-          - registry/update
-          - registry/delete
-          - registry/version/delete
-          - acls/read
-          - connect/read
-          - connect/insert
-          - connect/update
-          - connect/delete
-          - connect/state/update
-        attributes:
-          # Regexp list to filter topic available for group
-          topics-filter-regexp:
-            - "test.*"
-          # Regexp list to filter connect configs visible for group
-          connects-filter-regexp:
-            - "^test.*$"
-          # Regexp list to filter consumer groups visible for group
-          consumer-groups-filter-regexp:
-            - "consumer.*"
-      topic-reader: # unique key
-        name: topic-reader # Other group
-        roles:
-          - topic/read
-        attributes:
-          topics-filter-regexp:
-            - "test\\.reader.*"
+      admin:
+        - role: topic-admin
+        - role: connect-admin
+        - role: registry-admin
+        - role: group-read
+        - role: connect-cluster-read
+        - role: ksqldb-admin
+      topic-reader:
+        - role: topic-read
+        - role: registry-admin
+      topic-reader-dev:
+        - role: topic-read
+          clusters: ["dev"]
+        - role: registry-admin
+          clusters: ["dev"]
+      topic-reader-project-prod:
+        - role: topic-read
+          patterns: ["project.*"]
+          clusters: ["prod.*"]
+        - role: registry-admin
+          patterns: ["project.*"]
+          clusters: ["prod.*"]
 
     # Basic auth configuration
     basic-auth:
       - username: user # Username
         password: pass # Password in sha256
         groups: # Groups for the user
           - admin
-          - topic-reader
 
     # Ldap Groups configuration (when using ldap)
     ldap:
       default-group: topic-reader
       groups:
         - name: group-ldap-1
           groups: # Akhq groups list
-            - topic-reader
+            - topic-reader-dev
         - name: group-ldap-2
           groups:
             - admin
       users:
         - username: riemann # ldap user id
           groups: # Akhq groups list
-            - topic-reader
+            - topic-reader-project-prod
         - username: einstein
           groups:
             - admin

build.gradle

@@ -1,15 +1,15 @@
 plugins {
     // micronaut
     id "com.github.johnrengelman.shadow" version "8.1.1"
-    id "io.micronaut.application" version "3.7.5"
+    id "io.micronaut.application" version "3.7.10"
 
     // akhq
     id "com.gorylenko.gradle-git-properties" version "2.4.1"
     id 'com.adarshr.test-logger' version '3.2.0'
-    id 'org.gradle.test-retry' version '1.5.2'
+    id 'org.gradle.test-retry' version '1.5.3'
     id 'com.github.psxpaul.execfork' version '0.2.2'
-    id "com.github.ben-manes.versions" version "0.46.0"
-    id "com.github.davidmc24.gradle.plugin.avro" version "1.6.0"
+    id "com.github.ben-manes.versions" version "0.47.0"
+    id "com.github.davidmc24.gradle.plugin.avro" version "1.7.1"
 
     // idea
     id "org.jetbrains.gradle.plugin.idea-ext" version "1.1.7"
@@ -122,7 +122,7 @@ dependencies {
 
     // utils
     implementation group: 'org.codehaus.httpcache4j.uribuilder', name: 'uribuilder', version: '2.0.0'
-    implementation 'com.google.guava:guava:31.1-jre'
+    implementation 'com.google.guava:guava:32.0.1-jre'
     implementation 'com.google.code.gson:gson:2.10.1'
     implementation 'com.fasterxml.jackson.datatype:jackson-datatype-jdk8'
 
@@ -146,7 +146,7 @@ dependencies {
     implementation project(":client")
 
     //AWS MSK IAM Auth
-    implementation group: 'software.amazon.msk', name: 'aws-msk-iam-auth', version: '1.1.6'
+    implementation group: 'software.amazon.msk', name: 'aws-msk-iam-auth', version: '1.1.7'
 
     implementation group: 'io.projectreactor', name: 'reactor-core', version: '3.5.3'
 }
@@ -195,10 +195,10 @@ dependencies {
     testImplementation group: 'org.apache.kafka', name: 'kafka-streams', version: kafkaVersion
     testImplementation group: "io.confluent", name: "kafka-streams-avro-serde", version: confluentVersion
     testImplementation "io.confluent:kafka-connect-avro-converter:" + confluentVersion
-    testImplementation group: 'commons-codec', name: 'commons-codec', version: '1.15'
+    testImplementation group: 'commons-codec', name: 'commons-codec', version: '1.16.0'
     testImplementation 'org.hamcrest:hamcrest:2.2'
     testImplementation 'org.hamcrest:hamcrest-library:2.2'
-    testImplementation 'org.mockito:mockito-junit-jupiter:5.2.0'
+    testImplementation 'org.mockito:mockito-junit-jupiter:5.4.0'
     testImplementation 'com.salesforce.kafka.test:kafka-junit5:3.2.5'
     testImplementation 'com.fasterxml.jackson.core:jackson-core:'
     testImplementation 'com.fasterxml.jackson.core:jackson-annotations'