Skip to content

Commit

Permalink
[Hotfix] Update related official website and github urls (#2727)
Browse files Browse the repository at this point in the history
[Hotfix] Update related offical website and github urls in docs and xml

Co-authored-by: ZhouJinsong <zhoujinsong0505@163.com>
  • Loading branch information
tcodehuber and zhoujinsong committed Apr 11, 2024
1 parent efa02ad commit 170965a
Show file tree
Hide file tree
Showing 49 changed files with 71 additions and 71 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,5 @@
blank_issues_enabled: true
contact_links:
- name: GitHub Community Support
url: https://github.com/NetEase/amoro/discussions
url: https://github.com/apache/amoro/discussions
about: Please ask and answer questions here.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/improvement.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ body:
label: Search before asking
options:
- label: >
I have searched in the [issues](https://github.com/NetEase/amoro/issues?q=is%3Aissue) and found no similar
I have searched in the [issues](https://github.com/apache/amoro/issues?q=is%3Aissue) and found no similar
issues.
required: true
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/subtask.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ body:
label: Search before asking
options:
- label: >
I have searched in the [issues](https://github.com/NetEase/amoro/issues?q=is%3Aissue) and found no similar
I have searched in the [issues](https://github.com/apache/amoro/issues?q=is%3Aissue) and found no similar
issues.
required: true
Expand Down
4 changes: 2 additions & 2 deletions .github/PULL_REQUEST_TEMPLATE
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
Thanks for sending a pull request!

Here are some tips for you:
1. If this is your first time, please read our contributor guidelines: https://amoro.netease.com/how-to-contribute/
2. If the PR is related to an issue in https://github.com/NetEase/amoro/issues, add '[AMORO-XXXX]' in your PR title, e.g., '[AMORO-XXXX] Your PR title ...'.
1. If this is your first time, please read our contributor guidelines: https://amoro.apache.org/how-to-contribute/
2. If the PR is related to an issue in https://github.com/apache/amoro/issues, add '[AMORO-XXXX]' in your PR title, e.g., '[AMORO-XXXX] Your PR title ...'.
3. If the PR is unfinished, add '[WIP]' in your PR title, e.g., '[WIP][AMORO-XXXX] Your PR title ...'.
-->

Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ to track it.
Pull requests are the preferred mechanism for contributing to Amoro

### Contributor License Agreement
Before your contribution, To get your PR merged, you must submit [Amoro's Contributor License Agreement (CLA) ](https://cla-assistant.io/NetEase/amoro)first. You only need to submit it ONCE.
Before your contribution, To get your PR merged, you must submit [Amoro's Contributor License Agreement (CLA) ](https://cla-assistant.io/apache/amoro)first. You only need to submit it ONCE.

* Generally, create a PR only to the master branch.
* PR should be linked to the corresponding issue.
Expand Down
22 changes: 11 additions & 11 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,21 +17,21 @@ r
- limitations under the License.
-->
<p align="center">
<img src="https://amoro.netease.com/img/amoro-logo.svg" alt="Amoro logo" height="120px"/>
<img src="https://amoro.apache.org/img/amoro-logo.svg" alt="Amoro logo" height="120px"/>
</p>

<p align="center">
<a href="https://www.apache.org/licenses/LICENSE-2.0.html">
<img src="https://img.shields.io/badge/license-Apache%202-4EB1BA.svg" />
</a>
<a href="https://github.com/NetEase/amoro/actions/workflows/core-hadoop3-ci.yml">
<img src="https://github.com/NetEase/amoro/actions/workflows/core-hadoop3-ci.yml/badge.svg" />
<a href="https://github.com/apache/amoro/actions/workflows/core-hadoop3-ci.yml">
<img src="https://github.com/apache/amoro/actions/workflows/core-hadoop3-ci.yml/badge.svg" />
</a>
<a href="https://github.com/NetEase/amoro/actions/workflows/core-hadoop2-ci.yml">
<img src="https://github.com/NetEase/amoro/actions/workflows/core-hadoop2-ci.yml/badge.svg" />
<a href="https://github.com/apache/amoro/actions/workflows/core-hadoop2-ci.yml">
<img src="https://github.com/apache/amoro/actions/workflows/core-hadoop2-ci.yml/badge.svg" />
</a>
<a href="https://github.com/NetEase/amoro/actions/workflows/trino-ci.yml">
<img src="https://github.com/NetEase/amoro/actions/workflows/trino-ci.yml/badge.svg" />
<a href="https://github.com/apache/amoro/actions/workflows/trino-ci.yml">
<img src="https://github.com/apache/amoro/actions/workflows/trino-ci.yml/badge.svg" />
</a>
</p>

Expand All @@ -44,7 +44,7 @@ and helps data platforms or products easily build infra-decoupled, stream-and-ba
Here is the architecture diagram of Amoro:

<p align="center">
<img src="https://amoro.netease.com//img/home-content.png" alt="Amoro architecture" height="360px"/>
<img src="https://amoro.apache.org/img/home-content.png" alt="Amoro architecture" height="360px"/>
</p>

* AMS: Amoro Management Service provides Lakehouse management features, like self-optimizing, data expiration, etc.
Expand Down Expand Up @@ -144,7 +144,7 @@ Amoro is built using Maven with Java 1.8 and Java 17(only for `mixed-format/trin
* To only build `mixed-format/trino` and its dependent modules in Java 17 environment: `mvn clean package -DskipTests -P trino-spotless -pl 'mixed-format/trino' -am`
## Quickstart

Visit [https://amoro.netease.com/quick-demo/](https://amoro.netease.com/quick-demo/) to quickly
Visit [https://amoro.apache.org/quick-demo/](https://amoro.apache.org/quick-demo/) to quickly
explore what amoro can do.

## Join Community
Expand All @@ -157,8 +157,8 @@ Join the Amoro WeChat Group: Add " `kllnn999` " as a friend on WeChat and specif
## Contributors
This project exists thanks to all the people who contribute.

<a href="https://github.com/NetEase/amoro/graphs/contributors">
<img src="https://contrib.rocks/image?repo=NetEase/amoro" />
<a href="https://github.com/apache/amoro/graphs/contributors">
<img src="https://contrib.rocks/image?repo=apache/amoro" />
</a>

Made with [contrib.rocks](https://contrib.rocks).
Expand Down
2 changes: 1 addition & 1 deletion ams/api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
<artifactId>amoro-ams-api</artifactId>
<packaging>jar</packaging>
<name>Amoro Project AMS API</name>
<url>https://amoro.netease.com</url>
<url>https://amoro.apache.org</url>

<dependencies>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion ams/dashboard/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<artifactId>amoro-ams-dashboard</artifactId>
<packaging>jar</packaging>
<name>Amoro Project AMS Dashboard</name>
<url>https://amoro.netease.com</url>
<url>https://amoro.apache.org</url>

<properties>
<node.version>v18.0.0</node.version>
Expand Down
2 changes: 1 addition & 1 deletion ams/dashboard/src/components/Topbar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ export default defineComponent ({
}
const goDocs = () => {
window.open('https://amoro.netease.com/docs/latest/')
window.open('https://amoro.apache.org/docs/latest/')
}
onMounted(() => {
Expand Down
2 changes: 1 addition & 1 deletion ams/dist/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@

<artifactId>dist</artifactId>
<name>Amoro Project AMS Dist</name>
<url>https://amoro.netease.com</url>
<url>https://amoro.apache.org</url>

<properties>
<maven.compiler.source>8</maven.compiler.source>
Expand Down
2 changes: 1 addition & 1 deletion ams/metric-reporter/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<artifactId>amoro-metric-reporter</artifactId>
<packaging>pom</packaging>
<name>Amoro Project AMS Metric Reporter Parent</name>
<url>https://amoro.netease.com</url>
<url>https://amoro.apache.org</url>

<modules>
<module>prometheus-reporter</module>
Expand Down
2 changes: 1 addition & 1 deletion ams/metric-reporter/prometheus-reporter/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@

<artifactId>prometheus-reporter</artifactId>
<name>Amoro Project AMS Prometheus Reporter</name>
<url>https://amoro.netease.com</url>
<url>https://amoro.apache.org</url>

<dependencies>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion ams/optimizer/common/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@

<artifactId>optimizer-common</artifactId>
<name>Amoro Project AMS Optimizer Common</name>
<url>https://amoro.netease.com</url>
<url>https://amoro.apache.org</url>

<dependencies>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion ams/optimizer/flink-optimizer/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@

<artifactId>flink-optimizer</artifactId>
<name>Amoro Project AMS Flink Optimizer</name>
<url>https://amoro.netease.com</url>
<url>https://amoro.apache.org</url>

<properties>
<flink-optimizer.flink-version>1.18.1</flink-optimizer.flink-version>
Expand Down
2 changes: 1 addition & 1 deletion ams/optimizer/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<artifactId>amoro-optimizer</artifactId>
<packaging>pom</packaging>
<name>Amoro Project AMS Optimizer Parent</name>
<url>https://amoro.netease.com</url>
<url>https://amoro.apache.org</url>

<modules>
<module>flink-optimizer</module>
Expand Down
2 changes: 1 addition & 1 deletion ams/optimizer/spark-optimizer/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@

<artifactId>spark-optimizer</artifactId>
<name>Amoro Project AMS Spark Optimizer</name>
<url>https://amoro.netease.com</url>
<url>https://amoro.apache.org</url>

<properties>
<spark-optimizer.spark-version>3.3.3</spark-optimizer.spark-version>
Expand Down
2 changes: 1 addition & 1 deletion ams/optimizer/standalone-optimizer/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@

<artifactId>standalone-optimizer</artifactId>
<name>Amoro Project AMS Standalone Optimizer</name>
<url>https://amoro.netease.com</url>
<url>https://amoro.apache.org</url>


<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion ams/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<artifactId>amoro-ams</artifactId>
<packaging>pom</packaging>
<name>Amoro Project AMS Parent</name>
<url>https://amoro.netease.com</url>
<url>https://amoro.apache.org</url>

<modules>
<module>api</module>
Expand Down
2 changes: 1 addition & 1 deletion ams/server/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
<artifactId>amoro-ams-server</artifactId>
<packaging>jar</packaging>
<name>Amoro Project AMS Server</name>
<url>https://amoro.netease.com</url>
<url>https://amoro.apache.org</url>

<dependencies>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,7 @@ private void startHttpService() {
+ " / ___ | / / / // /_/ // _, _// /_/ / \n"
+ "/_/ |_|/_/ /_/ \\____//_/ |_| \\____/ \n"
+ " \n"
+ " https://amoro.netease.com/ \n");
+ " https://amoro.apache.org/ \n");

LOG.info("Http server start at {}.", port);
}
Expand Down
6 changes: 3 additions & 3 deletions charts/amoro/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ description: A Helm chart for Amoro
type: application
version: 0.1.0
appVersion: "0.6.0"
home: https://amoro.netease.com/
icon: https://amoro.netease.com/img/amoro-logo-icon.png
home: https://amoro.apache.org/
icon: https://amoro.apache.org/img/amoro-logo-icon.png
sources:
- https://github.com/NetEase/amoro
- https://github.com/apache/amoro
dependencies:
- name: common
repository: oci://registry-1.docker.io/bitnamicharts
Expand Down
8 changes: 4 additions & 4 deletions charts/amoro/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,14 @@

# Helm Chart for Amoro

[Amoro](https://amoro.netease.com) is a Lakehouse management system built on open data lake formats.
[Amoro](https://amoro.apache.org) is a Lakehouse management system built on open data lake formats.
Working with compute engines including Flink, Spark, and Trino, Amoro brings pluggable and self-managed features for Lakehouse to provide out-of-the-box data warehouse experience,
and helps data platforms or products easily build infra-decoupled, stream-and-batch-fused and lake-native architecture.


## Introduction

This chart will bootstrap an [Amoro](https://amoro.netease.com) deployment on a [Kubernetes](http://kubernetes.io)
This chart will bootstrap an [Amoro](https://amoro.apache.org) deployment on a [Kubernetes](http://kubernetes.io)
cluster using the [Helm](https://helm.sh) package manager.

## Requirements
Expand Down Expand Up @@ -58,8 +58,8 @@ helm install --dry-run --debug --generate-name ../amoro

## Documentation

Configuration guide documentation for Amoro lives [on the website](https://amoro.netease.com/docs/latest/). (Not just for Helm Chart)
Configuration guide documentation for Amoro lives [on the website](https://amoro.apache.org/docs/latest/). (Not just for Helm Chart)

## Contributing

Want to help build Amoro? Check out our [contributing documentation](https://amoro.netease.com/join-community/).
Want to help build Amoro? Check out our [contributing documentation](https://amoro.apache.org/join-community/).
8 changes: 4 additions & 4 deletions charts/amoro/templates/NOTES.txt
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,11 @@ Additional Resources Docs
================================================================================================================

{{ if eq .Chart.AppVersion "master-snapshot" }}
* Documentation: https://amoro.netease.com/docs/latest/
* Version build Info : https://github.com/NetEase/amoro
* Documentation: https://amoro.apache.org/docs/latest/
* Version build Info : https://github.com/apache/amoro
{{ else }}
* Documentation: https://amoro.netease.com/docs/{{ .Chart.AppVersion }}/
* Version build Info : https://github.com/NetEase/amoro/releases/tag/v{{ .Chart.AppVersion }}
* Documentation: https://amoro.apache.org/docs/{{ .Chart.AppVersion }}/
* Version build Info : https://github.com/apache/amoro/releases/tag/v{{ .Chart.AppVersion }}
{{ end }}

================================================================================================================
4 changes: 2 additions & 2 deletions charts/amoro/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -113,12 +113,12 @@ amoroConf:
# kyuubiJdbcUrl: jdbc:hive2://127.0.0.1:10009/

# The value (templated string) is used for conf.yaml file
# See https://github.com/NetEase/amoro/blob/master/dist/src/main/arctic-bin/conf/config.yaml for more details
# See https://github.com/apache/amoro/blob/master/dist/src/main/arctic-bin/conf/config.yaml for more details
#
amoroDefaults: ~

# The value (templated string) is used for conf/log4j2.xml file
# See example at conf/log4j2.xml.template https://github.com/NetEase/amoro/blob/master/dist/src/main/arctic-bin/conf/log4j2.xml for more details
# See example at conf/log4j2.xml.template https://github.com/apache/amoro/blob/master/dist/src/main/arctic-bin/conf/log4j2.xml for more details
log4j2: ~


Expand Down
2 changes: 1 addition & 1 deletion core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
<artifactId>amoro-core</artifactId>
<packaging>jar</packaging>
<name>Amoro Project Core</name>
<url>https://amoro.netease.com</url>
<url>https://amoro.apache.org</url>

<dependencies>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion docker/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ Usage: $0 [options] [image]
Build for Amoro demo docker images.
Images:
quickdemo Build Amoro QuickStart Image, for run flink ingestion job in quick-demo http://amoro.netease.com/quick-demo/
quickdemo Build Amoro QuickStart Image, for run flink ingestion job in quick-demo http://amoro.apache.org/quick-demo/
namenode Build a hadoop namenode container for quick start demo.
datanode Build a hadoop datanode container for quick start demo.
optimizer-flink Build official Amoro optimizer deployed with flink engine for production environments.
Expand Down
2 changes: 1 addition & 1 deletion docs/admin-guides/deployment-on-kubernetes.md
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ $ tar zxvf amoro-*.tgz
Alternatively, you can find the latest charts directly from the Github source code.

```shell
$ git clone https://github.com/NetEase/amoro.git
$ git clone https://github.com/apache/amoro.git
$ cd amoro/charts
$ helm dependency build ./amoro
```
Expand Down
4 changes: 2 additions & 2 deletions docs/admin-guides/deployment.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ menu:
---
# Deployment

You can choose to download the stable release package from [download page](../../../download/), or the source code form [Github](https://github.com/NetEase/amoro) and compile it according to the README.
You can choose to download the stable release package from [download page](../../../download/), or the source code form [Github](https://github.com/apache/amoro) and compile it according to the README.

## System requirements

Expand All @@ -32,7 +32,7 @@ Unzip it to create the amoro-x.y.z directory in the same directory, and then go
You can build based on the master branch without compiling Trino. The compilation method and the directory of results are described below:

```shell
git clone https://github.com/NetEase/amoro.git
git clone https://github.com/apache/amoro.git
cd amoro
base_dir=$(pwd)
mvn clean package -DskipTests -pl '!mixed-format/trino'
Expand Down
2 changes: 1 addition & 1 deletion mixed-format/flink/flink-common-format/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@

<artifactId>amoro-mixed-format-flink-common-format</artifactId>
<name>Amoro Project Mixed Format Flink Common Format</name>
<url>https://amoro.netease.com</url>
<url>https://amoro.apache.org</url>

<properties>
<flink.version>1.17.1</flink.version>
Expand Down
2 changes: 1 addition & 1 deletion mixed-format/flink/flink-common-iceberg-bridge/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@

<artifactId>amoro-mixed-format-flink-common-iceberg-bridge</artifactId>
<name>Amoro Project Mixed Format Flink Iceberg Bridge</name>
<url>https://amoro.netease.com</url>
<url>https://amoro.apache.org</url>

<properties>
<kafka.version>3.2.3</kafka.version>
Expand Down
2 changes: 1 addition & 1 deletion mixed-format/flink/flink-common/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@

<artifactId>amoro-mixed-format-flink-common</artifactId>
<name>Amoro Project Mixed Format Flink Common</name>
<url>https://amoro.netease.com</url>
<url>https://amoro.apache.org</url>

<packaging>jar</packaging>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ void testAlterTable(
try {
flinkUnifiedCatalog.alterTable(flinkCatalogContext.objectPath, newTable, false);
} catch (UnsupportedOperationException e) {
// https://github.com/NetEase/amoro/issues/2 altering Mixed format table is not supported.
// https://github.com/apache/amoro/issues/2 altering Mixed format table is not supported.
// Altering Iceberg schema is also not supported yet.
if (!tableFormat.in(
TableFormat.MIXED_ICEBERG, TableFormat.MIXED_HIVE, TableFormat.ICEBERG)) {
Expand Down
2 changes: 1 addition & 1 deletion mixed-format/flink/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
<artifactId>amoro-mixed-format-flink</artifactId>
<packaging>pom</packaging>
<name>Amoro Project Mixed Format Flink Parent</name>
<url>https://amoro.netease.com</url>
<url>https://amoro.apache.org</url>

<modules>
<module>flink-common</module>
Expand Down

0 comments on commit 170965a

Please sign in to comment.