Skip to content

Commit

Permalink
Merge branch 'release/0.9.79'
Browse files Browse the repository at this point in the history
  • Loading branch information
jfallows committed Apr 22, 2024
2 parents d7cd42e + 474ed35 commit d1762cb
Show file tree
Hide file tree
Showing 150 changed files with 3,103 additions and 104 deletions.
16 changes: 16 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,21 @@
# Changelog

## [Unreleased](https://github.com/aklivity/zilla/tree/HEAD)

[Full Changelog](https://github.com/aklivity/zilla/compare/0.9.78...HEAD)

**Implemented enhancements:**

- Support `filesystem` catalog for local schemas [\#908](https://github.com/aklivity/zilla/issues/908)

## [0.9.78](https://github.com/aklivity/zilla/tree/0.9.78) (2024-04-16)

[Full Changelog](https://github.com/aklivity/zilla/compare/0.9.77...0.9.78)

**Merged pull requests:**

- Ensure binding types are populated for `zilla dump` to dissect protocol-specific frames [\#928](https://github.com/aklivity/zilla/pull/928) ([attilakreiner](https://github.com/attilakreiner))

## [0.9.77](https://github.com/aklivity/zilla/tree/0.9.77) (2024-04-15)

[Full Changelog](https://github.com/aklivity/zilla/compare/0.9.76...0.9.77)
Expand Down
2 changes: 1 addition & 1 deletion build/flyweight-maven-plugin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>io.aklivity.zilla</groupId>
<artifactId>build</artifactId>
<version>0.9.78</version>
<version>0.9.79</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion build/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>io.aklivity.zilla</groupId>
<artifactId>zilla</artifactId>
<version>0.9.78</version>
<version>0.9.79</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
8 changes: 7 additions & 1 deletion cloud/docker-image/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>io.aklivity.zilla</groupId>
<artifactId>cloud</artifactId>
<version>0.9.78</version>
<version>0.9.79</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down Expand Up @@ -175,6 +175,12 @@
<version>${project.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>catalog-filesystem</artifactId>
<version>${project.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>catalog-inline</artifactId>
Expand Down
1 change: 1 addition & 0 deletions cloud/docker-image/src/main/docker/zpm.json.template
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
"io.aklivity.zilla:binding-tls",
"io.aklivity.zilla:binding-ws",
"io.aklivity.zilla:catalog-apicurio",
"io.aklivity.zilla:catalog-filesystem",
"io.aklivity.zilla:catalog-inline",
"io.aklivity.zilla:catalog-karapace",
"io.aklivity.zilla:common",
Expand Down
2 changes: 1 addition & 1 deletion cloud/helm-chart/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>io.aklivity.zilla</groupId>
<artifactId>cloud</artifactId>
<version>0.9.78</version>
<version>0.9.79</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion cloud/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>io.aklivity.zilla</groupId>
<artifactId>zilla</artifactId>
<version>0.9.78</version>
<version>0.9.79</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion conf/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>io.aklivity.zilla</groupId>
<artifactId>zilla</artifactId>
<version>0.9.78</version>
<version>0.9.79</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion incubator/binding-amqp.spec/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>io.aklivity.zilla</groupId>
<artifactId>incubator</artifactId>
<version>0.9.78</version>
<version>0.9.79</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion incubator/binding-amqp/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>io.aklivity.zilla</groupId>
<artifactId>incubator</artifactId>
<version>0.9.78</version>
<version>0.9.79</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
12 changes: 12 additions & 0 deletions incubator/catalog-filesystem.spec/COPYRIGHT
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
Copyright ${copyrightYears} Aklivity Inc

Licensed under the Aklivity Community License (the "License"); you may not use
this file except in compliance with the License. You may obtain a copy of the
License at

https://www.aklivity.io/aklivity-community-license/

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
WARRANTIES OF ANY KIND, either express or implied. See the License for the
specific language governing permissions and limitations under the License.
114 changes: 114 additions & 0 deletions incubator/catalog-filesystem.spec/LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,114 @@
Aklivity Community License Agreement
Version 1.0

This Aklivity Community License Agreement Version 1.0 (the “Agreement”) sets
forth the terms on which Aklivity, Inc. (“Aklivity”) makes available certain
software made available by Aklivity under this Agreement (the “Software”). BY
INSTALLING, DOWNLOADING, ACCESSING, USING OR DISTRIBUTING ANY OF THE SOFTWARE,
YOU AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT. IF YOU DO NOT AGREE TO
SUCH TERMS AND CONDITIONS, YOU MUST NOT USE THE SOFTWARE. IF YOU ARE RECEIVING
THE SOFTWARE ON BEHALF OF A LEGAL ENTITY, YOU REPRESENT AND WARRANT THAT YOU
HAVE THE ACTUAL AUTHORITY TO AGREE TO THE TERMS AND CONDITIONS OF THIS
AGREEMENT ON BEHALF OF SUCH ENTITY. “Licensee” means you, an individual, or
the entity on whose behalf you are receiving the Software.

1. LICENSE GRANT AND CONDITIONS.

1.1 License. Subject to the terms and conditions of this Agreement,
Aklivity hereby grants to Licensee a non-exclusive, royalty-free,
worldwide, non-transferable, non-sublicenseable license during the term
of this Agreement to: (a) use the Software; (b) prepare modifications and
derivative works of the Software; (c) distribute the Software (including
without limitation in source code or object code form); and (d) reproduce
copies of the Software (the “License”). Licensee is not granted the
right to, and Licensee shall not, exercise the License for an Excluded
Purpose. For purposes of this Agreement, “Excluded Purpose” means making
available any software-as-a-service, platform-as-a-service,
infrastructure-as-a-service or other similar online service that competes
with Aklivity products or services that provide the Software.

1.2 Conditions. In consideration of the License, Licensee’s distribution
of the Software is subject to the following conditions:

(a) Licensee must cause any Software modified by Licensee to carry
prominent notices stating that Licensee modified the Software.

(b) On each Software copy, Licensee shall reproduce and not remove or
alter all Aklivity or third party copyright or other proprietary
notices contained in the Software, and Licensee must provide the
notice below with each copy.

“This software is made available by Aklivity, Inc., under the
terms of the Aklivity Community License Agreement, Version 1.0
located at http://www.Aklivity.io/Aklivity-community-license. BY
INSTALLING, DOWNLOADING, ACCESSING, USING OR DISTRIBUTING ANY OF
THE SOFTWARE, YOU AGREE TO THE TERMS OF SUCH LICENSE AGREEMENT.”

1.3 Licensee Modifications. Licensee may add its own copyright notices
to modifications made by Licensee and may provide additional or different
license terms and conditions for use, reproduction, or distribution of
Licensee’s modifications. While redistributing the Software or
modifications thereof, Licensee may choose to offer, for a fee or free of
charge, support, warranty, indemnity, or other obligations. Licensee, and
not Aklivity, will be responsible for any such obligations.

1.4 No Sublicensing. The License does not include the right to
sublicense the Software, however, each recipient to which Licensee
provides the Software may exercise the Licenses so long as such recipient
agrees to the terms and conditions of this Agreement.

2. TERM AND TERMINATION. This Agreement will continue unless and until
earlier terminated as set forth herein. If Licensee breaches any of its
conditions or obligations under this Agreement, this Agreement will
terminate automatically and the License will terminate automatically and
permanently.

3. INTELLECTUAL PROPERTY. As between the parties, Aklivity will retain all
right, title, and interest in the Software, and all intellectual property
rights therein. Aklivity hereby reserves all rights not expressly granted
to Licensee in this Agreement. Aklivity hereby reserves all rights in its
trademarks and service marks, and no licenses therein are granted in this
Agreement.

4. DISCLAIMER. Aklivity HEREBY DISCLAIMS ANY AND ALL WARRANTIES AND
CONDITIONS, EXPRESS, IMPLIED, STATUTORY, OR OTHERWISE, AND SPECIFICALLY
DISCLAIMS ANY WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR
PURPOSE, WITH RESPECT TO THE SOFTWARE.

5. LIMITATION OF LIABILITY. Aklivity WILL NOT BE LIABLE FOR ANY DAMAGES OF
ANY KIND, INCLUDING BUT NOT LIMITED TO, LOST PROFITS OR ANY CONSEQUENTIAL,
SPECIAL, INCIDENTAL, INDIRECT, OR DIRECT DAMAGES, HOWEVER CAUSED AND ON ANY
THEORY OF LIABILITY, ARISING OUT OF THIS AGREEMENT. THE FOREGOING SHALL
APPLY TO THE EXTENT PERMITTED BY APPLICABLE LAW.

6.GENERAL.

6.1 Governing Law. This Agreement will be governed by and interpreted in
accordance with the laws of the state of California, without reference to
its conflict of laws principles. If Licensee is located within the
United States, all disputes arising out of this Agreement are subject to
the exclusive jurisdiction of courts located in Santa Clara County,
California. USA. If Licensee is located outside of the United States,
any dispute, controversy or claim arising out of or relating to this
Agreement will be referred to and finally determined by arbitration in
accordance with the JAMS International Arbitration Rules. The tribunal
will consist of one arbitrator. The place of arbitration will be Palo
Alto, California. The language to be used in the arbitral proceedings
will be English. Judgment upon the award rendered by the arbitrator may
be entered in any court having jurisdiction thereof.

6.2 Assignment. Licensee is not authorized to assign its rights under
this Agreement to any third party. Aklivity may freely assign its rights
under this Agreement to any third party.

6.3 Other. This Agreement is the entire agreement between the parties
regarding the subject matter hereof. No amendment or modification of
this Agreement will be valid or binding upon the parties unless made in
writing and signed by the duly authorized representatives of both
parties. In the event that any provision, including without limitation
any condition, of this Agreement is held to be unenforceable, this
Agreement and all licenses and rights granted hereunder will immediately
terminate. Waiver by Aklivity of a breach of any provision of this
Agreement or the failure by Aklivity to exercise any right hereunder
will not be construed as a waiver of any subsequent breach of that right
or as a waiver of any other right.
23 changes: 23 additions & 0 deletions incubator/catalog-filesystem.spec/NOTICE
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
Licensed under the Aklivity Community License (the "License"); you may not use
this file except in compliance with the License. You may obtain a copy of the
License at

https://www.aklivity.io/aklivity-community-license/

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
WARRANTIES OF ANY KIND, either express or implied. See the License for the
specific language governing permissions and limitations under the License.

This project includes:
agrona under The Apache License, Version 2.0
ANTLR 4 Runtime under BSD-3-Clause
ICU4J under Unicode/ICU License
Jakarta JSON Processing API under Eclipse Public License 2.0 or GNU General Public License, version 2 with the GNU Classpath Exception
Java Unified Expression Language API under The Apache Software License, Version 2.0
Java Unified Expression Language Implementation under The Apache Software License, Version 2.0
k3po/lang under The Apache Software License, Version 2.0
Kaazing Corporation License under The Apache Software License, Version 2.0
org.leadpony.justify under The Apache Software License, Version 2.0
zilla::specs::engine.spec under The Apache Software License, Version 2.0

13 changes: 13 additions & 0 deletions incubator/catalog-filesystem.spec/NOTICE.template
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
Licensed under the Aklivity Community License (the "License"); you may not use
this file except in compliance with the License. You may obtain a copy of the
License at

https://www.aklivity.io/aklivity-community-license/

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
WARRANTIES OF ANY KIND, either express or implied. See the License for the
specific language governing permissions and limitations under the License.

This project includes:
#GENERATED_NOTICES#
Loading

0 comments on commit d1762cb

Please sign in to comment.