Return-Path: X-Original-To: apmail-karaf-commits-archive@minotaur.apache.org Delivered-To: apmail-karaf-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id F043E11395 for ; Mon, 11 Aug 2014 11:34:21 +0000 (UTC) Received: (qmail 3844 invoked by uid 500); 11 Aug 2014 11:34:21 -0000 Delivered-To: apmail-karaf-commits-archive@karaf.apache.org Received: (qmail 3805 invoked by uid 500); 11 Aug 2014 11:34:21 -0000 Mailing-List: contact commits-help@karaf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@karaf.apache.org Delivered-To: mailing list commits@karaf.apache.org Received: (qmail 3796 invoked by uid 99); 11 Aug 2014 11:34:21 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 11 Aug 2014 11:34:21 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 839BF9AAD80; Mon, 11 Aug 2014 11:34:21 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: jbonofre@apache.org To: commits@karaf.apache.org Message-Id: <4f35abed1e134527888a3205331990b8@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: [KARAF-3158] Fix javax.annotation package version for jre 7 Date: Mon, 11 Aug 2014 11:34:21 +0000 (UTC) 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é Authored: Mon Aug 11 11:31:28 2014 +0200 Committer: Jean-Baptiste Onofré 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