servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ksobkow...@apache.org
Subject [1/3] git commit: SM-2376: Incorrect javax.annotation version for java7
Date Mon, 22 Sep 2014 20:34:35 GMT
Repository: servicemix
Updated Branches:
  refs/heads/master 5d896ae7d -> db73ca6c0


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/f4290405
Tree: http://git-wip-us.apache.org/repos/asf/servicemix/tree/f4290405
Diff: http://git-wip-us.apache.org/repos/asf/servicemix/diff/f4290405

Branch: refs/heads/master
Commit: f42904059be538d8aa87f23dbe5e28588dbd7392
Parents: 5d896ae
Author: Krzysztof Sobkowiak <krzys.sobkowiak@gmail.com>
Authored: Mon Sep 22 21:19:56 2014 +0200
Committer: Krzysztof Sobkowiak <krzys.sobkowiak@gmail.com>
Committed: Mon Sep 22 22:32:50 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/f4290405/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, \


Mime
View raw message