Repository: hadoop Updated Branches: refs/heads/trunk a30b1d182 -> 9bbeb5248
HADOOP-15775. [JDK9] Add missing javax.activation-api dependency. Contributed by Akira Ajisaka. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/9bbeb524 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/9bbeb524 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/9bbeb524 Branch: refs/heads/trunk Commit: 9bbeb5248640ec5df8420a5e359436375f73e0ce Parents: a30b1d1 Author: Takanobu Asanuma <tasan...@apache.org> Authored: Tue Oct 9 13:06:14 2018 +0900 Committer: Takanobu Asanuma <tasan...@apache.org> Committed: Tue Oct 9 13:06:14 2018 +0900 ---------------------------------------------------------------------- hadoop-client-modules/hadoop-client-runtime/pom.xml | 7 +++++++ hadoop-common-project/hadoop-common/pom.xml | 5 +++++ hadoop-project/pom.xml | 5 +++++ 3 files changed, 17 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/9bbeb524/hadoop-client-modules/hadoop-client-runtime/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-client-modules/hadoop-client-runtime/pom.xml b/hadoop-client-modules/hadoop-client-runtime/pom.xml index 1779db1..8afc89e 100644 --- a/hadoop-client-modules/hadoop-client-runtime/pom.xml +++ b/hadoop-client-modules/hadoop-client-runtime/pom.xml @@ -314,6 +314,13 @@ </excludes> </relocation> <relocation> + <pattern>javax/activation/</pattern> + <shadedPattern>${shaded.dependency.prefix}.javax.activation.</shadedPattern> + <excludes> + <exclude>**/pom.xml</exclude> + </excludes> + </relocation> + <relocation> <pattern>javax/ws/</pattern> <shadedPattern>${shaded.dependency.prefix}.javax.ws.</shadedPattern> <excludes> http://git-wip-us.apache.org/repos/asf/hadoop/blob/9bbeb524/hadoop-common-project/hadoop-common/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/pom.xml b/hadoop-common-project/hadoop-common/pom.xml index 6a7433a..a9e0fb1 100644 --- a/hadoop-common-project/hadoop-common/pom.xml +++ b/hadoop-common-project/hadoop-common/pom.xml @@ -91,6 +91,11 @@ <scope>compile</scope> </dependency> <dependency> + <groupId>javax.activation</groupId> + <artifactId>javax.activation-api</artifactId> + <scope>runtime</scope> + </dependency> + <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-server</artifactId> <scope>compile</scope> http://git-wip-us.apache.org/repos/asf/hadoop/blob/9bbeb524/hadoop-project/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml index 688e54b..0f54a55 100644 --- a/hadoop-project/pom.xml +++ b/hadoop-project/pom.xml @@ -1586,6 +1586,11 @@ <artifactId>jcodings</artifactId> <version>1.0.13</version> </dependency> + <dependency> + <groupId>javax.activation</groupId> + <artifactId>javax.activation-api</artifactId> + <version>1.2.0</version> + </dependency> </dependencies> </dependencyManagement> --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
