Merge branch 'release/0.9.66'

aklivity · Jan 24, 2024 · 21cc9de · 21cc9de
2 parents 3e0524d + f3c9d65
commit 21cc9de
Show file tree

Hide file tree

Showing 269 changed files with 5,340 additions and 587 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -7,6 +7,8 @@ updates:
       versions: [ "4.x", "5.x" ]
     - dependency-name: "com.guicedee.services:commons-*"
       versions: [ "62" ]
+    - dependency-name: "org.slf4j:slf4j-*"
+      versions: [ "2.x" ]
   schedule:
     interval: daily
 - package-ecosystem: docker

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,7 +2,30 @@
 
 ## [Unreleased](https://github.com/aklivity/zilla/tree/HEAD)
 
-[Full Changelog](https://github.com/aklivity/zilla/compare/0.9.64...HEAD)
+[Full Changelog](https://github.com/aklivity/zilla/compare/0.9.65...HEAD)
+
+**Fixed bugs:**
+
+- Schema validation fails before the `${{env.*}}` parameters have been removed [\#583](https://github.com/aklivity/zilla/issues/583)
+
+**Closed issues:**
+
+- Support `openapi` `http` response validation [\#684](https://github.com/aklivity/zilla/issues/684)
+- Support `protobuf` conversion to and from `json` for `kafka` messages [\#682](https://github.com/aklivity/zilla/issues/682)
+- Support incubator features preview in zilla release docker image [\#670](https://github.com/aklivity/zilla/issues/670)
+
+**Merged pull requests:**
+
+- update license exclude path to include both zpmw files [\#759](https://github.com/aklivity/zilla/pull/759) ([vordimous](https://github.com/vordimous))
+- Refactor resolvers to support configuration [\#758](https://github.com/aklivity/zilla/pull/758) ([jfallows](https://github.com/jfallows))
+- Fix docker file path [\#756](https://github.com/aklivity/zilla/pull/756) ([akrambek](https://github.com/akrambek))
+- Support incubator features preview in zilla release docker image [\#753](https://github.com/aklivity/zilla/pull/753) ([akrambek](https://github.com/akrambek))
+- Support  expression for primitive type in json schema [\#751](https://github.com/aklivity/zilla/pull/751) ([akrambek](https://github.com/akrambek))
+-  Implement response validation in http client binding [\#732](https://github.com/aklivity/zilla/pull/732) ([attilakreiner](https://github.com/attilakreiner))
+
+## [0.9.65](https://github.com/aklivity/zilla/tree/0.9.65) (2024-01-18)
+
+[Full Changelog](https://github.com/aklivity/zilla/compare/0.9.64...0.9.65)
 
 **Implemented enhancements:**
 

diff --git a/build/flyweight-maven-plugin/pom.xml b/build/flyweight-maven-plugin/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>io.aklivity.zilla</groupId>
     <artifactId>build</artifactId>
-    <version>0.9.65</version>
+    <version>0.9.66</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/build/pom.xml b/build/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>io.aklivity.zilla</groupId>
     <artifactId>zilla</artifactId>
-    <version>0.9.65</version>
+    <version>0.9.66</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/cloud/docker-image/pom.xml b/cloud/docker-image/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>io.aklivity.zilla</groupId>
     <artifactId>cloud</artifactId>
-    <version>0.9.65</version>
+    <version>0.9.66</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
@@ -25,12 +25,24 @@
   </licenses>
 
   <dependencies>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>common</artifactId>
+      <version>${project.version}</version>
+      <scope>runtime</scope>
+    </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>manager</artifactId>
       <version>${project.version}</version>
       <scope>runtime</scope>
     </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>binding-amqp</artifactId>
+      <version>${project.version}</version>
+      <scope>runtime</scope>
+    </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>binding-echo</artifactId>
@@ -139,6 +151,36 @@
       <version>${project.version}</version>
       <scope>runtime</scope>
     </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>catalog-inline</artifactId>
+      <version>${project.version}</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>catalog-schema-registry</artifactId>
+      <version>${project.version}</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>command-dump</artifactId>
+      <version>${project.version}</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>command-generate</artifactId>
+      <version>${project.version}</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>command-metrics</artifactId>
+      <version>${project.version}</version>
+      <scope>runtime</scope>
+    </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>command-start</artifactId>
@@ -151,6 +193,12 @@
       <version>${project.version}</version>
       <scope>runtime</scope>
     </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>command-tune</artifactId>
+      <version>${project.version}</version>
+      <scope>runtime</scope>
+    </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>engine</artifactId>
@@ -165,7 +213,7 @@
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>command-metrics</artifactId>
+      <artifactId>exporter-otlp</artifactId>
       <version>${project.version}</version>
       <scope>runtime</scope>
     </dependency>
@@ -193,6 +241,30 @@
       <version>${project.version}</version>
       <scope>runtime</scope>
     </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>resolver-env</artifactId>
+      <version>${project.version}</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>validator-avro</artifactId>
+      <version>${project.version}</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>validator-core</artifactId>
+      <version>${project.version}</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>validator-json</artifactId>
+      <version>${project.version}</version>
+      <scope>runtime</scope>
+    </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>vault-filesystem</artifactId>
@@ -212,14 +284,14 @@
         <artifactId>license-maven-plugin</artifactId>
         <configuration>
           <excludes>
-            <exclude>src/main/docker/*/zpmw</exclude>
-            <exclude>src/main/docker/*/zilla</exclude>
-            <exclude>src/main/docker/*/zilla.properties</exclude>
-            <exclude>src/main/docker/*/zilla.yaml</exclude>
-            <exclude>src/main/docker/*/.zilla/**</exclude>
-            <exclude>src/main/docker/*/zpm.json.template</exclude>
-            <exclude>src/main/docker/*/zpm.json</exclude>
-            <exclude>src/main/docker/*/.zpm/**</exclude>
+            <exclude>src/main/docker/**/zpmw</exclude>
+            <exclude>src/main/docker/**/zilla</exclude>
+            <exclude>src/main/docker/**/zilla.properties</exclude>
+            <exclude>src/main/docker/**/zilla.yaml</exclude>
+            <exclude>src/main/docker/**/.zilla/**</exclude>
+            <exclude>src/main/docker/**/zpm.json.template</exclude>
+            <exclude>src/main/docker/**/zpm.json</exclude>
+            <exclude>src/main/docker/**/.zpm/**</exclude>
           </excludes>
         </configuration>
       </plugin>
@@ -235,7 +307,7 @@
           <arguments>
             <argument>wrap</argument>
             <argument>--launcher-directory</argument>
-            <argument>${project.basedir}/src/main/docker/${docker.context}</argument>
+            <argument>${project.basedir}/src/main/docker</argument>
           </arguments>
         </configuration>
         <executions>
@@ -258,9 +330,9 @@
               <alias>zilla</alias>
               <name>ghcr.io/aklivity/zilla:%v</name>
               <build>
-                <contextDir>${docker.context}</contextDir>
+                <contextDir>${project.basedir}/src/main/docker</contextDir>
                 <tags>
-                  <tag>latest</tag>
+                  <tag>${docker.latest.tag}</tag>
                 </tags>
                 <buildx>
                   <platforms>
@@ -290,79 +362,6 @@
   </build>
 
   <profiles>
-    <profile>
-      <id>incubator</id>
-      <activation>
-        <property>
-          <name>release</name>
-          <value>!true</value>
-        </property>
-      </activation>
-
-      <dependencies>
-        <dependency>
-          <groupId>${project.groupId}</groupId>
-          <artifactId>binding-amqp</artifactId>
-          <version>${project.version}</version>
-          <scope>runtime</scope>
-        </dependency>
-        <dependency>
-          <groupId>${project.groupId}</groupId>
-          <artifactId>catalog-inline</artifactId>
-          <version>${project.version}</version>
-          <scope>runtime</scope>
-        </dependency>
-        <dependency>
-          <groupId>${project.groupId}</groupId>
-          <artifactId>catalog-schema-registry</artifactId>
-          <version>${project.version}</version>
-          <scope>runtime</scope>
-        </dependency>
-        <dependency>
-          <groupId>${project.groupId}</groupId>
-          <artifactId>command-dump</artifactId>
-          <version>${project.version}</version>
-          <scope>runtime</scope>
-        </dependency>
-        <dependency>
-          <groupId>${project.groupId}</groupId>
-          <artifactId>command-tune</artifactId>
-          <version>${project.version}</version>
-          <scope>runtime</scope>
-        </dependency>
-        <dependency>
-          <groupId>${project.groupId}</groupId>
-          <artifactId>exporter-otlp</artifactId>
-          <version>${project.version}</version>
-          <scope>runtime</scope>
-        </dependency>
-        <dependency>
-          <groupId>${project.groupId}</groupId>
-          <artifactId>command-generate</artifactId>
-          <version>${project.version}</version>
-          <scope>runtime</scope>
-        </dependency>
-        <dependency>
-          <groupId>${project.groupId}</groupId>
-          <artifactId>validator-avro</artifactId>
-          <version>${project.version}</version>
-          <scope>runtime</scope>
-        </dependency>
-        <dependency>
-          <groupId>${project.groupId}</groupId>
-          <artifactId>validator-core</artifactId>
-          <version>${project.version}</version>
-          <scope>runtime</scope>
-        </dependency>
-        <dependency>
-          <groupId>${project.groupId}</groupId>
-          <artifactId>validator-json</artifactId>
-          <version>${project.version}</version>
-          <scope>runtime</scope>
-        </dependency>
-      </dependencies>
-    </profile>
-
     <profile>
       <id>alpine</id>
       <activation>
@@ -383,7 +382,7 @@
                   <alias>zilla-alpine</alias>
                   <name>ghcr.io/aklivity/zilla:%v-alpine</name>
                   <build>
-                    <dockerFile>${docker.context}/alpine.Dockerfile</dockerFile>
+                    <dockerFile>alpine.Dockerfile</dockerFile>
                     <tags>
                       <tag>alpine</tag>
                     </tags>

diff --git a/...mage/src/main/docker/incubator/Dockerfile → ...d/docker-image/src/main/docker/Dockerfile b/...mage/src/main/docker/incubator/Dockerfile → ...d/docker-image/src/main/docker/Dockerfile
diff --git a/...image/src/main/docker/incubator/README.md → cloud/docker-image/src/main/docker/README.md b/...image/src/main/docker/incubator/README.md → cloud/docker-image/src/main/docker/README.md
diff --git a/...src/main/docker/release/alpine.Dockerfile → ...r-image/src/main/docker/alpine.Dockerfile b/...src/main/docker/release/alpine.Dockerfile → ...r-image/src/main/docker/alpine.Dockerfile
diff --git a/cloud/docker-image/src/main/docker/assembly.xml b/cloud/docker-image/src/main/docker/assembly.xml
@@ -24,13 +24,15 @@
       <useDefaultExcludes>false</useDefaultExcludes>
       <includes>
         <include>io/aklivity/zilla/zilla/**</include>
+        <include>io/aklivity/zilla/common/**</include>
         <include>io/aklivity/zilla/runtime/**</include>
         <include>io/aklivity/zilla/engine/**</include>
         <include>io/aklivity/zilla/binding-*/**</include>
         <include>io/aklivity/zilla/catalog-*/**</include>
         <include>io/aklivity/zilla/exporter-*/**</include>
         <include>io/aklivity/zilla/guard-*/**</include>
         <include>io/aklivity/zilla/metrics-*/**</include>
+        <include>io/aklivity/zilla/resolver-*/**</include>
         <include>io/aklivity/zilla/validator-*/**</include>
         <include>io/aklivity/zilla/vault-*/**</include>
         <include>io/aklivity/zilla/command/**</include>

diff --git a/cloud/docker-image/src/main/docker/release/Dockerfile b/cloud/docker-image/src/main/docker/release/Dockerfile
diff --git a/cloud/docker-image/src/main/docker/release/zilla.properties b/cloud/docker-image/src/main/docker/release/zilla.properties