From scm-return-45549-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org Thu Feb 10 00:36:53 2011 Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 42215 invoked from network); 10 Feb 2011 00:36:52 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 10 Feb 2011 00:36:52 -0000 Received: (qmail 5349 invoked by uid 500); 10 Feb 2011 00:36:52 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 5277 invoked by uid 500); 10 Feb 2011 00:36:52 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 5269 invoked by uid 99); 10 Feb 2011 00:36:52 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 10 Feb 2011 00:36:52 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.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; Thu, 10 Feb 2011 00:36:50 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id B46342388903; Thu, 10 Feb 2011 00:36:28 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1069177 - in /geronimo/server/trunk: framework/configs/karaf-framework/src/main/filtered-resources/etc/startup.properties pom.xml Date: Thu, 10 Feb 2011 00:36:28 -0000 To: scm@geronimo.apache.org From: djencks@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110210003628.B46342388903@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: djencks Date: Thu Feb 10 00:36:28 2011 New Revision: 1069177 URL: http://svn.apache.org/viewvc?rev=1069177&view=rev Log: GERONIMO-5801 need to update jaxb-impl version in startup.properties as well Modified: geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/startup.properties geronimo/server/trunk/pom.xml Modified: geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/startup.properties URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/startup.properties?rev=1069177&r1=1069176&r2=1069177&view=diff ============================================================================== --- geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/startup.properties (original) +++ geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/startup.properties Thu Feb 10 00:36:28 2011 @@ -64,7 +64,7 @@ org/apache/servicemix/bundles/org.apache org/apache/servicemix/bundles/org.apache.servicemix.bundles.cglib/2.1_3_4/org.apache.servicemix.bundles.cglib-2.1_3_4.jar=40 org/apache/servicemix/bundles/org.apache.servicemix.bundles.commons-jexl/1.1_3/org.apache.servicemix.bundles.commons-jexl-1.1_3.jar=40 commons-lang/commons-lang/2.5/commons-lang-2.5.jar=40 -org/apache/geronimo/bundles/jaxb-impl/2.2_1/jaxb-impl-2.2_1.jar=40 +org/apache/geronimo/bundles/jaxb-impl/${jaxbImplVersion}/jaxb-impl-${jaxbImplVersion}.jar=40 org/apache/geronimo/specs/geronimo-activation_1.1_spec/1.1/geronimo-activation_1.1_spec-1.1.jar=40 org/apache/geronimo/specs/geronimo-jaxb_2.2_spec/1.0.1/geronimo-jaxb_2.2_spec-1.0.1.jar=40 org/apache/geronimo/specs/geronimo-stax-api_1.2_spec/1.0/geronimo-stax-api_1.2_spec-1.0.jar=40 Modified: geronimo/server/trunk/pom.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=1069177&r1=1069176&r2=1069177&view=diff ============================================================================== --- geronimo/server/trunk/pom.xml (original) +++ geronimo/server/trunk/pom.xml Thu Feb 10 00:36:28 2011 @@ -82,6 +82,7 @@ 3.1 1.6 1.6 + 2.2_2-SNAPSHOT ${project.version} 1.5.3 @@ -1099,6 +1100,14 @@ net.sourceforge.serp serp + + + + + + org.apache.openwebbeans + openwebbeans-ee-common + @@ -1379,7 +1388,7 @@ org.apache.geronimo.bundles jaxb-impl - 2.2_2-SNAPSHOT + ${jaxbImplVersion} @@ -2016,7 +2025,7 @@ only found in cxf org.apache.maven.plugins maven-war-plugin - + 2.1.1 - + ${project.build.outputDirectory}