Apache
/
nifi
mirror of https://github.com/apache/nifi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

NIFI-7201 - Update build to latest apache-maven-parent and split Github Actions builds to include OSX and distribute localization 

Signed-off-by: Pierre Villard <pierre.villard.fr@gmail.com>

This closes #4091.
This commit is contained in:
Joe Witt 2020-02-25 15:29:50 -08:00 committed by Pierre Villard
parent c092a23bdf
commit bad0f10a52
No known key found for this signature in database
GPG Key ID: BEE1599F0726E9CD
5 changed files with 129 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

145
.github/workflows/ci-workflow.yml vendored
View File

@ -3,14 +3,11 @@ name: ci-workflow
on: [push, pull_request]
jobs:
ubuntu-build:
ubuntu-build-fr:
timeout-minutes: 90
runs-on: ubuntu-latest
strategy:
matrix:
java: [ '1.8', '11' ]
name: Ubuntu Build NiFi - JDK${{ matrix.java }}
name: Ubuntu Build NiFi - JDK 1.8 FR
steps:
- name: Checkout Code
@ -19,49 +16,161 @@ jobs:
uses: actions/cache@v1.1.2
with:
path: ~/.npm
key: linux-${{ matrix.java }}-npm-${{ hashFiles('**/package-lock.json') }}
key: linux-1.8-npm-${{ hashFiles('**/package-lock.json') }}
restore-keys: |
linux-${{ matrix.java }}-npm-
linux-1.8-npm-
- name: Check Maven Com Cache
uses: actions/cache@v1.1.2
with:
path: ~/.m2/repository/com
key: linux-${{ matrix.java }}-maven-com-${{ hashFiles('**/pom.xml') }}
key: linux-1.8-maven-com-${{ hashFiles('**/pom.xml') }}
restore-keys: |
linux-${{ matrix.java }}-maven-com-
linux-1.8-maven-com-
- name: Check Maven Org Cache
uses: actions/cache@v1.1.2
with:
path: ~/.m2/repository/org
key: linux-${{ matrix.java }}-maven-org-${{ hashFiles('**/pom.xml') }}
key: linux-1.8-maven-org-${{ hashFiles('**/pom.xml') }}
restore-keys: |
linux-${{ matrix.java }}-maven-org-
linux-1.8-maven-org-
- name: Check Maven Net Cache
uses: actions/cache@v1.1.2
with:
path: ~/.m2/repository/net
key: linux-${{ matrix.java }}-maven-net-${{ hashFiles('**/pom.xml') }}
key: linux-1.8-maven-net-${{ hashFiles('**/pom.xml') }}
restore-keys: |
linux-${{ matrix.java }}-maven-net-
linux-1.8-maven-net-
- name: Check Maven IO Cache
uses: actions/cache@v1.1.2
with:
path: ~/.m2/repository/io
key: linux-${{ matrix.java }}-maven-io-${{ hashFiles('**/pom.xml') }}
key: linux-1.8-maven-io-${{ hashFiles('**/pom.xml') }}
restore-keys: |
linux-${{ matrix.java }}-maven-io-
- name: Set up JDK ${{ matrix.java }}
linux-1.8-maven-io-
- name: Set up JDK 1.8 FR
uses: actions/setup-java@v1.3.0
with:
java-version: ${{ matrix.java }}
java-version: 1.8
- name: Build with Maven
env:
MAVEN_OPTS: -Xmx2g -XX:ReservedCodeCacheSize=1g -XX:+UseG1GC -Dorg.slf4j.simpleLogger.defaultLogLevel=WARN
MAVEN_OPTS: -Xmx2g -XX:ReservedCodeCacheSize=1g -XX:+UseG1GC -Dorg.slf4j.simpleLogger.defaultLogLevel=WARN -Dmaven.surefire.arguments="-Duser.language=fr -Duser.region=FR"
run: |
mvn -version
mvn -T 1C install -B -Pcontrib-check,include-grpc -Ddir-only -ntp -ff
rm -rf ~/.m2/repository/org/apache/nifi
ubuntu-build-en:
timeout-minutes: 90
runs-on: ubuntu-latest
name: Ubuntu Build NiFi - JDK 11 EN
steps:
- name: Checkout Code
uses: actions/checkout@v2
- name: Check NPM Cache
uses: actions/cache@v1.1.2
with:
path: ~/.npm
key: linux-1.11-npm-${{ hashFiles('**/package-lock.json') }}
restore-keys: |
linux-1.11-npm-
- name: Check Maven Com Cache
uses: actions/cache@v1.1.2
with:
path: ~/.m2/repository/com
key: linux-1.11-maven-com-${{ hashFiles('**/pom.xml') }}
restore-keys: |
linux-1.11-maven-com-
- name: Check Maven Org Cache
uses: actions/cache@v1.1.2
with:
path: ~/.m2/repository/org
key: linux-1.11-maven-org-${{ hashFiles('**/pom.xml') }}
restore-keys: |
linux-1.11-maven-org-
- name: Check Maven Net Cache
uses: actions/cache@v1.1.2
with:
path: ~/.m2/repository/net
key: linux-1.11-maven-net-${{ hashFiles('**/pom.xml') }}
restore-keys: |
linux-1.11-maven-net-
- name: Check Maven IO Cache
uses: actions/cache@v1.1.2
with:
path: ~/.m2/repository/io
key: linux-1.11-maven-io-${{ hashFiles('**/pom.xml') }}
restore-keys: |
linux-1.11-maven-io-
- name: Set up JDK 11 EN
uses: actions/setup-java@v1.3.0
with:
java-version: 11
- name: Build with Maven
env:
MAVEN_OPTS: -Xmx2g -XX:ReservedCodeCacheSize=1g -XX:+UseG1GC -Dorg.slf4j.simpleLogger.defaultLogLevel=WARN -Dmaven.surefire.arguments="-Duser.language=en -Duser.region=US"
run: |
mvn -version
mvn -T 1C install -B -Pcontrib-check,include-grpc -Ddir-only -ntp -ff
rm -rf ~/.m2/repository/org/apache/nifi
osx-build-jp:
timeout-minutes: 90
runs-on: macos-latest
name: MacOS Build NiFi - JDK 1.8 JP
steps:
- name: Checkout Code
uses: actions/checkout@v2
- name: Check NPM Cache
uses: actions/cache@v1.1.2
with:
path: ~/.npm
key: linux-1.8osx-npm-${{ hashFiles('**/package-lock.json') }}
restore-keys: |
linux-1.8osx-npm-
- name: Check Maven Com Cache
uses: actions/cache@v1.1.2
with:
path: ~/.m2/repository/com
key: linux-1.8osx-maven-com-${{ hashFiles('**/pom.xml') }}
restore-keys: |
linux-1.8osx-maven-com-
- name: Check Maven Org Cache
uses: actions/cache@v1.1.2
with:
path: ~/.m2/repository/org
key: linux-1.8osx-maven-org-${{ hashFiles('**/pom.xml') }}
restore-keys: |
linux-1.8osx-maven-org-
- name: Check Maven Net Cache
uses: actions/cache@v1.1.2
with:
path: ~/.m2/repository/net
key: linux-1.8osx-maven-net-${{ hashFiles('**/pom.xml') }}
restore-keys: |
linux-1.8osx-maven-net-
- name: Check Maven IO Cache
uses: actions/cache@v1.1.2
with:
path: ~/.m2/repository/io
key: linux-1.8osx-maven-io-${{ hashFiles('**/pom.xml') }}
restore-keys: |
linux-1.8osx-maven-io-
- name: Set up JDK 1.8 JP
uses: actions/setup-java@v1.3.0
with:
java-version: 1.8
- name: Build with Maven
env:
MAVEN_OPTS: -Xmx2g -XX:ReservedCodeCacheSize=1g -XX:+UseG1GC -Dorg.slf4j.simpleLogger.defaultLogLevel=WARN -Dmaven.surefire.arguments="-Duser.language=ja -Duser.region=JP"
run: |
mvn -version
mvn -T 1C install -B -Pcontrib-check,include-grpc -Ddir-only -ntp -ff
rm -rf ~/.m2/repository/org/apache/nifi
windows-build:
runs-on: windows-latest

4
nifi-commons/nifi-security-utils/pom.xml
View File

@ -37,10 +37,6 @@
<artifactId>nifi-utils</artifactId>
<version>1.12.0-SNAPSHOT</version>
</dependency>
<!--<dependency>-->
<!--<groupId>org.slf4j</groupId>-->
<!--<artifactId>slf4j-api</artifactId>-->
<!--</dependency>-->
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>

1
nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-client-service/pom.xml
View File

@ -87,7 +87,6 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>log4j-over-slf4j</artifactId>
<version>${org.slf4j.version}</version>
</dependency>

1
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-stateless/pom.xml
View File

@ -73,7 +73,6 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.25</version>
</dependency>
<!-- jackson dependencies -->

7
pom.xml
View File

@ -13,7 +13,7 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
<version>22</version>
<version>23</version>
<relativePath />
</parent>
<groupId>org.apache.nifi</groupId>
@ -70,9 +70,6 @@
<archive>https://mail-archives.apache.org/mod_mbox/nifi-commits</archive>
</mailingList>
</mailingLists>
<prerequisites>
<maven>${maven.min-version}</maven>
</prerequisites>
<scm>
<connection>scm:git:git://git.apache.org/nifi.git</connection>
<developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/nifi.git</developerConnection>
@ -91,7 +88,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<inceptionYear>2014</inceptionYear>
<org.slf4j.version>1.7.26</org.slf4j.version>
<org.slf4j.version>1.7.30</org.slf4j.version>
<ranger.version>2.0.0</ranger.version>
<jetty.version>9.4.19.v20190610</jetty.version>
<jackson.version>2.9.10</jackson.version>