Return-Path: Delivered-To: apmail-camel-commits-archive@www.apache.org Received: (qmail 58332 invoked from network); 23 Sep 2009 11:31:03 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 23 Sep 2009 11:31:03 -0000 Received: (qmail 72117 invoked by uid 500); 23 Sep 2009 11:31:03 -0000 Delivered-To: apmail-camel-commits-archive@camel.apache.org Received: (qmail 72081 invoked by uid 500); 23 Sep 2009 11:31:03 -0000 Mailing-List: contact commits-help@camel.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@camel.apache.org Delivered-To: mailing list commits@camel.apache.org Received: (qmail 72072 invoked by uid 99); 23 Sep 2009 11:31:03 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 23 Sep 2009 11:31:03 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 23 Sep 2009 11:31:00 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id A63392388897; Wed, 23 Sep 2009 11:30:40 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r818063 - in /camel/trunk: parent/pom.xml platforms/karaf/features/pom.xml platforms/karaf/features/src/main/resources/features.xml Date: Wed, 23 Sep 2009 11:30:40 -0000 To: commits@camel.apache.org From: ningjiang@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090923113040.A63392388897@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: ningjiang Date: Wed Sep 23 11:30:40 2009 New Revision: 818063 URL: http://svn.apache.org/viewvc?rev=818063&view=rev Log: CAMEL-2038 Add the javax.persistence version rang on bundle import package Modified: camel/trunk/parent/pom.xml camel/trunk/platforms/karaf/features/pom.xml camel/trunk/platforms/karaf/features/src/main/resources/features.xml Modified: camel/trunk/parent/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=818063&r1=818062&r2=818063&view=diff ============================================================================== --- camel/trunk/parent/pom.xml (original) +++ camel/trunk/parent/pom.xml Wed Sep 23 11:30:40 2009 @@ -120,6 +120,7 @@ org.mortbay.cometd.*;version="[6.1,7)", net.sf.flatpack.*;version="[3.1.1,4)", freemarker.*;version="[2.3.15,3)", + javax.persistence.*;version="[1.1,2)", Modified: camel/trunk/platforms/karaf/features/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/pom.xml?rev=818063&r1=818062&r2=818063&view=diff ============================================================================== --- camel/trunk/platforms/karaf/features/pom.xml (original) +++ camel/trunk/platforms/karaf/features/pom.xml Wed Sep 23 11:30:40 2009 @@ -71,6 +71,7 @@ 1.0_1 1.1_1 1.0.1_1 + 6.1.14_1 6.1.11_1 20030619_1 1.5.2_1 @@ -79,7 +80,8 @@ 2.1.0_1 4.4_1 2.0.9_1 - 2.0.4 + 1.1.7_1 + 2.0.4_1 2.7.3_1 2.0.8_1 1.2.1_1-SNAPSHOT @@ -88,15 +90,14 @@ 1.0-incubating-M2.1_1 9.1.0.1_1 1.4-SNAPSHOT - 2.5-20081211 + 1.1.2 + 1.13.1_1-SNAPSHOT 1.8.1_1 3.0.4_1 3.2.1 2.5.6.SEC01 1.2.0 1.0.0-20090215 - 1.99.0 - 1.13.1 3.2_1 1.2_1 1.6.2_1 @@ -104,7 +105,7 @@ 2.9.1_1 2.4.0_2 1.4.5 - 1.3.0_1 + 1.4.3_1-SNAPSHOT 1.2_1 1.1.4c_1 1.3_1 Modified: camel/trunk/platforms/karaf/features/src/main/resources/features.xml URL: http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/src/main/resources/features.xml?rev=818063&r1=818062&r2=818063&view=diff ============================================================================== --- camel/trunk/platforms/karaf/features/src/main/resources/features.xml (original) +++ camel/trunk/platforms/karaf/features/src/main/resources/features.xml Wed Sep 23 11:30:40 2009 @@ -37,17 +37,14 @@ mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo-jms-spec-version} mvn:org.springframework/spring-jms/${spring-version} mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.asm/${asm-bundle-version} - mvn:org.mortbay.jetty/jetty-util/${jetty-version} - mvn:org.mortbay.jetty/servlet-api/${servlet-api-2.5-version} - mvn:org.apache.geronimo.specs/geronimo-el_1.0_spec/${geronimo-el-version} - mvn:org.apache.geronimo.specs/geronimo-jsp_2.1_spec/${geronimo-jsp-version} - mvn:org.mortbay.jetty/jetty/${jetty-version} + mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/${servlet-api-2.5-version} + mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jetty-bundle/${jetty-bundle-version} mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-codec/${commons-codec-bundle-version} mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/${jdom-bundle-version} mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jettison/${jettison-bundle-version} mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ant/${ant-bundle-version} mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlbeans/${xmlbeans-bundle-version} - mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlsec/${servicemix-specs-version}_1 + mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlsec/${xmlsec-bundle-version} mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlresolver/${xmlresolver-bundle-version} mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.woodstox/${woodstox-bundle-version} mvn:org.apache.ws.commons.schema/XmlSchema/${xmlschema-version} @@ -60,7 +57,7 @@ mvn:org.apache.ws.commons.axiom/axiom-impl/${axiom-version} mvn:org.apache.ws.commons.axiom/axiom-api/${axiom-version} mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.javax.mail/${javax-mail-version} - mvn:org.apache.neethi/neethi/${neethi-version} + mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.neethi/${neethi-bundle-version} mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.abdera/${abdera-bundle-version} mvn:org.apache.geronimo.specs/geronimo-jaxws_2.1_spec/${geronimo-jaxws-spec-version} mvn:org.apache.geronimo.specs/geronimo-annotation_1.0_spec/${gernimo-annotation-spec-version} @@ -84,24 +81,21 @@ camel-core mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-codec/${commons-codec-bundle-version} mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-httpclient/${commons-httpclient-bundle-version} - mvn:org.mortbay.jetty/servlet-api/${servlet-api-2.5-version} + mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/${servlet-api-2.5-version} mvn:org.apache.camel/camel-http/${pom.version} camel-core + mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.mina/${mina-bundle-version} mvn:org.apache.camel/camel-mina/${pom.version} - mvn:org.mortbay.jetty/jetty-util/${jetty-version} - mvn:org.apache.geronimo.specs/geronimo-el_1.0_spec/${geronimo-el-version} - mvn:org.apache.geronimo.specs/geronimo-jsp_2.1_spec/${geronimo-jsp-version} - mvn:org.mortbay.jetty/jetty/${jetty-version} + mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jetty-bundle/${jetty-bundle-version} camel-http mvn:org.apache.camel/camel-jetty/${pom.version} camel-http - mvn:org.mortbay.jetty/servlet-api/${servlet-api-2.5-version} mvn:org.apache.camel/camel-servlet/${pom.version} @@ -126,8 +120,6 @@ mvn:org.springframework/spring-tx/${spring-version} - mvn:org.mortbay.jetty/servlet-api/${servlet-api-2.5-version} - mvn:org.apache.geronimo.specs/geronimo-el_1.0_spec/${geronimo-el-version} mvn:org.springframework/spring-web/${spring-version} mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo-jta-spec-version} mvn:org.springframework/spring-jdbc/${spring-version} @@ -145,11 +137,8 @@ mvn:org.apache.camel/camel-bindy/${pom.version} - mvn:org.mortbay.jetty/jetty-util/${jetty-version} - mvn:org.mortbay.jetty/servlet-api/${servlet-api-2.5-version} - mvn:org.apache.geronimo.specs/geronimo-el_1.0_spec/${geronimo-el-version} - mvn:org.apache.geronimo.specs/geronimo-jsp_2.1_spec/${geronimo-jsp-version} - mvn:org.mortbay.jetty/jetty/${jetty-version} + mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/${servlet-api-2.5-version} + mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jetty-bundle/${jetty-bundle-version} mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jetty-cometd/${jetty-cometd-bundle-version} camel-core mvn:org.apache.camel/camel-cometd/${pom.version} @@ -168,13 +157,6 @@ camel-spring - mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/${jdom-bundle-version} - mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xpp3/${xpp3-bundle-version} - mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.dom4j/${dom4j-bundle-version} - mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ant/${ant-bundle-version} - mvn:org.mortbay.jetty/servlet-api/${servlet-api-2.5-version} - mvn:org.apache.geronimo.specs/geronimo-el_1.0_spec/${geronimo-el-version} - mvn:org.apache.geronimo.specs/geronimo-jsp_2.1_spec/${geronimo-jsp-version} mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.freemarker/${freemarker-bundle-version} mvn:org.apache.camel/camel-freemarker/${pom.version} @@ -195,35 +177,20 @@ camel-core mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ant/${ant-bundle-version} - mvn:org.mortbay.jetty/servlet-api/${servlet-api-2.5-version} - mvn:org.apache.geronimo.specs/geronimo-el_1.0_spec/${geronimo-el-version} - mvn:org.apache.geronimo.specs/geronimo-jsp_2.1_spec/${geronimo-jsp-version} mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.scripting-api-1.0/${servicemix-specs-version} - mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xpp3/${xpp3-bundle-version} - mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.joda-time/${jodatime-bundle-version} - mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/${jdom-bundle-version} - mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.dom4j/${dom4j-bundle-version} - mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jettison/${jettison-bundle-version} - mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xstream/${xstream-bundle-version} mvn:org.codehaus.groovy/groovy-all/1.6.1 mvn:org.apache.camel/camel-groovy/${pom.version} camel-core - mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/${jdom-bundle-version} - mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo-jta-spec-version} - mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo-jms-spec-version} mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.hapi/${hapi-bundle-version} + mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.mina/${mina-bundle-version} mvn:org.apache.camel/camel-hl7/${pom.version} camel-spring mvn:commons-pool/commons-pool/${commons-pool-version} mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-dbcp/${commons-dbcp-bundle-version} - mvn:org.mortbay.jetty/servlet-api/${servlet-api-2.5-version} - mvn:org.apache.geronimo.specs/geronimo-el_1.0_spec/${geronimo-el-version} - mvn:org.apache.geronimo.specs/geronimo-jsp_2.1_spec/${geronimo-jsp-version} - mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo-jms-spec-version} mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.oscache/${oscache-bundle-version} mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ibatis-sqlmap/${ibatis-bundle-version} mvn:org.apache.camel/camel-ibatis/${pom.version} @@ -255,10 +222,6 @@ mvn:org.apache.camel/camel-jdbc/${pom.version} - mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ant/${ant-bundle-version} - mvn:org.mortbay.jetty/servlet-api/${servlet-api-2.5-version} - mvn:org.apache.geronimo.specs/geronimo-el_1.0_spec/${geronimo-el-version} - mvn:org.apache.geronimo.specs/geronimo-jsp_2.1_spec/${geronimo-jsp-version} mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.josql/${josql-bundle-version} camel-core mvn:org.apache.camel/camel-josql/${pom.version} @@ -274,6 +237,7 @@ mvn:commons-pool/commons-pool/${commons-pool-version} mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-dbcp/${commons-dbcp-bundle-version} mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ant/${ant-bundle-version} + mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.serp/${serp-bundle-version} mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo-jms-spec-version} mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.openjpa/${openjpa-bundle-version} mvn:org.springframework/spring-orm/${spring-version} @@ -281,12 +245,6 @@ mvn:org.apache.camel/camel-jpa/${pom.version} - mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/${jdom-bundle-version} - mvn:commons-collections/commons-collections/${commons-collections-version} - mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-beanutils/${commons-beanutils-bundle-version} - mvn:org.mortbay.jetty/servlet-api/${servlet-api-2.5-version} - mvn:org.apache.geronimo.specs/geronimo-el_1.0_spec/${geronimo-el-version} - mvn:org.apache.geronimo.specs/geronimo-jsp_2.1_spec/${geronimo-jsp-version} mvn:commons-jxpath/commons-jxpath/${commons-jxpath-version} camel-core mvn:org.apache.camel/camel-jxpath/${pom.version} @@ -382,22 +340,6 @@ mvn:org.apache.camel/camel-spring-integration/${pom.version} - mvn:org.springframework/spring-web/${spring-version} - mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.saaj-api-1.3/${servicemix-specs-version} - mvn:org.apache.geronimo.specs/geronimo-jaxws_2.1_spec/${geronimo-jaxws-spec-version} - mvn:org.apache.geronimo.specs/geronimo-jsp_2.1_spec/${geronimo-jsp-version} - mvn:org.mortbay.jetty/servlet-api/${servlet-api-2.5-version} - mvn:org.apache.geronimo.specs/geronimo-ws-metadata_2.0_spec/${geronimo-ws-metadata-spec-version} - mvn:org.apache.geronimo.specs/geronimo-el_1.0_spec/${geronimo-el-version} - mvn:org.springframework/spring-jdbc/${spring-version} - mvn:org.apache.geronimo.specs/geronimo-jpa_3.0_spec/1.1.1 - mvn:commons-pool/commons-pool/${commons-pool-version} - mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-dbcp/${commons-dbcp-bundle-version} - mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo-jms-spec-version} - mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.oscache/${oscache-bundle-version} - mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ibatis-sqlmap/${ibatis-bundle-version} - mvn:org.springframework/spring-orm/${spring-version} - mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.junit/${junit-bundle-version} mvn:org.springframework/org.springframework.test/${spring-version} mvn:org.springframework.javaconfig/org.springframework.config.java/${spring-javaconfig-version} camel-spring @@ -426,14 +368,9 @@ mvn:org.apache.camel/camel-tagsoup/${pom.version} - mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/${jdom-bundle-version} - mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ant/${ant-bundle-version} mvn:commons-lang/commons-lang/${commons-lang-version} mvn:commons-collections/commons-collections/${commons-collections-version} - mvn:org.mortbay.jetty/servlet-api/${servlet-api-2.5-version} - mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.antlr/${antlr-bundle-version} mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.oro/${oro-bundle-version} - mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.werken-xpath/${werken-xpath-bundle-version} mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.velocity/${velocity-bundle-version} camel-spring mvn:org.apache.camel/camel-velocity/${pom.version}