NIFI-10854 adjusting post merge for next release cycle

This commit is contained in:
Joe Witt 2022-11-28 08:49:35 -07:00
parent 1046b2c308
commit 198a27abbe
No known key found for this signature in database
GPG Key ID: 9093BF854F811A1A
5 changed files with 5 additions and 5 deletions

View File

@ -13,4 +13,4 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
apache/nifi:1.19.0 apache/nifi:1.20.0

View File

@ -25,7 +25,7 @@ LABEL site="https://nifi.apache.org"
ARG UID=1000 ARG UID=1000
ARG GID=1000 ARG GID=1000
ARG NIFI_VERSION=1.19.0 ARG NIFI_VERSION=1.20.0
ARG BASE_URL=https://archive.apache.org/dist ARG BASE_URL=https://archive.apache.org/dist
ARG MIRROR_BASE_URL=${MIRROR_BASE_URL:-${BASE_URL}} ARG MIRROR_BASE_URL=${MIRROR_BASE_URL:-${BASE_URL}}
ARG DISTRO_PATH=${DISTRO_PATH:-${NIFI_VERSION}} ARG DISTRO_PATH=${DISTRO_PATH:-${NIFI_VERSION}}

View File

@ -23,7 +23,7 @@
<properties> <properties>
<!-- files need to exist at https://archive.apache.org/dist/nifi/${docker.nifi.version}/nifi-[toolkit-]${docker.nifi.version}-bin.zip <!-- files need to exist at https://archive.apache.org/dist/nifi/${docker.nifi.version}/nifi-[toolkit-]${docker.nifi.version}-bin.zip
so this version needs to be *before* the current ${project.version} --> so this version needs to be *before* the current ${project.version} -->
<docker.nifi.version>1.19.0</docker.nifi.version> <docker.nifi.version>1.20.0</docker.nifi.version>
</properties> </properties>
<profiles> <profiles>

View File

@ -63,7 +63,7 @@
<dependency> <dependency>
<groupId>org.apache.nifi</groupId> <groupId>org.apache.nifi</groupId>
<artifactId>nifi-security-kerberos</artifactId> <artifactId>nifi-security-kerberos</artifactId>
<version>1.19.0-SNAPSHOT</version> <version>1.20.0-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.nifi</groupId> <groupId>org.apache.nifi</groupId>

View File

@ -59,7 +59,7 @@
<dependency> <dependency>
<groupId>org.apache.nifi</groupId> <groupId>org.apache.nifi</groupId>
<artifactId>nifi-security-kerberos</artifactId> <artifactId>nifi-security-kerberos</artifactId>
<version>1.19.0-SNAPSHOT</version> <version>1.20.0-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.nifi</groupId> <groupId>org.apache.nifi</groupId>