You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hop.apache.org by ha...@apache.org on 2022/01/04 12:26:47 UTC
[hop] branch master updated: HOP-3562 removed 'incubating' and 'incubator' references from a variety of files, removed DISCLAIMER
This is an automated email from the ASF dual-hosted git repository.
hansva pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hop.git
The following commit(s) were added to refs/heads/master by this push:
new 2fc2d57 HOP-3562 removed 'incubating' and 'incubator' references from a variety of files, removed DISCLAIMER
new 93aa996 Merge pull request #1254 from bamaer/HOP-3562
2fc2d57 is described below
commit 2fc2d57cb9505d21478fc07a478e12012ff5057b
Author: Bart Maertens <ba...@know.bi>
AuthorDate: Tue Jan 4 11:59:55 2022 +0100
HOP-3562 removed 'incubating' and 'incubator' references from a variety of files, removed DISCLAIMER
---
DISCLAIMER | 6 ---
LICENSE | 4 +-
NOTICE | 2 +-
README.md | 2 +-
assemblies/static/src/main/resources/LICENSE | 4 +-
.../pages/apache-release/checking-a-release.adoc | 24 +++++------
.../pages/apache-release/creating-a-release.adoc | 50 +++++++++++-----------
.../pages/apache-release/promoting-a-release.adoc | 24 +++++------
.../modules/ROOT/pages/integration-testing.adoc | 4 +-
.../modules/ROOT/pages/metadata-plugins.adoc | 4 +-
.../modules/ROOT/pages/plugin-development.adoc | 2 +-
.../modules/ROOT/pages/setup-dev-environment.adoc | 10 ++---
.../modules/ROOT/pages/docker-container.adoc | 12 +++---
.../modules/ROOT/pages/hop-gui/hop-web.adoc | 6 +--
.../modules/ROOT/pages/hop-server/index.adoc | 2 +-
.../beam-dataflow-pipeline-engine.adoc | 2 +-
docs/site.yml | 2 +-
helm/hop-server/values.yaml | 2 +-
pom.xml | 6 +--
19 files changed, 81 insertions(+), 87 deletions(-)
diff --git a/DISCLAIMER b/DISCLAIMER
deleted file mode 100644
index 541739f..0000000
--- a/DISCLAIMER
+++ /dev/null
@@ -1,6 +0,0 @@
-DISCLAIMER
-
-Apache Hop is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the name of Apache TLP sponsor.
-Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications,
-and decision-making process have stabilized in a manner consistent with other successful ASF projects.
-While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate that the project has yet to be fully endorsed by the ASF.
\ No newline at end of file
diff --git a/LICENSE b/LICENSE
index da91417..9ba365f 100644
--- a/LICENSE
+++ b/LICENSE
@@ -201,9 +201,9 @@
limitations under the License.
=======================================================================
-Apache Hop (Incubating) Subcomponents:
+Apache Hop Subcomponents:
-The Apache Hop (Incubating) project contains subcomponents with separate copyright
+The Apache Hop project contains subcomponents with separate copyright
notices and license terms. Your use of the source code for the these
subcomponents is subject to the terms and conditions of the following
licenses.
diff --git a/NOTICE b/NOTICE
index 9931dfb..7af4aa3 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,4 +1,4 @@
-Apache Hop (incubating)
+Apache Hop
Copyright 2021 The Apache Software Foundation.
This product includes software developed at
diff --git a/README.md b/README.md
index a2e741b..402efd3 100644
--- a/README.md
+++ b/README.md
@@ -40,7 +40,7 @@ There are various things you can do to help Hop continue moving forward quickly:
or [mattermost](https://chat.project-hop.org/hop/channels/dev)
- Help us write or fix documentation (lot of opportunities)
- Translate Hop. See our [i18n guide](https://hop.apache.org/dev-manual/latest/internationalisation.html).
-- help fix some [sonar issues](https://sonarcloud.io/dashboard?id=apache_incubator-hop)
+- help fix some [sonar issues](https://sonarcloud.io/dashboard?id=apache_hop)
Check our [Contribution Guide](https://hop.apache.org/community/contributing/) and
the [Hop website](https://hop.apache.org) for more information on how to contribute.
diff --git a/assemblies/static/src/main/resources/LICENSE b/assemblies/static/src/main/resources/LICENSE
index 7761b94..07528eb 100644
--- a/assemblies/static/src/main/resources/LICENSE
+++ b/assemblies/static/src/main/resources/LICENSE
@@ -201,9 +201,9 @@
limitations under the License.
=======================================================================
-Apache Hop (Incubating) Subcomponents:
+Apache Hop Subcomponents:
-The Apache Hop (Incubating) project contains subcomponents with separate copyright
+The Apache Hop project contains subcomponents with separate copyright
notices and license terms. Your use of the source code for the these
subcomponents is subject to the terms and conditions of the following
licenses.
diff --git a/docs/hop-dev-manual/modules/ROOT/pages/apache-release/checking-a-release.adoc b/docs/hop-dev-manual/modules/ROOT/pages/apache-release/checking-a-release.adoc
index 08af783..6afe237 100644
--- a/docs/hop-dev-manual/modules/ROOT/pages/apache-release/checking-a-release.adoc
+++ b/docs/hop-dev-manual/modules/ROOT/pages/apache-release/checking-a-release.adoc
@@ -26,7 +26,7 @@ There is no general rule on how to check a release, there is only a list on what
== Possible checks that can be followed (Linux)
Start by grabbing the artifacts mentioned in the vote mail.
-Either use the link provided in the mail or grab them https://dist.apache.org/repos/dist/dev/incubator/hop/[here].
+Either use the link provided in the mail or grab them https://dist.apache.org/repos/dist/dev/hop/[here].
In these examples a folder to check everything in was created in `/tmp` and the artifacts are already in place.
@@ -42,26 +42,26 @@ First check would be to see if the keys and hashes are in order
----
# check the sha512
-sha512sum -c apache-hop-X.XX-incubating-src.tar.gz.sha512
-sha512sum -c apache-hop-client-X.XX-incubating.zip.sha512
+sha512sum -c apache-hop-X.XX-src.tar.gz.sha512
+sha512sum -c apache-hop-client-X.XX.zip.sha512
# should echo the artifact name and OK
# check the gpg signature
-gpg --verify apache-hop-X.XX-incubating-src.tar.gz.asc
-gpg --verify apache-hop-client-X.XX-incubating.zip.asc
+gpg --verify apache-hop-X.XX-src.tar.gz.asc
+gpg --verify apache-hop-client-X.XX.zip.asc
# if it prints out gpg: Can't check signature: No public key fetch the key from public keyserver
-# 1. Check if the keyid matches a known key in the KEYS file https://dist.apache.org/repos/dist/dev/incubator/hop/KEYS
+# 1. Check if the keyid matches a known key in the KEYS file https://dist.apache.org/repos/dist/dev/hop/KEYS
# 2. grab the key from the public keyserver found in the release mail
gpg --keyserver <KEY SERVER> --receive-keys <KEY ID>
# verify the package again
-gpg --verify apache-hop-X.XX-incubating-src.tar.gz.asc
-gpg --verify apache-hop-client-X.XX-incubating.zip.asc
+gpg --verify apache-hop-X.XX-src.tar.gz.asc
+gpg --verify apache-hop-client-X.XX.zip.asc
# output should be:
# gpg: Good signature from "Owner Name <Ow...@apache.org>" [ultimate]
@@ -75,7 +75,7 @@ First step would be to download the matching source code from github.
----
# replace branch with the branch name mentioned in the release mail
-git clone --depth 1 --branch X.XX-rcX https://github.com/apache/incubator-hop.git source_version
+git clone --depth 1 --branch X.XX-rcX https://github.com/apache/hop.git source_version
# check if the git commit matches the commit mentioned in the release mail
@@ -94,11 +94,11 @@ final step is to see if the content of the source repository matches the content
----
# unpack the downloaded source code
-tar -xvf apache-hop-X.XX-incubating-src.tar.gz
+tar -xvf apache-hop-X.XX-src.tar.gz
# do a diff to see if they match
-diff -qr source_version apache-hop-X.XX-incubating
+diff -qr source_version apache-hop-X.XX
# this should show no output indicating that all files match
# the folder containing the source code can now be removed
@@ -119,7 +119,7 @@ Validate if all files contain the correct headers
[source,bash]
----
-cd apache-hop-X.XX-incubating
+cd apache-hop-X.XX
mvn apache-rat:check -debug
----
diff --git a/docs/hop-dev-manual/modules/ROOT/pages/apache-release/creating-a-release.adoc b/docs/hop-dev-manual/modules/ROOT/pages/apache-release/creating-a-release.adoc
index 6294ba4..e5e8d2d 100644
--- a/docs/hop-dev-manual/modules/ROOT/pages/apache-release/creating-a-release.adoc
+++ b/docs/hop-dev-manual/modules/ROOT/pages/apache-release/creating-a-release.adoc
@@ -25,7 +25,7 @@ This document includes the steps needed to be taken by the release manager to cr
first step is to create a new release branch.
The branch must follow following naming pattern `releaseX.XX` where `X.XX` is the release version number.
-In this example upstream is the apache/incubator-hop github repository
+In this example upstream is the apache/hop github repository
[source,bash]
----
@@ -62,9 +62,9 @@ Next up is creating the tar.gz file
[source,bash]
----
-git clone --depth 1 --branch X.XX-rcX https://github.com/apache/incubator-hop.git apache-hop-X.XX-incubating
-rm -rf apache-hop-X.XX-incubating/.git
-tar -czvf apache-hop-X.XX-incubating-src.tar.gz apache-hop-X.XX-incubating
+git clone --depth 1 --branch X.XX-rcX https://github.com/apache/hop.git apache-hop-X.XX
+rm -rf apache-hop-X.XX/.git
+tar -czvf apache-hop-X.XX-src.tar.gz apache-hop-X.XX
----
== Sign the artifacts
@@ -73,12 +73,12 @@ This part assumes you already have created and registered keys to sign the artif
[source,bash]
----
-gpg --armor --default-key username@apache.org --output apache-hop-X.XX-incubating-src.tar.gz.asc --detach-sig apache-hop-X.XX-incubating-src.tar.gz
-sha512sum apache-hop-X.XX-incubating-src.tar.gz > apache-hop-X.XX-incubating-src.tar.gz.sha512
+gpg --armor --default-key username@apache.org --output apache-hop-X.XX-src.tar.gz.asc --detach-sig apache-hop-X.XX-src.tar.gz
+sha512sum apache-hop-X.XX-src.tar.gz > apache-hop-X.XX-src.tar.gz.sha512
# Validate
-gpg --verify apache-hop-X.XX-incubating-src.tar.gz.asc
-sha512sum -c apache-hop-X.XX-incubating-src.tar.gz.sha512
+gpg --verify apache-hop-X.XX-src.tar.gz.asc
+sha512sum -c apache-hop-X.XX-src.tar.gz.sha512
----
== Creating the client
@@ -89,13 +89,13 @@ Use the source you just prepared to generate the client.
[source,bash]
----
# Copy source to temp build location
-cd apache-hop-X.XX-incubating/
+cd apache-hop-X.XX/
# Run Build
mvn -T 4 clean install -DskipTests=true
# Copy client back (and rename)
-cp assemblies/client/target/hop-client-X.XX.zip ../apache-hop-client-X.XX-incubating.zip
+cp assemblies/client/target/hop-client-X.XX.zip ../apache-hop-client-X.XX.zip
# Go back to root of your working dir
cd ..
@@ -106,12 +106,12 @@ As we now added a new binary file we also need to sign and create a sha512 for i
[source,bash]
----
# Create keyfile and sha512
-gpg --armor --default-key username@apache.org --output apache-hop-client-X.XX-incubating.zip.asc --detach-sig apache-hop-client-X.XX-incubating.zip
-sha512sum apache-hop-client-X.XX-incubating.zip > apache-hop-client-X.XX-incubating.zip.sha512
+gpg --armor --default-key username@apache.org --output apache-hop-client-X.XX.zip.asc --detach-sig apache-hop-client-X.XX.zip
+sha512sum apache-hop-client-X.XX.zip > apache-hop-client-X.XX.zip.sha512
# Validate
-gpg --verify apache-hop-client-X.XX-incubating.zip.asc
-sha512sum -c apache-hop-client-X.XX-incubating.zip.sha512
+gpg --verify apache-hop-client-X.XX.zip.asc
+sha512sum -c apache-hop-client-X.XX.zip.sha512
----
== Staging the files
@@ -120,21 +120,21 @@ First step is to check out the SVN directory, and create a new directory
[source,bash]
----
-svn co https://dist.apache.org/repos/dist/dev/incubator/hop hop_release
+svn co https://dist.apache.org/repos/dist/dev/hop hop_release
cd hop_release
-svn mkdir apache-hop-x.xx-incubating-rcx
+svn mkdir apache-hop-x.xx-rcx
----
Now copy over the following files in this new directory
[source,bash]
----
-apache-hop-X.XX-incubating-src.tar.gz.sha512
-apache-hop-X.XX-incubating-src.tar.gz.asc
-apache-hop-X.XX-incubating-src.tar.gz
-apache-hop-client-X.XX-incubating.zip.sha512
-apache-hop-client-X.XX-incubating.zip.asc
-apache-hop-client-X.XX-incubating.zip
+apache-hop-X.XX-src.tar.gz.sha512
+apache-hop-X.XX-src.tar.gz.asc
+apache-hop-X.XX-src.tar.gz
+apache-hop-client-X.XX.zip.sha512
+apache-hop-client-X.XX.zip.asc
+apache-hop-client-X.XX.zip
----
Add and commit the files to svn
@@ -146,7 +146,7 @@ svn status
svn commit -m 'Add release files for Apache hop X.XX-rcX'
----
-Check if the files are uploaded https://dist.apache.org/repos/dist/dev/incubator/hop/[here]
+Check if the files are uploaded https://dist.apache.org/repos/dist/dev/hop/[here]
== Send mail to dev list to announce new release candidate
@@ -167,7 +167,7 @@ The tag to be voted on is X.XX-rcX <REPLACE TAG> (commit <COMMIT HASH>):
The release files, including signatures, digests, etc. can be found at:
<INCLUDE URL TO DIST RC FOLDER>
-https://dist.apache.org/repos/dist/dev/incubator/hop/apache-hop-X.XX-incubating-rcX/
+https://dist.apache.org/repos/dist/dev/hop/apache-hop-X.XX-rcX/
The SHA512 Checksum for these artifacts is:
<INCLUDE CHECKSUM FROM SHA512 file>
@@ -235,7 +235,7 @@ Next step is to add your key to the key file in the Apache SVN repository.
[source,bash]
----
-svn co https://dist.apache.org/repos/dist/dev/incubator/hop hop_release
+svn co https://dist.apache.org/repos/dist/dev/hop hop_release
cd hop_release
gpg --list-sigs <keyID> >> KEYS
gpg --armor --export <keyID> >> KEYS
diff --git a/docs/hop-dev-manual/modules/ROOT/pages/apache-release/promoting-a-release.adoc b/docs/hop-dev-manual/modules/ROOT/pages/apache-release/promoting-a-release.adoc
index 9175113..f25bca1 100644
--- a/docs/hop-dev-manual/modules/ROOT/pages/apache-release/promoting-a-release.adoc
+++ b/docs/hop-dev-manual/modules/ROOT/pages/apache-release/promoting-a-release.adoc
@@ -29,7 +29,7 @@ Checkout or update your svn repository pointing to the staging area
[source,bash]
----
# Checkout
-svn co https://dist.apache.org/repos/dist/dev/incubator/hop hop_release
+svn co https://dist.apache.org/repos/dist/dev/hop hop_release
# Update
svn update
@@ -39,7 +39,7 @@ Checkout the release area
[source,bash]
----
-svn co https://dist.apache.org/repos/dist/release/incubator/hop/ hop_public_release
+svn co https://dist.apache.org/repos/dist/release/hop/ hop_public_release
----
@@ -49,7 +49,7 @@ Create a new folder in the hop_public_release location with the version number a
----
cd hop_public_release
svn mkdir X.XX
-cp ../hop_release/apache-hop-X.XX-incubating-rcX/* X.XX
+cp ../hop_release/apache-hop-X.XX-rcX/* X.XX
----
Remove the rc from the files and fix the link in the sha512 file
@@ -58,12 +58,12 @@ Remove the rc from the files and fix the link in the sha512 file
----
#Rename Files
-mv apache-hop-X.XX-incubating-rcX.tar.gz apache-hop-X.XX-incubating.tar.gz
-mv apache-hop-X.XX-incubating-rcX.tar.gz.asc apache-hop-X.XX-incubating.tar.gz.asc
-mv apache-hop-X.XX-incubating-rcX.tar.gz.sha512 apache-hop-X.XX-incubating.tar.gz.sha512
+mv apache-hop-X.XX-rcX.tar.gz apache-hop-X.XX.tar.gz
+mv apache-hop-X.XX-rcX.tar.gz.asc apache-hop-X.XX.tar.gz.asc
+mv apache-hop-X.XX-rcX.tar.gz.sha512 apache-hop-X.XX.tar.gz.sha512
#Remove rcx from sha512
-vi apache-hop-X.XX-incubating.tar.gz.sha512
+vi apache-hop-X.XX.tar.gz.sha512
#Remove rcx and save
----
@@ -71,8 +71,8 @@ Test if both key and sha512 still work
[source,bash]
----
-gpg --verify apache-hop-X.XX-incubating.tar.gz.asc
-sha512sum -c apache-hop-X.XX-incubating.tar.gz.sha512
+gpg --verify apache-hop-X.XX.tar.gz.asc
+sha512sum -c apache-hop-X.XX.tar.gz.sha512
----
== Creating Dockerhub Artifacts
@@ -86,12 +86,12 @@ unzip ./assemblies/web/target/hop.war -d ./assemblies/web/target/webapp
unzip ./assemblies/plugins/dist/target/hop-assemblies-*.zip -d ./assemblies/plugins/dist/target/
# Create image (make sure to add correct version)
-docker build . -f docker/Dockerfile -t docker.io/apache/incubator-hop:X.XX -t docker.io/apache/incubator-hop:latest
+docker build . -f docker/Dockerfile -t docker.io/apache/hop:X.XX -t docker.io/apache/hop:latest
# Push to dockerhub
-docker image push --all-tags docker.io/apache/incubator-hop
+docker image push --all-tags docker.io/apache/hop
# Create and push Hop Web
-docker buildx build --platform linux/amd64,linux/arm64 . -f docker/Dockerfile.web -t docker.io/apache/incubator-hop-web:X.XX -t docker.io/apache/incubator-hop-web:latest --push
+docker buildx build --platform linux/amd64,linux/arm64 . -f docker/Dockerfile.web -t docker.io/apache/hop-web:X.XX -t docker.io/apache/hop-web:latest --push
----
\ No newline at end of file
diff --git a/docs/hop-dev-manual/modules/ROOT/pages/integration-testing.adoc b/docs/hop-dev-manual/modules/ROOT/pages/integration-testing.adoc
index b27e317..a0ec669 100644
--- a/docs/hop-dev-manual/modules/ROOT/pages/integration-testing.adoc
+++ b/docs/hop-dev-manual/modules/ROOT/pages/integration-testing.adoc
@@ -83,7 +83,7 @@ TIP: You need version 1.27.0 or higher of docker-compose
. Clean build HOP
+
----
-cd incubator-hop
+cd hop
mvn clean install
----
+
@@ -107,7 +107,7 @@ We generate xml reports that can be used by Jenkins to generate reports. these r
A script is also provided to run the test without using Docker.
This script is also used inside the automated test suite but can be used in a stand alone mode.
-This script can be found at following location `incubator-hop/integration-tests/scripts/run-tests.sh`.
+This script can be found at following location `hop/integration-tests/scripts/run-tests.sh`.
Be sure to export the needed system variables for the script to find the correct paths to run the tests.
You can aslo run a single project by adding the project name to the command `./run-tests.sh projectname`
diff --git a/docs/hop-dev-manual/modules/ROOT/pages/metadata-plugins.adoc b/docs/hop-dev-manual/modules/ROOT/pages/metadata-plugins.adoc
index 34b5d7f..e8b14f8 100644
--- a/docs/hop-dev-manual/modules/ROOT/pages/metadata-plugins.adoc
+++ b/docs/hop-dev-manual/modules/ROOT/pages/metadata-plugins.adoc
@@ -35,7 +35,7 @@ Here are the attributes of the @HopMetadata annotation:
The class with this annotation will be found either because it lives in the ```plugins/``` folder of Hop or if it's an internal class and is described in the file ```engine/src/main/resources/hop-metadata-plugins.xml```
-Example: https://github.com/apache/incubator-hop/blob/f8f2ad2d0bc0cfd143ae90cc32e73b6c9e1cda78/engine/src/main/java/org/apache/hop/partition/PartitionSchema.java#L47[PartitionSchema.java]
+Example: https://github.com/apache/hop/blob/f8f2ad2d0bc0cfd143ae90cc32e73b6c9e1cda78/engine/src/main/java/org/apache/hop/partition/PartitionSchema.java#L47[PartitionSchema.java]
== Metadata Properties
@@ -65,7 +65,7 @@ Here are the supported data types:
You also want to have a way to edit the metadata in the GUI.
This can be done by extending the class `MetadataEditor<IHopMetadata>`.
-Example: https://github.com/apache/incubator-hop/blob/master/ui/src/main/java/org/apache/hop/ui/partition/PartitionSchemaEditor.java[PartitionSchemaEditor.java]
+Example: https://github.com/apache/hop/blob/master/ui/src/main/java/org/apache/hop/ui/partition/PartitionSchemaEditor.java[PartitionSchemaEditor.java]
The path to the Editor class will be found automatically by looking at the name of the metadata plugin class and then simply by appending Editor to it.
If you prefer to keep metadata and GUI code separate the Hop GUI will also look in package `org.apache.hop.ui` instead of `org.apache.hop`
diff --git a/docs/hop-dev-manual/modules/ROOT/pages/plugin-development.adoc b/docs/hop-dev-manual/modules/ROOT/pages/plugin-development.adoc
index 1adda50..8873bd3 100644
--- a/docs/hop-dev-manual/modules/ROOT/pages/plugin-development.adoc
+++ b/docs/hop-dev-manual/modules/ROOT/pages/plugin-development.adoc
@@ -78,7 +78,7 @@ The information in the IPlugin objects is copied from the plugin annotations on
== Where are the Hop plugins?
-In Hop all optional plugins are in the https://github.com/apache/incubator-hop/tree/master/plugins[hop/plugins] folder which contains the plugin categories:
+In Hop all optional plugins are in the https://github.com/apache/hop/tree/master/plugins[hop/plugins] folder which contains the plugin categories:
- database: relational database plugins
- actions: workflow actions
diff --git a/docs/hop-dev-manual/modules/ROOT/pages/setup-dev-environment.adoc b/docs/hop-dev-manual/modules/ROOT/pages/setup-dev-environment.adoc
index 9750708..e876818 100644
--- a/docs/hop-dev-manual/modules/ROOT/pages/setup-dev-environment.adoc
+++ b/docs/hop-dev-manual/modules/ROOT/pages/setup-dev-environment.adoc
@@ -26,7 +26,7 @@ We assume you're going to be using the IntelliJ IDEA integrated development envi
== Fork Apache Hop!
-If you visit the https://github.com/apache/incubator-hop[Apache Hop code] on github you'll notice a Fork icon on the top right of the page:
+If you visit the https://github.com/apache/hop[Apache Hop code] on github you'll notice a Fork icon on the top right of the page:
image::github-fork.png[width="25%"]
@@ -46,10 +46,10 @@ You can now run a command like this:
[source]
----
-git clone git@github.com:YourAccount/incubator-hop.git
+git clone git@github.com:YourAccount/hop.git
----
-Once it's done you'll have a new ```incubator-hop``` folder containing the project.
+Once it's done you'll have a new ```hop``` folder containing the project.
== Import the project
@@ -57,7 +57,7 @@ In IDEA you can use menu :
File / New / *Project from existing sources...*
-This will ask you to navigate to our new ```incubator-hop``` folder.
+This will ask you to navigate to our new ```hop``` folder.
Then you need to choose to import the project from external model "Maven":
@@ -179,7 +179,7 @@ If this is not the case, replace ```master``` with the branch you're interested
To update it you can add "upstream" to your local configuration:
[source]
-git remote add upstream git@github.com:apache/incubator-hop.git
+git remote add upstream git@github.com:apache/hop.git
Then you can fetch all the changes from "upstream":
diff --git a/docs/hop-tech-manual/modules/ROOT/pages/docker-container.adoc b/docs/hop-tech-manual/modules/ROOT/pages/docker-container.adoc
index 082945c..4daba9c 100644
--- a/docs/hop-tech-manual/modules/ROOT/pages/docker-container.adoc
+++ b/docs/hop-tech-manual/modules/ROOT/pages/docker-container.adoc
@@ -23,7 +23,7 @@ under the License.
This is the documentation of the official Apache Hop docker container published on:
-https://hub.docker.com/r/apache/incubator-hop
+https://hub.docker.com/r/apache/hop
It's a **Hop Docker image** supporting both **short-lived** and **long-lived** setups.
A short-lived setup executes a pipeline or workflow and stops right after.
@@ -193,7 +193,7 @@ Make sure to get the latest updates for the Hop image by pulling them:
[source,bash]
----
-docker pull apache/incubator-hop:<tag>
+docker pull apache/hop:<tag>
----
If you do not specify a value for `:<tag>` the value `latest` will be taken.
@@ -220,7 +220,7 @@ docker run -it --rm \
--env HOP_RUN_PARAMETERS=PARAM_LOG_MESSAGE=Hello,PARAM_WAIT_FOR_X_MINUTES=1 \
-v /path/to/local/dir:/files \
--name my-simple-hop-container \
- apache/incubator-hop:<tag>
+ apache/hop:<tag>
----
If you need a **long-lived container**, this option is also available.
@@ -228,7 +228,7 @@ Run this command to start a Hop Server in a docker container:
[source,bash]
----
-docker pull docker.io/apache/incubator-hop:<tag>
+docker pull docker.io/apache/hop:<tag>
docker run -it --rm \
--env HOP_SERVER_USER=admin \
--env HOP_SERVER_PASS=admin \
@@ -236,7 +236,7 @@ docker run -it --rm \
--env HOP_SERVER_HOSTNAME=localhost \
-p 8181:8181 \
--name my-hop-server-container \
- apache/incubator-hop:<tag>
+ apache/hop:<tag>
----
Hop Server is designed to receive all variables and metadata from executing clients.
@@ -270,7 +270,7 @@ We also make it parameter-driven, so it any other team can use it.We create our
[source,dockerfile]
----
-FROM apache/incubator-hop:1.1.0-SNAPSHOT
+FROM apache/hop:1.1.0-SNAPSHOT
ENV GIT_REPO_URI=https://...
# example value: https://github.com/diethardsteiner/apache-hop-minimal-project.git
ENV GIT_REPO_NAME=repo-name
diff --git a/docs/hop-user-manual/modules/ROOT/pages/hop-gui/hop-web.adoc b/docs/hop-user-manual/modules/ROOT/pages/hop-gui/hop-web.adoc
index b630549..b31a4a9 100644
--- a/docs/hop-user-manual/modules/ROOT/pages/hop-gui/hop-web.adoc
+++ b/docs/hop-user-manual/modules/ROOT/pages/hop-gui/hop-web.adoc
@@ -25,13 +25,13 @@ Hop Gui was designed from the ground up to be web-ready. You'll barely notice an
== Getting Hop Web
Hop Web is included in the default Hop build.
-With each build, an update is pushed to https://hub.docker.com/r/apache/incubator-hop-web[Docker Hub].
+With each build, an update is pushed to https://hub.docker.com/r/apache/hop-web[Docker Hub].
This continously updated docker image is by far the easiest way to try out Hop Web:
-Pull the latest build with: `docker pull apache/incubator-hop-web`.
+Pull the latest build with: `docker pull apache/hop-web`.
-Once the image has been pulled, start Hop Web with `docker run -p 8080:8080 apache/incubator-hop-web:latest`
+Once the image has been pulled, start Hop Web with `docker run -p 8080:8080 apache/hop-web:latest`
The Hop Web container should only take a couple of seconds to start.
Your container logs should output similar to the example below:
diff --git a/docs/hop-user-manual/modules/ROOT/pages/hop-server/index.adoc b/docs/hop-user-manual/modules/ROOT/pages/hop-server/index.adoc
index df58dac..3f6d6a5 100644
--- a/docs/hop-user-manual/modules/ROOT/pages/hop-server/index.adoc
+++ b/docs/hop-user-manual/modules/ROOT/pages/hop-server/index.adoc
@@ -289,7 +289,7 @@ docker run \
-e HOP_SERVER_PORT=8080 \
-e HOP_SERVER_USER=username \
-e HOP_SERVER_USER=password \
- apache/incubator-hop
+ apache/hop
----
=== Stopping Hop Server
diff --git a/docs/hop-user-manual/modules/ROOT/pages/pipeline/pipeline-run-configurations/beam-dataflow-pipeline-engine.adoc b/docs/hop-user-manual/modules/ROOT/pages/pipeline/pipeline-run-configurations/beam-dataflow-pipeline-engine.adoc
index 15052a8..0c6e5c5 100644
--- a/docs/hop-user-manual/modules/ROOT/pages/pipeline/pipeline-run-configurations/beam-dataflow-pipeline-engine.adoc
+++ b/docs/hop-user-manual/modules/ROOT/pages/pipeline/pipeline-run-configurations/beam-dataflow-pipeline-engine.adoc
@@ -134,7 +134,7 @@ GOOGLE_APPLICATION_CREDENTIALS=/path/to/google-key.json
== Security considerations
-To allow encrypted (TLS) network connections to, for example, Kafka and Neo4j Aura certain older security algorithms are https://github.com/apache/incubator-hop/blob/master/plugins/engines/beam/src/main/java/org/apache/hop/beam/engines/dataflow/DataFlowJvmStart.java[disabled on Dataflow].
+To allow encrypted (TLS) network connections to, for example, Kafka and Neo4j Aura certain older security algorithms are https://github.com/apache/hop/blob/master/plugins/engines/beam/src/main/java/org/apache/hop/beam/engines/dataflow/DataFlowJvmStart.java[disabled on Dataflow].
This is done by setting security property `jdk.tls.disabledAlgorithms` to value: `Lv3, RC4, DES, MD5withRSA, DH keySize < 1024, EC keySize < 224, 3DES_EDE_CBC, anon, NULL`.
Please let us know if you have a need to make this configurable and we'll look for a way to not hardcode this.
diff --git a/docs/site.yml b/docs/site.yml
index 4fbaa50..2b45b08 100644
--- a/docs/site.yml
+++ b/docs/site.yml
@@ -16,7 +16,7 @@
# under the License.
site:
- title: Apache Hop (Incubating)
+ title: Apache Hop
url: https://hop.apache.org
start_page: manual::index.adoc
keys:
diff --git a/helm/hop-server/values.yaml b/helm/hop-server/values.yaml
index 2f541a6..c9f7a31 100644
--- a/helm/hop-server/values.yaml
+++ b/helm/hop-server/values.yaml
@@ -22,7 +22,7 @@
replicaCount: 1
image:
- name: docker.io/apache/incubator-hop
+ name: docker.io/apache/hop
pullPolicy: IfNotPresent
# Overrides the image tag whose default is the chart appVersion.
tag: "1.0-SNAPSHOT"
diff --git a/pom.xml b/pom.xml
index 6b777f8..c6f21d0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -85,9 +85,9 @@
<scm>
- <connection>scm:git:http://gitbox.apache.org/repos/asf/incubator-hop.git</connection>
- <developerConnection>scm:git:http://gitbox.apache.org/repos/asf/incubator-hop.git</developerConnection>
- <url>https://gitbox.apache.org/repos/asf?p=incubator-hop.git;a=summary</url>
+ <connection>scm:git:http://gitbox.apache.org/repos/asf/hop.git</connection>
+ <developerConnection>scm:git:http://gitbox.apache.org/repos/asf/hop.git</developerConnection>
+ <url>https://gitbox.apache.org/repos/asf?p=hop.git;a=summary</url>
<tag>HEAD</tag>
</scm>