Repository: qpid-broker-j Updated Branches: refs/heads/master bb57b5159 -> 35998c406
QPID-7885: [Broker-J] Use jaxb dependency with legacy JMS client as it depends on jaxb base64 encoding Project: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/commit/35998c40 Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/35998c40 Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/35998c40 Branch: refs/heads/master Commit: 35998c406fd22606c60202308ecad75cfed98f84 Parents: a045ea8 Author: Alex Rudyy <[email protected]> Authored: Tue Oct 30 16:30:30 2018 +0000 Committer: Alex Rudyy <[email protected]> Committed: Tue Oct 30 16:32:41 2018 +0000 ---------------------------------------------------------------------- bdbstore/systests/pom.xml | 12 +++++++ joramtests/pom.xml | 16 +++++++++ perftests/pom.xml | 18 ++++++++-- pom.xml | 12 +++++++ qpid-perftests-systests/pom.xml | 12 +++++++ systests/end-to-end-conversion-tests/pom.xml | 2 +- systests/qpid-systests-http-management/pom.xml | 11 ++++++ systests/qpid-systests-jms_1.1/pom.xml | 11 ++++++ systests/qpid-systests-spawn-admin/pom.xml | 12 +++++++ tck/pom.xml | 16 +++++++++ tools/pom.xml | 40 +++++++++++++++++++++ 11 files changed, 159 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/35998c40/bdbstore/systests/pom.xml ---------------------------------------------------------------------- diff --git a/bdbstore/systests/pom.xml b/bdbstore/systests/pom.xml index 9a7c050..1036aba 100644 --- a/bdbstore/systests/pom.xml +++ b/bdbstore/systests/pom.xml @@ -123,10 +123,22 @@ <dependency> <groupId>org.apache.geronimo.specs</groupId> <artifactId>geronimo-jms_1.1_spec</artifactId> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.qpid</groupId> <artifactId>qpid-client</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.glassfish.jaxb</groupId> + <artifactId>jaxb-runtime</artifactId> + <scope>test</scope> </dependency> </dependencies> </profile> http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/35998c40/joramtests/pom.xml ---------------------------------------------------------------------- diff --git a/joramtests/pom.xml b/joramtests/pom.xml index 179d21a..6fdfce8 100644 --- a/joramtests/pom.xml +++ b/joramtests/pom.xml @@ -282,6 +282,14 @@ <groupId>org.apache.qpid</groupId> <artifactId>qpid-client</artifactId> </dependency> + <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + </dependency> + <dependency> + <groupId>org.glassfish.jaxb</groupId> + <artifactId>jaxb-runtime</artifactId> + </dependency> </dependencies> </profile> @@ -304,6 +312,14 @@ <groupId>org.apache.qpid</groupId> <artifactId>qpid-client</artifactId> </dependency> + <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + </dependency> + <dependency> + <groupId>org.glassfish.jaxb</groupId> + <artifactId>jaxb-runtime</artifactId> + </dependency> </dependencies> </profile> </profiles> http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/35998c40/perftests/pom.xml ---------------------------------------------------------------------- diff --git a/perftests/pom.xml b/perftests/pom.xml index bd1c6eb..b636cc1 100644 --- a/perftests/pom.xml +++ b/perftests/pom.xml @@ -362,7 +362,14 @@ <dependency> <groupId>org.apache.qpid</groupId> <artifactId>qpid-client</artifactId> - <scope>compile</scope> + </dependency> + <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + </dependency> + <dependency> + <groupId>org.glassfish.jaxb</groupId> + <artifactId>jaxb-runtime</artifactId> </dependency> </dependencies> </profile> @@ -384,7 +391,14 @@ <dependency> <groupId>org.apache.qpid</groupId> <artifactId>qpid-client</artifactId> - <scope>compile</scope> + </dependency> + <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + </dependency> + <dependency> + <groupId>org.glassfish.jaxb</groupId> + <artifactId>jaxb-runtime</artifactId> </dependency> </dependencies> </profile> http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/35998c40/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index ce1d736..69442be 100644 --- a/pom.xml +++ b/pom.xml @@ -136,6 +136,7 @@ <httpclient-version>4.5.3</httpclient-version> <qpid-jms-client-version>0.36.0</qpid-jms-client-version> <qpid-jms-client-amqp-0-x-version>6.3.3</qpid-jms-client-amqp-0-x-version> + <jaxb-api-version>2.3.1</jaxb-api-version> <exec-maven-plugin-version>1.6.0</exec-maven-plugin-version> <javacc-maven-plugin-version>2.6</javacc-maven-plugin-version> @@ -452,6 +453,17 @@ <artifactId>qpid-client</artifactId> <version>${qpid-jms-client-amqp-0-x-version}</version> </dependency> + <!-- qpid-client requires jaxb-api for Base64 encoding--> + <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + <version>${jaxb-api-version}</version> + </dependency> + <dependency> + <groupId>org.glassfish.jaxb</groupId> + <artifactId>jaxb-runtime</artifactId> + <version>2.3.1</version> + </dependency> <dependency> <groupId>org.apache.qpid</groupId> <artifactId>qpid-jms-client</artifactId> http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/35998c40/qpid-perftests-systests/pom.xml ---------------------------------------------------------------------- diff --git a/qpid-perftests-systests/pom.xml b/qpid-perftests-systests/pom.xml index afccd22..447514c 100644 --- a/qpid-perftests-systests/pom.xml +++ b/qpid-perftests-systests/pom.xml @@ -39,6 +39,18 @@ <dependency> <groupId>org.apache.qpid</groupId> <artifactId>qpid-client</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.glassfish.jaxb</groupId> + <artifactId>jaxb-runtime</artifactId> + <scope>test</scope> </dependency> <!-- other deps --> http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/35998c40/systests/end-to-end-conversion-tests/pom.xml ---------------------------------------------------------------------- diff --git a/systests/end-to-end-conversion-tests/pom.xml b/systests/end-to-end-conversion-tests/pom.xml index 42a1a7d..73abac0 100644 --- a/systests/end-to-end-conversion-tests/pom.xml +++ b/systests/end-to-end-conversion-tests/pom.xml @@ -34,7 +34,7 @@ <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <amqp10ClientGavs>org.apache.qpid:qpid-jms-client:${qpid-jms-client-version},org.slf4j:slf4j-simple:${slf4j-version}</amqp10ClientGavs> - <amqp0xClientGavs>org.apache.qpid:qpid-client:${qpid-jms-client-amqp-0-x-version},org.apache.geronimo.specs:geronimo-jms_1.1_spec:${geronimo-jms-1-1-version},org.slf4j:slf4j-simple:${slf4j-version}</amqp0xClientGavs> + <amqp0xClientGavs>org.apache.qpid:qpid-client:${qpid-jms-client-amqp-0-x-version},org.apache.geronimo.specs:geronimo-jms_1.1_spec:${geronimo-jms-1-1-version},org.slf4j:slf4j-simple:${slf4j-version},javax.xml.bind:jaxb-api:${jaxb-api-version},org.glassfish.jaxb:jaxb-runtime:${jaxb-api-version}</amqp0xClientGavs> </properties> <dependencies> http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/35998c40/systests/qpid-systests-http-management/pom.xml ---------------------------------------------------------------------- diff --git a/systests/qpid-systests-http-management/pom.xml b/systests/qpid-systests-http-management/pom.xml index 7135629..2da15b0 100644 --- a/systests/qpid-systests-http-management/pom.xml +++ b/systests/qpid-systests-http-management/pom.xml @@ -149,6 +149,17 @@ <dependency> <groupId>org.apache.qpid</groupId> <artifactId>qpid-client</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.glassfish.jaxb</groupId> + <artifactId>jaxb-runtime</artifactId> + <scope>test</scope> </dependency> </dependencies> </profile> http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/35998c40/systests/qpid-systests-jms_1.1/pom.xml ---------------------------------------------------------------------- diff --git a/systests/qpid-systests-jms_1.1/pom.xml b/systests/qpid-systests-jms_1.1/pom.xml index 1897cc9..4f29cc7 100644 --- a/systests/qpid-systests-jms_1.1/pom.xml +++ b/systests/qpid-systests-jms_1.1/pom.xml @@ -100,6 +100,17 @@ <dependency> <groupId>org.apache.qpid</groupId> <artifactId>qpid-client</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.glassfish.jaxb</groupId> + <artifactId>jaxb-runtime</artifactId> + <scope>test</scope> </dependency> </dependencies> </profile> http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/35998c40/systests/qpid-systests-spawn-admin/pom.xml ---------------------------------------------------------------------- diff --git a/systests/qpid-systests-spawn-admin/pom.xml b/systests/qpid-systests-spawn-admin/pom.xml index e252b66..d5ab714 100644 --- a/systests/qpid-systests-spawn-admin/pom.xml +++ b/systests/qpid-systests-spawn-admin/pom.xml @@ -79,10 +79,22 @@ <dependency> <groupId>org.apache.qpid</groupId> <artifactId>qpid-client</artifactId> + <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.geronimo.specs</groupId> <artifactId>geronimo-jms_1.1_spec</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.glassfish.jaxb</groupId> + <artifactId>jaxb-runtime</artifactId> + <scope>provided</scope> </dependency> </dependencies> </profile> http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/35998c40/tck/pom.xml ---------------------------------------------------------------------- diff --git a/tck/pom.xml b/tck/pom.xml index a71a101..707a4cc 100644 --- a/tck/pom.xml +++ b/tck/pom.xml @@ -661,6 +661,14 @@ <groupId>org.apache.qpid</groupId> <artifactId>qpid-client</artifactId> </dependency> + <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + </dependency> + <dependency> + <groupId>org.glassfish.jaxb</groupId> + <artifactId>jaxb-runtime</artifactId> + </dependency> </dependencies> </profile> @@ -684,6 +692,14 @@ <groupId>org.apache.qpid</groupId> <artifactId>qpid-client</artifactId> </dependency> + <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + </dependency> + <dependency> + <groupId>org.glassfish.jaxb</groupId> + <artifactId>jaxb-runtime</artifactId> + </dependency> </dependencies> </profile> </profiles> http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/35998c40/tools/pom.xml ---------------------------------------------------------------------- diff --git a/tools/pom.xml b/tools/pom.xml index d0bed0e..b3d0f93 100644 --- a/tools/pom.xml +++ b/tools/pom.xml @@ -135,6 +135,16 @@ <artifactId>geronimo-jms_1.1_spec</artifactId> <scope>compile</scope> </dependency> + <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.glassfish.jaxb</groupId> + <artifactId>jaxb-runtime</artifactId> + <scope>compile</scope> + </dependency> </dependencies> </profile> <profile> @@ -172,6 +182,16 @@ <artifactId>geronimo-jms_1.1_spec</artifactId> <scope>compile</scope> </dependency> + <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.glassfish.jaxb</groupId> + <artifactId>jaxb-runtime</artifactId> + <scope>compile</scope> + </dependency> </dependencies> </profile> <profile> @@ -236,6 +256,16 @@ <artifactId>geronimo-jms_1.1_spec</artifactId> <scope>compile</scope> </dependency> + <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.glassfish.jaxb</groupId> + <artifactId>jaxb-runtime</artifactId> + <scope>compile</scope> + </dependency> </dependencies> </profile> <profile> @@ -273,6 +303,16 @@ <artifactId>geronimo-jms_1.1_spec</artifactId> <scope>compile</scope> </dependency> + <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.glassfish.jaxb</groupId> + <artifactId>jaxb-runtime</artifactId> + <scope>compile</scope> + </dependency> </dependencies> </profile> <profile> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
