Support incubator features preview in zilla release docker image

cloud/docker-image/pom.xml

@@ -25,6 +25,12 @@
   </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>
@@ -212,14 +218,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 +241,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,7 +264,6 @@
               <alias>zilla</alias>
               <name>ghcr.io/aklivity/zilla:%v</name>
               <build>
-                <contextDir>${docker.context}</contextDir>
                 <tags>
                   <tag>latest</tag>
                 </tags>
@@ -383,7 +388,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>

cloud/docker-image/src/main/docker/assembly.xml

@@ -24,6 +24,7 @@
       <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>

cloud/docker-image/src/main/docker/incubator/zpm.json.template → cloud/docker-image/src/main/docker/zpm.json.template

@@ -34,6 +34,7 @@
     "io.aklivity.zilla:binding-ws",
     "io.aklivity.zilla:catalog-inline",
     "io.aklivity.zilla:catalog-schema-registry",
+    "io.aklivity.zilla:common",
     "io.aklivity.zilla:command",
     "io.aklivity.zilla:command-dump",
     "io.aklivity.zilla:command-generate",

incubator/binding-amqp/src/main/java/io/aklivity/zilla/runtime/binding/amqp/internal/AmqpBindingFactorySpi.java

@@ -15,13 +15,15 @@
  */
 package io.aklivity.zilla.runtime.binding.amqp.internal;
 
+import io.aklivity.zilla.runtime.common.feature.Incubating;
 import io.aklivity.zilla.runtime.engine.Configuration;
 import io.aklivity.zilla.runtime.engine.binding.BindingFactorySpi;
 
+@Incubating
 public final class AmqpBindingFactorySpi implements BindingFactorySpi
 {
     @Override
-    public String name()
+    public String type()
     {
         return AmqpBinding.NAME;
     }

incubator/catalog-inline/src/main/java/io/aklivity/zilla/runtime/catalog/inline/internal/InlineCatalogFactorySpi.java

@@ -14,14 +14,16 @@
  */
 package io.aklivity.zilla.runtime.catalog.inline.internal;
 
+import io.aklivity.zilla.runtime.common.feature.Incubating;
 import io.aklivity.zilla.runtime.engine.Configuration;
 import io.aklivity.zilla.runtime.engine.catalog.Catalog;
 import io.aklivity.zilla.runtime.engine.catalog.CatalogFactorySpi;
 
+@Incubating
 public class InlineCatalogFactorySpi implements CatalogFactorySpi
 {
     @Override
-    public String name()
+    public String type()
     {
         return InlineCatalog.NAME;
     }

incubator/catalog-schema-registry/src/main/java/io/aklivity/zilla/runtime/catalog/schema/registry/internal/SchemaRegistryCatalogFactorySpi.java

@@ -14,14 +14,16 @@
  */
 package io.aklivity.zilla.runtime.catalog.schema.registry.internal;
 
+import io.aklivity.zilla.runtime.common.feature.Incubating;
 import io.aklivity.zilla.runtime.engine.Configuration;
 import io.aklivity.zilla.runtime.engine.catalog.Catalog;
 import io.aklivity.zilla.runtime.engine.catalog.CatalogFactorySpi;
 
+@Incubating
 public class SchemaRegistryCatalogFactorySpi implements CatalogFactorySpi
 {
     @Override
-    public String name()
+    public String type()
     {
         return SchemaRegistryCatalog.NAME;
     }

incubator/command-dump/src/main/java/io/aklivity/zilla/runtime/command/dump/internal/ZillaDumpCommandSpi.java

@@ -18,7 +18,9 @@
 
 import io.aklivity.zilla.runtime.command.ZillaCommandSpi;
 import io.aklivity.zilla.runtime.command.dump.internal.airline.ZillaDumpCommand;
+import io.aklivity.zilla.runtime.common.feature.Incubating;
 
+@Incubating
 public class ZillaDumpCommandSpi implements ZillaCommandSpi
 {
     @Override

incubator/command-generate/src/main/java/io/aklivity/zilla/runtime/command/generate/internal/ZillaConfigCommandSpi.java

@@ -18,7 +18,9 @@
 
 import io.aklivity.zilla.runtime.command.ZillaCommandSpi;
 import io.aklivity.zilla.runtime.command.generate.internal.airline.ZillaConfigCommand;
+import io.aklivity.zilla.runtime.common.feature.Incubating;
 
+@Incubating
 public class ZillaConfigCommandSpi implements ZillaCommandSpi
 {
     @Override

incubator/command-log/NOTICE

@@ -23,6 +23,7 @@ This project includes:
   JSON-B API under Eclipse Public License 2.0 or GNU General Public License, version 2 with the GNU Classpath Exception
   org.leadpony.justify under The Apache Software License, Version 2.0
   SnakeYAML under Apache License, Version 2.0
+  zilla::runtime::common under The Apache Software License, Version 2.0
   zilla::runtime::engine under The Apache Software License, Version 2.0
 
 

incubator/command-tune/src/main/java/io/aklivity/zilla/runtime/command/tune/internal/ZillaTuneCommandSpi.java

@@ -19,7 +19,9 @@
 
 import io.aklivity.zilla.runtime.command.ZillaCommandSpi;
 import io.aklivity.zilla.runtime.command.tune.internal.airline.ZillaTuneCommand;
+import io.aklivity.zilla.runtime.common.feature.Incubating;
 
+@Incubating
 public final class ZillaTuneCommandSpi implements ZillaCommandSpi
 {
     @Override

incubator/exporter-otlp/src/main/java/io/aklivity/zilla/runtime/exporter/otlp/internal/OtlpExporterFactorySpi.java

@@ -14,10 +14,12 @@
  */
 package io.aklivity.zilla.runtime.exporter.otlp.internal;
 
+import io.aklivity.zilla.runtime.common.feature.Incubating;
 import io.aklivity.zilla.runtime.engine.Configuration;
 import io.aklivity.zilla.runtime.engine.exporter.Exporter;
 import io.aklivity.zilla.runtime.engine.exporter.ExporterFactorySpi;
 
+@Incubating
 public class OtlpExporterFactorySpi implements ExporterFactorySpi
 {
     @Override

incubator/validator-avro/src/main/java/io/aklivity/zilla/runtime/validator/avro/AvroValidatorFactory.java

@@ -18,12 +18,14 @@
 import java.util.function.LongFunction;
 import java.util.function.ToLongFunction;
 
+import io.aklivity.zilla.runtime.common.feature.Incubating;
 import io.aklivity.zilla.runtime.engine.catalog.CatalogHandler;
 import io.aklivity.zilla.runtime.engine.config.ValidatorConfig;
 import io.aklivity.zilla.runtime.engine.validator.Validator;
 import io.aklivity.zilla.runtime.engine.validator.ValidatorFactorySpi;
 import io.aklivity.zilla.runtime.validator.avro.config.AvroValidatorConfig;
 
+@Incubating
 public final class AvroValidatorFactory implements ValidatorFactorySpi
 {
     @Override

incubator/validator-core/src/main/java/io/aklivity/zilla/runtime/validator/core/IntegerValidatorFactory.java

@@ -18,12 +18,14 @@
 import java.util.function.LongFunction;
 import java.util.function.ToLongFunction;
 
+import io.aklivity.zilla.runtime.common.feature.Incubating;
 import io.aklivity.zilla.runtime.engine.catalog.CatalogHandler;
 import io.aklivity.zilla.runtime.engine.config.ValidatorConfig;
 import io.aklivity.zilla.runtime.engine.validator.Validator;
 import io.aklivity.zilla.runtime.engine.validator.ValidatorFactorySpi;
 import io.aklivity.zilla.runtime.validator.core.config.IntegerValidatorConfig;
 
+@Incubating
 public class IntegerValidatorFactory implements ValidatorFactorySpi
 {
     @Override

incubator/validator-core/src/main/java/io/aklivity/zilla/runtime/validator/core/LongValidatorFactory.java

@@ -18,12 +18,14 @@
 import java.util.function.LongFunction;
 import java.util.function.ToLongFunction;
 
+import io.aklivity.zilla.runtime.common.feature.Incubating;
 import io.aklivity.zilla.runtime.engine.catalog.CatalogHandler;
 import io.aklivity.zilla.runtime.engine.config.ValidatorConfig;
 import io.aklivity.zilla.runtime.engine.validator.Validator;
 import io.aklivity.zilla.runtime.engine.validator.ValidatorFactorySpi;
 import io.aklivity.zilla.runtime.validator.core.config.LongValidatorConfig;
 
+@Incubating
 public class LongValidatorFactory implements ValidatorFactorySpi
 {
     @Override

incubator/validator-core/src/main/java/io/aklivity/zilla/runtime/validator/core/StringValidatorFactory.java

@@ -18,12 +18,14 @@
 import java.util.function.LongFunction;
 import java.util.function.ToLongFunction;
 
+import io.aklivity.zilla.runtime.common.feature.Incubating;
 import io.aklivity.zilla.runtime.engine.catalog.CatalogHandler;
 import io.aklivity.zilla.runtime.engine.config.ValidatorConfig;
 import io.aklivity.zilla.runtime.engine.validator.Validator;
 import io.aklivity.zilla.runtime.engine.validator.ValidatorFactorySpi;
 import io.aklivity.zilla.runtime.validator.core.config.StringValidatorConfig;
 
+@Incubating
 public final class StringValidatorFactory implements ValidatorFactorySpi
 {
     @Override

incubator/validator-json/src/main/java/io/aklivity/zilla/runtime/validator/json/JsonValidatorFactory.java

@@ -18,12 +18,14 @@
 import java.util.function.LongFunction;
 import java.util.function.ToLongFunction;
 
+import io.aklivity.zilla.runtime.common.feature.Incubating;
 import io.aklivity.zilla.runtime.engine.catalog.CatalogHandler;
 import io.aklivity.zilla.runtime.engine.config.ValidatorConfig;
 import io.aklivity.zilla.runtime.engine.validator.Validator;
 import io.aklivity.zilla.runtime.engine.validator.ValidatorFactorySpi;
 import io.aklivity.zilla.runtime.validator.json.config.JsonValidatorConfig;
 
+@Incubating
 public final class JsonValidatorFactory implements ValidatorFactorySpi
 {
     @Override

pom.xml

@@ -62,6 +62,7 @@
     <module>runtime</module>
     <module>manager</module>
     <module>cloud</module>
+    <module>incubator</module>
   </modules>
 
   <dependencyManagement>
@@ -591,7 +592,6 @@
       </activation>
 
       <properties>
-        <docker.context>incubator</docker.context>
         <docker.skip.push>true</docker.skip.push>
         <docker.skip.tag>true</docker.skip.tag>
       </properties>
@@ -620,10 +620,6 @@
           </plugin>
         </plugins>
       </build>
-
-      <modules>
-        <module>incubator</module>
-      </modules>
     </profile>
 
     <profile>
@@ -648,7 +644,6 @@
       </distributionManagement>
 
       <properties>
-        <docker.context>release</docker.context>
         <docker.skip.push>false</docker.skip.push>
         <docker.skip.tag>false</docker.skip.tag>
       </properties>

runtime/binding-echo/src/main/java/io/aklivity/zilla/runtime/binding/echo/internal/EchoBindingFactorySpi.java

@@ -21,7 +21,7 @@
 public final class EchoBindingFactorySpi implements BindingFactorySpi
 {
     @Override
-    public String name()
+    public String type()
     {
         return EchoBinding.NAME;
     }

runtime/binding-fan/src/main/java/io/aklivity/zilla/runtime/binding/fan/internal/FanBindingFactorySpi.java

@@ -21,7 +21,7 @@
 public final class FanBindingFactorySpi implements BindingFactorySpi
 {
     @Override
-    public String name()
+    public String type()
     {
         return FanBinding.NAME;
     }