Merge branch 'main' into fix-owner-feature-kafkasql

Apicurio · Jan 20, 2025 · c51bcac · c51bcac
2 parents c3464b9 + 80f4621
commit c51bcac
Show file tree

Hide file tree

Showing 24 changed files with 806 additions and 2,471 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -59,22 +59,11 @@ updates:
       ui-app-dependencies:
         patterns:
           - "*"
-        exclude-patterns:
-          - "eslint"
-          - "@patternfly/*"
-          - "@microsoft/*"
-      ui-app-eslint:
-        patterns:
-          - "eslint"
-        update-types:
-          - "patch"
-          - "minor"
-      ui-app-patternfly:
-        patterns:
-          - "@patternfly/*"
         update-types:
           - "patch"
           - "minor"
+        exclude-patterns:
+          - "@microsoft/*"
       ui-app-kiota:
         patterns:
           - "@microsoft/*"
@@ -92,14 +81,11 @@ updates:
       ui-docs-dependencies:
         patterns:
           - "*"
-        exclude-patterns:
-          - "eslint"
-      eslint:
-        patterns:
-          - "eslint"
         update-types:
           - "patch"
           - "minor"
+        exclude-patterns:
+          - "eslint"
     open-pull-requests-limit: 10
     versioning-strategy: increase
 
@@ -111,14 +97,11 @@ updates:
       ui-test-dependencies:
         patterns:
           - "*"
-        exclude-patterns:
-          - "eslint"
-      eslint:
-        patterns:
-          - "eslint"
         update-types:
           - "patch"
           - "minor"
+        exclude-patterns:
+          - "eslint"
     open-pull-requests-limit: 10
     versioning-strategy: increase
 
@@ -130,15 +113,11 @@ updates:
       typescript-sdk-dependencies:
         patterns:
           - "*"
-        exclude-patterns:
-          - "eslint"
-          - "@microsoft/*"
-      typescript-sdk-eslint:
-        patterns:
-          - "eslint"
         update-types:
           - "patch"
           - "minor"
+        exclude-patterns:
+          - "@microsoft/*"
       typescript-sdk-kiota:
         patterns:
           - "@microsoft/*"
@@ -159,3 +138,4 @@ updates:
           - "*"
         update-types:
           - "patch"
+          - "minor"
diff --git a/.github/workflows/verify.yaml b/.github/workflows/verify.yaml
@@ -90,7 +90,7 @@ jobs:
           docker images
 
       - name: Slack Notification (Always)
-        if: always()
+        if: github.event_name == 'push' && always()
         run: |
           MESSAGE="Registry 'build-verify' job completed with status: ${{ job.status }}"
           REPO="${{ github.repository }}"
@@ -99,7 +99,7 @@ jobs:
           curl -X POST -H "Content-Type: application/json" -d "$PAYLOAD" ${{ secrets.SLACK_NOTIFICATION_WEBHOOK }}
 
       - name: Slack Notification (Error)
-        if: failure()
+        if: github.event_name == 'push' && failure()
         run: |
           MESSAGE="Registry 'build-verify' job FAILED"
           REPO="${{ github.repository }}"
@@ -181,7 +181,7 @@ jobs:
         run: docker buildx build --push -f ./Dockerfile -t quay.io/apicurio/apicurio-registry-ui:latest-snapshot -t docker.io/apicurio/apicurio-registry-ui:latest-snapshot --platform linux/amd64,linux/arm64,linux/s390x,linux/ppc64le .
 
       - name: Slack Notification (Always)
-        if: always()
+        if: github.event_name == 'push' && always()
         run: |
           MESSAGE="Registry 'build-verify-ui' job completed with status: ${{ job.status }}"
           REPO="${{ github.repository }}"
@@ -190,7 +190,7 @@ jobs:
           curl -X POST -H "Content-Type: application/json" -d "$PAYLOAD" ${{ secrets.SLACK_NOTIFICATION_WEBHOOK }}
 
       - name: Slack Notification (Error)
-        if: failure()
+        if: github.event_name == 'push' && failure()
         run: |
           MESSAGE="Registry 'build-verify-ui' job FAILED"
           REPO="${{ github.repository }}"
@@ -287,7 +287,7 @@ jobs:
         run: docker images
 
       - name: Slack Notification (Always)
-        if: always()
+        if: github.event_name == 'push' && always()
         run: |
           MESSAGE="Registry 'build-native-images' job completed with status: ${{ job.status }}"
           REPO="${{ github.repository }}"
@@ -296,7 +296,7 @@ jobs:
           curl -X POST -H "Content-Type: application/json" -d "$PAYLOAD" ${{ secrets.SLACK_NOTIFICATION_WEBHOOK }}
 
       - name: Slack Notification (Error)
-        if: failure()
+        if: github.event_name == 'push' && failure()
         run: |
           MESSAGE="Registry 'build-native-images' job FAILED"
           REPO="${{ github.repository }}"
@@ -342,7 +342,7 @@ jobs:
         run: make test
 
       - name: Slack Notification (Always)
-        if: always()
+        if: github.event_name == 'push' && always()
         run: |
           MESSAGE="Registry 'build-verify-python-sdk' job completed with status: ${{ job.status }}"
           REPO="${{ github.repository }}"
@@ -351,7 +351,7 @@ jobs:
           curl -X POST -H "Content-Type: application/json" -d "$PAYLOAD" ${{ secrets.SLACK_NOTIFICATION_WEBHOOK }}
 
       - name: Slack Notification (Error)
-        if: failure()
+        if: github.event_name == 'push' && failure()
         run: |
           MESSAGE="Registry 'build-verify-python-sdk' job FAILED"
           REPO="${{ github.repository }}"
@@ -387,7 +387,7 @@ jobs:
         run: make test
 
       - name: Slack Notification (Always)
-        if: always()
+        if: github.event_name == 'push' && always()
         run: |
           MESSAGE="Registry 'build-verify-go-sdk' job completed with status: ${{ job.status }}"
           REPO="${{ github.repository }}"
@@ -396,7 +396,7 @@ jobs:
           curl -X POST -H "Content-Type: application/json" -d "$PAYLOAD" ${{ secrets.SLACK_NOTIFICATION_WEBHOOK }}
 
       - name: Slack Notification (Error)
-        if: failure()
+        if: github.event_name == 'push' && failure()
         run: |
           MESSAGE="Registry 'build-verify-go-sdk' job FAILED"
           REPO="${{ github.repository }}"

diff --git a/go-sdk/go-sdk.csproj b/go-sdk/go-sdk.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.OpenApi.Kiota.Builder" Version="1.21.0" />
+    <PackageReference Include="Microsoft.OpenApi.Kiota.Builder" Version="1.22.2" />
   </ItemGroup>
 
 </Project>
diff --git a/pom.xml b/pom.xml
@@ -77,7 +77,6 @@
     <module>utils/converter</module>
     <module>utils/kafka</module>
     <module>utils/maven-plugin</module>
-    <module>utils/tools</module>
     <module>utils/importexport</module>
     <module>utils/exportConfluent</module>
     <module>utils/protobuf-schema-utilities</module>
@@ -161,12 +160,12 @@
 
     <!-- Schema types -->
     <avro.version>1.12.0</avro.version>
-    <json-schema-validator.version>1.5.4</json-schema-validator.version>
+    <json-schema-validator.version>1.5.5</json-schema-validator.version>
     <wire-schema.version>4.9.9</wire-schema.version>
     <okhttp.version>4.12.0</okhttp.version>
-    <okio-jvm.version>3.9.1</okio-jvm.version>
+    <okio-jvm.version>3.10.2</okio-jvm.version>
     <okio.version>3.9.1</okio.version>
-    <okio-fake-file-system.version>3.9.1</okio-fake-file-system.version>
+    <okio-fake-file-system.version>3.10.2</okio-fake-file-system.version>
     <icu4j.version>76.1</icu4j.version>
     <protobuf.version>3.25.5</protobuf.version>
     <xmlsec.version>4.0.3</xmlsec.version>
@@ -213,7 +212,6 @@
     <!-- Dependency versions -->
     <lombok.version>1.18.36</lombok.version>
     <commons-codec.version>1.17.1</commons-codec.version>
-    <jboss-slf4j.version>1.2.1.Final</jboss-slf4j.version>
     <apicurio-common-rest-client.version>0.1.18.Final</apicurio-common-rest-client.version>
     <kafka-clients.version>3.6.0</kafka-clients.version>
     <debezium.version>2.6.2.Final</debezium.version>
@@ -225,7 +223,7 @@
     <woodstox-core.version>7.1.0</woodstox-core.version>
     <jgit.version>7.1.0.202411261347-r</jgit.version>
     <awaitility.version>4.2.2</awaitility.version>
-    <assertj.core.version>3.26.3</assertj.core.version>
+    <assertj.core.version>3.27.2</assertj.core.version>
     <semver4j.version>5.5.0</semver4j.version>
     <bouncycastle.version>1.79</bouncycastle.version>
 
@@ -269,7 +267,7 @@
 
     <!-- Kiota -->
     <kiota.libs.version>1.8.2</kiota.libs.version>
-    <kiota.community.version>0.0.19</kiota.community.version>
+    <kiota.community.version>0.0.20</kiota.community.version>
 
     <kiota.version>1.21.0</kiota.version>
     <kiota.timeout>60</kiota.timeout>

diff --git a/python-sdk/python-sdk.csproj b/python-sdk/python-sdk.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.OpenApi.Kiota.Builder" Version="1.21.0" />
+    <PackageReference Include="Microsoft.OpenApi.Kiota.Builder" Version="1.22.3" />
   </ItemGroup>
 
 </Project>
diff --git a/schema-resolver/src/main/java/io/apicurio/registry/resolver/AbstractSchemaResolver.java b/schema-resolver/src/main/java/io/apicurio/registry/resolver/AbstractSchemaResolver.java
@@ -42,15 +42,20 @@ public abstract class AbstractSchemaResolver<S, T> implements SchemaResolver<S,
     protected String explicitArtifactId;
     protected String explicitArtifactVersion;
 
-    protected Vertx vertx;
+    protected static Vertx vertx;
+    protected Vertx internalReference;
     protected boolean resolveDereferenced;
 
     @Override
     public void configure(Map<String, ?> configs, SchemaParser<S, T> schemaParser) {
         this.schemaParser = schemaParser;
 
-        if (this.vertx == null) {
-            this.vertx = Vertx.vertx();
+        if (vertx != null) {
+            internalReference = vertx;
+        }
+
+        if (internalReference == null) {
+            internalReference = Vertx.vertx();
         }
 
         this.config = new SchemaResolverConfig(configs);
@@ -72,7 +77,7 @@ public void configure(Map<String, ?> configs, SchemaParser<S, T> schemaParser) {
                     if (username != null) {
                         client = configureClientWithBasicAuth(config, baseUrl, username);
                     } else {
-                        var adapter = new VertXRequestAdapter(this.vertx);
+                        var adapter = new VertXRequestAdapter(internalReference);
                         adapter.setBaseUrl(baseUrl);
                         client = new RegistryClient(adapter);
                     }
@@ -275,8 +280,12 @@ public void reset() {
      */
     @Override
     public void close() throws IOException {
-        if (this.vertx != null) {
-            this.vertx.close();
+        if (internalReference != null) {
+            if (vertx == null) {
+                internalReference.close();
+            } else {
+                vertx = null;
+            }
         }
     }
 
@@ -304,7 +313,7 @@ private RequestAdapter configureAuthWithUrl(SchemaResolverConfig config, String
         final String clientScope = config.getAuthClientScope();
 
         return new VertXRequestAdapter(
-                buildOIDCWebClient(this.vertx, tokenEndpoint, clientId, clientSecret, clientScope));
+                buildOIDCWebClient(internalReference, tokenEndpoint, clientId, clientSecret, clientScope));
     }
 
     private RegistryClient configureClientWithBasicAuth(SchemaResolverConfig config, String registryUrl,
@@ -317,7 +326,8 @@ private RegistryClient configureClientWithBasicAuth(SchemaResolverConfig config,
                     "Missing registry auth password, set " + SchemaResolverConfig.AUTH_PASSWORD);
         }
 
-        var adapter = new VertXRequestAdapter(buildSimpleAuthWebClient(this.vertx, username, password));
+        var adapter = new VertXRequestAdapter(
+                buildSimpleAuthWebClient(internalReference, username, password));
 
         adapter.setBaseUrl(registryUrl);
         return new RegistryClient(adapter);
@@ -340,4 +350,8 @@ protected void loadFromSearchedVersion(SearchedVersion version,
         resultBuilder.artifactId(version.getArtifactId());
         resultBuilder.version(String.valueOf(version.getVersion()));
     }
+
+    public static void setVertx(Vertx vertx) {
+        AbstractSchemaResolver.vertx = vertx;
+    }
 }
diff --git a/schema-util/common/pom.xml b/schema-util/common/pom.xml
@@ -71,12 +71,6 @@
       <artifactId>slf4j-api</artifactId>
     </dependency>
 
-    <dependency>
-      <groupId>org.jboss.slf4j</groupId>
-      <artifactId>slf4j-jboss-logging</artifactId>
-      <version>${jboss-slf4j.version}</version>
-    </dependency>
-
     <dependency>
       <groupId>com.fasterxml.jackson.datatype</groupId>
       <artifactId>jackson-datatype-json-org</artifactId>

diff --git a/serdes/generic/serde-common/pom.xml b/serdes/generic/serde-common/pom.xml
@@ -27,12 +27,6 @@
       <artifactId>slf4j-api</artifactId>
     </dependency>
 
-    <dependency>
-      <groupId>org.jboss.slf4j</groupId>
-      <artifactId>slf4j-jboss-logging</artifactId>
-      <version>${jboss-slf4j.version}</version>
-    </dependency>
-
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter</artifactId>

diff --git a/serdes/kafka/serde-kafka-common/pom.xml b/serdes/kafka/serde-kafka-common/pom.xml
@@ -28,12 +28,6 @@
       <artifactId>slf4j-api</artifactId>
     </dependency>
 
-    <dependency>
-      <groupId>org.jboss.slf4j</groupId>
-      <artifactId>slf4j-jboss-logging</artifactId>
-      <version>${jboss-slf4j.version}</version>
-    </dependency>
-
     <dependency>
       <groupId>org.apache.kafka</groupId>
       <artifactId>kafka-clients</artifactId>