You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2013/12/26 19:07:46 UTC
git commit: [KARAF-2660] Upgrade javax.annotation to 1.2.0 for
jre7/jre8
Updated Branches:
refs/heads/karaf-2.3.x a23b88a8c -> a9cabfcc2
[KARAF-2660] Upgrade javax.annotation to 1.2.0 for jre7/jre8
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/a9cabfcc
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/a9cabfcc
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/a9cabfcc
Branch: refs/heads/karaf-2.3.x
Commit: a9cabfcc29c6ce1db50360994ed195466d3b8312
Parents: a23b88a
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Thu Dec 26 19:07:08 2013 +0100
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Thu Dec 26 19:07:08 2013 +0100
----------------------------------------------------------------------
.../src/main/filtered-resources/etc/jre.properties | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/a9cabfcc/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..3dad6f5 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, \
@@ -506,4 +506,4 @@ jre-1.8= \
org.w3c.dom.xpath, \
org.xml.sax, \
org.xml.sax.ext, \
- org.xml.sax.helpers
\ No newline at end of file
+ org.xml.sax.helpers