This is an automated email from the ASF dual-hosted git repository. mattyb149 pushed a commit to branch support/nifi-1.x in repository https://gitbox.apache.org/repos/asf/nifi.git
commit 1a9e972721eb14352ee396f6e784c8111935ec76 Author: Matt Burgess <[email protected]> AuthorDate: Tue Aug 29 15:36:45 2023 -0400 NIFI-11195: Fixed NiFi versions for backport --- nifi-commons/nifi-security-identity/pom.xml | 4 ++-- nifi-commons/nifi-site-to-site-client/pom.xml | 8 -------- nifi-commons/nifi-utils/pom.xml | 2 +- nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/pom.xml | 2 +- .../nifi-extension-utils/nifi-event-transport/pom.xml | 2 +- .../nifi-framework/nifi-file-authorizer/pom.xml | 2 +- .../nifi-framework/nifi-framework-core/pom.xml | 2 +- .../nifi-framework/nifi-site-to-site/pom.xml | 2 +- .../nifi-framework/nifi-web/nifi-web-api/pom.xml | 2 +- .../nifi-framework/nifi-web/nifi-web-security/pom.xml | 2 +- .../nifi-ldap-iaa-providers/pom.xml | 2 +- .../nifi-web-client-provider-service/pom.xml | 2 +- 12 files changed, 12 insertions(+), 20 deletions(-) diff --git a/nifi-commons/nifi-security-identity/pom.xml b/nifi-commons/nifi-security-identity/pom.xml index b6c3fd397f..acada8a844 100644 --- a/nifi-commons/nifi-security-identity/pom.xml +++ b/nifi-commons/nifi-security-identity/pom.xml @@ -17,14 +17,14 @@ <parent> <groupId>org.apache.nifi</groupId> <artifactId>nifi-commons</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>1.24.0-SNAPSHOT</version> </parent> <artifactId>nifi-security-identity</artifactId> <dependencies> <dependency> <groupId>org.apache.nifi</groupId> <artifactId>nifi-properties</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>1.24.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.commons</groupId> diff --git a/nifi-commons/nifi-site-to-site-client/pom.xml b/nifi-commons/nifi-site-to-site-client/pom.xml index 25eb9053dc..9884f04433 100644 --- a/nifi-commons/nifi-site-to-site-client/pom.xml +++ b/nifi-commons/nifi-site-to-site-client/pom.xml @@ -126,14 +126,6 @@ <artifactId>validation-api</artifactId> <version>2.0.1.Final</version> </dependency> - <dependency> - <groupId>jakarta.xml.bind</groupId> - <artifactId>jakarta.xml.bind-api</artifactId> - </dependency> - <dependency> - <groupId>org.glassfish.jaxb</groupId> - <artifactId>jaxb-runtime</artifactId> - </dependency> </dependencies> <profiles> <profile> diff --git a/nifi-commons/nifi-utils/pom.xml b/nifi-commons/nifi-utils/pom.xml index cddbbd4b78..88c58d38d0 100644 --- a/nifi-commons/nifi-utils/pom.xml +++ b/nifi-commons/nifi-utils/pom.xml @@ -43,7 +43,7 @@ <dependency> <groupId>org.apache.nifi</groupId> <artifactId>nifi-property-utils</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>1.24.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.hamcrest</groupId> diff --git a/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/pom.xml b/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/pom.xml index 71f40c3d24..e6d0b91180 100644 --- a/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/pom.xml +++ b/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/pom.xml @@ -139,7 +139,7 @@ <dependency> <groupId>org.apache.nifi</groupId> <artifactId>nifi-security-utils</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>1.24.0-SNAPSHOT</version> <scope>test</scope> </dependency> <dependency> diff --git a/nifi-nar-bundles/nifi-extension-utils/nifi-event-transport/pom.xml b/nifi-nar-bundles/nifi-extension-utils/nifi-event-transport/pom.xml index 3eabf7dac0..bb2965a64b 100644 --- a/nifi-nar-bundles/nifi-extension-utils/nifi-event-transport/pom.xml +++ b/nifi-nar-bundles/nifi-extension-utils/nifi-event-transport/pom.xml @@ -39,7 +39,7 @@ <dependency> <groupId>org.apache.nifi</groupId> <artifactId>nifi-security-utils</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>1.24.0-SNAPSHOT</version> <scope>test</scope> </dependency> <dependency> diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-file-authorizer/pom.xml b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-file-authorizer/pom.xml index 424c55f968..5680c495fd 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-file-authorizer/pom.xml +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-file-authorizer/pom.xml @@ -203,7 +203,7 @@ <dependency> <groupId>org.apache.nifi</groupId> <artifactId>nifi-security-identity</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>1.24.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.nifi</groupId> diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/pom.xml b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/pom.xml index 50e3a6c719..ea9904350a 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/pom.xml +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/pom.xml @@ -80,7 +80,7 @@ <dependency> <groupId>org.apache.nifi</groupId> <artifactId>nifi-security-identity</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>1.24.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.nifi</groupId> diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-site-to-site/pom.xml b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-site-to-site/pom.xml index 960fc39a0d..845c8e1412 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-site-to-site/pom.xml +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-site-to-site/pom.xml @@ -45,7 +45,7 @@ <dependency> <groupId>org.apache.nifi</groupId> <artifactId>nifi-security-identity</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>1.24.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.nifi</groupId> diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/pom.xml b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/pom.xml index ed16d77621..a1ce0720d3 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/pom.xml +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/pom.xml @@ -201,7 +201,7 @@ <dependency> <groupId>org.apache.nifi</groupId> <artifactId>nifi-security-identity</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>1.24.0-SNAPSHOT</version> <scope>provided</scope> </dependency> <dependency> diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-security/pom.xml b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-security/pom.xml index 01994189f7..5d5883de58 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-security/pom.xml +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-security/pom.xml @@ -155,7 +155,7 @@ <dependency> <groupId>org.apache.nifi</groupId> <artifactId>nifi-security-identity</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>1.24.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.nifi</groupId> diff --git a/nifi-nar-bundles/nifi-ldap-iaa-providers-bundle/nifi-ldap-iaa-providers/pom.xml b/nifi-nar-bundles/nifi-ldap-iaa-providers-bundle/nifi-ldap-iaa-providers/pom.xml index c0415fd326..8e9e39b205 100644 --- a/nifi-nar-bundles/nifi-ldap-iaa-providers-bundle/nifi-ldap-iaa-providers/pom.xml +++ b/nifi-nar-bundles/nifi-ldap-iaa-providers-bundle/nifi-ldap-iaa-providers/pom.xml @@ -44,7 +44,7 @@ <dependency> <groupId>org.apache.nifi</groupId> <artifactId>nifi-security-identity</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>1.24.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.nifi</groupId> diff --git a/nifi-nar-bundles/nifi-standard-services/nifi-web-client-provider-bundle/nifi-web-client-provider-service/pom.xml b/nifi-nar-bundles/nifi-standard-services/nifi-web-client-provider-bundle/nifi-web-client-provider-service/pom.xml index 0f4ee733c6..7ae8138483 100644 --- a/nifi-nar-bundles/nifi-standard-services/nifi-web-client-provider-bundle/nifi-web-client-provider-service/pom.xml +++ b/nifi-nar-bundles/nifi-standard-services/nifi-web-client-provider-bundle/nifi-web-client-provider-service/pom.xml @@ -60,7 +60,7 @@ <dependency> <groupId>org.apache.nifi</groupId> <artifactId>nifi-security-utils</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>1.24.0-SNAPSHOT</version> <scope>test</scope> </dependency> <dependency>
