You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by kd...@apache.org on 2023/03/16 02:17:31 UTC

[nifi-maven] 01/01: Merge branch 'NIFI-11278-RC2'

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-maven.git

commit 3ec4448c7cf94cf3137c7a67b168c65a33192eea
Merge: c33e500 fc2ab48
Author: Kevin Doran <kd...@apache.org>
AuthorDate: Wed Mar 15 22:16:46 2023 -0400

    Merge branch 'NIFI-11278-RC2'

 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --cc pom.xml
index 25f85a7,8a24687..0d75d65
--- a/pom.xml
+++ b/pom.xml
@@@ -71,19 -74,13 +71,19 @@@
          <url>https://issues.apache.org/jira/browse/NIFI</url>
      </issueManagement>
      <properties>
 +        <!-- Set minimum Java version for maven-enforcer-plugin from parent POM -->
 +        <minimalJavaBuildVersion>1.8.0-251</minimalJavaBuildVersion>
 +        <!-- Set minimum Maven version for maven-enforcer-plugin from parent POM -->
 +        <minimalMavenBuildVersion>3.6.3</minimalMavenBuildVersion>
          <maven.compiler.source>1.8</maven.compiler.source>
          <maven.compiler.target>1.8</maven.compiler.target>
 -        <maven.min-version>3.6.3</maven.min-version>
          <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
          <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-         <project.build.outputTimestamp>2023-03-08T15:05:37Z</project.build.outputTimestamp>
+         <project.build.outputTimestamp>2023-03-14T20:49:10Z</project.build.outputTimestamp>
          <inceptionYear>2014</inceptionYear>
 +        <mockito.version>4.11.0</mockito.version>
 +        <junit.version>5.9.2</junit.version>
 +        <slf4j.version>2.0.6</slf4j.version>
      </properties>
      <build>
          <pluginManagement>