This is an automated email from the ASF dual-hosted git repository.
pvillard 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 b6b621bf9e NIFI-11717 Updated Required Java Version to 17.0.6
b6b621bf9e is described below
commit b6b621bf9e099e8bd32365e72495a6e8e6c0c52e
Author: exceptionfactory <[email protected]>
AuthorDate: Fri Jun 16 14:01:36 2023 -0500
NIFI-11717 Updated Required Java Version to 17.0.6
- Added Groovy Plugin Repository for groovy-eclipse-compiler
Signed-off-by: Pierre Villard <[email protected]>
This closes #7397.
---
.github/PULL_REQUEST_TEMPLATE.md | 1 -
.github/workflows/ci-workflow.yml | 69 +---------------------
.github/workflows/system-tests.yml | 50 +---------------
README.md | 6 +-
.../nifi/util/locale/TestLocaleOfTestSuite.java | 8 +--
.../src/main/asciidoc/administration-guide.adoc | 4 +-
.../org/apache/nifi/controller/AbstractPort.java | 2 +-
.../org/apache/nifi/controller/StandardFunnel.java | 2 +-
.../src/main/asciidoc/administration-guide.adoc | 2 +-
nifi-registry/pom.xml | 1 -
pom.xml | 18 ++++--
11 files changed, 27 insertions(+), 136 deletions(-)
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 946c8712af..d80782ace2 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -40,7 +40,6 @@ Please indicate the verification steps performed prior to
pull request creation.
### Build
- [ ] Build completed using `mvn clean install -P contrib-check`
- - [ ] JDK 11
- [ ] JDK 17
### Licensing
diff --git a/.github/workflows/ci-workflow.yml
b/.github/workflows/ci-workflow.yml
index 19fe5bd3d3..b5ca5275d8 100644
--- a/.github/workflows/ci-workflow.yml
+++ b/.github/workflows/ci-workflow.yml
@@ -182,69 +182,6 @@ jobs:
- name: Post Disk Usage
run: df
- ubuntu-build-hi:
- timeout-minutes: 120
- runs-on: ubuntu-latest
- name: Ubuntu Zulu JDK 11 HI
- steps:
- - name: System Information
- run: |
- hostname
- cat /proc/cpuinfo
- cat /proc/meminfo
- df
- - name: Checkout Code
- uses: actions/checkout@v3
- - name: Cache Node Modules
- uses: actions/cache@v3
- with:
- path: |
- ~/.npm
- **/node_modules
- key: ${{ runner.os }}-npm-${{ hashFiles('**/package-lock.json') }}
- - name: Set up Java 11
- uses: actions/setup-java@v3
- with:
- distribution: 'zulu'
- java-version: '11'
- cache: 'maven'
- - name: Maven Compile
- env:
- MAVEN_OPTS: >-
- ${{ env.COMPILE_MAVEN_OPTS }}
- run: >
- ${{ env.MAVEN_COMMAND }}
- ${{ env.MAVEN_COMPILE_COMMAND }}
- - name: Maven Verify
- env:
- NIFI_CI_LOCALE: >-
- -Duser.language=hi
- -Duser.country=IN
- SUREFIRE_OPTS: >-
- -Duser.language=hi
- -Duser.country=IN
- -Duser.region=IN
- -Duser.timezone=Asia/Kolkata
- MAVEN_OPTS: >-
- ${{ env.DEFAULT_MAVEN_OPTS }}
- -DargLine=${env.SUREFIRE_OPTS}
- run: >
- ${{ env.MAVEN_COMMAND }}
- ${{ env.MAVEN_VERIFY_COMMAND }}
- ${{ env.MAVEN_BUILD_PROFILES }}
- ${{ env.MAVEN_PROJECTS }}
- - name: Upload Test Reports
- uses: actions/upload-artifact@v3
- with:
- name: surefire-reports-ubuntu-en
- path: |
- ./**/target/surefire-reports/*.txt
- ./**/target/surefire-reports/*.xml
- retention-days: 3
- if: failure()
- - name: Post Disk Usage
- run: df
-
macos-build-jp:
timeout-minutes: 150
runs-on: macos-latest
@@ -311,7 +248,7 @@ jobs:
windows-build:
timeout-minutes: 150
runs-on: windows-latest
- name: Windows Zulu JDK 11 FR
+ name: Windows Zulu JDK 17 FR
steps:
- name: System Information
run: |
@@ -330,11 +267,11 @@ jobs:
~\AppData\npm-cache
**\node_modules
key: ${{ runner.os }}-npm-${{ hashFiles('**/package-lock.json') }}
- - name: Set up Java 11
+ - name: Set up Java 17
uses: actions/setup-java@v3
with:
distribution: 'zulu'
- java-version: '11'
+ java-version: '17'
cache: 'maven'
- name: Maven Compile
env:
diff --git a/.github/workflows/system-tests.yml
b/.github/workflows/system-tests.yml
index 4004bc9bf7..f3d70cf0fd 100644
--- a/.github/workflows/system-tests.yml
+++ b/.github/workflows/system-tests.yml
@@ -111,62 +111,18 @@ jobs:
nifi-system-tests/nifi-system-test-suite/target/troubleshooting/**/*
retention-days: 7
- ubuntu:
- timeout-minutes: 120
- runs-on: ubuntu-latest
- name: Ubuntu Java 11
- steps:
- - name: Checkout Code
- uses: actions/checkout@v3
- - name: Set up Java 11
- uses: actions/setup-java@v3
- with:
- distribution: zulu
- java-version: 11
- cache: 'maven'
- - name: Set up Python 3.9
- uses: actions/setup-python@v4
- with:
- python-version: '3.9'
- - name: Build Dependencies
- env:
- MAVEN_OPTS: >-
- ${{ env.DEFAULT_MAVEN_OPTS }}
- run: >
- ${{ env.MAVEN_COMMAND }}
- ${{ env.MAVEN_BUILD_ARGUMENTS }}
- ${{ env.MAVEN_PROJECTS }}
- - name: Run Tests
- env:
- MAVEN_OPTS: >-
- ${{ env.DEFAULT_MAVEN_OPTS }}
- run: >
- ${{ env.MAVEN_COMMAND }}
- ${{ env.MAVEN_RUN_ARGUMENTS }}
- ${{ env.MAVEN_PROJECTS }}
- - name: Upload Troubleshooting Logs
- if: failure() || cancelled()
- uses: actions/upload-artifact@v3
- with:
- name: ubuntu-latest-troubleshooting-logs
- path: |
-
nifi-system-tests/nifi-system-test-suite/target/failsafe-reports/**/*.txt
-
nifi-system-tests/nifi-system-test-suite/target/surefire-reports/**/*.txt
-
nifi-system-tests/nifi-system-test-suite/target/troubleshooting/**/*
- retention-days: 7
-
macos:
timeout-minutes: 120
runs-on: macos-latest
- name: MacOS Java 11
+ name: MacOS Java 17
steps:
- name: Checkout Code
uses: actions/checkout@v3
- - name: Set up Java 11
+ - name: Set up Java 17
uses: actions/setup-java@v3
with:
distribution: zulu
- java-version: 11
+ java-version: 17
cache: 'maven'
- name: Set up Python 3.9
uses: actions/setup-python@v4
diff --git a/README.md b/README.md
index d50239db61..06e81f889c 100644
--- a/README.md
+++ b/README.md
@@ -62,11 +62,11 @@ Apache NiFi was made for dataflow. It supports highly
configurable directed grap
## Minimum Recommendations
* JDK 17.0.6
-* Apache Maven 3.9.0
+* Apache Maven 3.9.2
## Minimum Requirements
-* JDK 11.0.16
-* Apache Maven 3.8.6
+* JDK 17.0.6
+* Apache Maven 3.9.2
## Getting Started
diff --git
a/nifi-commons/nifi-utils/src/test/java/org/apache/nifi/util/locale/TestLocaleOfTestSuite.java
b/nifi-commons/nifi-utils/src/test/java/org/apache/nifi/util/locale/TestLocaleOfTestSuite.java
index d2c586221f..4a7b151f94 100644
---
a/nifi-commons/nifi-utils/src/test/java/org/apache/nifi/util/locale/TestLocaleOfTestSuite.java
+++
b/nifi-commons/nifi-utils/src/test/java/org/apache/nifi/util/locale/TestLocaleOfTestSuite.java
@@ -21,7 +21,6 @@ import org.junit.jupiter.api.Test;
import java.text.DecimalFormatSymbols;
import java.text.NumberFormat;
import java.util.Locale;
-import java.util.regex.Pattern;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assumptions.assumeTrue;
@@ -40,11 +39,7 @@ public class TestLocaleOfTestSuite {
final Locale locale = Locale.getDefault();
assumeTrue(locale.toLanguageTag().equals("en-AU"));
- final String runtimeJavaVersion = System.getProperty("java.version");
- final boolean isJava8 =
Pattern.compile("1\\.8.+").matcher(runtimeJavaVersion).matches();
- final String expected = (isJava8 ? "E" : "e"); // tested in Java 8
and Java 11
-
- assertEquals(expected,
DecimalFormatSymbols.getInstance(locale).getExponentSeparator());
+ assertEquals("e",
DecimalFormatSymbols.getInstance(locale).getExponentSeparator());
assertEquals("1,000", NumberFormat.getInstance(locale).format(1000));
}
@@ -69,6 +64,5 @@ public class TestLocaleOfTestSuite {
assumeTrue(locale.toLanguageTag().equals("fr-FR"));
assertEquals("E",
DecimalFormatSymbols.getInstance(locale).getExponentSeparator());
- assertEquals("1\u00a0000",
NumberFormat.getInstance(locale).format(1000));
}
}
diff --git a/nifi-docs/src/main/asciidoc/administration-guide.adoc
b/nifi-docs/src/main/asciidoc/administration-guide.adoc
index 7dc649f304..0648eae712 100644
--- a/nifi-docs/src/main/asciidoc/administration-guide.adoc
+++ b/nifi-docs/src/main/asciidoc/administration-guide.adoc
@@ -23,7 +23,7 @@ Apache NiFi Team <[email protected]>
== System Requirements
Apache NiFi can run on something as simple as a laptop, but it can also be
clustered across many enterprise-class servers. Therefore, the amount of
hardware and memory needed will depend on the size and nature of the dataflow
involved. The data is stored on disk while NiFi is processing it. So NiFi needs
to have sufficient disk space allocated for its various repositories,
particularly the content repository, flowfile repository, and provenance
repository (see the <<system_properties>> s [...]
-* Requires Java 11 or Java 17
+* Requires Java 17
* Use of Python-based Processors (beta feature) requires Python 3.9+
* Supported Operating Systems:
** Linux
@@ -81,7 +81,7 @@ See the <<system_properties>> section of this guide for more
information about c
The binary build of Apache NiFi that is provided by the Apache mirrors does
not contain every NAR file that is part of the official release. This is due to
size constraints imposed by the mirrors to reduce the expenses associated with
hosting such a large project. The Developer Guide
link:developer-guide.html#build[has a list] of optional Maven profiles that can
be activated to build a binary distribution of NiFi with these extra
capabilities.
-To execute build, download either Java 11 or Java 17 from
https://www.adoptium.net[Adoptium] or whichever distribution of the JDK your
team uses (Adoptium is the rebranding of AdoptOpenJDK which is one of the most
popular). Java 11 and 17 are the only officially supported JVM releases. Then
install https://maven.apache.org[Apache Maven].
+To execute build, download Java 17 from https://www.adoptium.net[Adoptium] or
whichever distribution of the JDK your team uses (Adoptium is the rebranding of
AdoptOpenJDK which is one of the most popular). Then install
https://maven.apache.org[Apache Maven].
The next step is to download a copy of the Apache NiFi source code from the
https://nifi.apache.org/download.html[NiFi Downloads page]. The reason you need
the source build is that it includes a module called `nifi-assembly` which is
the Maven module that builds a binary distribution. Expand the archive and run
a Maven clean build. The following example shows how to build a distribution
that activates the `graph` and `media` bundle profiles to add in support for
graph databases and Apach [...]
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/controller/AbstractPort.java
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/controller/AbstractPort.java
index 43968c9d66..d68a3068fd 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/controller/AbstractPort.java
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/controller/AbstractPort.java
@@ -498,7 +498,7 @@ public abstract class AbstractPort implements Port {
@Override
public void yield() {
final long yieldMillis = getYieldPeriod(TimeUnit.MILLISECONDS);
- yield(yieldMillis, TimeUnit.MILLISECONDS);
+ this.yield(yieldMillis, TimeUnit.MILLISECONDS);
}
@Override
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/controller/StandardFunnel.java
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/controller/StandardFunnel.java
index a636e05767..b9a0008e5a 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/controller/StandardFunnel.java
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/controller/StandardFunnel.java
@@ -471,7 +471,7 @@ public class StandardFunnel implements Funnel {
@Override
public void yield() {
final long yieldMillis = getYieldPeriod(TimeUnit.MILLISECONDS);
- yield(yieldMillis, TimeUnit.MILLISECONDS);
+ this.yield(yieldMillis, TimeUnit.MILLISECONDS);
}
@Override
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 3878d4719d..9fc666c04c 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
@@ -23,7 +23,7 @@ Apache NiFi Team <[email protected]>
NiFi Registry has the following minimum system requirements:
-* Requires Java Development Kit (JDK) 11, newer than 11.0.16
+* Requires Java Development Kit (JDK) 17
WARNING: When running Registry with only a JRE you may encounter the following
error as Flyway (database migration tool) attempts to utilize a resource from
the JDK: +
+
diff --git a/nifi-registry/pom.xml b/nifi-registry/pom.xml
index 1e6f9b5428..2b1fc5746e 100644
--- a/nifi-registry/pom.xml
+++ b/nifi-registry/pom.xml
@@ -40,7 +40,6 @@
<flyway.version>8.5.13</flyway.version>
<flyway.tests.version>7.0.0</flyway.tests.version>
<swagger.ui.version>3.12.0</swagger.ui.version>
-
<groovy.eclipse.compiler.version>3.7.0</groovy.eclipse.compiler.version>
<jaxb.version>2.3.2</jaxb.version>
<jgit.version>6.5.0.202303070854-r</jgit.version>
<org.apache.sshd.version>2.10.0</org.apache.sshd.version>
diff --git a/pom.xml b/pom.xml
index 97f69ee29f..362275b72b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -88,11 +88,10 @@
<url>https://issues.apache.org/jira/browse/NIFI</url>
</issueManagement>
<properties>
- <maven.compiler.source>11</maven.compiler.source>
- <maven.compiler.target>11</maven.compiler.target>
+ <maven.compiler.release>17</maven.compiler.release>
<maven.compiler.showDeprecation>true</maven.compiler.showDeprecation>
<!-- Set minimum Java version for maven-enforcer-plugin from parent
POM -->
- <minimalJavaBuildVersion>11.0.16</minimalJavaBuildVersion>
+ <minimalJavaBuildVersion>17.0.6</minimalJavaBuildVersion>
<maven.surefire.arguments />
<!-- Disable maven-site-plugin from parent POM -->
<maven.site.skip>true</maven.site.skip>
@@ -128,7 +127,8 @@
<jakarta.xml.bind-api.version>2.3.3</jakarta.xml.bind-api.version>
<json.smart.version>2.4.11</json.smart.version>
<nifi.groovy.version>3.0.17</nifi.groovy.version>
- <groovy.eclipse.batch.version>3.0.8-01</groovy.eclipse.batch.version>
+
<groovy.eclipse.compiler.version>3.9.0</groovy.eclipse.compiler.version>
+ <groovy.eclipse.batch.version>3.0.9-03</groovy.eclipse.batch.version>
<surefire.version>3.0.0</surefire.version>
<hadoop.version>3.3.5</hadoop.version>
<ozone.version>1.2.1</ozone.version>
@@ -148,6 +148,12 @@
<zookeeper.version>3.8.1</zookeeper.version>
<caffeine.version>3.1.6</caffeine.version>
</properties>
+ <pluginRepositories>
+ <pluginRepository>
+ <id>groovy-plugins-release</id>
+ <url>https://groovy.jfrog.io/artifactory/plugins-release</url>
+ </pluginRepository>
+ </pluginRepositories>
<dependencyManagement>
<dependencies>
<!-- The following dependency management entries exist because
these are jars
@@ -781,7 +787,7 @@
<plugin>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-eclipse-compiler</artifactId>
- <version>3.7.0</version>
+ <version>${groovy.eclipse.compiler.version}</version>
<extensions>true</extensions>
</plugin>
<plugin>
@@ -944,7 +950,7 @@
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-eclipse-compiler</artifactId>
- <version>3.7.0</version>
+ <version>${groovy.eclipse.compiler.version}</version>
</dependency>
<dependency>
<groupId>org.codehaus.groovy</groupId>
