karaf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbono...@apache.org
Subject git commit: [KARAF-3158] Fix javax.annotation package version for jre 7
Date Mon, 11 Aug 2014 11:34:21 GMT
Repository: karaf
Updated Branches:
  refs/heads/karaf-3.0.x 65874116c -> 255c1d0d2


[KARAF-3158] Fix javax.annotation package version for jre 7


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

Branch: refs/heads/karaf-3.0.x
Commit: 255c1d0d26bc0112e361495276ba7b750a913393
Parents: 6587411
Author: Jean-Baptiste Onofré <jbonofre@apache.org>
Authored: Mon Aug 11 11:31:28 2014 +0200
Committer: Jean-Baptiste Onofré <jbonofre@apache.org>
Committed: Mon Aug 11 13:31:06 2014 +0200

----------------------------------------------------------------------
 .../src/main/filtered-resources/resources/etc/jre.properties   | 6 +++---
 main/src/test/resources/test-karaf-home/etc/jre.properties     | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/karaf/blob/255c1d0d/assemblies/features/framework/src/main/filtered-resources/resources/etc/jre.properties
----------------------------------------------------------------------
diff --git a/assemblies/features/framework/src/main/filtered-resources/resources/etc/jre.properties
b/assemblies/features/framework/src/main/filtered-resources/resources/etc/jre.properties
index 74bd2e3..31ac1ae 100644
--- a/assemblies/features/framework/src/main/filtered-resources/resources/etc/jre.properties
+++ b/assemblies/features/framework/src/main/filtered-resources/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, \
@@ -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

http://git-wip-us.apache.org/repos/asf/karaf/blob/255c1d0d/main/src/test/resources/test-karaf-home/etc/jre.properties
----------------------------------------------------------------------
diff --git a/main/src/test/resources/test-karaf-home/etc/jre.properties b/main/src/test/resources/test-karaf-home/etc/jre.properties
index ec0a344..31ac1ae 100644
--- a/main/src/test/resources/test-karaf-home/etc/jre.properties
+++ b/main/src/test/resources/test-karaf-home/etc/jre.properties
@@ -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


Mime
View raw message