You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by gn...@apache.org on 2015/02/26 11:35:24 UTC

[5/6] karaf git commit: [KARAF-3566] The javax.annotation package should be exported from system bundle with version 1.1 in JDK8

[KARAF-3566] The javax.annotation package should be exported from system bundle with version 1.1 in JDK8


Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/9fe14a07
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/9fe14a07
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/9fe14a07

Branch: refs/heads/master
Commit: 9fe14a07a12a0582607c9a28c7c9be382500dae2
Parents: da5a577
Author: Guillaume Nodet <gn...@gmail.com>
Authored: Thu Feb 26 09:13:01 2015 +0100
Committer: Guillaume Nodet <gn...@gmail.com>
Committed: Thu Feb 26 10:53:35 2015 +0100

----------------------------------------------------------------------
 .../src/main/filtered-resources/resources/etc/jre.properties     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/karaf/blob/9fe14a07/assemblies/features/base/src/main/filtered-resources/resources/etc/jre.properties
----------------------------------------------------------------------
diff --git a/assemblies/features/base/src/main/filtered-resources/resources/etc/jre.properties b/assemblies/features/base/src/main/filtered-resources/resources/etc/jre.properties
index 94da9db..b9301b1 100644
--- a/assemblies/features/base/src/main/filtered-resources/resources/etc/jre.properties
+++ b/assemblies/features/base/src/main/filtered-resources/resources/etc/jre.properties
@@ -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.1", \
+ javax.annotation.processing;version="1.1", \
  javax.crypto, \
  javax.crypto.interfaces, \
  javax.crypto.spec, \