Skip to content

Commit c451d70

Browse files
akrambekakrambek
authored
Merge branch 'aklivity:develop' into develop
2 parents 70f2543 + e5cfb43 commit c451d70

700 files changed

Lines changed: 419 additions & 523 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎cloud/docker-image/src/main/docker/README.md‎

Lines changed: 4 additions & 0 deletions

‎incubator/command-dump/src/main/java/io/aklivity/zilla/runtime/command/dump/internal/airline/ZillaDumpCommand.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -314,7 +314,9 @@ public void run()
314314
final int streamBufferCount = streamBuffers.length;
315315

316316
final IdleStrategy idleStrategy = new BackoffIdleStrategy(MAX_SPINS, MAX_YIELDS, MIN_PARK_NS, MAX_PARK_NS);
317-
final BindingsLayoutReader bindings = BindingsLayoutReader.builder().directory(directory).build();
317+
final BindingsLayoutReader bindings = BindingsLayoutReader.builder()
318+
.path(directory.resolve("bindings"))
319+
.build();
318320
final DumpHandler[] dumpHandlers = new DumpHandler[streamBufferCount];
319321
for (int i = 0; i < streamBufferCount; i++)
320322
{

‎incubator/pom.xml‎

Lines changed: 0 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -18,38 +18,13 @@
1818

1919
<modules>
2020
<module>binding-amqp.spec</module>
21-
<module>binding-asyncapi.spec</module>
22-
<module>binding-openapi.spec</module>
23-
<module>binding-openapi-asyncapi.spec</module>
24-
<module>catalog-apicurio.spec</module>
25-
<module>catalog-inline.spec</module>
26-
<module>exporter-otlp.spec</module>
27-
<module>exporter-stdout.spec</module>
28-
<module>model-avro.spec</module>
29-
<module>model-core.spec</module>
30-
<module>model-json.spec</module>
31-
<module>model-protobuf.spec</module>
3221

3322
<module>binding-amqp</module>
34-
<module>binding-asyncapi</module>
35-
<module>binding-openapi</module>
36-
<module>binding-openapi-asyncapi</module>
37-
38-
<module>catalog-apicurio</module>
39-
<module>catalog-inline</module>
4023

4124
<module>command-log</module>
4225
<module>command-dump</module>
4326
<module>command-generate</module>
4427
<module>command-tune</module>
45-
46-
<module>exporter-otlp</module>
47-
<module>exporter-stdout</module>
48-
49-
<module>model-avro</module>
50-
<module>model-core</module>
51-
<module>model-json</module>
52-
<module>model-protobuf</module>
5328
</modules>
5429

5530
<dependencyManagement>
@@ -59,31 +34,6 @@
5934
<artifactId>binding-amqp</artifactId>
6035
<version>${project.version}</version>
6136
</dependency>
62-
<dependency>
63-
<groupId>${project.groupId}</groupId>
64-
<artifactId>binding-asyncapi</artifactId>
65-
<version>${project.version}</version>
66-
</dependency>
67-
<dependency>
68-
<groupId>${project.groupId}</groupId>
69-
<artifactId>binding-openapi</artifactId>
70-
<version>${project.version}</version>
71-
</dependency>
72-
<dependency>
73-
<groupId>${project.groupId}</groupId>
74-
<artifactId>binding-openapi-asyncapi</artifactId>
75-
<version>${project.version}</version>
76-
</dependency>
77-
<dependency>
78-
<groupId>${project.groupId}</groupId>
79-
<artifactId>catalog-apicurio</artifactId>
80-
<version>${project.version}</version>
81-
</dependency>
82-
<dependency>
83-
<groupId>${project.groupId}</groupId>
84-
<artifactId>catalog-inline</artifactId>
85-
<version>${project.version}</version>
86-
</dependency>
8737
<dependency>
8838
<groupId>${project.groupId}</groupId>
8939
<artifactId>command-log</artifactId>
@@ -104,36 +54,6 @@
10454
<artifactId>command-generate</artifactId>
10555
<version>${project.version}</version>
10656
</dependency>
107-
<dependency>
108-
<groupId>${project.groupId}</groupId>
109-
<artifactId>exporter-otlp</artifactId>
110-
<version>${project.version}</version>
111-
</dependency>
112-
<dependency>
113-
<groupId>${project.groupId}</groupId>
114-
<artifactId>exporter-stdout</artifactId>
115-
<version>${project.version}</version>
116-
</dependency>
117-
<dependency>
118-
<groupId>${project.groupId}</groupId>
119-
<artifactId>model-avro</artifactId>
120-
<version>${project.version}</version>
121-
</dependency>
122-
<dependency>
123-
<groupId>${project.groupId}</groupId>
124-
<artifactId>model-core</artifactId>
125-
<version>${project.version}</version>
126-
</dependency>
127-
<dependency>
128-
<groupId>${project.groupId}</groupId>
129-
<artifactId>model-json</artifactId>
130-
<version>${project.version}</version>
131-
</dependency>
132-
<dependency>
133-
<groupId>${project.groupId}</groupId>
134-
<artifactId>model-protobuf</artifactId>
135-
<version>${project.version}</version>
136-
</dependency>
13757
</dependencies>
13858
</dependencyManagement>
13959
</project>

incubator/binding-asyncapi/COPYRIGHT renamed to runtime/binding-asyncapi/COPYRIGHT

File renamed without changes.

incubator/binding-asyncapi/LICENSE renamed to runtime/binding-asyncapi/LICENSE

File renamed without changes.

incubator/binding-asyncapi/NOTICE renamed to runtime/binding-asyncapi/NOTICE

File renamed without changes.

incubator/binding-asyncapi/NOTICE.template renamed to runtime/binding-asyncapi/NOTICE.template

File renamed without changes.

incubator/binding-asyncapi.spec/mvnw renamed to runtime/binding-asyncapi/mvnw

File renamed without changes.

incubator/binding-asyncapi.spec/mvnw.cmd renamed to runtime/binding-asyncapi/mvnw.cmd

File renamed without changes.

incubator/binding-asyncapi/pom.xml renamed to runtime/binding-asyncapi/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@
77
<modelVersion>4.0.0</modelVersion>
88
<parent>
99
<groupId>io.aklivity.zilla</groupId>
10-
<artifactId>incubator</artifactId>
10+
<artifactId>runtime</artifactId>
1111
<version>develop-SNAPSHOT</version>
1212
<relativePath>../pom.xml</relativePath>
1313
</parent>
1414

1515
<artifactId>binding-asyncapi</artifactId>
16-
<name>zilla::incubator::binding-asyncapi</name>
16+
<name>zilla::runtime::binding-asyncapi</name>
1717

1818
<licenses>
1919
<license>

0 commit comments

Comments
 (0)