This is an automated email from the ASF dual-hosted git repository. mthomsen 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 f5a421c NIFI-9067 Upgraded JAXB Runtime from 2.3.0 to 2.3.5 f5a421c is described below commit f5a421ccb13e853d89f1fa3e648d49b62a19e3ed Author: exceptionfactory <exceptionfact...@apache.org> AuthorDate: Thu Aug 19 15:42:13 2021 -0500 NIFI-9067 Upgraded JAXB Runtime from 2.3.0 to 2.3.5 - Replaced old com.sun.xml.bind:jaxb-impl and jaxb-core with current org.glassfish.jaxb:jaxb-runtime - Replaced old javax.xml.bind:jaxb-api with current jakarta.xml.bind-api - Removed unnecessary dependency references to javax.activation-api This closes #5320 Signed-off-by: Mike Thomsen <mthom...@apache.org> --- .../main/assembly/dependencies-windows-service.xml | 2 +- .../src/main/assembly/dependencies.xml | 2 +- nifi-assembly/NOTICE | 10 +++---- nifi-assembly/pom.xml | 34 +++++++--------------- nifi-assembly/src/main/assembly/common.xml | 6 ++-- nifi-assembly/src/main/assembly/dependencies.xml | 6 ++-- nifi-assembly/src/main/assembly/ranger.xml | 6 ++-- nifi-commons/nifi-security-utils/pom.xml | 13 +++------ nifi-commons/nifi-site-to-site-client/pom.xml | 12 +++----- nifi-commons/nifi-utils/pom.xml | 12 +++----- .../nifi-kafka-connector-assembly/pom.xml | 22 ++++---------- .../src/main/assembly/dependencies.xml | 12 +++----- .../src/main/assembly/dependencies.xml | 12 +++----- .../nifi-kafka-connector/pom.xml | 23 ++++----------- .../nifi-beats-processors/pom.xml | 12 +++----- .../nifi-database-utils/pom.xml | 12 +++----- .../nifi-processor-utils/pom.xml | 12 +++----- .../nifi-prometheus-utils/pom.xml | 12 +++----- .../nifi-framework/nifi-authorizer/pom.xml | 12 +++----- .../nifi-framework/nifi-client-dto/pom.xml | 12 +++----- .../nifi-framework/nifi-file-authorizer/pom.xml | 12 +++----- .../nifi-framework-cluster-protocol/pom.xml | 12 +++----- .../nifi-framework/nifi-framework-cluster/pom.xml | 12 +++----- .../nifi-framework/nifi-framework-core-api/pom.xml | 12 +++----- .../nifi-framework/nifi-framework-core/pom.xml | 12 +++----- .../nifi-framework/nifi-web/nifi-web-api/pom.xml | 12 +++----- .../nifi-web/nifi-web-security/pom.xml | 12 +++----- .../nifi-hdfs-processors/pom.xml | 12 +++----- .../nifi-kafka-0-10-processors/pom.xml | 12 +++----- .../nifi-kafka-0-11-processors/pom.xml | 12 +++----- .../nifi-kafka-0-9-processors/pom.xml | 12 +++----- .../nifi-kafka-1-0-processors/pom.xml | 12 +++----- .../nifi-kafka-2-0-processors/pom.xml | 12 +++----- .../nifi-kafka-2-6-processors/pom.xml | 12 +++----- .../nifi-yandex-processors/pom.xml | 12 +++----- .../nifi-lumberjack-processors/pom.xml | 12 +++----- .../nifi-jolt-transform-json-ui/pom.xml | 12 +++----- .../nifi-standard-processors/pom.xml | 12 +++----- .../nifi-update-attribute-model/pom.xml | 12 +++----- .../nifi-update-attribute-ui/pom.xml | 12 +++----- .../src/main/resources/META-INF/NOTICE | 2 -- nifi-stateless/nifi-stateless-assembly/NOTICE | 12 ++++++++ nifi-stateless/nifi-stateless-assembly/pom.xml | 22 ++++---------- .../src/main/assembly/common.xml | 6 ++-- .../src/main/assembly/dependencies.xml | 6 ++-- .../nifi-stateless-system-test-suite/pom.xml | 26 +++++------------ .../src/test/assembly/dependencies.xml | 12 +++----- nifi-system-tests/nifi-system-test-suite/pom.xml | 23 ++++----------- .../src/test/assembly/dependencies.xml | 12 +++----- nifi-toolkit/nifi-toolkit-admin/pom.xml | 12 +++----- nifi-toolkit/nifi-toolkit-assembly/NOTICE | 15 +++++++++- nifi-toolkit/nifi-toolkit-assembly/pom.xml | 22 ++++---------- .../src/main/assembly/dependencies.xml | 12 +++----- nifi-toolkit/pom.xml | 17 ++++------- pom.xml | 21 ++++++------- 55 files changed, 244 insertions(+), 460 deletions(-) diff --git a/minifi/minifi-assembly/src/main/assembly/dependencies-windows-service.xml b/minifi/minifi-assembly/src/main/assembly/dependencies-windows-service.xml index 8e28643..7d390d3 100644 --- a/minifi/minifi-assembly/src/main/assembly/dependencies-windows-service.xml +++ b/minifi/minifi-assembly/src/main/assembly/dependencies-windows-service.xml @@ -43,7 +43,7 @@ <exclude>swagger-annotations</exclude> <exclude>aspectjweaver</exclude> <exclude>h2</exclude> - <exclude>jaxb-impl</exclude> + <exclude>jaxb-runtime</exclude> <exclude>mail</exclude> <exclude>log4j</exclude> <exclude>lucene-queryparser</exclude> diff --git a/minifi/minifi-assembly/src/main/assembly/dependencies.xml b/minifi/minifi-assembly/src/main/assembly/dependencies.xml index 5bdb6da..a0ed808 100644 --- a/minifi/minifi-assembly/src/main/assembly/dependencies.xml +++ b/minifi/minifi-assembly/src/main/assembly/dependencies.xml @@ -43,7 +43,7 @@ <exclude>swagger-annotations</exclude> <exclude>aspectjweaver</exclude> <exclude>h2</exclude> - <exclude>jaxb-impl</exclude> + <exclude>jaxb-runtime</exclude> <exclude>mail</exclude> <exclude>log4j</exclude> <exclude>lucene-queryparser</exclude> diff --git a/nifi-assembly/NOTICE b/nifi-assembly/NOTICE index a47342d..e1bca0c 100644 --- a/nifi-assembly/NOTICE +++ b/nifi-assembly/NOTICE @@ -2027,12 +2027,7 @@ The following binary components are provided under the Common Development and Di (CDDL 1.1) (GPL2 w/ CPE) javax.inject:1 as OSGi bundle (org.glassfish.hk2.external:javax.inject:jar:2.4.0-b25 - https://hk2.java.net/external/javax.inject) (CDDL 1.1) (GPL2 w/ CPE) javax.ws.rs-api (javax.ws.rs:javax.ws.rs-api:jar:2.0.1 - http://jax-rs-spec.java.net) (CDDL 1.1) (GPL2 w/ CPE) javax.ws.rs-api (javax.ws.rs:javax.ws.rs-api:jar:2.1 - http://jax-rs-spec.java.net) - - (CDDL 1.1) (GPL2 w/ CPE) JavaBeans Activation Framework API (javax.activation:javax.activation-api:jar:1.2.0) (CDDL 1.1) (GPL2 w/ CPE) JavaMail API (com.sun.mail:javax.mail:jar:1.6.1) - (CDDL 1.1) (GPL2 w/ CPE) JAXB API (javax.xml.bind:jaxb-api:jar:2.3.0) - (CDDL 1.1) (GPL 1.1) Old JAXB Core (com.sun.xml.bind:jaxb-core:jar:2.3.0) - (CDDL 1.1) (GPL 1.1) Old JAXB Runtime (com.sun.xml.bind:jaxb-impl:jar:2.3.0) ************************ Common Development and Distribution License 1.0 @@ -2091,7 +2086,10 @@ The following binary components are provided under the Eclipse Distribution Lice (EDL 1.0) Jakarta Activation API (jakarta.activation:jakarta.activation-api:jar:2.0.1) (EDL 1.0) Jakarta Activation (com.sun.activation:jakarta.activation:jar:2.0.1) - (EDL 1.0) Jakarta XML Binding API (jakarta.xml.bind:jakarta.xml.bind-api:jar:2.3.2) + (EDL 1.0) Jakarta XML Binding API (jakarta.xml.bind:jakarta.xml.bind-api:jar:2.3.3) + (EDL 1.0) JAXB (JSR 222) Reference Implementation (org.glassfish.jaxb:jaxb-runtime:jar:2.3.5) + (EDL 1.0) Istack Common Utility Code Runtime (com.sun.istack:istack-commons-runtime:jar:3.0.12) + (EDL 1.0) TXW2 Runtime (org.glassfish.jaxb:txw2:jar:2.3.5) ************************ The MIT License diff --git a/nifi-assembly/pom.xml b/nifi-assembly/pom.xml index 7f94d7f..03a9c4f 100644 --- a/nifi-assembly/pom.xml +++ b/nifi-assembly/pom.xml @@ -769,30 +769,20 @@ language governing permissions and limitations under the License. --> <!-- dependencies for jaxb/activation/annotation for running NiFi on Java 11 --> <!-- TODO: remove these once minimum Java version is 11 --> <dependency> - <groupId>javax.xml.bind</groupId> - <artifactId>jaxb-api</artifactId> - <version>2.3.0</version> + <groupId>jakarta.xml.bind</groupId> + <artifactId>jakarta.xml.bind-api</artifactId> + <version>${jakarta.xml.bind-api.version}</version> </dependency> <dependency> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-impl</artifactId> - <version>2.3.0</version> - </dependency> - <dependency> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-core</artifactId> - <version>2.3.0</version> + <groupId>org.glassfish.jaxb</groupId> + <artifactId>jaxb-runtime</artifactId> + <version>${jaxb.runtime.version}</version> </dependency> <dependency> <groupId>javax.annotation</groupId> <artifactId>javax.annotation-api</artifactId> <version>1.3.2</version> </dependency> - <dependency> - <groupId>javax.activation</groupId> - <artifactId>javax.activation-api</artifactId> - <version>1.2.0</version> - </dependency> <!-- AspectJ library needed by the Java Agent used for native library loading (see bootstrap.conf) --> <dependency> <groupId>org.aspectj</groupId> @@ -1232,10 +1222,8 @@ language governing permissions and limitations under the License. --> <exclude>com.squareup.okio:okio</exclude> <!-- exclude jaxb/activation/annotation libs from lib, they'll be included in the java11 subdir --> <!-- TODO: remove these once minimum Java version is 11 --> - <exclude>javax.xml.bind:jaxb-api</exclude> - <exclude>com.sun.xml.bind:jaxb-impl</exclude> - <exclude>com.sun.xml.bind:jaxb-core</exclude> - <exclude>javax.activation:javax.activation-api</exclude> + <exclude>org.glassfish.jaxb:jaxb-runtime</exclude> + <exclude>jakarta.xml.bind:jakarta.xml.bind-api</exclude> <exclude>javax.annotation:javax.annotation-api</exclude> <!-- exclude AspectJ library from lib, it'll be included in the aspectj subdir --> <exclude>org.aspectj:aspectjweaver</exclude> @@ -1294,10 +1282,8 @@ language governing permissions and limitations under the License. --> <directory>/opt/nifi/nifi-${project.version}/lib/java11</directory> <dependency> <includes> - <include>javax.xml.bind:jaxb-api</include> - <include>com.sun.xml.bind:jaxb-impl</include> - <include>com.sun.xml.bind:jaxb-core</include> - <include>javax.activation:javax.activation-api</include> + <include>org.glassfish.jaxb:jaxb-runtime</include> + <include>jakarta.xml.bind:jakarta.xml.bind-api</include> <include>javax.annotation:javax.annotation-api</include> </includes> </dependency> diff --git a/nifi-assembly/src/main/assembly/common.xml b/nifi-assembly/src/main/assembly/common.xml index 45e3c93..58f6923 100644 --- a/nifi-assembly/src/main/assembly/common.xml +++ b/nifi-assembly/src/main/assembly/common.xml @@ -42,10 +42,8 @@ <fileMode>0664</fileMode> <useTransitiveFiltering>true</useTransitiveFiltering> <includes> - <include>javax.xml.bind:jaxb-api</include> - <include>com.sun.xml.bind:jaxb-impl</include> - <include>com.sun.xml.bind:jaxb-core</include> - <include>javax.activation:javax.activation-api</include> + <include>org.glassfish.jaxb:jaxb-runtime</include> + <include>jakarta.xml.bind:jakarta.xml.bind-api</include> <include>javax.annotation:javax.annotation-api</include> </includes> </dependencySet> diff --git a/nifi-assembly/src/main/assembly/dependencies.xml b/nifi-assembly/src/main/assembly/dependencies.xml index 6f48841..ed6ef0a 100644 --- a/nifi-assembly/src/main/assembly/dependencies.xml +++ b/nifi-assembly/src/main/assembly/dependencies.xml @@ -39,10 +39,8 @@ <!-- exclude jaxb/activation/annotation libs from lib, they'll be included in the java11 subdir --> <!-- TODO: remove these once minimum Java version is 11 --> - <exclude>javax.xml.bind:jaxb-api</exclude> - <exclude>com.sun.xml.bind:jaxb-impl</exclude> - <exclude>com.sun.xml.bind:jaxb-core</exclude> - <exclude>javax.activation:javax.activation-api</exclude> + <exclude>org.glassfish.jaxb:jaxb-runtime</exclude> + <exclude>jakarta.xml.bind:jakarta.xml.bind-api</exclude> <exclude>javax.annotation:javax.annotation-api</exclude> <!-- exclude AspectJ library from lib, it'll be included in the aspectj subdir --> diff --git a/nifi-assembly/src/main/assembly/ranger.xml b/nifi-assembly/src/main/assembly/ranger.xml index 531ca30..da18c37 100644 --- a/nifi-assembly/src/main/assembly/ranger.xml +++ b/nifi-assembly/src/main/assembly/ranger.xml @@ -45,10 +45,8 @@ <!-- exclude jaxb/activation/annotation libs from lib, they'll be included in the java11 subdir --> <!-- TODO: remove these once minimum Java version is 11 --> - <exclude>javax.xml.bind:jaxb-api</exclude> - <exclude>com.sun.xml.bind:jaxb-impl</exclude> - <exclude>com.sun.xml.bind:jaxb-core</exclude> - <exclude>javax.activation:javax.activation-api</exclude> + <exclude>org.glassfish.jaxb:jaxb-runtime</exclude> + <exclude>jakarta.xml.bind:jakarta.xml.bind-api</exclude> <exclude>javax.annotation:javax.annotation-api</exclude> </excludes> </dependencySet> diff --git a/nifi-commons/nifi-security-utils/pom.xml b/nifi-commons/nifi-security-utils/pom.xml index 0785971..5f70115 100644 --- a/nifi-commons/nifi-security-utils/pom.xml +++ b/nifi-commons/nifi-security-utils/pom.xml @@ -133,18 +133,13 @@ </activation> <dependencies> <dependency> - <groupId>javax.xml.bind</groupId> - <artifactId>jaxb-api</artifactId> + <groupId>jakarta.xml.bind</groupId> + <artifactId>jakarta.xml.bind-api</artifactId> <scope>test</scope> </dependency> <dependency> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-core</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-impl</artifactId> + <groupId>org.glassfish.jaxb</groupId> + <artifactId>jaxb-runtime</artifactId> <scope>test</scope> </dependency> <dependency> diff --git a/nifi-commons/nifi-site-to-site-client/pom.xml b/nifi-commons/nifi-site-to-site-client/pom.xml index 2c9c259..cd42601 100644 --- a/nifi-commons/nifi-site-to-site-client/pom.xml +++ b/nifi-commons/nifi-site-to-site-client/pom.xml @@ -140,16 +140,12 @@ </properties> <dependencies> <dependency> - <groupId>javax.xml.bind</groupId> - <artifactId>jaxb-api</artifactId> + <groupId>jakarta.xml.bind</groupId> + <artifactId>jakarta.xml.bind-api</artifactId> </dependency> <dependency> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-core</artifactId> - </dependency> - <dependency> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-impl</artifactId> + <groupId>org.glassfish.jaxb</groupId> + <artifactId>jaxb-runtime</artifactId> </dependency> </dependencies> </profile> diff --git a/nifi-commons/nifi-utils/pom.xml b/nifi-commons/nifi-utils/pom.xml index 16cf809..eafc788 100644 --- a/nifi-commons/nifi-utils/pom.xml +++ b/nifi-commons/nifi-utils/pom.xml @@ -51,16 +51,12 @@ </activation> <dependencies> <dependency> - <groupId>javax.xml.bind</groupId> - <artifactId>jaxb-api</artifactId> + <groupId>jakarta.xml.bind</groupId> + <artifactId>jakarta.xml.bind-api</artifactId> </dependency> <dependency> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-core</artifactId> - </dependency> - <dependency> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-impl</artifactId> + <groupId>org.glassfish.jaxb</groupId> + <artifactId>jaxb-runtime</artifactId> </dependency> </dependencies> </profile> diff --git a/nifi-external/nifi-kafka-connect/nifi-kafka-connector-assembly/pom.xml b/nifi-external/nifi-kafka-connect/nifi-kafka-connector-assembly/pom.xml index 43b8afd..44356cf 100644 --- a/nifi-external/nifi-kafka-connect/nifi-kafka-connector-assembly/pom.xml +++ b/nifi-external/nifi-kafka-connect/nifi-kafka-connector-assembly/pom.xml @@ -104,30 +104,20 @@ <!-- dependencies for jaxb/activation/annotation for running NiFi on Java 11 --> <!-- TODO: remove these once minimum Java version is 11 --> <dependency> - <groupId>javax.xml.bind</groupId> - <artifactId>jaxb-api</artifactId> - <version>2.3.0</version> + <groupId>jakarta.xml.bind</groupId> + <artifactId>jakarta.xml.bind-api</artifactId> + <version>${jakarta.xml.bind-api.version}</version> </dependency> <dependency> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-impl</artifactId> - <version>2.3.0</version> - </dependency> - <dependency> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-core</artifactId> - <version>2.3.0</version> + <groupId>org.glassfish.jaxb</groupId> + <artifactId>jaxb-runtime</artifactId> + <version>${jaxb.runtime.version}</version> </dependency> <dependency> <groupId>javax.annotation</groupId> <artifactId>javax.annotation-api</artifactId> <version>1.3.2</version> </dependency> - <dependency> - <groupId>javax.activation</groupId> - <artifactId>javax.activation-api</artifactId> - <version>1.2.0</version> - </dependency> </dependencies> diff --git a/nifi-external/nifi-kafka-connect/nifi-kafka-connector-assembly/src/main/assembly/dependencies.xml b/nifi-external/nifi-kafka-connect/nifi-kafka-connector-assembly/src/main/assembly/dependencies.xml index 1ce7f18..b4006c6 100644 --- a/nifi-external/nifi-kafka-connect/nifi-kafka-connector-assembly/src/main/assembly/dependencies.xml +++ b/nifi-external/nifi-kafka-connect/nifi-kafka-connector-assembly/src/main/assembly/dependencies.xml @@ -38,10 +38,8 @@ <!-- exclude jaxb/activation/annotation libs from lib, they'll be included in the java11 subdir --> <!-- TODO: remove these once minimum Java version is 11 --> - <exclude>javax.xml.bind:jaxb-api</exclude> - <exclude>com.sun.xml.bind:jaxb-impl</exclude> - <exclude>com.sun.xml.bind:jaxb-core</exclude> - <exclude>javax.activation:javax.activation-api</exclude> + <exclude>org.glassfish.jaxb:jaxb-runtime</exclude> + <exclude>jakarta.xml.bind:jakarta.xml.bind-api</exclude> <exclude>javax.annotation:javax.annotation-api</exclude> <!-- exclude AspectJ library from lib, it'll be included in the aspectj subdir --> @@ -59,10 +57,8 @@ <fileMode>0664</fileMode> <useTransitiveFiltering>true</useTransitiveFiltering> <includes> - <include>javax.xml.bind:jaxb-api</include> - <include>com.sun.xml.bind:jaxb-impl</include> - <include>com.sun.xml.bind:jaxb-core</include> - <include>javax.activation:javax.activation-api</include> + <include>org.glassfish.jaxb:jaxb-runtime</include> + <include>jakarta.xml.bind:jakarta.xml.bind-api</include> <include>javax.annotation:javax.annotation-api</include> </includes> </dependencySet> diff --git a/nifi-external/nifi-kafka-connect/nifi-kafka-connector-tests/src/main/assembly/dependencies.xml b/nifi-external/nifi-kafka-connect/nifi-kafka-connector-tests/src/main/assembly/dependencies.xml index b631278..0d83b8d 100644 --- a/nifi-external/nifi-kafka-connect/nifi-kafka-connector-tests/src/main/assembly/dependencies.xml +++ b/nifi-external/nifi-kafka-connect/nifi-kafka-connector-tests/src/main/assembly/dependencies.xml @@ -35,10 +35,8 @@ <!-- exclude jaxb/activation/annotation libs from lib, they'll be included in the java11 subdir --> <!-- TODO: remove these once minimum Java version is 11 --> - <exclude>javax.xml.bind:jaxb-api</exclude> - <exclude>com.sun.xml.bind:jaxb-impl</exclude> - <exclude>com.sun.xml.bind:jaxb-core</exclude> - <exclude>javax.activation:javax.activation-api</exclude> + <exclude>org.glassfish.jaxb:jaxb-runtime</exclude> + <exclude>jakarta.xml.bind:jakarta.xml.bind-api</exclude> <exclude>javax.annotation:javax.annotation-api</exclude> <!-- exclude AspectJ library from lib, it'll be included in the aspectj subdir --> @@ -56,10 +54,8 @@ <fileMode>0664</fileMode> <useTransitiveFiltering>true</useTransitiveFiltering> <includes> - <include>javax.xml.bind:jaxb-api</include> - <include>com.sun.xml.bind:jaxb-impl</include> - <include>com.sun.xml.bind:jaxb-core</include> - <include>javax.activation:javax.activation-api</include> + <include>org.glassfish.jaxb:jaxb-runtime</include> + <include>jakarta.xml.bind:jakarta.xml.bind-api</include> <include>javax.annotation:javax.annotation-api</include> </includes> </dependencySet> diff --git a/nifi-external/nifi-kafka-connect/nifi-kafka-connector/pom.xml b/nifi-external/nifi-kafka-connect/nifi-kafka-connector/pom.xml index 0582d09..969fad6 100644 --- a/nifi-external/nifi-kafka-connect/nifi-kafka-connector/pom.xml +++ b/nifi-external/nifi-kafka-connect/nifi-kafka-connector/pom.xml @@ -109,31 +109,20 @@ <!-- dependencies for jaxb/activation/annotation for running NiFi on Java 11 --> <!-- TODO: remove these once minimum Java version is 11 --> <dependency> - <groupId>javax.xml.bind</groupId> - <artifactId>jaxb-api</artifactId> - <version>2.3.0</version> + <groupId>jakarta.xml.bind</groupId> + <artifactId>jakarta.xml.bind-api</artifactId> + <version>${jakarta.xml.bind-api.version}</version> </dependency> <dependency> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-impl</artifactId> - <version>2.3.0</version> - </dependency> - <dependency> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-core</artifactId> - <version>2.3.0</version> + <groupId>org.glassfish.jaxb</groupId> + <artifactId>jaxb-runtime</artifactId> + <version>${jaxb.runtime.version}</version> </dependency> <dependency> <groupId>javax.annotation</groupId> <artifactId>javax.annotation-api</artifactId> <version>1.3.2</version> </dependency> - <dependency> - <groupId>javax.activation</groupId> - <artifactId>javax.activation-api</artifactId> - <version>1.2.0</version> - </dependency> - </dependencies> </project> \ No newline at end of file diff --git a/nifi-nar-bundles/nifi-beats-bundle/nifi-beats-processors/pom.xml b/nifi-nar-bundles/nifi-beats-bundle/nifi-beats-processors/pom.xml index d8974e4..d91ef89 100644 --- a/nifi-nar-bundles/nifi-beats-bundle/nifi-beats-processors/pom.xml +++ b/nifi-nar-bundles/nifi-beats-bundle/nifi-beats-processors/pom.xml @@ -83,16 +83,12 @@ </activation> <dependencies> <dependency> - <groupId>javax.xml.bind</groupId> - <artifactId>jaxb-api</artifactId> + <groupId>jakarta.xml.bind</groupId> + <artifactId>jakarta.xml.bind-api</artifactId> </dependency> <dependency> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-core</artifactId> - </dependency> - <dependency> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-impl</artifactId> + <groupId>org.glassfish.jaxb</groupId> + <artifactId>jaxb-runtime</artifactId> </dependency> </dependencies> </profile> diff --git a/nifi-nar-bundles/nifi-extension-utils/nifi-database-utils/pom.xml b/nifi-nar-bundles/nifi-extension-utils/nifi-database-utils/pom.xml index 5a85b8e..d428c60 100644 --- a/nifi-nar-bundles/nifi-extension-utils/nifi-database-utils/pom.xml +++ b/nifi-nar-bundles/nifi-extension-utils/nifi-database-utils/pom.xml @@ -119,16 +119,12 @@ </activation> <dependencies> <dependency> - <groupId>javax.xml.bind</groupId> - <artifactId>jaxb-api</artifactId> + <groupId>jakarta.xml.bind</groupId> + <artifactId>jakarta.xml.bind-api</artifactId> </dependency> <dependency> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-core</artifactId> - </dependency> - <dependency> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-impl</artifactId> + <groupId>org.glassfish.jaxb</groupId> + <artifactId>jaxb-runtime</artifactId> </dependency> </dependencies> </profile> diff --git a/nifi-nar-bundles/nifi-extension-utils/nifi-processor-utils/pom.xml b/nifi-nar-bundles/nifi-extension-utils/nifi-processor-utils/pom.xml index ed7675e..b55aaf2 100644 --- a/nifi-nar-bundles/nifi-extension-utils/nifi-processor-utils/pom.xml +++ b/nifi-nar-bundles/nifi-extension-utils/nifi-processor-utils/pom.xml @@ -115,16 +115,12 @@ </activation> <dependencies> <dependency> - <groupId>javax.xml.bind</groupId> - <artifactId>jaxb-api</artifactId> + <groupId>jakarta.xml.bind</groupId> + <artifactId>jakarta.xml.bind-api</artifactId> </dependency> <dependency> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-core</artifactId> - </dependency> - <dependency> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-impl</artifactId> + <groupId>org.glassfish.jaxb</groupId> + <artifactId>jaxb-runtime</artifactId> </dependency> </dependencies> </profile> diff --git a/nifi-nar-bundles/nifi-extension-utils/nifi-prometheus-utils/pom.xml b/nifi-nar-bundles/nifi-extension-utils/nifi-prometheus-utils/pom.xml index 9ee87fb..2abd97e 100644 --- a/nifi-nar-bundles/nifi-extension-utils/nifi-prometheus-utils/pom.xml +++ b/nifi-nar-bundles/nifi-extension-utils/nifi-prometheus-utils/pom.xml @@ -82,16 +82,12 @@ </activation> <dependencies> <dependency> - <groupId>javax.xml.bind</groupId> - <artifactId>jaxb-api</artifactId> + <groupId>jakarta.xml.bind</groupId> + <artifactId>jakarta.xml.bind-api</artifactId> </dependency> <dependency> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-core</artifactId> - </dependency> - <dependency> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-impl</artifactId> + <groupId>org.glassfish.jaxb</groupId> + <artifactId>jaxb-runtime</artifactId> </dependency> </dependencies> </profile> diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-authorizer/pom.xml b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-authorizer/pom.xml index 88037f5..e2a2b46 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-authorizer/pom.xml +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-authorizer/pom.xml @@ -100,16 +100,12 @@ </build> <dependencies> <dependency> - <groupId>javax.xml.bind</groupId> - <artifactId>jaxb-api</artifactId> + <groupId>jakarta.xml.bind</groupId> + <artifactId>jakarta.xml.bind-api</artifactId> </dependency> <dependency> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-core</artifactId> - </dependency> - <dependency> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-impl</artifactId> + <groupId>org.glassfish.jaxb</groupId> + <artifactId>jaxb-runtime</artifactId> </dependency> </dependencies> </profile> diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/pom.xml b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/pom.xml index ae70a2c..f4f7111 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/pom.xml +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/pom.xml @@ -42,16 +42,12 @@ </activation> <dependencies> <dependency> - <groupId>javax.xml.bind</groupId> - <artifactId>jaxb-api</artifactId> + <groupId>jakarta.xml.bind</groupId> + <artifactId>jakarta.xml.bind-api</artifactId> </dependency> <dependency> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-core</artifactId> - </dependency> - <dependency> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-impl</artifactId> + <groupId>org.glassfish.jaxb</groupId> + <artifactId>jaxb-runtime</artifactId> </dependency> </dependencies> </profile> 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 6e82c41..8c597e2 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 @@ -177,16 +177,12 @@ </build> <dependencies> <dependency> - <groupId>javax.xml.bind</groupId> - <artifactId>jaxb-api</artifactId> + <groupId>jakarta.xml.bind</groupId> + <artifactId>jakarta.xml.bind-api</artifactId> </dependency> <dependency> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-core</artifactId> - </dependency> - <dependency> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-impl</artifactId> + <groupId>org.glassfish.jaxb</groupId> + <artifactId>jaxb-runtime</artifactId> </dependency> </dependencies> </profile> diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/pom.xml b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/pom.xml index b96f224..fb8f8d2 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/pom.xml +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/pom.xml @@ -72,16 +72,12 @@ </activation> <dependencies> <dependency> - <groupId>javax.xml.bind</groupId> - <artifactId>jaxb-api</artifactId> + <groupId>jakarta.xml.bind</groupId> + <artifactId>jakarta.xml.bind-api</artifactId> </dependency> <dependency> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-core</artifactId> - </dependency> - <dependency> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-impl</artifactId> + <groupId>org.glassfish.jaxb</groupId> + <artifactId>jaxb-runtime</artifactId> </dependency> </dependencies> </profile> diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/pom.xml b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/pom.xml index 4ec7141..12d1ed4 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/pom.xml +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/pom.xml @@ -198,16 +198,12 @@ </activation> <dependencies> <dependency> - <groupId>javax.xml.bind</groupId> - <artifactId>jaxb-api</artifactId> + <groupId>jakarta.xml.bind</groupId> + <artifactId>jakarta.xml.bind-api</artifactId> </dependency> <dependency> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-core</artifactId> - </dependency> - <dependency> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-impl</artifactId> + <groupId>org.glassfish.jaxb</groupId> + <artifactId>jaxb-runtime</artifactId> </dependency> </dependencies> </profile> diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/pom.xml b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/pom.xml index 67ace9a..c8aea7b 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/pom.xml +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/pom.xml @@ -86,16 +86,12 @@ language governing permissions and limitations under the License. --> </activation> <dependencies> <dependency> - <groupId>javax.xml.bind</groupId> - <artifactId>jaxb-api</artifactId> + <groupId>jakarta.xml.bind</groupId> + <artifactId>jakarta.xml.bind-api</artifactId> </dependency> <dependency> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-core</artifactId> - </dependency> - <dependency> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-impl</artifactId> + <groupId>org.glassfish.jaxb</groupId> + <artifactId>jaxb-runtime</artifactId> </dependency> </dependencies> </profile> 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 2607acc..ad557b6 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 @@ -292,16 +292,12 @@ </activation> <dependencies> <dependency> - <groupId>javax.xml.bind</groupId> - <artifactId>jaxb-api</artifactId> + <groupId>jakarta.xml.bind</groupId> + <artifactId>jakarta.xml.bind-api</artifactId> </dependency> <dependency> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-core</artifactId> - </dependency> - <dependency> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-impl</artifactId> + <groupId>org.glassfish.jaxb</groupId> + <artifactId>jaxb-runtime</artifactId> </dependency> </dependencies> </profile> 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 823659b..c06fbdc 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 @@ -136,16 +136,12 @@ </activation> <dependencies> <dependency> - <groupId>javax.xml.bind</groupId> - <artifactId>jaxb-api</artifactId> + <groupId>jakarta.xml.bind</groupId> + <artifactId>jakarta.xml.bind-api</artifactId> </dependency> <dependency> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-core</artifactId> - </dependency> - <dependency> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-impl</artifactId> + <groupId>org.glassfish.jaxb</groupId> + <artifactId>jaxb-runtime</artifactId> </dependency> </dependencies> </profile> 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 8135064..7556dbb 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 @@ -118,16 +118,12 @@ </build> <dependencies> <dependency> - <groupId>javax.xml.bind</groupId> - <artifactId>jaxb-api</artifactId> + <groupId>jakarta.xml.bind</groupId> + <artifactId>jakarta.xml.bind-api</artifactId> </dependency> <dependency> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-core</artifactId> - </dependency> - <dependency> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-impl</artifactId> + <groupId>org.glassfish.jaxb</groupId> + <artifactId>jaxb-runtime</artifactId> </dependency> </dependencies> </profile> diff --git a/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/pom.xml b/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/pom.xml index e143bc2..3d8911d 100644 --- a/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/pom.xml +++ b/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/pom.xml @@ -135,16 +135,12 @@ </activation> <dependencies> <dependency> - <groupId>javax.xml.bind</groupId> - <artifactId>jaxb-api</artifactId> + <groupId>jakarta.xml.bind</groupId> + <artifactId>jakarta.xml.bind-api</artifactId> </dependency> <dependency> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-core</artifactId> - </dependency> - <dependency> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-impl</artifactId> + <groupId>org.glassfish.jaxb</groupId> + <artifactId>jaxb-runtime</artifactId> </dependency> </dependencies> </profile> diff --git a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-10-processors/pom.xml b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-10-processors/pom.xml index 60e3493..ec067ec 100644 --- a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-10-processors/pom.xml +++ b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-10-processors/pom.xml @@ -103,16 +103,12 @@ </activation> <dependencies> <dependency> - <groupId>javax.xml.bind</groupId> - <artifactId>jaxb-api</artifactId> + <groupId>jakarta.xml.bind</groupId> + <artifactId>jakarta.xml.bind-api</artifactId> </dependency> <dependency> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-core</artifactId> - </dependency> - <dependency> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-impl</artifactId> + <groupId>org.glassfish.jaxb</groupId> + <artifactId>jaxb-runtime</artifactId> </dependency> </dependencies> </profile> diff --git a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-11-processors/pom.xml b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-11-processors/pom.xml index cc5dccc..74734b1 100644 --- a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-11-processors/pom.xml +++ b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-11-processors/pom.xml @@ -102,16 +102,12 @@ </activation> <dependencies> <dependency> - <groupId>javax.xml.bind</groupId> - <artifactId>jaxb-api</artifactId> + <groupId>jakarta.xml.bind</groupId> + <artifactId>jakarta.xml.bind-api</artifactId> </dependency> <dependency> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-core</artifactId> - </dependency> - <dependency> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-impl</artifactId> + <groupId>org.glassfish.jaxb</groupId> + <artifactId>jaxb-runtime</artifactId> </dependency> </dependencies> </profile> diff --git a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-9-processors/pom.xml b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-9-processors/pom.xml index 3d9e26c..7958049 100644 --- a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-9-processors/pom.xml +++ b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-9-processors/pom.xml @@ -90,16 +90,12 @@ </activation> <dependencies> <dependency> - <groupId>javax.xml.bind</groupId> - <artifactId>jaxb-api</artifactId> + <groupId>jakarta.xml.bind</groupId> + <artifactId>jakarta.xml.bind-api</artifactId> </dependency> <dependency> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-core</artifactId> - </dependency> - <dependency> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-impl</artifactId> + <groupId>org.glassfish.jaxb</groupId> + <artifactId>jaxb-runtime</artifactId> </dependency> </dependencies> </profile> diff --git a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-1-0-processors/pom.xml b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-1-0-processors/pom.xml index 55a2c68..c971873 100644 --- a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-1-0-processors/pom.xml +++ b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-1-0-processors/pom.xml @@ -119,16 +119,12 @@ </activation> <dependencies> <dependency> - <groupId>javax.xml.bind</groupId> - <artifactId>jaxb-api</artifactId> + <groupId>jakarta.xml.bind</groupId> + <artifactId>jakarta.xml.bind-api</artifactId> </dependency> <dependency> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-core</artifactId> - </dependency> - <dependency> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-impl</artifactId> + <groupId>org.glassfish.jaxb</groupId> + <artifactId>jaxb-runtime</artifactId> </dependency> </dependencies> </profile> diff --git a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-2-0-processors/pom.xml b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-2-0-processors/pom.xml index 5d5135c..e064ff5 100644 --- a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-2-0-processors/pom.xml +++ b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-2-0-processors/pom.xml @@ -120,16 +120,12 @@ </activation> <dependencies> <dependency> - <groupId>javax.xml.bind</groupId> - <artifactId>jaxb-api</artifactId> + <groupId>jakarta.xml.bind</groupId> + <artifactId>jakarta.xml.bind-api</artifactId> </dependency> <dependency> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-core</artifactId> - </dependency> - <dependency> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-impl</artifactId> + <groupId>org.glassfish.jaxb</groupId> + <artifactId>jaxb-runtime</artifactId> </dependency> </dependencies> </profile> diff --git a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-2-6-processors/pom.xml b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-2-6-processors/pom.xml index ce58244..589cee2 100644 --- a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-2-6-processors/pom.xml +++ b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-2-6-processors/pom.xml @@ -128,16 +128,12 @@ </activation> <dependencies> <dependency> - <groupId>javax.xml.bind</groupId> - <artifactId>jaxb-api</artifactId> + <groupId>jakarta.xml.bind</groupId> + <artifactId>jakarta.xml.bind-api</artifactId> </dependency> <dependency> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-core</artifactId> - </dependency> - <dependency> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-impl</artifactId> + <groupId>org.glassfish.jaxb</groupId> + <artifactId>jaxb-runtime</artifactId> </dependency> </dependencies> </profile> diff --git a/nifi-nar-bundles/nifi-language-translation-bundle/nifi-yandex-processors/pom.xml b/nifi-nar-bundles/nifi-language-translation-bundle/nifi-yandex-processors/pom.xml index 50874a9..bd9124b 100644 --- a/nifi-nar-bundles/nifi-language-translation-bundle/nifi-yandex-processors/pom.xml +++ b/nifi-nar-bundles/nifi-language-translation-bundle/nifi-yandex-processors/pom.xml @@ -73,16 +73,12 @@ </activation> <dependencies> <dependency> - <groupId>javax.xml.bind</groupId> - <artifactId>jaxb-api</artifactId> + <groupId>jakarta.xml.bind</groupId> + <artifactId>jakarta.xml.bind-api</artifactId> </dependency> <dependency> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-core</artifactId> - </dependency> - <dependency> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-impl</artifactId> + <groupId>org.glassfish.jaxb</groupId> + <artifactId>jaxb-runtime</artifactId> </dependency> </dependencies> </profile> diff --git a/nifi-nar-bundles/nifi-lumberjack-bundle/nifi-lumberjack-processors/pom.xml b/nifi-nar-bundles/nifi-lumberjack-bundle/nifi-lumberjack-processors/pom.xml index cdbf9c9..b1dc88c 100644 --- a/nifi-nar-bundles/nifi-lumberjack-bundle/nifi-lumberjack-processors/pom.xml +++ b/nifi-nar-bundles/nifi-lumberjack-bundle/nifi-lumberjack-processors/pom.xml @@ -78,16 +78,12 @@ </activation> <dependencies> <dependency> - <groupId>javax.xml.bind</groupId> - <artifactId>jaxb-api</artifactId> + <groupId>jakarta.xml.bind</groupId> + <artifactId>jakarta.xml.bind-api</artifactId> </dependency> <dependency> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-core</artifactId> - </dependency> - <dependency> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-impl</artifactId> + <groupId>org.glassfish.jaxb</groupId> + <artifactId>jaxb-runtime</artifactId> </dependency> </dependencies> </profile> diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-jolt-transform-json-ui/pom.xml b/nifi-nar-bundles/nifi-standard-bundle/nifi-jolt-transform-json-ui/pom.xml index c9abb6c..c70928f 100644 --- a/nifi-nar-bundles/nifi-standard-bundle/nifi-jolt-transform-json-ui/pom.xml +++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-jolt-transform-json-ui/pom.xml @@ -242,16 +242,12 @@ language governing permissions and limitations under the License. --> </activation> <dependencies> <dependency> - <groupId>javax.xml.bind</groupId> - <artifactId>jaxb-api</artifactId> + <groupId>jakarta.xml.bind</groupId> + <artifactId>jakarta.xml.bind-api</artifactId> </dependency> <dependency> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-core</artifactId> - </dependency> - <dependency> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-impl</artifactId> + <groupId>org.glassfish.jaxb</groupId> + <artifactId>jaxb-runtime</artifactId> </dependency> <dependency> <groupId>com.sun.activation</groupId> diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/pom.xml b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/pom.xml index 0b9cba7..ff78f70 100644 --- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/pom.xml +++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/pom.xml @@ -668,16 +668,12 @@ </activation> <dependencies> <dependency> - <groupId>javax.xml.bind</groupId> - <artifactId>jaxb-api</artifactId> + <groupId>jakarta.xml.bind</groupId> + <artifactId>jakarta.xml.bind-api</artifactId> </dependency> <dependency> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-core</artifactId> - </dependency> - <dependency> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-impl</artifactId> + <groupId>org.glassfish.jaxb</groupId> + <artifactId>jaxb-runtime</artifactId> </dependency> </dependencies> </profile> diff --git a/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-model/pom.xml b/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-model/pom.xml index 248d218..32b3da7 100644 --- a/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-model/pom.xml +++ b/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-model/pom.xml @@ -40,16 +40,12 @@ </activation> <dependencies> <dependency> - <groupId>javax.xml.bind</groupId> - <artifactId>jaxb-api</artifactId> + <groupId>jakarta.xml.bind</groupId> + <artifactId>jakarta.xml.bind-api</artifactId> </dependency> <dependency> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-core</artifactId> - </dependency> - <dependency> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-impl</artifactId> + <groupId>org.glassfish.jaxb</groupId> + <artifactId>jaxb-runtime</artifactId> </dependency> </dependencies> </profile> diff --git a/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-ui/pom.xml b/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-ui/pom.xml index 1464340..b7fffa1 100644 --- a/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-ui/pom.xml +++ b/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-ui/pom.xml @@ -56,16 +56,12 @@ </activation> <dependencies> <dependency> - <groupId>javax.xml.bind</groupId> - <artifactId>jaxb-api</artifactId> + <groupId>jakarta.xml.bind</groupId> + <artifactId>jakarta.xml.bind-api</artifactId> </dependency> <dependency> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-core</artifactId> - </dependency> - <dependency> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-impl</artifactId> + <groupId>org.glassfish.jaxb</groupId> + <artifactId>jaxb-runtime</artifactId> </dependency> </dependencies> </profile> diff --git a/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-ui/src/main/resources/META-INF/NOTICE b/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-ui/src/main/resources/META-INF/NOTICE index fe7a4a5..e70e06b 100644 --- a/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-ui/src/main/resources/META-INF/NOTICE +++ b/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-ui/src/main/resources/META-INF/NOTICE @@ -39,8 +39,6 @@ The following binary components are provided under the Common Development and Di (CDDL 1.1) (GPL2 w/ CPE) hk2-api (org.glassfish.hk2.core:hk2-api:jar:2.5.0-b42 - https://javaee.github.io/glassfish/) (CDDL 1.1) (GPL2 w/ CPE) hk2-utils (org.glassfish.hk2.core:hk2-utils:jar:2.5.0-b42 - https://javaee.github.io/glassfish/) (CDDL 1.1) (GPL2 w/ CPE) hk2-locator (org.glassfish.hk2.core:hk2-locator:jar:2.5.0-b42 - https://javaee.github.io/glassfish/) - (CDDL 1.1) (GPL2 w/ CPE) Old JAXB Runtime (com.sun.xml.bind:jaxb-impl:jar:2.2.3-1 - http://jaxb.java.net/) - (CDDL 1.1) (GPL2 w/ CPE) Java Architecture For XML Binding (javax.xml.bind:jaxb-api:jar:2.2.2 - https://jaxb.dev.java.net/) (CDDL 1.1) (GPL2 w/ CPE) javax.ws.rs-api (javax.ws.rs:javax.ws.rs-api:jar:2.1 - http://jax-rs-spec.java.net) ************************ diff --git a/nifi-stateless/nifi-stateless-assembly/NOTICE b/nifi-stateless/nifi-stateless-assembly/NOTICE index 6611fe5..9074edb 100644 --- a/nifi-stateless/nifi-stateless-assembly/NOTICE +++ b/nifi-stateless/nifi-stateless-assembly/NOTICE @@ -142,6 +142,18 @@ The following binary components are provided under the Common Development and Di (CDDL 1.1) (GPL2 w/ CPE) MIME Streaming Extension (org.jvnet.mimepull:mimepull:jar:1.9.3 - http://mimepull.java.net) (CDDL 1.1) (GPL2 w/ CPE) OSGi resource locator bundle (org.glassfish.hk2:osgi-resource-locator:jar:1.0.1 - http://glassfish.org/osgi-resource-locator) +************************ +Eclipse Distribution License 1.0 +************************ + +The following binary components are provided under the Eclipse Distribution License 1.0. + + (EDL 1.0) Jakarta Activation API (jakarta.activation:jakarta.activation-api:jar:1.2.2) + (EDL 1.0) Jakarta Activation (com.sun.activation:jakarta.activation:jar:1.2.2) + (EDL 1.0) Jakarta XML Binding API (jakarta.xml.bind:jakarta.xml.bind-api:jar:2.3.3) + (EDL 1.0) JAXB (JSR 222) Reference Implementation (org.glassfish.jaxb:jaxb-runtime:jar:2.3.5) + (EDL 1.0) Istack Common Utility Code Runtime (com.sun.istack:istack-commons-runtime:jar:3.0.12) + (EDL 1.0) TXW2 Runtime (org.glassfish.jaxb:txw2:jar:2.3.5) ************************ Eclipse Public License 1.0 diff --git a/nifi-stateless/nifi-stateless-assembly/pom.xml b/nifi-stateless/nifi-stateless-assembly/pom.xml index 8c9aeed..47522c5 100644 --- a/nifi-stateless/nifi-stateless-assembly/pom.xml +++ b/nifi-stateless/nifi-stateless-assembly/pom.xml @@ -123,30 +123,20 @@ <!-- dependencies for jaxb/activation/annotation for running NiFi on Java 11 --> <!-- TODO: remove these once minimum Java version is 11 --> <dependency> - <groupId>javax.xml.bind</groupId> - <artifactId>jaxb-api</artifactId> - <version>2.3.0</version> + <groupId>jakarta.xml.bind</groupId> + <artifactId>jakarta.xml.bind-api</artifactId> + <version>${jakarta.xml.bind-api.version}</version> </dependency> <dependency> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-impl</artifactId> - <version>2.3.0</version> - </dependency> - <dependency> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-core</artifactId> - <version>2.3.0</version> + <groupId>org.glassfish.jaxb</groupId> + <artifactId>jaxb-runtime</artifactId> + <version>${jaxb.runtime.version}</version> </dependency> <dependency> <groupId>javax.annotation</groupId> <artifactId>javax.annotation-api</artifactId> <version>1.3.2</version> </dependency> - <dependency> - <groupId>javax.activation</groupId> - <artifactId>javax.activation-api</artifactId> - <version>1.2.0</version> - </dependency> <!-- AspectJ library needed by the Java Agent used for native library loading --> <dependency> diff --git a/nifi-stateless/nifi-stateless-assembly/src/main/assembly/common.xml b/nifi-stateless/nifi-stateless-assembly/src/main/assembly/common.xml index d769728..e14ad18 100644 --- a/nifi-stateless/nifi-stateless-assembly/src/main/assembly/common.xml +++ b/nifi-stateless/nifi-stateless-assembly/src/main/assembly/common.xml @@ -40,10 +40,8 @@ <fileMode>0664</fileMode> <useTransitiveFiltering>true</useTransitiveFiltering> <includes> - <include>javax.xml.bind:jaxb-api</include> - <include>com.sun.xml.bind:jaxb-impl</include> - <include>com.sun.xml.bind:jaxb-core</include> - <include>javax.activation:javax.activation-api</include> + <include>org.glassfish.jaxb:jaxb-runtime</include> + <include>jakarta.xml.bind:jakarta.xml.bind-api</include> <include>javax.annotation:javax.annotation-api</include> </includes> </dependencySet> diff --git a/nifi-stateless/nifi-stateless-assembly/src/main/assembly/dependencies.xml b/nifi-stateless/nifi-stateless-assembly/src/main/assembly/dependencies.xml index 12d0022..caa2029 100644 --- a/nifi-stateless/nifi-stateless-assembly/src/main/assembly/dependencies.xml +++ b/nifi-stateless/nifi-stateless-assembly/src/main/assembly/dependencies.xml @@ -36,10 +36,8 @@ <!-- exclude jaxb/activation/annotation libs from lib, they'll be included in the java11 subdir --> <!-- TODO: remove these once minimum Java version is 11 --> - <exclude>javax.xml.bind:jaxb-api</exclude> - <exclude>com.sun.xml.bind:jaxb-impl</exclude> - <exclude>com.sun.xml.bind:jaxb-core</exclude> - <exclude>javax.activation:javax.activation-api</exclude> + <exclude>org.glassfish.jaxb:jaxb-runtime</exclude> + <exclude>jakarta.xml.bind:jakarta.xml.bind-api</exclude> <exclude>javax.annotation:javax.annotation-api</exclude> <!-- exclude AspectJ library from lib, it'll be included in the aspectj subdir --> diff --git a/nifi-system-tests/nifi-stateless-system-test-suite/pom.xml b/nifi-system-tests/nifi-stateless-system-test-suite/pom.xml index d9d060c..d839035 100644 --- a/nifi-system-tests/nifi-stateless-system-test-suite/pom.xml +++ b/nifi-system-tests/nifi-stateless-system-test-suite/pom.xml @@ -22,9 +22,7 @@ <modelVersion>4.0.0</modelVersion> <artifactId>nifi-stateless-system-test-suite</artifactId> - <properties> - <jaxb.version>2.3.0</jaxb.version> - </properties> + <dependencies> <dependency> <groupId>org.apache.nifi</groupId> @@ -55,30 +53,20 @@ <!-- Java 11 Dependencies --> <!-- TODO: remove these once minimum Java version is 11 --> <dependency> - <groupId>javax.xml.bind</groupId> - <artifactId>jaxb-api</artifactId> - <version>${jaxb.version}</version> - </dependency> - <dependency> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-impl</artifactId> - <version>${jaxb.version}</version> + <groupId>jakarta.xml.bind</groupId> + <artifactId>jakarta.xml.bind-api</artifactId> + <version>${jakarta.xml.bind-api.version}</version> </dependency> <dependency> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-core</artifactId> - <version>${jaxb.version}</version> + <groupId>org.glassfish.jaxb</groupId> + <artifactId>jaxb-runtime</artifactId> + <version>${jaxb.runtime.version}</version> </dependency> <dependency> <groupId>javax.annotation</groupId> <artifactId>javax.annotation-api</artifactId> <version>1.3.2</version> </dependency> - <dependency> - <groupId>javax.activation</groupId> - <artifactId>javax.activation-api</artifactId> - <version>1.2.0</version> - </dependency> <!-- Optional Dependencies --> <dependency> diff --git a/nifi-system-tests/nifi-stateless-system-test-suite/src/test/assembly/dependencies.xml b/nifi-system-tests/nifi-stateless-system-test-suite/src/test/assembly/dependencies.xml index 4253eea..e4ec7d6 100644 --- a/nifi-system-tests/nifi-stateless-system-test-suite/src/test/assembly/dependencies.xml +++ b/nifi-system-tests/nifi-stateless-system-test-suite/src/test/assembly/dependencies.xml @@ -35,10 +35,8 @@ <exclude>jackson-core</exclude> <exclude>jackson-databind</exclude> <!-- TODO: remove these once minimum Java version is 11 --> - <exclude>javax.xml.bind:jaxb-api</exclude> - <exclude>com.sun.xml.bind:jaxb-impl</exclude> - <exclude>com.sun.xml.bind:jaxb-core</exclude> - <exclude>javax.activation:javax.activation-api</exclude> + <exclude>org.glassfish.jaxb:jaxb-runtime</exclude> + <exclude>jakarta.xml.bind:jakarta.xml.bind-api</exclude> <exclude>javax.annotation:javax.annotation-api</exclude> </excludes> </dependencySet> @@ -53,10 +51,8 @@ <fileMode>0664</fileMode> <useTransitiveFiltering>true</useTransitiveFiltering> <includes> - <include>javax.xml.bind:jaxb-api</include> - <include>com.sun.xml.bind:jaxb-impl</include> - <include>com.sun.xml.bind:jaxb-core</include> - <include>javax.activation:javax.activation-api</include> + <include>org.glassfish.jaxb:jaxb-runtime</include> + <include>jakarta.xml.bind:jakarta.xml.bind-api</include> <include>javax.annotation:javax.annotation-api</include> </includes> </dependencySet> diff --git a/nifi-system-tests/nifi-system-test-suite/pom.xml b/nifi-system-tests/nifi-system-test-suite/pom.xml index 81bd547..cf8eed7 100644 --- a/nifi-system-tests/nifi-system-test-suite/pom.xml +++ b/nifi-system-tests/nifi-system-test-suite/pom.xml @@ -207,31 +207,20 @@ <!-- dependencies for jaxb/activation/annotation for running NiFi on Java 11 --> <!-- TODO: remove these once minimum Java version is 11 --> <dependency> - <groupId>javax.xml.bind</groupId> - <artifactId>jaxb-api</artifactId> - <version>2.3.0</version> + <groupId>jakarta.xml.bind</groupId> + <artifactId>jakarta.xml.bind-api</artifactId> + <version>${jakarta.xml.bind-api.version}</version> </dependency> <dependency> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-impl</artifactId> - <version>2.3.0</version> - </dependency> - <dependency> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-core</artifactId> - <version>2.3.0</version> + <groupId>org.glassfish.jaxb</groupId> + <artifactId>jaxb-runtime</artifactId> + <version>${jaxb.runtime.version}</version> </dependency> <dependency> <groupId>javax.annotation</groupId> <artifactId>javax.annotation-api</artifactId> <version>1.3.2</version> </dependency> - <dependency> - <groupId>javax.activation</groupId> - <artifactId>javax.activation-api</artifactId> - <version>1.2.0</version> - </dependency> - </dependencies> </project> \ No newline at end of file diff --git a/nifi-system-tests/nifi-system-test-suite/src/test/assembly/dependencies.xml b/nifi-system-tests/nifi-system-test-suite/src/test/assembly/dependencies.xml index 5f830c5..5b80a55 100644 --- a/nifi-system-tests/nifi-system-test-suite/src/test/assembly/dependencies.xml +++ b/nifi-system-tests/nifi-system-test-suite/src/test/assembly/dependencies.xml @@ -48,10 +48,8 @@ <fileMode>0664</fileMode> <useTransitiveFiltering>true</useTransitiveFiltering> <includes> - <include>javax.xml.bind:jaxb-api</include> - <include>com.sun.xml.bind:jaxb-impl</include> - <include>com.sun.xml.bind:jaxb-core</include> - <include>javax.activation:javax.activation-api</include> + <include>org.glassfish.jaxb:jaxb-runtime</include> + <include>jakarta.xml.bind:jakarta.xml.bind-api</include> <include>javax.annotation:javax.annotation-api</include> </includes> </dependencySet> @@ -73,10 +71,8 @@ <!-- exclude jaxb/activation/annotation libs from lib, they'll be included in the java11 subdir --> <!-- TODO: remove these once minimum Java version is 11 --> - <exclude>javax.xml.bind:jaxb-api</exclude> - <exclude>com.sun.xml.bind:jaxb-impl</exclude> - <exclude>com.sun.xml.bind:jaxb-core</exclude> - <exclude>javax.activation:javax.activation-api</exclude> + <exclude>org.glassfish.jaxb:jaxb-runtime</exclude> + <exclude>jakarta.xml.bind:jakarta.xml.bind-api</exclude> <exclude>javax.annotation:javax.annotation-api</exclude> </excludes> </dependencySet> diff --git a/nifi-toolkit/nifi-toolkit-admin/pom.xml b/nifi-toolkit/nifi-toolkit-admin/pom.xml index b49d101..cbdff4d 100644 --- a/nifi-toolkit/nifi-toolkit-admin/pom.xml +++ b/nifi-toolkit/nifi-toolkit-admin/pom.xml @@ -214,16 +214,12 @@ language governing permissions and limitations under the License. --> </activation> <dependencies> <dependency> - <groupId>javax.xml.bind</groupId> - <artifactId>jaxb-api</artifactId> + <groupId>jakarta.xml.bind</groupId> + <artifactId>jakarta.xml.bind-api</artifactId> </dependency> <dependency> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-core</artifactId> - </dependency> - <dependency> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-impl</artifactId> + <groupId>org.glassfish.jaxb</groupId> + <artifactId>jaxb-runtime</artifactId> </dependency> </dependencies> </profile> diff --git a/nifi-toolkit/nifi-toolkit-assembly/NOTICE b/nifi-toolkit/nifi-toolkit-assembly/NOTICE index 84afb12..090d3c6 100644 --- a/nifi-toolkit/nifi-toolkit-assembly/NOTICE +++ b/nifi-toolkit/nifi-toolkit-assembly/NOTICE @@ -158,4 +158,17 @@ The following binary components are provided under the Common Development and Di (CDDL 1.1) (GPL2 w/ CPE) hk2-api (org.glassfish.hk2:hk2-api:jar:2.5.0-b42 - https://javaee.github.io/glassfish/) (CDDL 1.1) (GPL2 w/ CPE) hk2-utils (org.glassfish.hk2:hk2-utils:jar:2.5.0-b42 - https://javaee.github.io/glassfish/) (CDDL 1.1) (GPL2 w/ CPE) hk2-locator (org.glassfish.hk2:hk2-locator:jar:2.5.0-b42 - https://javaee.github.io/glassfish/) - (CDDL 1.1) (GPL2 w/ CPE) aopalliance-repackaged (org.glassfish.hk2.external:aopalliance-repackaged:jar:2.5.0-b42 - https://javaee.github.io/glassfish/) \ No newline at end of file + (CDDL 1.1) (GPL2 w/ CPE) aopalliance-repackaged (org.glassfish.hk2.external:aopalliance-repackaged:jar:2.5.0-b42 - https://javaee.github.io/glassfish/) + +************************ +Eclipse Distribution License 1.0 +************************ + +The following binary components are provided under the Eclipse Distribution License 1.0. + + (EDL 1.0) Jakarta Activation API (jakarta.activation:jakarta.activation-api:jar:1.2.2) + (EDL 1.0) Jakarta Activation (com.sun.activation:jakarta.activation:jar:1.2.2) + (EDL 1.0) Jakarta XML Binding API (jakarta.xml.bind:jakarta.xml.bind-api:jar:2.3.3) + (EDL 1.0) JAXB (JSR 222) Reference Implementation (org.glassfish.jaxb:jaxb-runtime:jar:2.3.5) + (EDL 1.0) Istack Common Utility Code Runtime (com.sun.istack:istack-commons-runtime:jar:3.0.12) + (EDL 1.0) TXW2 Runtime (org.glassfish.jaxb:txw2:jar:2.3.5) diff --git a/nifi-toolkit/nifi-toolkit-assembly/pom.xml b/nifi-toolkit/nifi-toolkit-assembly/pom.xml index dbfc572..6e4a447 100644 --- a/nifi-toolkit/nifi-toolkit-assembly/pom.xml +++ b/nifi-toolkit/nifi-toolkit-assembly/pom.xml @@ -116,30 +116,20 @@ language governing permissions and limitations under the License. --> <!-- dependencies for jaxb/activation/annotation for running NiFi on Java 11 --> <!-- TODO: remove these once minimum Java version is 11 --> <dependency> - <groupId>javax.xml.bind</groupId> - <artifactId>jaxb-api</artifactId> - <version>2.3.0</version> + <groupId>jakarta.xml.bind</groupId> + <artifactId>jakarta.xml.bind-api</artifactId> + <version>${jakarta.xml.bind-api.version}</version> </dependency> <dependency> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-impl</artifactId> - <version>2.3.0</version> - </dependency> - <dependency> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-core</artifactId> - <version>2.3.0</version> + <groupId>org.glassfish.jaxb</groupId> + <artifactId>jaxb-runtime</artifactId> + <version>${jaxb.runtime.version}</version> </dependency> <dependency> <groupId>javax.annotation</groupId> <artifactId>javax.annotation-api</artifactId> <version>1.3.2</version> </dependency> - <dependency> - <groupId>javax.activation</groupId> - <artifactId>javax.activation-api</artifactId> - <version>1.2.0</version> - </dependency> </dependencies> diff --git a/nifi-toolkit/nifi-toolkit-assembly/src/main/assembly/dependencies.xml b/nifi-toolkit/nifi-toolkit-assembly/src/main/assembly/dependencies.xml index b4f15ea..4cdae09 100644 --- a/nifi-toolkit/nifi-toolkit-assembly/src/main/assembly/dependencies.xml +++ b/nifi-toolkit/nifi-toolkit-assembly/src/main/assembly/dependencies.xml @@ -35,10 +35,8 @@ <excludes> <!-- exclude jaxb/activation libs from lib, they'll be included in the java11 subdir --> <!-- TODO: remove these once minimum Java version is 11 --> - <exclude>javax.xml.bind:jaxb-api</exclude> - <exclude>com.sun.xml.bind:jaxb-impl</exclude> - <exclude>com.sun.xml.bind:jaxb-core</exclude> - <exclude>javax.activation:javax.activation-api</exclude> + <exclude>org.glassfish.jaxb:jaxb-runtime</exclude> + <exclude>jakarta.xml.bind:jakarta.xml.bind-api</exclude> </excludes> </dependencySet> <!-- Write out the bootstrap libs for java11 to its own dir --> @@ -51,10 +49,8 @@ <fileMode>0664</fileMode> <useTransitiveFiltering>true</useTransitiveFiltering> <includes> - <include>javax.xml.bind:jaxb-api</include> - <include>com.sun.xml.bind:jaxb-impl</include> - <include>com.sun.xml.bind:jaxb-core</include> - <include>javax.activation:javax.activation-api</include> + <include>org.glassfish.jaxb:jaxb-runtime</include> + <include>jakarta.xml.bind:jakarta.xml.bind-api</include> </includes> </dependencySet> </dependencySets> diff --git a/nifi-toolkit/pom.xml b/nifi-toolkit/pom.xml index d865671..9ea80d3 100644 --- a/nifi-toolkit/pom.xml +++ b/nifi-toolkit/pom.xml @@ -93,19 +93,14 @@ <dependencyManagement> <dependencies> <dependency> - <groupId>javax.xml.bind</groupId> - <artifactId>jaxb-api</artifactId> - <version>2.3.0</version> + <groupId>jakarta.xml.bind</groupId> + <artifactId>jakarta.xml.bind-api</artifactId> + <version>${jakarta.xml.bind-api.version}</version> </dependency> <dependency> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-core</artifactId> - <version>2.3.0</version> - </dependency> - <dependency> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-impl</artifactId> - <version>2.3.0</version> + <groupId>org.glassfish.jaxb</groupId> + <artifactId>jaxb-runtime</artifactId> + <version>${jaxb.runtime.version}</version> </dependency> <dependency> <groupId>com.sun.activation</groupId> diff --git a/pom.xml b/pom.xml index 236bd74..56fab65 100644 --- a/pom.xml +++ b/pom.xml @@ -99,6 +99,8 @@ <ranger.version>2.1.0</ranger.version> <jetty.version>9.4.43.v20210629</jetty.version> <jackson.version>2.12.3</jackson.version> + <jaxb.runtime.version>2.3.5</jaxb.runtime.version> + <jakarta.xml.bind-api.version>2.3.3</jakarta.xml.bind-api.version> <nifi.groovy.version>2.5.14</nifi.groovy.version> <surefire.version>3.0.0-M5</surefire.version> <!-- The Hadoop version used by nifi-hadoop-libraries-nar and any NARs that depend on it, other NARs that need @@ -564,7 +566,7 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>jaxb2-maven-plugin</artifactId> - <version>2.3.1</version> + <version>2.5.0</version> </plugin> <plugin> <groupId>org.codehaus.mojo</groupId> @@ -981,19 +983,14 @@ <dependencyManagement> <dependencies> <dependency> - <groupId>javax.xml.bind</groupId> - <artifactId>jaxb-api</artifactId> - <version>2.3.0</version> + <groupId>jakarta.xml.bind</groupId> + <artifactId>jakarta.xml.bind-api</artifactId> + <version>${jakarta.xml.bind-api.version}</version> </dependency> <dependency> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-core</artifactId> - <version>2.3.0</version> - </dependency> - <dependency> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-impl</artifactId> - <version>2.3.0</version> + <groupId>org.glassfish.jaxb</groupId> + <artifactId>jaxb-runtime</artifactId> + <version>${jaxb.runtime.version}</version> </dependency> <dependency> <groupId>com.sun.activation</groupId>