ARTEMIS-1449 Add the classes JRE 11 will remove as explicit dependencies Since the classes in question are marked for removal, using the ``--add-modules java.xml.bind` JVM option would be only a temporary solution. Pulling them as dependencies from repo1.maven.org and distributing them with Artemis should be more permanent one.
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/94c34b7e Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/94c34b7e Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/94c34b7e Branch: refs/heads/master Commit: 94c34b7ed9345a4be4948a52ff3a177b270cd0e6 Parents: d5be611 Author: Jiri Danek <[email protected]> Authored: Tue May 1 08:15:51 2018 +0200 Committer: Clebert Suconic <[email protected]> Committed: Tue May 1 13:58:29 2018 -0400 ---------------------------------------------------------------------- artemis-distribution/src/main/assembly/dep.xml | 4 ++ artemis-dto/pom.xml | 48 +++++++++++---------- 2 files changed, 30 insertions(+), 22 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/94c34b7e/artemis-distribution/src/main/assembly/dep.xml ---------------------------------------------------------------------- diff --git a/artemis-distribution/src/main/assembly/dep.xml b/artemis-distribution/src/main/assembly/dep.xml index aad4ab1..0987425 100644 --- a/artemis-distribution/src/main/assembly/dep.xml +++ b/artemis-distribution/src/main/assembly/dep.xml @@ -99,6 +99,10 @@ <include>org.apache.geronimo.specs:geronimo-json_1.0_spec</include> <include>org.apache.johnzon:johnzon-core</include> <include>org.hdrhistogram:HdrHistogram</include> + <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:activation</include> </includes> <!--excludes> <exclude>org.apache.activemq:artemis-website</exclude> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/94c34b7e/artemis-dto/pom.xml ---------------------------------------------------------------------- diff --git a/artemis-dto/pom.xml b/artemis-dto/pom.xml index 1ed1b7e..bf4a608 100644 --- a/artemis-dto/pom.xml +++ b/artemis-dto/pom.xml @@ -28,6 +28,9 @@ <name>ActiveMQ Artemis DTO</name> <properties> + <version.activation>1.1.1</version.activation> + <version.jaxb>2.2.7</version.jaxb> + <activemq.basedir>${project.basedir}/..</activemq.basedir> </properties> @@ -37,6 +40,26 @@ <artifactId>artemis-commons</artifactId> <version>${project.version}</version> </dependency> + <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + <version>${version.jaxb}</version> + </dependency> + <dependency> + <groupId>com.sun.xml.bind</groupId> + <artifactId>jaxb-impl</artifactId> + <version>${version.jaxb}</version> + </dependency> + <dependency> + <groupId>com.sun.xml.bind</groupId> + <artifactId>jaxb-jxc</artifactId> + <version>${version.jaxb}</version> + </dependency> + <dependency> + <groupId>javax.activation</groupId> + <artifactId>activation</artifactId> + <version>${version.activation}</version> + </dependency> </dependencies> <build> @@ -90,17 +113,17 @@ <dependency> <groupId>javax.xml.bind</groupId> <artifactId>jaxb-api</artifactId> - <version>2.2.7</version> + <version>${version.jaxb}</version> </dependency> <dependency> <groupId>com.sun.xml.bind</groupId> <artifactId>jaxb-impl</artifactId> - <version>2.2.7</version> + <version>${version.jaxb}</version> </dependency> <dependency> <groupId>com.sun.xml.bind</groupId> <artifactId>jaxb-jxc</artifactId> - <version>2.2.7</version> + <version>${version.jaxb}</version> </dependency> </dependencies> </plugin> @@ -138,25 +161,6 @@ <profiles> <profile> - <id>jdk-1.5</id> - <activation> - <jdk>1.5</jdk> - </activation> - <dependencies> - <dependency> - <groupId>javax.xml.bind</groupId> - <artifactId>jaxb-api</artifactId> - <version>${jaxb-api-version}</version> - </dependency> - <dependency> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-impl</artifactId> - <version>${jaxb-version}</version> - </dependency> - </dependencies> - </profile> - - <profile> <id>ibmjdk</id> <activation> <file>
