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 3c10910 NIFI-9845 Fix NiFi Registry database ITs
3c10910 is described below
commit 3c10910fe266ca8274ef8d14ad2423e5bef6c7be
Author: Bryan Bende
AuthorDate: Tue Mar 29 11:44:59 2022 -0400
NIFI-9845 Fix NiFi Registry database ITs
- remove unsupported DB test containers, update admin guide
This closes #5914.
Signed-off-by: Kevin Doran
---
.../src/main/asciidoc/administration-guide.adoc| 2 +-
.../nifi-registry-core/nifi-registry-test/pom.xml | 10 --
.../nifi/registry/db/MySql6DataSourceFactory.java | 37 --
.../nifi/registry/db/MySql7DataSourceFactory.java | 37 --
...ctory.java => Postgres14DataSourceFactory.java} | 6 ++--
nifi-registry/nifi-registry-core/pom.xml | 35 +++-
nifi-registry/pom.xml | 26 +++
7 files changed, 41 insertions(+), 112 deletions(-)
diff --git
a/nifi-registry/nifi-registry-core/nifi-registry-docs/src/main/asciidoc/administration-guide.adoc
b/nifi-registry/nifi-registry-core/nifi-registry-docs/src/main/asciidoc/administration-guide.adoc
index 7609c40..f8c6f88 100644
---
a/nifi-registry/nifi-registry-core/nifi-registry-docs/src/main/asciidoc/administration-guide.adoc
+++
b/nifi-registry/nifi-registry-core/nifi-registry-docs/src/main/asciidoc/administration-guide.adoc
@@ -1131,7 +1131,7 @@ providing 2 total locations, including
`nifi.registry.extension.dir.1`.
The metadata database maintains the knowledge of which buckets exist, which
versioned items belong to which buckets, as well as the version history for
each item.
-Currently, NiFi Registry supports using H2, Postgres (9.x, 10.x), and MySQL
(5.6, 5.7, 8.0) for the relational database engine.
+Currently, NiFi Registry supports using H2, Postgres (10.x - 13.x), and MySQL
(8.0) for the relational database engine.
NOTE: NiFi Registry 0.1.0 only supports H2.
diff --git a/nifi-registry/nifi-registry-core/nifi-registry-test/pom.xml
b/nifi-registry/nifi-registry-core/nifi-registry-test/pom.xml
index 0354b71..65cbe5a 100644
--- a/nifi-registry/nifi-registry-core/nifi-registry-test/pom.xml
+++ b/nifi-registry/nifi-registry-core/nifi-registry-test/pom.xml
@@ -40,29 +40,19 @@
org.testcontainers
testcontainers
-${testcontainers.version}
compile
org.testcontainers
mysql
-${testcontainers.version}
-
-
-org.slf4j
-jcl-over-slf4j
-
-
org.testcontainers
mariadb
-${testcontainers.version}
org.testcontainers
postgresql
-${testcontainers.version}
mysql
diff --git
a/nifi-registry/nifi-registry-core/nifi-registry-test/src/main/java/org/apache/nifi/registry/db/MySql6DataSourceFactory.java
b/nifi-registry/nifi-registry-core/nifi-registry-test/src/main/java/org/apache/nifi/registry/db/MySql6DataSourceFactory.java
deleted file mode 100644
index 69fc987..000
---
a/nifi-registry/nifi-registry-core/nifi-registry-test/src/main/java/org/apache/nifi/registry/db/MySql6DataSourceFactory.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.nifi.registry.db;
-
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Profile;
-import org.testcontainers.containers.MySQLContainer;
-
-@Configuration
-@Profile("mysql-56")
-public class MySql6DataSourceFactory extends MySqlDataSourceFactory {
-
-private static final MySQLContainer MYSQL_CONTAINER = new
MySqlCustomContainer("mysql:5.6");
-
-static {
-MYSQL_CONTAINER.start();
-}
-
-@Override
-protected MySQLContainer mysqlContainer() {
-return MYSQL_CO
