diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index d632321..0d3538e 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -3,6 +3,8 @@ name: Java CI with Maven on: push: branches: [ "develop" ] + tags: + - "*.*.*" pull_request: branches: [ "develop" ] @@ -21,3 +23,8 @@ jobs: cache: maven - name: Build with Maven run: mvn -B package --file pom.xml + - name: Release + uses: softprops/action-gh-release@v1 + if: startsWith(github.ref, 'refs/tags/') + with: + files: nifi-file-identity-provider-nar/target/nifi-file-identity-provider-nar-*.*.*.nar diff --git a/.github/workflows/mvn-dependency-submission.yml b/.github/workflows/mvn-dependency-submission.yml index f1043dd..442696d 100644 --- a/.github/workflows/mvn-dependency-submission.yml +++ b/.github/workflows/mvn-dependency-submission.yml @@ -1,4 +1,4 @@ -name: Java CI with Maven +name: Submit Maven dependency tree on: push: diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml deleted file mode 100644 index 4fd7ac5..0000000 --- a/.github/workflows/publish.yml +++ /dev/null @@ -1,20 +0,0 @@ -name: Publish package to GitHub Packages -on: - release: - types: [created] -jobs: - publish: - runs-on: ubuntu-latest - permissions: - contents: read - packages: write - steps: - - uses: actions/checkout@v4 - - uses: actions/setup-java@v3 - with: - java-version: '17' - distribution: 'temurin' - - name: Publish package - run: mvn --batch-mode deploy - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/nifi-file-identity-provider-nar/pom.xml b/nifi-file-identity-provider-nar/pom.xml index ea3a64c..a92fed0 100644 --- a/nifi-file-identity-provider-nar/pom.xml +++ b/nifi-file-identity-provider-nar/pom.xml @@ -24,6 +24,7 @@ nifi-file-identity-provider-nar + 1.23.2 nar true diff --git a/nifi-file-identity-provider/pom.xml b/nifi-file-identity-provider/pom.xml index 454f803..bd591f3 100644 --- a/nifi-file-identity-provider/pom.xml +++ b/nifi-file-identity-provider/pom.xml @@ -26,6 +26,9 @@ nifi-file-identity-provider jar + + 1.23.2 + @@ -89,8 +92,8 @@ jigsaw - 11 - 11 + 17 + 17 @@ -127,47 +130,38 @@ org.apache.nifi nifi-api - 1.23.2 + ${nifi.version} org.apache.nifi nifi-framework-api - 1.23.2 + ${nifi.version} org.apache.nifi nifi-utils - 1.23.2 + ${nifi.version} org.apache.nifi nifi-properties - 1.23.2 + ${nifi.version} ch.qos.logback logback-classic - 1.2.9 org.springframework.security spring-security-core - 6.1.5 - - - commons-logging - commons-logging - 1.2 org.apache.commons commons-lang3 - 3.4 commons-io commons-io - 2.7 diff --git a/pom.xml b/pom.xml index d65f261..e6cdb92 100644 --- a/pom.xml +++ b/pom.xml @@ -17,49 +17,30 @@ 4.0.0 + + org.apache.nifi + nifi-nar-bundles + 1.23.2 + + io.egm nifi-file-identity-provider-bundle 1.23.2 pom + + 17 + 17 + + nifi-file-identity-provider nifi-file-identity-provider-nar - - UTF-8 - UTF-8 - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.11.0 - - true - true - true - true - - - - org.apache.maven.plugins - maven-surefire-plugin - 3.1.2 - - - **/*Test.class - **/Test*.class - **/*Spec.class - - true - -Xmx1G -Djava.net.preferIPv4Stack=true - - org.codehaus.mojo jaxb2-maven-plugin @@ -67,51 +48,6 @@ - - - org.apache.maven.plugins - maven-compiler-plugin - 3.11.0 - - 11 - 11 - - - - org.apache.nifi - nifi-nar-maven-plugin - 1.5.0 - true - - - - - - org.junit.jupiter - junit-jupiter-engine - 5.10.0 - test - - - - - - - github - GitHub Packages - https://maven.pkg.github.com/easy-global-market/nifi-file-identity-provider-bundle - - - - - - org.junit.jupiter - junit-jupiter-engine - 5.10.0 - test - - -