[nifi-site] branch asf-staging updated: Published changes from 0fc2a2b549795354b46cb8d36552e978557edcf3
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch asf-staging in repository https://gitbox.apache.org/repos/asf/nifi-site.git The following commit(s) were added to refs/heads/asf-staging by this push: new bb82903 Published changes from 0fc2a2b549795354b46cb8d36552e978557edcf3 bb82903 is described below commit bb829039009a4ac24cc321210b47db18a18772c4 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Wed Jul 20 02:27:11 2022 + Published changes from 0fc2a2b549795354b46cb8d36552e978557edcf3 --- licensing-guide.html | 7 ++- sitemap.xml | 52 ++-- 2 files changed, 32 insertions(+), 27 deletions(-) diff --git a/licensing-guide.html b/licensing-guide.html index 410d421..a033136 100644 --- a/licensing-guide.html +++ b/licensing-guide.html @@ -98,6 +98,9 @@ + + + Apache NiFi Release Guidelines This document provides guidance to contributors of Apache NiFi to help properly account for licensing, notice, and legal requirements. Disclaimer: @@ -186,7 +189,9 @@ modified. Merely distributing a copyleft work alongside a non-copyleft work does the copyleft terms.” Specific guidance for handling works in the public domain is https://www.apache.org/legal/resolved.html#can-works-placed-in-the-public-domain-be-included-in-apache-products";>here - + + + https://www.apache.org";> diff --git a/sitemap.xml b/sitemap.xml index 860451b..b10d07f 100644 --- a/sitemap.xml +++ b/sitemap.xml @@ -4,132 +4,132 @@ https://nifi.apache.org/ -2022-07-19T13:56:42-05:00 +2022-04-19T10:58:39-05:00 https://nifi.apache.org/fds.html -2022-07-19T13:56:42-05:00 +2022-04-19T10:58:39-05:00 https://nifi.apache.org/minifi/ -2022-07-19T13:56:42-05:00 +2022-04-19T10:58:39-05:00 https://nifi.apache.org/minifi/download.html -2022-07-19T13:56:42-05:00 +2022-04-19T10:58:39-05:00 https://nifi.apache.org/registry.html -2022-07-19T13:56:42-05:00 +2022-04-19T10:58:39-05:00 https://nifi.apache.org/developer-guide.html -2022-07-19T13:56:42-05:00 +2022-04-19T10:58:39-05:00 https://nifi.apache.org/quickstart.html -2022-07-19T13:56:42-05:00 +2022-04-19T10:58:39-05:00 https://nifi.apache.org/docs.html -2022-07-19T13:56:42-05:00 +2022-04-19T10:58:39-05:00 https://nifi.apache.org/download.html -2022-07-19T13:56:42-05:00 +2022-04-19T10:58:39-05:00 https://nifi.apache.org/faq.html -2022-07-19T13:56:42-05:00 +2022-04-19T10:58:39-05:00 https://nifi.apache.org/minifi/faq.html -2022-07-19T13:56:42-05:00 +2022-04-19T10:58:39-05:00 https://nifi.apache.org/fds-release-guide.html -2022-07-19T13:56:42-05:00 +2022-04-19T10:58:39-05:00 https://nifi.apache.org/licensing-guide.html -2022-07-19T13:56:42-05:00 +2022-04-19T10:58:39-05:00 https://nifi.apache.org/mailing_lists.html -2022-07-19T13:56:42-05:00 +2022-04-19T10:58:39-05:00 https://nifi.apache.org/minifi/getting-started.html -2022-07-19T13:56:42-05:00 +2022-04-19T10:58:39-05:00 https://nifi.apache.org/minifi/minifi-java-agent-quick-start.html -2022-07-19T13:56:42-05:00 +2022-04-19T10:58:39-05:00 https://nifi.apache.org/minifi/system-admin-guide.html -2022-07-19T13:56:42-05:00 +2022-04-19T10:58:39-05:00 https://nifi.apache.org/minifi/minifi-toolkit.html -2022-07-19T13:56:42-05:00 +2022-04-19T10:58:39-05:00 https://nifi.apache.org/registry-security.html -2022-07-19T13:56:42-05:00 +2022-04-19T10:58:39-05:00 https://nifi.apache.org/release-guide.html -2022-07-19T13:56:42-05:00 +2022-04-19T10:58:39-05:00 https://nifi.apache.org/videos.html -2022-07-19T13:56:42-05:00 +2022-04-19T10:58:39-05:00 https://nifi.apache.org/security.html -2022-07-19T13:56:42-05:00 +2022-04-19T10:58:39-05:00 https://nifi.apache.org/people.html -2022-07-19T13:56:42-05:00 +2022-04-19T10:58:39-05:00 https://nifi.apache.org/gpg.html -2022-07-19T13:56:42-05:00 +2022-04-19T10:58:39-05:00 https://nifi.apache.org/minifi.html -2022-07-19T13:56:42-05:00 +2022-04-19T10:58:39-05:00 https://nifi.apache.org/powered-by-nifi.html -2022-07-19T13:56:42-05:00 +2022-04-19T10:58:39-05:00 \ No newline at end of file
[nifi-site] branch main-staging updated (83cfe48 -> 0fc2a2b)
This is an automated email from the ASF dual-hosted git repository. exceptionfactory pushed a change to branch main-staging in repository https://gitbox.apache.org/repos/asf/nifi-site.git discard 83cfe48 NIFI-9802 Updated RewriteRule for component documentation discard 344bacb NIFI-9802 Removed unnecessary spacing for base template discard f78521a NIFI-9802 Added configurable container to handle page spacing discard 7ceda7f NIFI-9802 Refactored site build using Hugo new 0fc2a2b NIFI-9802 Refactored site build using Hugo This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (83cfe48) \ N -- N -- N refs/heads/main-staging (0fc2a2b) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: source/licensing-guide.md | 1 + 1 file changed, 1 insertion(+)
[nifi-site] branch asf-staging updated: Published changes from 83cfe482846e772728c08907a4af7a80348abab0
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch asf-staging
in repository https://gitbox.apache.org/repos/asf/nifi-site.git
The following commit(s) were added to refs/heads/asf-staging by this push:
new 7810ce3 Published changes from
83cfe482846e772728c08907a4af7a80348abab0
7810ce3 is described below
commit 7810ce3abe1e66e8076e509e686415bcca49fd14
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Wed Jul 20 02:17:04 2022 +
Published changes from 83cfe482846e772728c08907a4af7a80348abab0
---
.htaccess | 16
sitemap.xml | 52 ++--
2 files changed, 30 insertions(+), 38 deletions(-)
diff --git a/.htaccess b/.htaccess
index a23bc6a..2fbff34 100644
--- a/.htaccess
+++ b/.htaccess
@@ -1,16 +1,8 @@
-AddType text/turtle .ttl
-
-AddType application/rdf+xml .rdf
-AddType application/ld+json .jsonld
-AddType application/n-triples .nt
-AddType application/owl+xml .owl
-
-AddType text/trig .trig
-AddType application/n-quads .nq
-
RewriteEngine on
-# Switch http to https
+
+# Redirect HTTP to HTTPS
RewriteCond %{HTTPS} !=on
RewriteRule ^(.*)$ https://%{SERVER_NAME}%{REQUEST_URI} [L,R]
-#RewriteRule
^/docs/nifi-docs/components/org\.apache\.nifi/([^/+])/(!?:1.16.3)/(.*)$
/docs/nifi-docs/components/org.apache.nifi/$1/1.16.3/$2 [L, R]
+# Redirect component documentation to specified version
+RewriteRule
^docs/nifi-docs/components/org\.apache\.nifi/([^\/]+?)/[^\/]+?/(.*)$
docs/nifi-docs/components/org.apache.nifi/$1/1.16.3/$2 [L]
diff --git a/sitemap.xml b/sitemap.xml
index 988b36f..860451b 100644
--- a/sitemap.xml
+++ b/sitemap.xml
@@ -4,132 +4,132 @@
https://nifi.apache.org/
-2022-07-19T16:33:35-05:00
+2022-07-19T13:56:42-05:00
https://nifi.apache.org/fds.html
-2022-07-19T16:33:35-05:00
+2022-07-19T13:56:42-05:00
https://nifi.apache.org/minifi/
-2022-07-19T16:33:35-05:00
+2022-07-19T13:56:42-05:00
https://nifi.apache.org/minifi/download.html
-2022-07-19T16:33:35-05:00
+2022-07-19T13:56:42-05:00
https://nifi.apache.org/registry.html
-2022-07-19T16:33:35-05:00
+2022-07-19T13:56:42-05:00
https://nifi.apache.org/developer-guide.html
-2022-07-19T16:33:35-05:00
+2022-07-19T13:56:42-05:00
https://nifi.apache.org/quickstart.html
-2022-07-19T16:33:35-05:00
+2022-07-19T13:56:42-05:00
https://nifi.apache.org/docs.html
-2022-07-19T16:33:35-05:00
+2022-07-19T13:56:42-05:00
https://nifi.apache.org/download.html
-2022-07-19T16:33:35-05:00
+2022-07-19T13:56:42-05:00
https://nifi.apache.org/faq.html
-2022-07-19T16:33:35-05:00
+2022-07-19T13:56:42-05:00
https://nifi.apache.org/minifi/faq.html
-2022-07-19T16:33:35-05:00
+2022-07-19T13:56:42-05:00
https://nifi.apache.org/fds-release-guide.html
-2022-07-19T16:33:35-05:00
+2022-07-19T13:56:42-05:00
https://nifi.apache.org/licensing-guide.html
-2022-07-19T16:33:35-05:00
+2022-07-19T13:56:42-05:00
https://nifi.apache.org/mailing_lists.html
-2022-07-19T16:33:35-05:00
+2022-07-19T13:56:42-05:00
https://nifi.apache.org/minifi/getting-started.html
-2022-07-19T16:33:35-05:00
+2022-07-19T13:56:42-05:00
https://nifi.apache.org/minifi/minifi-java-agent-quick-start.html
-2022-07-19T16:33:35-05:00
+2022-07-19T13:56:42-05:00
https://nifi.apache.org/minifi/system-admin-guide.html
-2022-07-19T16:33:35-05:00
+2022-07-19T13:56:42-05:00
https://nifi.apache.org/minifi/minifi-toolkit.html
-2022-07-19T16:33:35-05:00
+2022-07-19T13:56:42-05:00
https://nifi.apache.org/registry-security.html
-2022-07-19T16:33:35-05:00
+2022-07-19T13:56:42-05:00
https://nifi.apache.org/release-guide.html
-2022-07-19T16:33:35-05:00
+2022-07-19T13:56:42-05:00
https://nifi.apache.org/videos.html
-2022-07-19T16:33:35-05:00
+2022-07-19T13:56:42-05:00
https://nifi.apache.org/security.html
-2022-07-19T16:33:35-05:00
+2022-07-19T13:56:42-05:00
https://nifi.apache.org/people.html
-2022-07-19T16:33:35-05:00
+2022-07-19T13:56:42-05:00
https://nifi.apache.org/gpg.html
-2022-07-19T16:33:35-05:00
+2022-07-19T13:56:42-05:00
https://nifi.apache.org/minifi.html
-2022-07-19T16:33:35-05:00
+2022-07-19T13:56:42-05:00
https://nifi.apache.org/powered-by-nifi.html
-2022-07-19T16:33:35-05:00
+2022-07-19T13:56:42-05:00
\ No newline at end of file
[nifi-site] branch main-staging updated (1e74589 -> 83cfe48)
This is an automated email from the ASF dual-hosted git repository. exceptionfactory pushed a change to branch main-staging in repository https://gitbox.apache.org/repos/asf/nifi-site.git discard 1e74589 NIFI-9802 Changed documentation redirect to use RewriteRule discard 777abe0 NIFI-9802 Changed documentation redirect to use LocationMatch discard b844f8f NIFI-9802 Adjusted documentation rewrite rules for 1.16.3 discard 6cef403 NIFI-9802 Added RedirectMatch for component documentation new 83cfe48 NIFI-9802 Updated RewriteRule for component documentation This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (1e74589) \ N -- N -- N refs/heads/main-staging (83cfe48) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: static/.htaccess | 16 1 file changed, 4 insertions(+), 12 deletions(-)
[nifi-site] 01/01: NIFI-9802 Updated RewriteRule for component documentation
This is an automated email from the ASF dual-hosted git repository.
exceptionfactory pushed a commit to branch main-staging
in repository https://gitbox.apache.org/repos/asf/nifi-site.git
commit 83cfe482846e772728c08907a4af7a80348abab0
Author: exceptionfactory
AuthorDate: Tue Jul 19 13:56:42 2022 -0500
NIFI-9802 Updated RewriteRule for component documentation
---
static/.htaccess | 16 +---
1 file changed, 5 insertions(+), 11 deletions(-)
diff --git a/static/.htaccess b/static/.htaccess
index 4e4b6f8..2fbff34 100644
--- a/static/.htaccess
+++ b/static/.htaccess
@@ -1,14 +1,8 @@
-AddType text/turtle .ttl
-
-AddType application/rdf+xml .rdf
-AddType application/ld+json .jsonld
-AddType application/n-triples .nt
-AddType application/owl+xml .owl
-
-AddType text/trig .trig
-AddType application/n-quads .nq
-
RewriteEngine on
-# Switch http to https
+
+# Redirect HTTP to HTTPS
RewriteCond %{HTTPS} !=on
RewriteRule ^(.*)$ https://%{SERVER_NAME}%{REQUEST_URI} [L,R]
+
+# Redirect component documentation to specified version
+RewriteRule
^docs/nifi-docs/components/org\.apache\.nifi/([^\/]+?)/[^\/]+?/(.*)$
docs/nifi-docs/components/org.apache.nifi/$1/1.16.3/$2 [L]
[nifi-site] branch asf-staging updated: Published changes from 1e74589931d7a224c86fafb0fdd69749fa5369f1
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch asf-staging
in repository https://gitbox.apache.org/repos/asf/nifi-site.git
The following commit(s) were added to refs/heads/asf-staging by this push:
new 66abf70 Published changes from
1e74589931d7a224c86fafb0fdd69749fa5369f1
66abf70 is described below
commit 66abf70e5a40bfeb6489a8959d0835e39d296dcc
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Tue Jul 19 21:37:02 2022 +
Published changes from 1e74589931d7a224c86fafb0fdd69749fa5369f1
---
.htaccess | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.htaccess b/.htaccess
index 77655e3..a23bc6a 100644
--- a/.htaccess
+++ b/.htaccess
@@ -13,4 +13,4 @@ RewriteEngine on
RewriteCond %{HTTPS} !=on
RewriteRule ^(.*)$ https://%{SERVER_NAME}%{REQUEST_URI} [L,R]
-RewriteRule
^/docs/nifi-docs/components/org\.apache\.nifi/([^/+])/(!?:1.16.3)/(.*)$
/docs/nifi-docs/components/org.apache.nifi/$1/1.16.3/$2 [L, R]
+#RewriteRule
^/docs/nifi-docs/components/org\.apache\.nifi/([^/+])/(!?:1.16.3)/(.*)$
/docs/nifi-docs/components/org.apache.nifi/$1/1.16.3/$2 [L, R]
[nifi-site] branch main-staging updated (939294a -> 1e74589)
This is an automated email from the ASF dual-hosted git repository. exceptionfactory pushed a change to branch main-staging in repository https://gitbox.apache.org/repos/asf/nifi-site.git discard 939294a NIFI-9802 Changed documentation redirect to use RewriteRule new 1e74589 NIFI-9802 Changed documentation redirect to use RewriteRule This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (939294a) \ N -- N -- N refs/heads/main-staging (1e74589) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: static/.htaccess | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[nifi-site] 01/01: NIFI-9802 Changed documentation redirect to use RewriteRule
This is an automated email from the ASF dual-hosted git repository.
exceptionfactory pushed a commit to branch main-staging
in repository https://gitbox.apache.org/repos/asf/nifi-site.git
commit 1e74589931d7a224c86fafb0fdd69749fa5369f1
Author: exceptionfactory
AuthorDate: Tue Jul 19 16:33:35 2022 -0500
NIFI-9802 Changed documentation redirect to use RewriteRule
---
static/.htaccess | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/static/.htaccess b/static/.htaccess
index 2a40ca6..a23bc6a 100644
--- a/static/.htaccess
+++ b/static/.htaccess
@@ -13,6 +13,4 @@ RewriteEngine on
RewriteCond %{HTTPS} !=on
RewriteRule ^(.*)$ https://%{SERVER_NAME}%{REQUEST_URI} [L,R]
-
- Redirect
"https://%{HTTP_HOST}/docs/nifi-docs/components/org.apache.nifi/$1/1.16.3/$2";
-
+#RewriteRule
^/docs/nifi-docs/components/org\.apache\.nifi/([^/+])/(!?:1.16.3)/(.*)$
/docs/nifi-docs/components/org.apache.nifi/$1/1.16.3/$2 [L, R]
[nifi-site] branch asf-staging updated: Published changes from 939294a7eb57ddb37337dccb1f8fc96c32a910d5
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch asf-staging
in repository https://gitbox.apache.org/repos/asf/nifi-site.git
The following commit(s) were added to refs/heads/asf-staging by this push:
new 45d46e2 Published changes from
939294a7eb57ddb37337dccb1f8fc96c32a910d5
45d46e2 is described below
commit 45d46e234c574ba571fdacc8ca55992c57a6fc38
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Tue Jul 19 21:35:10 2022 +
Published changes from 939294a7eb57ddb37337dccb1f8fc96c32a910d5
---
.htaccess | 4 +---
sitemap.xml | 52 ++--
2 files changed, 27 insertions(+), 29 deletions(-)
diff --git a/.htaccess b/.htaccess
index 2a40ca6..77655e3 100644
--- a/.htaccess
+++ b/.htaccess
@@ -13,6 +13,4 @@ RewriteEngine on
RewriteCond %{HTTPS} !=on
RewriteRule ^(.*)$ https://%{SERVER_NAME}%{REQUEST_URI} [L,R]
-
- Redirect
"https://%{HTTP_HOST}/docs/nifi-docs/components/org.apache.nifi/$1/1.16.3/$2";
-
+RewriteRule
^/docs/nifi-docs/components/org\.apache\.nifi/([^/+])/(!?:1.16.3)/(.*)$
/docs/nifi-docs/components/org.apache.nifi/$1/1.16.3/$2 [L, R]
diff --git a/sitemap.xml b/sitemap.xml
index 4f66f63..988b36f 100644
--- a/sitemap.xml
+++ b/sitemap.xml
@@ -4,132 +4,132 @@
https://nifi.apache.org/
-2022-07-19T15:52:03-05:00
+2022-07-19T16:33:35-05:00
https://nifi.apache.org/fds.html
-2022-07-19T15:52:03-05:00
+2022-07-19T16:33:35-05:00
https://nifi.apache.org/minifi/
-2022-07-19T15:52:03-05:00
+2022-07-19T16:33:35-05:00
https://nifi.apache.org/minifi/download.html
-2022-07-19T15:52:03-05:00
+2022-07-19T16:33:35-05:00
https://nifi.apache.org/registry.html
-2022-07-19T15:52:03-05:00
+2022-07-19T16:33:35-05:00
https://nifi.apache.org/developer-guide.html
-2022-07-19T15:52:03-05:00
+2022-07-19T16:33:35-05:00
https://nifi.apache.org/quickstart.html
-2022-07-19T15:52:03-05:00
+2022-07-19T16:33:35-05:00
https://nifi.apache.org/docs.html
-2022-07-19T15:52:03-05:00
+2022-07-19T16:33:35-05:00
https://nifi.apache.org/download.html
-2022-07-19T15:52:03-05:00
+2022-07-19T16:33:35-05:00
https://nifi.apache.org/faq.html
-2022-07-19T15:52:03-05:00
+2022-07-19T16:33:35-05:00
https://nifi.apache.org/minifi/faq.html
-2022-07-19T15:52:03-05:00
+2022-07-19T16:33:35-05:00
https://nifi.apache.org/fds-release-guide.html
-2022-07-19T15:52:03-05:00
+2022-07-19T16:33:35-05:00
https://nifi.apache.org/licensing-guide.html
-2022-07-19T15:52:03-05:00
+2022-07-19T16:33:35-05:00
https://nifi.apache.org/mailing_lists.html
-2022-07-19T15:52:03-05:00
+2022-07-19T16:33:35-05:00
https://nifi.apache.org/minifi/getting-started.html
-2022-07-19T15:52:03-05:00
+2022-07-19T16:33:35-05:00
https://nifi.apache.org/minifi/minifi-java-agent-quick-start.html
-2022-07-19T15:52:03-05:00
+2022-07-19T16:33:35-05:00
https://nifi.apache.org/minifi/system-admin-guide.html
-2022-07-19T15:52:03-05:00
+2022-07-19T16:33:35-05:00
https://nifi.apache.org/minifi/minifi-toolkit.html
-2022-07-19T15:52:03-05:00
+2022-07-19T16:33:35-05:00
https://nifi.apache.org/registry-security.html
-2022-07-19T15:52:03-05:00
+2022-07-19T16:33:35-05:00
https://nifi.apache.org/release-guide.html
-2022-07-19T15:52:03-05:00
+2022-07-19T16:33:35-05:00
https://nifi.apache.org/videos.html
-2022-07-19T15:52:03-05:00
+2022-07-19T16:33:35-05:00
https://nifi.apache.org/security.html
-2022-07-19T15:52:03-05:00
+2022-07-19T16:33:35-05:00
https://nifi.apache.org/people.html
-2022-07-19T15:52:03-05:00
+2022-07-19T16:33:35-05:00
https://nifi.apache.org/gpg.html
-2022-07-19T15:52:03-05:00
+2022-07-19T16:33:35-05:00
https://nifi.apache.org/minifi.html
-2022-07-19T15:52:03-05:00
+2022-07-19T16:33:35-05:00
https://nifi.apache.org/powered-by-nifi.html
-2022-07-19T15:52:03-05:00
+2022-07-19T16:33:35-05:00
\ No newline at end of file
[nifi-site] branch main-staging updated: NIFI-9802 Changed documentation redirect to use RewriteRule
This is an automated email from the ASF dual-hosted git repository.
exceptionfactory pushed a commit to branch main-staging
in repository https://gitbox.apache.org/repos/asf/nifi-site.git
The following commit(s) were added to refs/heads/main-staging by this push:
new 939294a NIFI-9802 Changed documentation redirect to use RewriteRule
939294a is described below
commit 939294a7eb57ddb37337dccb1f8fc96c32a910d5
Author: exceptionfactory
AuthorDate: Tue Jul 19 16:33:35 2022 -0500
NIFI-9802 Changed documentation redirect to use RewriteRule
---
static/.htaccess | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/static/.htaccess b/static/.htaccess
index 2a40ca6..77655e3 100644
--- a/static/.htaccess
+++ b/static/.htaccess
@@ -13,6 +13,4 @@ RewriteEngine on
RewriteCond %{HTTPS} !=on
RewriteRule ^(.*)$ https://%{SERVER_NAME}%{REQUEST_URI} [L,R]
-
- Redirect
"https://%{HTTP_HOST}/docs/nifi-docs/components/org.apache.nifi/$1/1.16.3/$2";
-
+RewriteRule
^/docs/nifi-docs/components/org\.apache\.nifi/([^/+])/(!?:1.16.3)/(.*)$
/docs/nifi-docs/components/org.apache.nifi/$1/1.16.3/$2 [L, R]
[nifi-site] branch asf-staging updated: Published changes from 777abe057175ee0dc68bf3ac596a34b1883f2885
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch asf-staging
in repository https://gitbox.apache.org/repos/asf/nifi-site.git
The following commit(s) were added to refs/heads/asf-staging by this push:
new 7387bb0 Published changes from
777abe057175ee0dc68bf3ac596a34b1883f2885
7387bb0 is described below
commit 7387bb00138af8fc4e6f1e65468e65d637eb7b2a
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Tue Jul 19 21:19:39 2022 +
Published changes from 777abe057175ee0dc68bf3ac596a34b1883f2885
---
.htaccess | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.htaccess b/.htaccess
index 9ba9bcf..2a40ca6 100644
--- a/.htaccess
+++ b/.htaccess
@@ -13,6 +13,6 @@ RewriteEngine on
RewriteCond %{HTTPS} !=on
RewriteRule ^(.*)$ https://%{SERVER_NAME}%{REQUEST_URI} [L,R]
-
+
Redirect
"https://%{HTTP_HOST}/docs/nifi-docs/components/org.apache.nifi/$1/1.16.3/$2";
[nifi-site] branch main-staging updated (e862053 -> 777abe0)
This is an automated email from the ASF dual-hosted git repository. exceptionfactory pushed a change to branch main-staging in repository https://gitbox.apache.org/repos/asf/nifi-site.git discard e862053 NIFI-9802 Changed documentation redirect to use LocationMatch new 777abe0 NIFI-9802 Changed documentation redirect to use LocationMatch This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (e862053) \ N -- N -- N refs/heads/main-staging (777abe0) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: static/.htaccess | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[nifi-site] 01/01: NIFI-9802 Changed documentation redirect to use LocationMatch
This is an automated email from the ASF dual-hosted git repository.
exceptionfactory pushed a commit to branch main-staging
in repository https://gitbox.apache.org/repos/asf/nifi-site.git
commit 777abe057175ee0dc68bf3ac596a34b1883f2885
Author: exceptionfactory
AuthorDate: Tue Jul 19 15:52:03 2022 -0500
NIFI-9802 Changed documentation redirect to use LocationMatch
---
static/.htaccess | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/static/.htaccess b/static/.htaccess
index 9ec5be9..2a40ca6 100644
--- a/static/.htaccess
+++ b/static/.htaccess
@@ -13,6 +13,6 @@ RewriteEngine on
RewriteCond %{HTTPS} !=on
RewriteRule ^(.*)$ https://%{SERVER_NAME}%{REQUEST_URI} [L,R]
-# Redirect component documentation to latest version
-RewriteCond %{REQUEST_URI}
!^/docs/nifi-docs/components/org\.apache\.nifi/[^/+]/1.16.3.*$
-RewriteRule
"^/docs/nifi-docs/components/org\.apache\.nifi/(\d[^/]+)/[^/]+/(.*)"
"https://%{HTTP_HOST}/docs/nifi-docs/components/org.apache.nifi/$1/1.16.3/$2";
[L]
+
+ Redirect
"https://%{HTTP_HOST}/docs/nifi-docs/components/org.apache.nifi/$1/1.16.3/$2";
+
[nifi-site] branch asf-staging updated: Published changes from e8620530f9ab88ccc5b9c948ad22ab3ebac01c3a
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch asf-staging
in repository https://gitbox.apache.org/repos/asf/nifi-site.git
The following commit(s) were added to refs/heads/asf-staging by this push:
new 3c58dbc Published changes from
e8620530f9ab88ccc5b9c948ad22ab3ebac01c3a
3c58dbc is described below
commit 3c58dbc58f6b7e98c1395d195a39ce06491c8646
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Tue Jul 19 20:53:27 2022 +
Published changes from e8620530f9ab88ccc5b9c948ad22ab3ebac01c3a
---
.htaccess | 6 +++---
sitemap.xml | 52 ++--
2 files changed, 29 insertions(+), 29 deletions(-)
diff --git a/.htaccess b/.htaccess
index 9ec5be9..9ba9bcf 100644
--- a/.htaccess
+++ b/.htaccess
@@ -13,6 +13,6 @@ RewriteEngine on
RewriteCond %{HTTPS} !=on
RewriteRule ^(.*)$ https://%{SERVER_NAME}%{REQUEST_URI} [L,R]
-# Redirect component documentation to latest version
-RewriteCond %{REQUEST_URI}
!^/docs/nifi-docs/components/org\.apache\.nifi/[^/+]/1.16.3.*$
-RewriteRule
"^/docs/nifi-docs/components/org\.apache\.nifi/(\d[^/]+)/[^/]+/(.*)"
"https://%{HTTP_HOST}/docs/nifi-docs/components/org.apache.nifi/$1/1.16.3/$2";
[L]
+
+ Redirect
"https://%{HTTP_HOST}/docs/nifi-docs/components/org.apache.nifi/$1/1.16.3/$2";
+
diff --git a/sitemap.xml b/sitemap.xml
index d9e6e9a..4f66f63 100644
--- a/sitemap.xml
+++ b/sitemap.xml
@@ -4,132 +4,132 @@
https://nifi.apache.org/
-2022-07-19T14:40:39-05:00
+2022-07-19T15:52:03-05:00
https://nifi.apache.org/fds.html
-2022-07-19T14:40:39-05:00
+2022-07-19T15:52:03-05:00
https://nifi.apache.org/minifi/
-2022-07-19T14:40:39-05:00
+2022-07-19T15:52:03-05:00
https://nifi.apache.org/minifi/download.html
-2022-07-19T14:40:39-05:00
+2022-07-19T15:52:03-05:00
https://nifi.apache.org/registry.html
-2022-07-19T14:40:39-05:00
+2022-07-19T15:52:03-05:00
https://nifi.apache.org/developer-guide.html
-2022-07-19T14:40:39-05:00
+2022-07-19T15:52:03-05:00
https://nifi.apache.org/quickstart.html
-2022-07-19T14:40:39-05:00
+2022-07-19T15:52:03-05:00
https://nifi.apache.org/docs.html
-2022-07-19T14:40:39-05:00
+2022-07-19T15:52:03-05:00
https://nifi.apache.org/download.html
-2022-07-19T14:40:39-05:00
+2022-07-19T15:52:03-05:00
https://nifi.apache.org/faq.html
-2022-07-19T14:40:39-05:00
+2022-07-19T15:52:03-05:00
https://nifi.apache.org/minifi/faq.html
-2022-07-19T14:40:39-05:00
+2022-07-19T15:52:03-05:00
https://nifi.apache.org/fds-release-guide.html
-2022-07-19T14:40:39-05:00
+2022-07-19T15:52:03-05:00
https://nifi.apache.org/licensing-guide.html
-2022-07-19T14:40:39-05:00
+2022-07-19T15:52:03-05:00
https://nifi.apache.org/mailing_lists.html
-2022-07-19T14:40:39-05:00
+2022-07-19T15:52:03-05:00
https://nifi.apache.org/minifi/getting-started.html
-2022-07-19T14:40:39-05:00
+2022-07-19T15:52:03-05:00
https://nifi.apache.org/minifi/minifi-java-agent-quick-start.html
-2022-07-19T14:40:39-05:00
+2022-07-19T15:52:03-05:00
https://nifi.apache.org/minifi/system-admin-guide.html
-2022-07-19T14:40:39-05:00
+2022-07-19T15:52:03-05:00
https://nifi.apache.org/minifi/minifi-toolkit.html
-2022-07-19T14:40:39-05:00
+2022-07-19T15:52:03-05:00
https://nifi.apache.org/registry-security.html
-2022-07-19T14:40:39-05:00
+2022-07-19T15:52:03-05:00
https://nifi.apache.org/release-guide.html
-2022-07-19T14:40:39-05:00
+2022-07-19T15:52:03-05:00
https://nifi.apache.org/videos.html
-2022-07-19T14:40:39-05:00
+2022-07-19T15:52:03-05:00
https://nifi.apache.org/security.html
-2022-07-19T14:40:39-05:00
+2022-07-19T15:52:03-05:00
https://nifi.apache.org/people.html
-2022-07-19T14:40:39-05:00
+2022-07-19T15:52:03-05:00
https://nifi.apache.org/gpg.html
-2022-07-19T14:40:39-05:00
+2022-07-19T15:52:03-05:00
https://nifi.apache.org/minifi.html
-2022-07-19T14:40:39-05:00
+2022-07-19T15:52:03-05:00
https://nifi.apache.org/powered-by-nifi.html
-2022-07-19T14:40:39-05:00
+2022-07-19T15:52:03-05:00
\ No newline at end of file
[nifi-site] branch main-staging updated: NIFI-9802 Changed documentation redirect to use LocationMatch
This is an automated email from the ASF dual-hosted git repository.
exceptionfactory pushed a commit to branch main-staging
in repository https://gitbox.apache.org/repos/asf/nifi-site.git
The following commit(s) were added to refs/heads/main-staging by this push:
new e862053 NIFI-9802 Changed documentation redirect to use LocationMatch
e862053 is described below
commit e8620530f9ab88ccc5b9c948ad22ab3ebac01c3a
Author: exceptionfactory
AuthorDate: Tue Jul 19 15:52:03 2022 -0500
NIFI-9802 Changed documentation redirect to use LocationMatch
---
static/.htaccess | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/static/.htaccess b/static/.htaccess
index 9ec5be9..9ba9bcf 100644
--- a/static/.htaccess
+++ b/static/.htaccess
@@ -13,6 +13,6 @@ RewriteEngine on
RewriteCond %{HTTPS} !=on
RewriteRule ^(.*)$ https://%{SERVER_NAME}%{REQUEST_URI} [L,R]
-# Redirect component documentation to latest version
-RewriteCond %{REQUEST_URI}
!^/docs/nifi-docs/components/org\.apache\.nifi/[^/+]/1.16.3.*$
-RewriteRule
"^/docs/nifi-docs/components/org\.apache\.nifi/(\d[^/]+)/[^/]+/(.*)"
"https://%{HTTP_HOST}/docs/nifi-docs/components/org.apache.nifi/$1/1.16.3/$2";
[L]
+
+ Redirect
"https://%{HTTP_HOST}/docs/nifi-docs/components/org.apache.nifi/$1/1.16.3/$2";
+
[nifi-site] branch asf-staging updated: Published changes from b844f8f12c37e942b1f34d3cb39fb991f41ea52c
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch asf-staging
in repository https://gitbox.apache.org/repos/asf/nifi-site.git
The following commit(s) were added to refs/heads/asf-staging by this push:
new 2a471f1 Published changes from
b844f8f12c37e942b1f34d3cb39fb991f41ea52c
2a471f1 is described below
commit 2a471f12c6bdfafc3cb6661a1d06a4313970f33d
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Tue Jul 19 20:04:00 2022 +
Published changes from b844f8f12c37e942b1f34d3cb39fb991f41ea52c
---
.htaccess | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.htaccess b/.htaccess
index 4e8ac4f..9ec5be9 100644
--- a/.htaccess
+++ b/.htaccess
@@ -14,5 +14,5 @@ RewriteCond %{HTTPS} !=on
RewriteRule ^(.*)$ https://%{SERVER_NAME}%{REQUEST_URI} [L,R]
# Redirect component documentation to latest version
-RewriteCond %{REQUEST_URI}
!^/docs/nifi-docs/components/org\.apache\.nifi/[^/+]/1.16.3
+RewriteCond %{REQUEST_URI}
!^/docs/nifi-docs/components/org\.apache\.nifi/[^/+]/1.16.3.*$
RewriteRule
"^/docs/nifi-docs/components/org\.apache\.nifi/(\d[^/]+)/[^/]+/(.*)"
"https://%{HTTP_HOST}/docs/nifi-docs/components/org.apache.nifi/$1/1.16.3/$2";
[L]
[nifi-site] branch main-staging updated (8fa6e3f -> b844f8f)
This is an automated email from the ASF dual-hosted git repository. exceptionfactory pushed a change to branch main-staging in repository https://gitbox.apache.org/repos/asf/nifi-site.git discard 8fa6e3f NIFI-9802 Adjusted documentation rewrite rules for 1.16.3 new b844f8f NIFI-9802 Adjusted documentation rewrite rules for 1.16.3 This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (8fa6e3f) \ N -- N -- N refs/heads/main-staging (b844f8f) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: static/.htaccess | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[nifi-site] 01/01: NIFI-9802 Adjusted documentation rewrite rules for 1.16.3
This is an automated email from the ASF dual-hosted git repository.
exceptionfactory pushed a commit to branch main-staging
in repository https://gitbox.apache.org/repos/asf/nifi-site.git
commit b844f8f12c37e942b1f34d3cb39fb991f41ea52c
Author: exceptionfactory
AuthorDate: Tue Jul 19 14:40:39 2022 -0500
NIFI-9802 Adjusted documentation rewrite rules for 1.16.3
---
static/.htaccess | 7 ---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/static/.htaccess b/static/.htaccess
index d287058..9ec5be9 100644
--- a/static/.htaccess
+++ b/static/.htaccess
@@ -8,10 +8,11 @@ AddType application/owl+xml .owl
AddType text/trig .trig
AddType application/n-quads .nq
-# Redirect component documentation to latest version
-RedirectMatch 302
^/docs/nifi-docs/components/org\.apache\.nifi/([^/]+)/[^/]+/(.*)
"https://%{HTTP_HOST}/docs/nifi-docs/components/org.apache.nifi/$1/1.16.3/$2";
-
RewriteEngine on
# Switch http to https
RewriteCond %{HTTPS} !=on
RewriteRule ^(.*)$ https://%{SERVER_NAME}%{REQUEST_URI} [L,R]
+
+# Redirect component documentation to latest version
+RewriteCond %{REQUEST_URI}
!^/docs/nifi-docs/components/org\.apache\.nifi/[^/+]/1.16.3.*$
+RewriteRule
"^/docs/nifi-docs/components/org\.apache\.nifi/(\d[^/]+)/[^/]+/(.*)"
"https://%{HTTP_HOST}/docs/nifi-docs/components/org.apache.nifi/$1/1.16.3/$2";
[L]
[nifi-site] branch asf-staging updated: Published changes from 8fa6e3f55e8570edd5156ae75ab2385e68c2b478
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch asf-staging
in repository https://gitbox.apache.org/repos/asf/nifi-site.git
The following commit(s) were added to refs/heads/asf-staging by this push:
new c9cc671 Published changes from
8fa6e3f55e8570edd5156ae75ab2385e68c2b478
c9cc671 is described below
commit c9cc67130f444a9a67056b1feee57ae58624ea48
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Tue Jul 19 19:41:28 2022 +
Published changes from 8fa6e3f55e8570edd5156ae75ab2385e68c2b478
---
.htaccess | 7 ---
sitemap.xml | 52 ++--
2 files changed, 30 insertions(+), 29 deletions(-)
diff --git a/.htaccess b/.htaccess
index d287058..4e8ac4f 100644
--- a/.htaccess
+++ b/.htaccess
@@ -8,10 +8,11 @@ AddType application/owl+xml .owl
AddType text/trig .trig
AddType application/n-quads .nq
-# Redirect component documentation to latest version
-RedirectMatch 302
^/docs/nifi-docs/components/org\.apache\.nifi/([^/]+)/[^/]+/(.*)
"https://%{HTTP_HOST}/docs/nifi-docs/components/org.apache.nifi/$1/1.16.3/$2";
-
RewriteEngine on
# Switch http to https
RewriteCond %{HTTPS} !=on
RewriteRule ^(.*)$ https://%{SERVER_NAME}%{REQUEST_URI} [L,R]
+
+# Redirect component documentation to latest version
+RewriteCond %{REQUEST_URI}
!^/docs/nifi-docs/components/org\.apache\.nifi/[^/+]/1.16.3
+RewriteRule
"^/docs/nifi-docs/components/org\.apache\.nifi/(\d[^/]+)/[^/]+/(.*)"
"https://%{HTTP_HOST}/docs/nifi-docs/components/org.apache.nifi/$1/1.16.3/$2";
[L]
diff --git a/sitemap.xml b/sitemap.xml
index 860451b..d9e6e9a 100644
--- a/sitemap.xml
+++ b/sitemap.xml
@@ -4,132 +4,132 @@
https://nifi.apache.org/
-2022-07-19T13:56:42-05:00
+2022-07-19T14:40:39-05:00
https://nifi.apache.org/fds.html
-2022-07-19T13:56:42-05:00
+2022-07-19T14:40:39-05:00
https://nifi.apache.org/minifi/
-2022-07-19T13:56:42-05:00
+2022-07-19T14:40:39-05:00
https://nifi.apache.org/minifi/download.html
-2022-07-19T13:56:42-05:00
+2022-07-19T14:40:39-05:00
https://nifi.apache.org/registry.html
-2022-07-19T13:56:42-05:00
+2022-07-19T14:40:39-05:00
https://nifi.apache.org/developer-guide.html
-2022-07-19T13:56:42-05:00
+2022-07-19T14:40:39-05:00
https://nifi.apache.org/quickstart.html
-2022-07-19T13:56:42-05:00
+2022-07-19T14:40:39-05:00
https://nifi.apache.org/docs.html
-2022-07-19T13:56:42-05:00
+2022-07-19T14:40:39-05:00
https://nifi.apache.org/download.html
-2022-07-19T13:56:42-05:00
+2022-07-19T14:40:39-05:00
https://nifi.apache.org/faq.html
-2022-07-19T13:56:42-05:00
+2022-07-19T14:40:39-05:00
https://nifi.apache.org/minifi/faq.html
-2022-07-19T13:56:42-05:00
+2022-07-19T14:40:39-05:00
https://nifi.apache.org/fds-release-guide.html
-2022-07-19T13:56:42-05:00
+2022-07-19T14:40:39-05:00
https://nifi.apache.org/licensing-guide.html
-2022-07-19T13:56:42-05:00
+2022-07-19T14:40:39-05:00
https://nifi.apache.org/mailing_lists.html
-2022-07-19T13:56:42-05:00
+2022-07-19T14:40:39-05:00
https://nifi.apache.org/minifi/getting-started.html
-2022-07-19T13:56:42-05:00
+2022-07-19T14:40:39-05:00
https://nifi.apache.org/minifi/minifi-java-agent-quick-start.html
-2022-07-19T13:56:42-05:00
+2022-07-19T14:40:39-05:00
https://nifi.apache.org/minifi/system-admin-guide.html
-2022-07-19T13:56:42-05:00
+2022-07-19T14:40:39-05:00
https://nifi.apache.org/minifi/minifi-toolkit.html
-2022-07-19T13:56:42-05:00
+2022-07-19T14:40:39-05:00
https://nifi.apache.org/registry-security.html
-2022-07-19T13:56:42-05:00
+2022-07-19T14:40:39-05:00
https://nifi.apache.org/release-guide.html
-2022-07-19T13:56:42-05:00
+2022-07-19T14:40:39-05:00
https://nifi.apache.org/videos.html
-2022-07-19T13:56:42-05:00
+2022-07-19T14:40:39-05:00
https://nifi.apache.org/security.html
-2022-07-19T13:56:42-05:00
+2022-07-19T14:40:39-05:00
https://nifi.apache.org/people.html
-2022-07-19T13:56:42-05:00
+2022-07-19T14:40:39-05:00
https://nifi.apache.org/gpg.html
-2022-07-19T13:56:42-05:00
+2022-07-19T14:40:39-05:00
https://nifi.apache.org/minifi.html
-2022-07-19T13:56:42-05:00
+2022-07-19T14:40:39-05:00
https://nifi.apache.org/powered-by-nifi.html
-2022-07-19T13:56:42-05:00
+2022-07-19T14:40:39-05:00
\ No newline at end of file
[nifi-site] branch main-staging updated: NIFI-9802 Adjusted documentation rewrite rules for 1.16.3
This is an automated email from the ASF dual-hosted git repository.
exceptionfactory pushed a commit to branch main-staging
in repository https://gitbox.apache.org/repos/asf/nifi-site.git
The following commit(s) were added to refs/heads/main-staging by this push:
new 8fa6e3f NIFI-9802 Adjusted documentation rewrite rules for 1.16.3
8fa6e3f is described below
commit 8fa6e3f55e8570edd5156ae75ab2385e68c2b478
Author: exceptionfactory
AuthorDate: Tue Jul 19 14:40:39 2022 -0500
NIFI-9802 Adjusted documentation rewrite rules for 1.16.3
---
static/.htaccess | 7 ---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/static/.htaccess b/static/.htaccess
index d287058..4e8ac4f 100644
--- a/static/.htaccess
+++ b/static/.htaccess
@@ -8,10 +8,11 @@ AddType application/owl+xml .owl
AddType text/trig .trig
AddType application/n-quads .nq
-# Redirect component documentation to latest version
-RedirectMatch 302
^/docs/nifi-docs/components/org\.apache\.nifi/([^/]+)/[^/]+/(.*)
"https://%{HTTP_HOST}/docs/nifi-docs/components/org.apache.nifi/$1/1.16.3/$2";
-
RewriteEngine on
# Switch http to https
RewriteCond %{HTTPS} !=on
RewriteRule ^(.*)$ https://%{SERVER_NAME}%{REQUEST_URI} [L,R]
+
+# Redirect component documentation to latest version
+RewriteCond %{REQUEST_URI}
!^/docs/nifi-docs/components/org\.apache\.nifi/[^/+]/1.16.3
+RewriteRule
"^/docs/nifi-docs/components/org\.apache\.nifi/(\d[^/]+)/[^/]+/(.*)"
"https://%{HTTP_HOST}/docs/nifi-docs/components/org.apache.nifi/$1/1.16.3/$2";
[L]
[nifi-site] branch asf-staging updated: Published changes from 6cef4035b8589705bd16bdd60c2e389513835def
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch asf-staging
in repository https://gitbox.apache.org/repos/asf/nifi-site.git
The following commit(s) were added to refs/heads/asf-staging by this push:
new 899ab5e Published changes from
6cef4035b8589705bd16bdd60c2e389513835def
899ab5e is described below
commit 899ab5e86826b03345431af3deea0b5521bd4aaa
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Tue Jul 19 19:11:07 2022 +
Published changes from 6cef4035b8589705bd16bdd60c2e389513835def
---
.htaccess | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.htaccess b/.htaccess
index c47678f..d287058 100644
--- a/.htaccess
+++ b/.htaccess
@@ -9,7 +9,7 @@ AddType text/trig .trig
AddType application/n-quads .nq
# Redirect component documentation to latest version
-RedirectMatch ^/docs/nifi-docs/components/org.apache.nifi/([^/]+)/[^/]+/(.*)
"/docs/nifi-docs/components/org.apache.nifi/$1/1.16.3/$2"
+RedirectMatch 302
^/docs/nifi-docs/components/org\.apache\.nifi/([^/]+)/[^/]+/(.*)
"https://%{HTTP_HOST}/docs/nifi-docs/components/org.apache.nifi/$1/1.16.3/$2";
RewriteEngine on
# Switch http to https
[nifi-site] 01/01: NIFI-9802 Added RedirectMatch for component documentation
This is an automated email from the ASF dual-hosted git repository.
exceptionfactory pushed a commit to branch main-staging
in repository https://gitbox.apache.org/repos/asf/nifi-site.git
commit 6cef4035b8589705bd16bdd60c2e389513835def
Author: exceptionfactory
AuthorDate: Tue Jul 19 13:56:42 2022 -0500
NIFI-9802 Added RedirectMatch for component documentation
---
static/.htaccess | 3 +++
1 file changed, 3 insertions(+)
diff --git a/static/.htaccess b/static/.htaccess
index 4e4b6f8..d287058 100644
--- a/static/.htaccess
+++ b/static/.htaccess
@@ -8,6 +8,9 @@ AddType application/owl+xml .owl
AddType text/trig .trig
AddType application/n-quads .nq
+# Redirect component documentation to latest version
+RedirectMatch 302
^/docs/nifi-docs/components/org\.apache\.nifi/([^/]+)/[^/]+/(.*)
"https://%{HTTP_HOST}/docs/nifi-docs/components/org.apache.nifi/$1/1.16.3/$2";
+
RewriteEngine on
# Switch http to https
RewriteCond %{HTTPS} !=on
[nifi-site] branch main-staging updated (2a179bf -> 6cef403)
This is an automated email from the ASF dual-hosted git repository. exceptionfactory pushed a change to branch main-staging in repository https://gitbox.apache.org/repos/asf/nifi-site.git discard 2a179bf NIFI-9802 Added RedirectMatch for component documentation new 6cef403 NIFI-9802 Added RedirectMatch for component documentation This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (2a179bf) \ N -- N -- N refs/heads/main-staging (6cef403) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: static/.htaccess | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[nifi-site] branch asf-staging updated: Published changes from 2a179bf287924fe5c06c9e3d8169820b7f1063d6
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch asf-staging
in repository https://gitbox.apache.org/repos/asf/nifi-site.git
The following commit(s) were added to refs/heads/asf-staging by this push:
new 6850c67 Published changes from
2a179bf287924fe5c06c9e3d8169820b7f1063d6
6850c67 is described below
commit 6850c67da02b4e0f0143db0a37bba50122213030
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Tue Jul 19 18:57:47 2022 +
Published changes from 2a179bf287924fe5c06c9e3d8169820b7f1063d6
---
.htaccess | 3 +++
sitemap.xml | 52 ++--
2 files changed, 29 insertions(+), 26 deletions(-)
diff --git a/.htaccess b/.htaccess
index 4e4b6f8..c47678f 100644
--- a/.htaccess
+++ b/.htaccess
@@ -8,6 +8,9 @@ AddType application/owl+xml .owl
AddType text/trig .trig
AddType application/n-quads .nq
+# Redirect component documentation to latest version
+RedirectMatch ^/docs/nifi-docs/components/org.apache.nifi/([^/]+)/[^/]+/(.*)
"/docs/nifi-docs/components/org.apache.nifi/$1/1.16.3/$2"
+
RewriteEngine on
# Switch http to https
RewriteCond %{HTTPS} !=on
diff --git a/sitemap.xml b/sitemap.xml
index b1d0af6..860451b 100644
--- a/sitemap.xml
+++ b/sitemap.xml
@@ -4,132 +4,132 @@
https://nifi.apache.org/
-2022-07-15T15:40:35-05:00
+2022-07-19T13:56:42-05:00
https://nifi.apache.org/fds.html
-2022-07-15T15:40:35-05:00
+2022-07-19T13:56:42-05:00
https://nifi.apache.org/minifi/
-2022-07-15T15:40:35-05:00
+2022-07-19T13:56:42-05:00
https://nifi.apache.org/minifi/download.html
-2022-07-15T15:40:35-05:00
+2022-07-19T13:56:42-05:00
https://nifi.apache.org/registry.html
-2022-07-15T15:40:35-05:00
+2022-07-19T13:56:42-05:00
https://nifi.apache.org/developer-guide.html
-2022-07-15T15:40:35-05:00
+2022-07-19T13:56:42-05:00
https://nifi.apache.org/quickstart.html
-2022-07-15T15:40:35-05:00
+2022-07-19T13:56:42-05:00
https://nifi.apache.org/docs.html
-2022-07-15T15:40:35-05:00
+2022-07-19T13:56:42-05:00
https://nifi.apache.org/download.html
-2022-07-15T15:40:35-05:00
+2022-07-19T13:56:42-05:00
https://nifi.apache.org/faq.html
-2022-07-15T15:40:35-05:00
+2022-07-19T13:56:42-05:00
https://nifi.apache.org/minifi/faq.html
-2022-07-15T15:40:35-05:00
+2022-07-19T13:56:42-05:00
https://nifi.apache.org/fds-release-guide.html
-2022-07-15T15:40:35-05:00
+2022-07-19T13:56:42-05:00
https://nifi.apache.org/licensing-guide.html
-2022-07-15T15:40:35-05:00
+2022-07-19T13:56:42-05:00
https://nifi.apache.org/mailing_lists.html
-2022-07-15T15:40:35-05:00
+2022-07-19T13:56:42-05:00
https://nifi.apache.org/minifi/getting-started.html
-2022-07-15T15:40:35-05:00
+2022-07-19T13:56:42-05:00
https://nifi.apache.org/minifi/minifi-java-agent-quick-start.html
-2022-07-15T15:40:35-05:00
+2022-07-19T13:56:42-05:00
https://nifi.apache.org/minifi/system-admin-guide.html
-2022-07-15T15:40:35-05:00
+2022-07-19T13:56:42-05:00
https://nifi.apache.org/minifi/minifi-toolkit.html
-2022-07-15T15:40:35-05:00
+2022-07-19T13:56:42-05:00
https://nifi.apache.org/registry-security.html
-2022-07-15T15:40:35-05:00
+2022-07-19T13:56:42-05:00
https://nifi.apache.org/release-guide.html
-2022-07-15T15:40:35-05:00
+2022-07-19T13:56:42-05:00
https://nifi.apache.org/videos.html
-2022-07-15T15:40:35-05:00
+2022-07-19T13:56:42-05:00
https://nifi.apache.org/security.html
-2022-07-15T15:40:35-05:00
+2022-07-19T13:56:42-05:00
https://nifi.apache.org/people.html
-2022-07-15T15:40:35-05:00
+2022-07-19T13:56:42-05:00
https://nifi.apache.org/gpg.html
-2022-07-15T15:40:35-05:00
+2022-07-19T13:56:42-05:00
https://nifi.apache.org/minifi.html
-2022-07-15T15:40:35-05:00
+2022-07-19T13:56:42-05:00
https://nifi.apache.org/powered-by-nifi.html
-2022-07-15T15:40:35-05:00
+2022-07-19T13:56:42-05:00
\ No newline at end of file
[nifi-site] branch main-staging updated: NIFI-9802 Added RedirectMatch for component documentation
This is an automated email from the ASF dual-hosted git repository.
exceptionfactory pushed a commit to branch main-staging
in repository https://gitbox.apache.org/repos/asf/nifi-site.git
The following commit(s) were added to refs/heads/main-staging by this push:
new 2a179bf NIFI-9802 Added RedirectMatch for component documentation
2a179bf is described below
commit 2a179bf287924fe5c06c9e3d8169820b7f1063d6
Author: exceptionfactory
AuthorDate: Tue Jul 19 13:56:42 2022 -0500
NIFI-9802 Added RedirectMatch for component documentation
---
static/.htaccess | 3 +++
1 file changed, 3 insertions(+)
diff --git a/static/.htaccess b/static/.htaccess
index 4e4b6f8..c47678f 100644
--- a/static/.htaccess
+++ b/static/.htaccess
@@ -8,6 +8,9 @@ AddType application/owl+xml .owl
AddType text/trig .trig
AddType application/n-quads .nq
+# Redirect component documentation to latest version
+RedirectMatch ^/docs/nifi-docs/components/org.apache.nifi/([^/]+)/[^/]+/(.*)
"/docs/nifi-docs/components/org.apache.nifi/$1/1.16.3/$2"
+
RewriteEngine on
# Switch http to https
RewriteCond %{HTTPS} !=on
svn commit: r1902862 - in /nifi/site/trunk/docs: nifi-docs/components/nifi-docs/ nifi-docs/components/nifi/ nifi-docs/components/robots.txt nifi-docs/nifi-docs/ nifi-docs/nifi/ nifi-docs/robots.txt ro
Author: exceptionfactory Date: Tue Jul 19 18:53:40 2022 New Revision: 1902862 URL: http://svn.apache.org/viewvc?rev=1902862&view=rev Log: Removed duplicated unused copies of 1.9.0 documentation and robots.txt files Removed: nifi/site/trunk/docs/nifi-docs/components/nifi/ nifi/site/trunk/docs/nifi-docs/components/nifi-docs/ nifi/site/trunk/docs/nifi-docs/components/robots.txt nifi/site/trunk/docs/nifi-docs/nifi/ nifi/site/trunk/docs/nifi-docs/nifi-docs/ nifi/site/trunk/docs/nifi-docs/robots.txt nifi/site/trunk/docs/robots.txt
[nifi] branch main updated: NIFI-9812 Disabled Native Lib loading tests on ARM64
This is an automated email from the ASF dual-hosted git repository.
exceptionfactory pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/main by this push:
new ccf3866261 NIFI-9812 Disabled Native Lib loading tests on ARM64
ccf3866261 is described below
commit ccf386626142e8e8447e0983d75b893d289cc5b8
Author: Kevin Doran
AuthorDate: Sat Jul 16 13:10:39 2022 -0400
NIFI-9812 Disabled Native Lib loading tests on ARM64
- Migrate tests in nifi-framework-mark-loading-utils to JUnit5
- Annotate tests that use x86_64 native binaries to be conditional on
x86_64 os.arch
This closes #6215
Signed-off-by: David Handermann
---
.../org/apache/nifi/nar/AbstractTestNarLoader.java | 16 ---
.../apache/nifi/nar/TestLoadNativeLibFromNar.java | 18 -
.../nar/TestLoadNativeLibViaSystemProperty.java| 23 --
.../java/org/apache/nifi/nar/TestNarLoader.java| 20 +--
4 files changed, 34 insertions(+), 43 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-nar-loading-utils/src/test/java/org/apache/nifi/nar/AbstractTestNarLoader.java
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-nar-loading-utils/src/test/java/org/apache/nifi/nar/AbstractTestNarLoader.java
index a34ef92c7c..5548031aa2 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-nar-loading-utils/src/test/java/org/apache/nifi/nar/AbstractTestNarLoader.java
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-nar-loading-utils/src/test/java/org/apache/nifi/nar/AbstractTestNarLoader.java
@@ -16,15 +16,12 @@
*/
package org.apache.nifi.nar;
-import org.apache.commons.lang3.SystemUtils;
import org.apache.nifi.bundle.Bundle;
import org.apache.nifi.controller.ControllerService;
import org.apache.nifi.processor.Processor;
import org.apache.nifi.reporting.ReportingTask;
import org.apache.nifi.util.NiFiProperties;
-import org.junit.Assume;
-import org.junit.Before;
-import org.junit.BeforeClass;
+import org.junit.jupiter.api.BeforeEach;
import java.io.File;
import java.io.IOException;
@@ -36,8 +33,8 @@ import java.nio.file.SimpleFileVisitor;
import java.nio.file.attribute.BasicFileAttributes;
import java.util.Collections;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public abstract class AbstractTestNarLoader {
abstract String getWorkDir();
@@ -52,12 +49,7 @@ public abstract class AbstractTestNarLoader {
NarClassLoaders narClassLoaders;
ExtensionDiscoveringManager extensionManager;
-@BeforeClass
-public static void setupClass() {
-Assume.assumeTrue("Test only runs on *nix",
!SystemUtils.IS_OS_WINDOWS);
-}
-
-@Before
+@BeforeEach
public void setup() throws IOException, ClassNotFoundException {
deleteDir(getWorkDir());
deleteDir(getNarAutoloadDir());
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-nar-loading-utils/src/test/java/org/apache/nifi/nar/TestLoadNativeLibFromNar.java
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-nar-loading-utils/src/test/java/org/apache/nifi/nar/TestLoadNativeLibFromNar.java
index a54eda5dbd..49033f50fe 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-nar-loading-utils/src/test/java/org/apache/nifi/nar/TestLoadNativeLibFromNar.java
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-nar-loading-utils/src/test/java/org/apache/nifi/nar/TestLoadNativeLibFromNar.java
@@ -17,8 +17,10 @@
package org.apache.nifi.nar;
import org.apache.nifi.bundle.Bundle;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
+import org.junit.jupiter.api.condition.EnabledOnOs;
+import org.junit.jupiter.api.condition.OS;
import java.io.File;
import java.nio.file.Files;
@@ -34,21 +36,17 @@ import java.util.stream.Collectors;
import static org.hamcrest.CoreMatchers.containsString;
import static org.hamcrest.CoreMatchers.hasItem;
import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assume.assumeTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+@EnabledOnOs({ OS.MAC })
+@DisabledIfSystemProperty(named = "os.arch", matches = "aarch64|arm64")
public class TestLoadNativeLibFromNar extends AbstractTestNarLoader {
static final String WORK_DIR = "./target/work";
static final St
[nifi] branch main updated: NIFI-10249 Enabled Parallel Builds in GitHub Workflow
This is an automated email from the ASF dual-hosted git repository.
kdoran pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/main by this push:
new 8185ad0598 NIFI-10249 Enabled Parallel Builds in GitHub Workflow
8185ad0598 is described below
commit 8185ad05986d4b2c24cb892adce0422031cb1d06
Author: exceptionfactory
AuthorDate: Mon Jul 18 14:15:20 2022 -0500
NIFI-10249 Enabled Parallel Builds in GitHub Workflow
- Upgraded maven-enforcer-plugin from 3.0.0 to 3.1.0
- Upgraded maven-dependency-plugin from 3.2.0 to 3.3.0
- Upgraded checkstyle from 9.2.1 to 9.3
- Upgraded buildnumber-maven-plugin from 1.4 to 3.0.0
This closes #6222.
Signed-off-by: Kevin Doran
---
.github/workflows/ci-workflow.yml | 25 -
pom.xml | 14 --
2 files changed, 16 insertions(+), 23 deletions(-)
diff --git a/.github/workflows/ci-workflow.yml
b/.github/workflows/ci-workflow.yml
index 7511137136..abf17320d4 100644
--- a/.github/workflows/ci-workflow.yml
+++ b/.github/workflows/ci-workflow.yml
@@ -33,6 +33,7 @@ env:
-nsu
-ntp
-ff
+--threads 1C
MAVEN_BUILD_PROFILES: >-
-P include-grpc
-P skip-nifi-bin-assembly
@@ -57,12 +58,18 @@ jobs:
steps:
- name: Checkout Code
uses: actions/checkout@v3
+ - name: Cache Maven Modules
+uses: actions/cache@v3
+with:
+ path: |
+~/.m2/repository
+ # Cache Maven modules using a cache key different from setup-java
steps
+ key: ${{ runner.os }}-maven-static-analysis-${{
hashFiles('**/pom.xml') }}
- name: Set up Java 17
uses: actions/setup-java@v3
with:
distribution: 'zulu'
java-version: '17'
- cache: 'maven'
- name: Maven Build
run: >
mvn validate
@@ -91,9 +98,7 @@ jobs:
path: |
~/.npm
**/node_modules
- key: ${{ runner.os }}-npm16-${{ hashFiles('**/package-lock.json') }}
- restore-keys: |
-${{ runner.os }}-npm16-
+ key: ${{ runner.os }}-npm-${{ hashFiles('**/package-lock.json') }}
- name: Set up Java 17
uses: actions/setup-java@v3
with:
@@ -148,9 +153,7 @@ jobs:
path: |
~/.npm
**/node_modules
- key: ${{ runner.os }}-npm16-${{ hashFiles('**/package-lock.json') }}
- restore-keys: |
-${{ runner.os }}-npm16-
+ key: ${{ runner.os }}-npm-${{ hashFiles('**/package-lock.json') }}
- name: Set up Java 11
uses: actions/setup-java@v3
with:
@@ -205,9 +208,7 @@ jobs:
path: |
~/.npm
**/node_modules
- key: ${{ runner.os }}-npm16-${{ hashFiles('**/package-lock.json') }}
- restore-keys: |
-${{ runner.os }}-npm16-
+ key: ${{ runner.os }}-npm-${{ hashFiles('**/package-lock.json') }}
- name: Set up Java 8
uses: actions/setup-java@v3
with:
@@ -268,9 +269,7 @@ jobs:
path: |
${{ steps.npm-cache-directory.outputs.directory }}
**/node_modules
- key: ${{ runner.os }}-npm16-${{ hashFiles('**/package-lock.json') }}
- restore-keys: |
-${{ runner.os }}-npm16-
+ key: ${{ runner.os }}-npm-${{ hashFiles('**/package-lock.json') }}
- name: Set up Java 8
uses: actions/setup-java@v3
with:
diff --git a/pom.xml b/pom.xml
index e94680a5d0..d390a7db1a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -709,7 +709,7 @@
org.codehaus.mojo
buildnumber-maven-plugin
-1.4
+3.0.0
org.antlr
@@ -724,14 +724,14 @@
com.puppycrawl.tools
checkstyle
-9.2.1
+9.3
org.apache.maven.plugins
maven-dependency-plugin
-3.2.0
+3.3.0
org.apache.rat
@@ -797,7 +797,7 @@
org.apache.maven.plugins
maven-enforcer-plugin
-3.0.0
+3.1.0
enforce-maven-version
@@ -975,12 +975,6 @@
-
contrib-check
[nifi] branch main updated: NIFI-9813 Excluded Ranger modules on ARM64
This is an automated email from the ASF dual-hosted git repository. exceptionfactory pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git The following commit(s) were added to refs/heads/main by this push: new 1a1037022f NIFI-9813 Excluded Ranger modules on ARM64 1a1037022f is described below commit 1a1037022f128782b24c7d928a69b06daf3cd08a Author: Kevin Doran AuthorDate: Sat Jul 16 11:13:06 2022 -0400 NIFI-9813 Excluded Ranger modules on ARM64 This closes #6216 Signed-off-by: David Handermann --- nifi-nar-bundles/pom.xml | 34 +++- nifi-registry/nifi-registry-extensions/pom.xml | 36 +- 2 files changed, 68 insertions(+), 2 deletions(-) diff --git a/nifi-nar-bundles/pom.xml b/nifi-nar-bundles/pom.xml index cc254050ac..7730578f7f 100755 --- a/nifi-nar-bundles/pom.xml +++ b/nifi-nar-bundles/pom.xml @@ -80,7 +80,6 @@ nifi-graph-bundle nifi-email-bundle nifi-groovyx-bundle -nifi-ranger-bundle nifi-websocket-bundle nifi-tcp-bundle nifi-gcp-bundle @@ -168,6 +167,39 @@ nifi-grpc-bundle + +include-ranger + + +false + + +nifi-ranger-bundle + + + +include-ranger-x86 + + +x86_64 + + + +nifi-ranger-bundle + + + +include-ranger-amd64 + + +amd64 + + + +nifi-ranger-bundle + + diff --git a/nifi-registry/nifi-registry-extensions/pom.xml b/nifi-registry/nifi-registry-extensions/pom.xml index a952d28566..f7ab68536e 100644 --- a/nifi-registry/nifi-registry-extensions/pom.xml +++ b/nifi-registry/nifi-registry-extensions/pom.xml @@ -25,7 +25,41 @@ pom -nifi-registry-ranger nifi-registry-aws + + + +include-ranger + +false + + +nifi-registry-ranger + + + +include-ranger-x86 + + +x86_64 + + + +nifi-registry-ranger + + + +include-ranger-amd64 + + +amd64 + + + +nifi-registry-ranger + + + +
[nifi] branch main updated: NIFI-9809 Disabled Kudu tests on ARM64
This is an automated email from the ASF dual-hosted git repository.
exceptionfactory pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/main by this push:
new 97e7a3c030 NIFI-9809 Disabled Kudu tests on ARM64
97e7a3c030 is described below
commit 97e7a3c030dba7925cb4e15708d003bda36903ad
Author: Kevin Doran
AuthorDate: Fri Jul 15 14:32:08 2022 -0400
NIFI-9809 Disabled Kudu tests on ARM64
This closes #6214
Signed-off-by: David Handermann
---
.../nifi-kudu-controller-service/pom.xml | 24 -
.../nifi-kudu-bundle/nifi-kudu-processors/pom.xml | 24 -
nifi-nar-bundles/nifi-kudu-bundle/pom.xml | 40 ++
3 files changed, 72 insertions(+), 16 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-kudu-bundle/nifi-kudu-controller-service/pom.xml
b/nifi-nar-bundles/nifi-kudu-bundle/nifi-kudu-controller-service/pom.xml
index 8a167584e8..766f677731 100644
--- a/nifi-nar-bundles/nifi-kudu-bundle/nifi-kudu-controller-service/pom.xml
+++ b/nifi-nar-bundles/nifi-kudu-bundle/nifi-kudu-controller-service/pom.xml
@@ -97,22 +97,29 @@
-kudu-windows
+kudu-linux-x86
-Windows
+Unix
+x86_64
-
-
-**/*.java
-
+
+
+org.apache.kudu
+kudu-binary
+${kudu.version}
+${os.detected.classifier}
+test
+
+
-kudu-linux
+kudu-linux-amd64
Unix
+amd64
@@ -126,10 +133,11 @@
-kudu-mac
+kudu-mac-x86
mac
+x86_64
diff --git a/nifi-nar-bundles/nifi-kudu-bundle/nifi-kudu-processors/pom.xml
b/nifi-nar-bundles/nifi-kudu-bundle/nifi-kudu-processors/pom.xml
index 5d45b1780b..36f5c9bb35 100644
--- a/nifi-nar-bundles/nifi-kudu-bundle/nifi-kudu-processors/pom.xml
+++ b/nifi-nar-bundles/nifi-kudu-bundle/nifi-kudu-processors/pom.xml
@@ -116,22 +116,29 @@
-kudu-windows
+kudu-linux-x86
-Windows
+Unix
+x86_64
-
-
-**/*.java
-
+
+
+org.apache.kudu
+kudu-binary
+${kudu.version}
+${os.detected.classifier}
+test
+
+
-kudu-linux
+kudu-linux-amd64
Unix
+amd64
@@ -145,10 +152,11 @@
-kudu-mac
+kudu-mac-x86
mac
+x86_64
diff --git a/nifi-nar-bundles/nifi-kudu-bundle/pom.xml
b/nifi-nar-bundles/nifi-kudu-bundle/pom.xml
index 8f2c8f5ddf..3e35b8bb50 100644
--- a/nifi-nar-bundles/nifi-kudu-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-kudu-bundle/pom.xml
@@ -35,4 +35,44 @@
nifi-kudu-nar
nifi-kudu-controller-service
+
+
+
+kudu-windows
+
+
+Windows
+
+
+
+
+**/*.java
+
+
+
+kudu-arm64
+
+
+arm64
+
+
+
+
+**/*.java
+
+
+
+kudu-aarch64
+
+
+aarch64
+
+
+
+
+**/*.java
+
+
+
+
[nifi] branch main updated: NIFI-10247 Corrected REST API documentation for empty-all-connection-requests
This is an automated email from the ASF dual-hosted git repository. exceptionfactory pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git The following commit(s) were added to refs/heads/main by this push: new 148834e71b NIFI-10247 Corrected REST API documentation for empty-all-connection-requests 148834e71b is described below commit 148834e71b93fd6f243fe8b93d93f6562851c3bd Author: Paul Grey AuthorDate: Mon Jul 18 16:45:00 2022 -0400 NIFI-10247 Corrected REST API documentation for empty-all-connection-requests This closes #6220 Signed-off-by: David Handermann --- .../src/main/java/org/apache/nifi/web/api/ProcessGroupResource.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ProcessGroupResource.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ProcessGroupResource.java index 146631613f..6176a2e026 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ProcessGroupResource.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ProcessGroupResource.java @@ -1636,7 +1636,7 @@ public class ProcessGroupResource extends FlowUpdateResource
[nifi-minifi-cpp] 02/03: MINIFICPP-1880 Address documentation issues of daemonset deployment
This is an automated email from the ASF dual-hosted git repository. szaszm pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git commit 6f9419783f22d8c6b22627aebdb21651f07278a9 Author: Gabor Gyimesi AuthorDate: Tue Jul 19 13:56:06 2022 +0200 MINIFICPP-1880 Address documentation issues of daemonset deployment Closes #1366 Signed-off-by: Marton Szasz --- examples/kubernetes/README.md | 12 .../cluster-roles/daemon.namespace.yml | 6 ++ .../cluster-roles/namespace-reader.clusterrole.yml | 9 + .../namespace-reader.clusterrolebinding.yml| 12 .../cluster-roles/pod-reader.clusterrole.yml | 9 + .../cluster-roles/pod-reader.clusterrolebinding.yml| 12 .../daemon-set-log-collection.yml | 18 +- .../sidecar-log-collection.yml | 0 8 files changed, 69 insertions(+), 9 deletions(-) diff --git a/examples/kubernetes/README.md b/examples/kubernetes/README.md index 1ff7a47b2..028505a24 100644 --- a/examples/kubernetes/README.md +++ b/examples/kubernetes/README.md @@ -18,13 +18,17 @@ The following examples show different configurations that can be applied in Kube ## Cluster level log collection with MiNiFi C++ -The [daemon-set-log-collection.yml](daemon-set-log-collection.yml) file has an example for cluster level log collection, which is done on every node by creating a daemon set. +The [daemon-set-log-collection.yml](daemon-set-log-collection/daemon-set-log-collection.yml) file has an example for cluster level log collection, which is done on every node by creating a daemon set. The config includes a KubernetesControllerService that provides the namespace, pod, uid, container variables for the TailFile processor for getting the logs for the filtered Kubernetes objects. In this specific example all container logs from the default namespace are collected and forwarded to Kafka. The controller service can be modified to have additional filters for namespaces, pods, containers, for which more information can be found in the [CONTROLLERS.md](/CONTROLLERS.md#kubernetesControllerService) documentation. -This setup complies with the ["node logging agent"](https://kubernetes.io/docs/concepts/cluster-administration/logging/#using-a-node-logging-agent) architecture described in the Kubernetes documentation. + +Note: To query Kubernetes cluster information, the MiNiFi agent requires read permission on the pod and namespace objects. One way to give read access to MiNiFi is to create specific cluster roles and cluster role bindings for a specific namespace where the MiNiFi is deployed. There is an example on this in the [daemon-set-log-collection/cluster-roles](daemon-set-log-collection/cluster-roles) directory. + +This setup complies with the [node logging agent](https://kubernetes.io/docs/concepts/cluster-administration/logging/#using-a-node-logging-agent) architecture described in the Kubernetes documentation. ## Pod level log collection with sidecar container using MiNiFi C++ -The [sidecar-log-collection.yml](sidecar-log-collection.yml) file has an example for pod level log collection, which is done by creating a sidecar container in the same pod where the container we want to collect the logs from is present. In this specific example a pod with a NiFi container is instantiated with a MiNiFi sidecar container which collects, compresses and uploads the NiFi logs to an AWS S3 bucket. -This setup complies with the ["sidecar container with logging agent"](https://kubernetes.io/docs/concepts/cluster-administration/logging/#sidecar-container-with-logging-agent) architecture described in the Kubernetes documentation. +The [sidecar-log-collection.yml](sidecar-log-collection/sidecar-log-collection.yml) file has an example for pod level log collection, which is done by creating a sidecar container in the same pod where the container we want to collect the logs from is present. In this specific example a pod with a NiFi container is instantiated with a MiNiFi sidecar container which collects, compresses and uploads the NiFi logs to an AWS S3 bucket. + +This setup complies with the [sidecar container with logging agent](https://kubernetes.io/docs/concepts/cluster-administration/logging/#sidecar-container-with-logging-agent) architecture described in the Kubernetes documentation. diff --git a/examples/kubernetes/daemon-set-log-collection/cluster-roles/daemon.namespace.yml b/examples/kubernetes/daemon-set-log-collection/cluster-roles/daemon.namespace.yml new file mode 100644 index 0..f628b21e6 --- /dev/null +++ b/examples/kubernetes/daemon-set-log-collection/cluster-roles/daemon.namespace.yml @@ -0,0 +1,6 @@ +apiVersion: v1 +kind: Namespace +metadata: + name: daemon + labels: +name: daemon diff --git a/examples/kub
[nifi-minifi-cpp] 03/03: MINIFICPP-1883 Enable compression in Prometheus client
This is an automated email from the ASF dual-hosted git repository.
szaszm pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git
commit 999304f5926f6ee5db77a67f220277076b54adf0
Author: Gabor Gyimesi
AuthorDate: Tue Jul 19 13:57:00 2022 +0200
MINIFICPP-1883 Enable compression in Prometheus client
Closes #1371
Signed-off-by: Marton Szasz
---
cmake/Prometheus.cmake | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/cmake/Prometheus.cmake b/cmake/Prometheus.cmake
index 2a1560bd5..10be31eb0 100644
--- a/cmake/Prometheus.cmake
+++ b/cmake/Prometheus.cmake
@@ -20,7 +20,7 @@ include(FetchContent)
set(ENABLE_PUSH OFF CACHE BOOL "" FORCE)
set(ENABLE_TESTING OFF CACHE BOOL "" FORCE)
set(USE_THIRDPARTY_LIBRARIES OFF CACHE BOOL "" FORCE)
-set(ENABLE_COMPRESSION OFF CACHE BOOL "" FORCE)
+set(ENABLE_COMPRESSION ON CACHE BOOL "" FORCE)
set(PATCH_FILE
"${CMAKE_SOURCE_DIR}/thirdparty/prometheus-cpp/remove-find_package.patch")
set(PC ${Bash_EXECUTABLE} -c "set -x &&\
[nifi-minifi-cpp] branch main updated (699479ca6 -> 999304f59)
This is an automated email from the ASF dual-hosted git repository.
szaszm pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git
from 699479ca6 MINIFICPP-1874 docker-verify should only run tests that are
enabled
new 799243702 MINIFICPP-1879 Fix Prometheus switch in bootstrap.sh
new 6f9419783 MINIFICPP-1880 Address documentation issues of daemonset
deployment
new 999304f59 MINIFICPP-1883 Enable compression in Prometheus client
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
bootstrap.sh | 2 +-
cmake/Prometheus.cmake | 2 +-
examples/kubernetes/README.md | 12
.../cluster-roles}/daemon.namespace.yml| 0
.../cluster-roles}/namespace-reader.clusterrole.yml| 0
.../namespace-reader.clusterrolebinding.yml| 0
.../cluster-roles}/pod-reader.clusterrole.yml | 0
.../cluster-roles}/pod-reader.clusterrolebinding.yml | 0
.../daemon-set-log-collection.yml | 18 +-
.../sidecar-log-collection.yml | 0
10 files changed, 23 insertions(+), 11 deletions(-)
copy {docker/test/integration/resources/kubernetes/pods-etc =>
examples/kubernetes/daemon-set-log-collection/cluster-roles}/daemon.namespace.yml
(100%)
copy {docker/test/integration/resources/kubernetes/pods-etc =>
examples/kubernetes/daemon-set-log-collection/cluster-roles}/namespace-reader.clusterrole.yml
(100%)
copy {docker/test/integration/resources/kubernetes/pods-etc =>
examples/kubernetes/daemon-set-log-collection/cluster-roles}/namespace-reader.clusterrolebinding.yml
(100%)
copy {docker/test/integration/resources/kubernetes/pods-etc =>
examples/kubernetes/daemon-set-log-collection/cluster-roles}/pod-reader.clusterrole.yml
(100%)
copy {docker/test/integration/resources/kubernetes/pods-etc =>
examples/kubernetes/daemon-set-log-collection/cluster-roles}/pod-reader.clusterrolebinding.yml
(100%)
rename examples/kubernetes/{ =>
daemon-set-log-collection}/daemon-set-log-collection.yml (92%)
rename examples/kubernetes/{ =>
sidecar-log-collection}/sidecar-log-collection.yml (100%)
[nifi-minifi-cpp] 01/03: MINIFICPP-1879 Fix Prometheus switch in bootstrap.sh
This is an automated email from the ASF dual-hosted git repository.
szaszm pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git
commit 799243702177d32136f989b801409486c4eea6e3
Author: Gabor Gyimesi
AuthorDate: Tue Jul 19 13:54:47 2022 +0200
MINIFICPP-1879 Fix Prometheus switch in bootstrap.sh
Closes #1365
Signed-off-by: Marton Szasz
---
bootstrap.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/bootstrap.sh b/bootstrap.sh
index 6c842d3c9..15a887ed5 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -343,7 +343,7 @@ set_dependency ELASTIC_ENABLED HTTP_CURL_ENABLED
add_option PROCFS_ENABLED ${TRUE} "ENABLE_PROCFS"
-add_disabled_option PROMETHEUS_ENABLED ${FALSE} "ENABLE_PROMETHEUS"
+add_option PROMETHEUS_ENABLED ${FALSE} "ENABLE_PROMETHEUS"
USE_SHARED_LIBS=${TRUE}
ASAN_ENABLED=${FALSE}
