Repository: brooklyn-server Updated Branches: refs/heads/master 187a9a03b -> c7ce1d280
Use non-jdk versions of JAXB and JAva Activation JAXB and Java Activation are no longer bundled as part of JDK 9. Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/72fb6d70 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/72fb6d70 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/72fb6d70 Branch: refs/heads/master Commit: 72fb6d70961876b7ba74716260ac54bc552ebbf0 Parents: e27cc7b Author: Paul Campbell <paul.campb...@cloudsoft.io> Authored: Tue Sep 18 10:49:28 2018 +0100 Committer: Paul Campbell <paul.campb...@cloudsoft.io> Committed: Thu Sep 20 16:42:34 2018 +0100 ---------------------------------------------------------------------- camp/camp-server/pom.xml | 8 ++++++++ parent/pom.xml | 20 ++++++++++++++++++++ pom.xml | 2 ++ 3 files changed, 30 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/72fb6d70/camp/camp-server/pom.xml ---------------------------------------------------------------------- diff --git a/camp/camp-server/pom.xml b/camp/camp-server/pom.xml index 175eb57..bc97c84 100644 --- a/camp/camp-server/pom.xml +++ b/camp/camp-server/pom.xml @@ -38,6 +38,14 @@ <dependencies> <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + </dependency> + <dependency> + <groupId>javax.activation</groupId> + <artifactId>activation</artifactId> + </dependency> + <dependency> <groupId>org.apache.brooklyn.camp</groupId> <artifactId>camp-base</artifactId> <version>${project.version}</version> http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/72fb6d70/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index cf6e105..683e2fe 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -55,6 +55,26 @@ <dependencyManagement> <dependencies> <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + <version>${jaxb.version}</version> + </dependency> + <dependency> + <groupId>com.sun.xml.bind</groupId> + <artifactId>jaxb-core</artifactId> + <version>${jaxb.version}</version> + </dependency> + <dependency> + <groupId>com.sun.xml.bind</groupId> + <artifactId>jaxb-impl</artifactId> + <version>${jaxb.version}</version> + </dependency> + <dependency> + <groupId>javax.activation</groupId> + <artifactId>activation</artifactId> + <version>${javax.activation.version}</version> + </dependency> + <dependency> <groupId>ch.qos.logback</groupId> <artifactId>logback-classic</artifactId> <version>${logback.version}</version> http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/72fb6d70/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 30eeaf7..c4161a1 100644 --- a/pom.xml +++ b/pom.xml @@ -217,6 +217,8 @@ <maven-antrun-plugin.version>1.7</maven-antrun-plugin.version> <ant.version>1.8.4</ant.version> + <jaxb.version>2.2.11</jaxb.version> + <javax.activation.version>1.1.1</javax.activation.version> </properties> <modules>
