Repository: karaf Updated Branches: refs/heads/master fb985f250 -> 18a8290ac
[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/18a8290a Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/18a8290a Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/18a8290a Branch: refs/heads/master Commit: 18a8290ac0b2f200f56841a6608313474495d924 Parents: fb985f2 Author: Jean-Baptiste Onofré <[email protected]> Authored: Mon Aug 11 11:31:28 2014 +0200 Committer: Jean-Baptiste Onofré <[email protected]> Committed: Mon Aug 11 11:31:28 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/18a8290a/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/18a8290a/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
