Updated Branches: refs/heads/karaf-2.x c5de0e213 -> 3f6857985
[KARAF-2660] Upgrade javax.annotation to 1.2.0 for jre7 and jre8 Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/3f685798 Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/3f685798 Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/3f685798 Branch: refs/heads/karaf-2.x Commit: 3f68579850af4e05c1f15f2b0bc523f60b0ce7ec Parents: c5de0e2 Author: Jean-Baptiste Onofré <[email protected]> Authored: Thu Dec 26 18:49:15 2013 +0100 Committer: Jean-Baptiste Onofré <[email protected]> Committed: Thu Dec 26 18:49:15 2013 +0100 ---------------------------------------------------------------------- .../src/main/filtered-resources/etc/jre.properties | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/3f685798/assemblies/apache-karaf/src/main/filtered-resources/etc/jre.properties ---------------------------------------------------------------------- diff --git a/assemblies/apache-karaf/src/main/filtered-resources/etc/jre.properties b/assemblies/apache-karaf/src/main/filtered-resources/etc/jre.properties index ec0a344..74bd2e3 100644 --- a/assemblies/apache-karaf/src/main/filtered-resources/etc/jre.properties +++ b/assemblies/apache-karaf/src/main/filtered-resources/etc/jre.properties @@ -190,8 +190,8 @@ jre-1.7= \ javax.accessibility, \ javax.activation;version="1.1", \ javax.activity, \ - javax.annotation;version="1.1", \ - javax.annotation.processing;version="1.1", \ + javax.annotation;version="1.2", \ + javax.annotation.processing;version="1.2", \ javax.crypto, \ javax.crypto.interfaces, \ javax.crypto.spec, \ @@ -351,8 +351,8 @@ jre-1.8= \ javax.accessibility, \ javax.activation;version="1.1", \ javax.activity, \ - javax.annotation;version="1.1", \ - javax.annotation.processing;version="1.1", \ + javax.annotation;version="1.2", \ + javax.annotation.processing;version="1.2", \ javax.crypto, \ javax.crypto.interfaces, \ javax.crypto.spec, \
