Skip to content

Commit af90305

Browse files
authored
Merge branch 'main' into feature/adding-parent-job
2 parents dd34c80 + c551e98 commit af90305

18 files changed

Lines changed: 49 additions & 25 deletions

File tree

.circleci/api-load-test.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
set -e
1515

1616
# Build version of Marquez
17-
readonly MARQUEZ_VERSION=0.49.0-SNAPSHOT
17+
readonly MARQUEZ_VERSION=0.50.0-SNAPSHOT
1818
# Fully qualified path to marquez.jar
1919
readonly MARQUEZ_JAR="api/build/libs/marquez-api-${MARQUEZ_VERSION}.jar"
2020

.circleci/db-migration.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# Version of PostgreSQL
1414
readonly POSTGRES_VERSION="14"
1515
# Version of Marquez
16-
readonly MARQUEZ_VERSION=0.48.0
16+
readonly MARQUEZ_VERSION=0.49.0
1717
# Build version of Marquez
1818
readonly MARQUEZ_BUILD_VERSION="$(git log --pretty=format:'%h' -n 1)" # SHA1
1919
readonly POSTGRES_PORT=5432

.env.example

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ API_PORT=5000
22
API_ADMIN_PORT=5001
33
WEB_PORT=3000
44
POSTGRES_PORT=5432
5-
TAG=0.48.0
5+
TAG=0.49.0

CHANGELOG.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,24 @@
22

33
## [Unreleased](https://github.com/MarquezProject/marquez/compare/0.48.0...HEAD)
44

5+
## [0.49.0](https://github.com/MarquezProject/marquez/compare/0.48.0...0.49.0) - 2024-08-07
6+
7+
### Added
8+
9+
* API: Job-to-Job lineage [`#2752`](https://github.com/MarquezProject/marquez/pull/2752) [@yanlibert](https://github.com/yanlibert)
10+
*Intended in part to spur a larger discussion of full parent/child hierarchy handling in Marquez. Changes only the backend API, adding the Job UUID along with the parent name to the Job metadata returned.*
11+
12+
### Fixed
13+
14+
* Web: security updates [`#2864`](https://github.com/MarquezProject/marquez/pull/2864) [@phixMe](https://github.com/phixMe)
15+
*Resolves `critical` security issues found using NPM's `audit` command.*
16+
* Web: encode Job name in API requests [`#2866`](https://github.com/MarquezProject/marquez/pull/2866) [@dolfinus](https://github.com/dolfinus)
17+
*Urlencodes Job, Dataset, tag and field names while sending an API request.*
18+
519
## [0.48.0](https://github.com/MarquezProject/marquez/compare/0.47.0...0.48.0) - 2024-07-30
620

721
### Added
22+
823
* API: add endpoint method and path to metrics name [`#2850`](https://github.com/MarquezProject/marquez/pull/2850) [@JDarDagran](https://github.com/JDarDagran)
924
*In the metrics endpoint, there was information gathered containing the SQL Object name and method name. This introduces labels (DAO name, DAO method, endpoint method, endpoint path) and adds more information about endpoints.*
1025
* API: add paging to dataset versions panel [`#2855`](https://github.com/MarquezProject/marquez/pull/2855) [@davidsharp7](https://github.com/davidsharp7)

README.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<div align="center">
22
<img src="./docs/assets/images/marquez-logo.png" width="500px" />
33
<a href="https://lfaidata.foundation/projects">
4-
<img src="./docs/assets/images/lfaidata-project-badge-incubation-black.png" width="125px" />
4+
<img src="./docs/assets/images/lfaidata-project-badge-graduate-black.png" width="125px" />
55
</a>
66
</div>
77

@@ -22,7 +22,7 @@ Marquez is an open source **metadata service** for the **collection**, **aggrega
2222

2323
## Status
2424

25-
Marquez is an [LF AI & Data Foundation](https://lfaidata.foundation/projects/marquez) incubation project under active development, and we'd love your help!
25+
Marquez is an [LF AI & Data Foundation](https://lfaidata.foundation/projects/marquez) Graduated project under active development, and we'd love your help!
2626

2727
## Adopters
2828

@@ -97,9 +97,9 @@ Versions of Marquez are compatible with OpenLineage unless noted otherwise. We e
9797

9898
| **Marquez** | **OpenLineage** | **Status** |
9999
|--------------------------------------------------------------------------------------------------|---------------------------------------------------------------|---------------|
100-
| [`UNRELEASED`](https://github.com/MarquezProject/marquez/blob/main/CHANGELOG.md#unreleased) | [`1-0-5`](https://openlineage.io/spec/1-0-5/OpenLineage.json) | `CURRENT` |
101-
| [`0.46.0`](https://github.com/MarquezProject/marquez/blob/0.46.0/CHANGELOG.md#0460---2024-03-15) | [`1-0-5`](https://openlineage.io/spec/1-0-5/OpenLineage.json) | `RECOMMENDED` |
102-
| [`0.45.0`](https://github.com/MarquezProject/marquez/blob/0.45.0/CHANGELOG.md#0450---2024-03-07) | [`1-0-5`](https://openlineage.io/spec/1-0-0/OpenLineage.json) | `MAINTENANCE` |
100+
| [`UNRELEASED`](https://github.com/MarquezProject/marquez/blob/main/CHANGELOG.md#unreleased) | [`2-0-2`](https://openlineage.io/spec/2-0-2/OpenLineage.json) | `CURRENT` |
101+
| [`0.49.0`](https://github.com/MarquezProject/marquez/blob/0.49.0/CHANGELOG.md#0490---2024-08-07) | [`2-0-2`](https://openlineage.io/spec/2-0-2/OpenLineage.json) | `RECOMMENDED` |
102+
| [`0.48.0`](https://github.com/MarquezProject/marquez/blob/0.45.0/CHANGELOG.md#0480---2024-08-05) | [`2-0-2`](https://openlineage.io/spec/2-0-2/OpenLineage.json) | `MAINTENANCE` |
103103

104104
> **Note:** The [`openlineage-python`](https://pypi.org/project/openlineage-python) and [`openlineage-java`](https://central.sonatype.com/artifact/io.openlineage/openlineage-java) libraries will a higher version than the OpenLineage [specification](https://github.com/OpenLineage/OpenLineage/tree/main/spec) as they have different version requirements.
105105
@@ -180,7 +180,7 @@ Marquez listens on port `8080` for all API calls and port `8081` for the admin i
180180
* Website: https://marquezproject.ai
181181
* Source: https://github.com/MarquezProject/marquez
182182
* Chat: [MarquezProject Slack](https://bit.ly/Marquez_Slack_invite)
183-
* Twitter: [@MarquezProject](https://twitter.com/MarquezProject)
183+
* X: [@MarquezProject](https://twitter.com/MarquezProject)
184184

185185
## Contributing
186186

@@ -192,4 +192,4 @@ If you discover a vulnerability in the project, please open an issue and attach
192192

193193
----
194194
SPDX-License-Identifier: Apache-2.0
195-
Copyright 2018-2023 contributors to the Marquez project.
195+
Copyright 2018-2024 contributors to the Marquez project.

api/src/main/java/marquez/db/models/JobRow.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public class JobRow {
2525
@NonNull String name;
2626
@NonNull String simpleName;
2727
@Nullable String parentJobName;
28-
@Nullable UUID parentJoUuid;
28+
@Nullable UUID parentJobUuid;
2929
@Nullable String description;
3030
@Nullable UUID currentVersionUuid;
3131
@Nullable String location;

chart/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,4 +29,4 @@ name: marquez
2929
sources:
3030
- https://github.com/MarquezProject/marquez
3131
- https://marquezproject.github.io/marquez/
32-
version: 0.48.0
32+
version: 0.49.0

chart/values.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ marquez:
2020
image:
2121
registry: docker.io
2222
repository: marquezproject/marquez
23-
tag: 0.48.0
23+
tag: 0.49.0
2424
pullPolicy: IfNotPresent
2525
## Name of the existing secret containing credentials for the Marquez installation.
2626
## When this is specified, it will take precedence over the values configured in the 'db' section.
@@ -80,7 +80,7 @@ web:
8080
image:
8181
registry: docker.io
8282
repository: marquezproject/marquez-web
83-
tag: 0.48.0
83+
tag: 0.49.0
8484
pullPolicy: IfNotPresent
8585
## Marquez website will run on this port
8686
##

clients/java/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@ Maven:
1010
<dependency>
1111
<groupId>io.github.marquezproject</groupId>
1212
<artifactId>marquez-java</artifactId>
13-
<version>0.48.0</version>
13+
<version>0.49.0</version>
1414
</dependency>
1515
```
1616

1717
or Gradle:
1818

1919
```groovy
20-
implementation 'io.github.marquezproject:marquez-java:0.48.0
20+
implementation 'io.github.marquezproject:marquez-java:0.49.0
2121
```
2222

2323
## Usage

clients/python/marquez_client/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# -*- coding: utf-8 -*-
55

66
__author__ = """Marquez Project"""
7-
__version__ = "0.49.0"
7+
__version__ = "0.50.0"
88

99
from marquez_client.client import MarquezClient # noqa: F401
1010
from marquez_client.clients import Clients # noqa: F401

0 commit comments

Comments
 (0)