You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by ch...@apache.org on 2014/10/27 09:35:15 UTC
git commit: [KARAF-2660] adjust javax.annotation-versions to reflect
those in Java SE
Repository: karaf
Updated Branches:
refs/heads/master 6c68e506d -> b11ed61ff
[KARAF-2660] adjust javax.annotation-versions to reflect those in Java SE
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/b11ed61f
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/b11ed61f
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/b11ed61f
Branch: refs/heads/master
Commit: b11ed61ff9a06fc6e0480869184d0eca33ad1cce
Parents: 6c68e50
Author: Christoph Gritschenberger <ch...@gmail.com>
Authored: Mon Oct 27 09:04:31 2014 +0100
Committer: Christoph Gritschenberger <ch...@gmail.com>
Committed: Mon Oct 27 09:04:31 2014 +0100
----------------------------------------------------------------------
.../filtered-resources/resources/etc/jre.properties | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/b11ed61f/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 94da9db..fd48ccb 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
@@ -27,8 +27,8 @@ jre-1.6= \
javax.accessibility, \
javax.activation;version="1.1", \
javax.activity, \
- javax.annotation;version="1.1", \
- javax.annotation.processing;version="1.1", \
+ javax.annotation;version="1.0", \
+ javax.annotation.processing;version="1.6", \
javax.crypto, \
javax.crypto.interfaces, \
javax.crypto.spec, \
@@ -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.0", \
+ javax.annotation.processing;version="1.6", \
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.2", \
- javax.annotation.processing;version="1.2", \
+ javax.annotation;version="1.0", \
+ javax.annotation.processing;version="1.6", \
javax.crypto, \
javax.crypto.interfaces, \
javax.crypto.spec, \