Author: ffang
Date: Sun Aug 28 04:07:36 2011
New Revision: 1162477
URL: http://svn.apache.org/viewvc?rev=1162477&view=rev
Log:
[KARAF-840]specify javax.annotation packages version to 1.1.0 for jre-1.6 as
Annotation 1.1 Spec is used for Java 6
Modified:
karaf/trunk/assemblies/apache-karaf/src/main/filtered-resources/etc/jre.properties
karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/etc/jre.properties
Modified:
karaf/trunk/assemblies/apache-karaf/src/main/filtered-resources/etc/jre.properties
URL:
http://svn.apache.org/viewvc/karaf/trunk/assemblies/apache-karaf/src/main/filtered-resources/etc/jre.properties?rev=1162477&r1=1162476&r2=1162477&view=diff
==============================================================================
---
karaf/trunk/assemblies/apache-karaf/src/main/filtered-resources/etc/jre.properties
(original)
+++
karaf/trunk/assemblies/apache-karaf/src/main/filtered-resources/etc/jre.properties
Sun Aug 28 04:07:36 2011
@@ -153,8 +153,8 @@ jre-1.6= \
javax.accessibility, \
javax.activation, \
javax.activity, \
- javax.annotation, \
- javax.annotation.processing, \
+ javax.annotation;version="1.1", \
+ javax.annotation.processing;version="1.1", \
javax.crypto, \
javax.crypto.interfaces, \
javax.crypto.spec, \
@@ -315,8 +315,8 @@ jre-1.7= \
javax.accessibility, \
javax.activation, \
javax.activity, \
- javax.annotation, \
- javax.annotation.processing, \
+ javax.annotation;version="1.1", \
+ javax.annotation.processing;version="1.1", \
javax.crypto, \
javax.crypto.interfaces, \
javax.crypto.spec, \
Modified:
karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/etc/jre.properties
URL:
http://svn.apache.org/viewvc/karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/etc/jre.properties?rev=1162477&r1=1162476&r2=1162477&view=diff
==============================================================================
---
karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/etc/jre.properties
(original)
+++
karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/etc/jre.properties
Sun Aug 28 04:07:36 2011
@@ -153,8 +153,8 @@ jre-1.6= \
javax.accessibility, \
javax.activation, \
javax.activity, \
- javax.annotation, \
- javax.annotation.processing, \
+ javax.annotation;version="1.1", \
+ javax.annotation.processing;version="1.1", \
javax.crypto, \
javax.crypto.interfaces, \
javax.crypto.spec, \
