Move jaxb-api version to parent pom
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/1dc5f8f2 Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/1dc5f8f2 Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/1dc5f8f2 Branch: refs/heads/STABLE-4.0 Commit: 1dc5f8f2179c265af68fdf8c3141f1fed6bc2ef9 Parents: 92eeccb Author: Nikita Timofeev <[email protected]> Authored: Wed Jul 4 16:15:31 2018 +0300 Committer: Nikita Timofeev <[email protected]> Committed: Wed Jul 4 16:15:31 2018 +0300 ---------------------------------------------------------------------- cayenne-crypto/pom.xml | 5 ++++- pom.xml | 6 ++++++ 2 files changed, 10 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cayenne/blob/1dc5f8f2/cayenne-crypto/pom.xml ---------------------------------------------------------------------- diff --git a/cayenne-crypto/pom.xml b/cayenne-crypto/pom.xml index 3f076da..67839ed 100644 --- a/cayenne-crypto/pom.xml +++ b/cayenne-crypto/pom.xml @@ -27,10 +27,13 @@ <artifactId>cayenne-server</artifactId> <version>${project.version}</version> </dependency> + <!-- + Include jaxb-api to support Base64 encoding, + can't use new encoder from java 8 as we need to support java 7 + --> <dependency> <groupId>javax.xml.bind</groupId> <artifactId>jaxb-api</artifactId> - <version>2.3.0</version> </dependency> <dependency> <groupId>org.slf4j</groupId> http://git-wip-us.apache.org/repos/asf/cayenne/blob/1dc5f8f2/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index d38622d..f0d04b7 100644 --- a/pom.xml +++ b/pom.xml @@ -476,6 +476,12 @@ <version>1.1</version> <scope>provided</scope> </dependency> + <!-- Used only by crypto module for Java 7 compatibility --> + <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + <version>2.3.0</version> + </dependency> </dependencies> </dependencyManagement>
