Updated Branches: refs/heads/master 55d4066ae -> 1b39dd9eb
[KARAF-2660] Upgrade javax.annotation to 1.2.0 for jre 1.7/1.8 Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/1b39dd9e Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/1b39dd9e Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/1b39dd9e Branch: refs/heads/master Commit: 1b39dd9eb3fe88b9e722c0bb12002cc9f596af87 Parents: 55d4066 Author: Jean-Baptiste Onofré <[email protected]> Authored: Thu Dec 26 15:34:31 2013 +0100 Committer: Jean-Baptiste Onofré <[email protected]> Committed: Thu Dec 26 15:34:31 2013 +0100 ---------------------------------------------------------------------- .../src/main/filtered-resources/resources/etc/jre.properties | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/1b39dd9e/assemblies/features/framework/src/main/filtered-resources/resources/etc/jre.properties ---------------------------------------------------------------------- diff --git a/assemblies/features/framework/src/main/filtered-resources/resources/etc/jre.properties b/assemblies/features/framework/src/main/filtered-resources/resources/etc/jre.properties index ec0a344..74bd2e3 100644 --- a/assemblies/features/framework/src/main/filtered-resources/resources/etc/jre.properties +++ b/assemblies/features/framework/src/main/filtered-resources/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, \
