git commit: SM-2376: Incorrect javax.annotation version for java7

[ks...@apache.org]

Repository: servicemix
Updated Branches:
  refs/heads/servicemix-5.2.x 49cbabed4 -> 11f4be5fb


SM-2376: Incorrect javax.annotation version for java7

(Cherry picked from the commit a6dccb4dc209c63502aa7e279ea321c88710617d)


Project: http://git-wip-us.apache.org/repos/asf/servicemix/repo
Commit: http://git-wip-us.apache.org/repos/asf/servicemix/commit/11f4be5f
Tree: http://git-wip-us.apache.org/repos/asf/servicemix/tree/11f4be5f
Diff: http://git-wip-us.apache.org/repos/asf/servicemix/diff/11f4be5f

Branch: refs/heads/servicemix-5.2.x
Commit: 11f4be5fbbf4d0dd5c519dc535ec7d2e3c7cb6be
Parents: 49cbabe
Author: Krzysztof Sobkowiak <kr...@gmail.com>
Authored: Mon Sep 22 21:19:56 2014 +0200
Committer: Krzysztof Sobkowiak <kr...@gmail.com>
Committed: Mon Sep 22 22:42:19 2014 +0200

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


http://git-wip-us.apache.org/repos/asf/servicemix/blob/11f4be5f/assembly/src/main/resources/etc/jre.properties
----------------------------------------------------------------------
diff --git a/assembly/src/main/resources/etc/jre.properties b/assembly/src/main/resources/etc/jre.properties
index 12d0002..c034c4a 100644
--- a/assembly/src/main/resources/etc/jre.properties
+++ b/assembly/src/main/resources/etc/jre.properties
@@ -190,8 +190,8 @@ jre-1.7= \
  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, \