From commits-return-26283-apmail-servicemix-commits-archive=servicemix.apache.org@servicemix.apache.org Tue Jul 22 05:36:26 2014 Return-Path: X-Original-To: apmail-servicemix-commits-archive@www.apache.org Delivered-To: apmail-servicemix-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 0BE8E113C8 for ; Tue, 22 Jul 2014 05:36:26 +0000 (UTC) Received: (qmail 56236 invoked by uid 500); 22 Jul 2014 05:36:25 -0000 Delivered-To: apmail-servicemix-commits-archive@servicemix.apache.org Received: (qmail 56205 invoked by uid 500); 22 Jul 2014 05:36:25 -0000 Mailing-List: contact commits-help@servicemix.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@servicemix.apache.org Delivered-To: mailing list commits@servicemix.apache.org Received: (qmail 56196 invoked by uid 99); 22 Jul 2014 05:36:25 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 22 Jul 2014 05:36:25 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 8186D9AE779; Tue, 22 Jul 2014 05:36:25 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: gertv@apache.org To: commits@servicemix.apache.org Date: Tue, 22 Jul 2014 05:36:26 -0000 Message-Id: <578b50a277884748af7cb5695dc6e523@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/2] git commit: [SM-2320] Prepare for release - revert "Upgrade to Karaf 2.3.6-SNAPSHOT" [SM-2320] Prepare for release - revert "Upgrade to Karaf 2.3.6-SNAPSHOT" This reverts commit ef9bc2ec669b2df51113c60feec536cbea486a92. Project: http://git-wip-us.apache.org/repos/asf/servicemix/repo Commit: http://git-wip-us.apache.org/repos/asf/servicemix/commit/58c90b33 Tree: http://git-wip-us.apache.org/repos/asf/servicemix/tree/58c90b33 Diff: http://git-wip-us.apache.org/repos/asf/servicemix/diff/58c90b33 Branch: refs/heads/servicemix-5.0.x Commit: 58c90b337609468b80c4a08c56d3d871afe4a217 Parents: e360cb2 Author: Gert Vanthienen Authored: Tue Jul 22 07:30:56 2014 +0200 Committer: Gert Vanthienen Committed: Tue Jul 22 07:30:56 2014 +0200 ---------------------------------------------------------------------- assembly/src/main/filtered-resources/features.xml | 14 +++++++++++++- parent/pom.xml | 3 ++- 2 files changed, 15 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/servicemix/blob/58c90b33/assembly/src/main/filtered-resources/features.xml ---------------------------------------------------------------------- diff --git a/assembly/src/main/filtered-resources/features.xml b/assembly/src/main/filtered-resources/features.xml index 3ebfd2b..34fb47a 100644 --- a/assembly/src/main/filtered-resources/features.xml +++ b/assembly/src/main/filtered-resources/features.xml @@ -17,6 +17,18 @@ --> + + transaction + mvn:org.apache.geronimo.specs/geronimo-j2ee-connector_1.5_spec/${geronimo-j2ee-connector.version} + mvn:org.apache.geronimo.components/geronimo-connector/${geronimo-connector.version} + mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo-jms.version} + mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/${geronimo-servlet.version} + mvn:org.springframework/org.springframework.transaction/${spring.version} + mvn:org.springframework/org.springframework.beans/${spring.version} + mvn:org.springframework/org.springframework.context/${spring.version} ‚ + mvn:org.springframework/org.springframework.aop/${spring.version} + + activemq-broker-noweb mvn:org.apache.servicemix.logging/jms-appender/${version} @@ -32,7 +44,7 @@ jpa cxf-specs - transaction + transaction camel spring-orm drools http://git-wip-us.apache.org/repos/asf/servicemix/blob/58c90b33/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 2699f0a..6c8662b 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -43,10 +43,11 @@ 2.7.11 1.6.6 - 2.3.6-SNAPSHOT + 2.3.4 1.0.2 1.1.0 1.4.0 + 1.0.1 1.7.2 2.2.3