Repository: camel Updated Branches: refs/heads/camel-2.16.x d84c66f5a -> 43775d084 refs/heads/master 083814876 -> 962216f9c
axiom-api/axiom-impl do not have a (transitive) dependency on javax.mail anymore, but now use geronimo-javamail_1.4_spec so excluded that instead abdera-parser does not have a (transitive) dependency on javax.mail anymore, so remove the exclusion Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/6a4534d4 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/6a4534d4 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/6a4534d4 Branch: refs/heads/master Commit: 6a4534d40af3745d21773d21492dc71bc252cbe1 Parents: 5406300 Author: Pascal Schumacher <pascalschumac...@gmx.net> Authored: Sat Dec 19 18:03:28 2015 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Sun Dec 20 07:05:46 2015 +0100 ---------------------------------------------------------------------- components/camel-atom/pom.xml | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/6a4534d4/components/camel-atom/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-atom/pom.xml b/components/camel-atom/pom.xml index cabe979..64f1bcb 100644 --- a/components/camel-atom/pom.xml +++ b/components/camel-atom/pom.xml @@ -76,10 +76,6 @@ <version>${abdera-version}</version> <exclusions> <exclusion> - <groupId>com.sun.mail</groupId> - <artifactId>javax.mail</artifactId> - </exclusion> - <exclusion> <groupId>xml-apis</groupId> <artifactId>xml-apis</artifactId> </exclusion> @@ -118,8 +114,8 @@ <artifactId>axiom-api</artifactId> <exclusions> <exclusion> - <groupId>com.sun.mail</groupId> - <artifactId>javax.mail</artifactId> + <artifactId>geronimo-javamail_1.4_spec</artifactId> + <groupId>org.apache.geronimo.specs</groupId> </exclusion> <exclusion> <groupId>xml-apis</groupId> @@ -160,8 +156,8 @@ <artifactId>axiom-impl</artifactId> <exclusions> <exclusion> - <groupId>com.sun.mail</groupId> - <artifactId>javax.mail</artifactId> + <artifactId>geronimo-javamail_1.4_spec</artifactId> + <groupId>org.apache.geronimo.specs</groupId> </exclusion> <exclusion> <groupId>xml-apis</groupId>