geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
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 GMT
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 @@
         <txmanagerVersion>3.1</txmanagerVersion>
         <tranqlVersion>1.6</tranqlVersion>
         <tranqlDerbyVersion>1.6</tranqlDerbyVersion>
+        <jaxbImplVersion>2.2_2-SNAPSHOT</jaxbImplVersion>
 
         <monitoringConsoleVersion>${project.version}</monitoringConsoleVersion>
         <pax.logging.version>1.5.3</pax.logging.version>
@@ -1099,6 +1100,14 @@
                         <groupId>net.sourceforge.serp</groupId>
                         <artifactId>serp</artifactId>
                     </exclusion>
+                    <!--<exclusion>-->
+                        <!--<groupId>org.apache.openwebbeans</groupId>-->
+                        <!--<artifactId>openwebbeans-ee</artifactId>-->
+                    <!--</exclusion>-->
+                    <exclusion>
+                        <groupId>org.apache.openwebbeans</groupId>
+                        <artifactId>openwebbeans-ee-common</artifactId>
+                    </exclusion>
                 </exclusions>
             </dependency>
 
@@ -1379,7 +1388,7 @@
             <dependency>
                 <groupId>org.apache.geronimo.bundles</groupId>
                 <artifactId>jaxb-impl</artifactId>
-                <version>2.2_2-SNAPSHOT</version>
+                <version>${jaxbImplVersion}</version>
             </dependency>
 
             <dependency>
@@ -2016,7 +2025,7 @@ only found in cxf
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-war-plugin</artifactId>
-                    <!--<version>2.1-alpha-2</version>-->
+                    <version>2.1.1</version>
                     <configuration>
                         <!--
                        <webXml>${project.build.directory}/jspweb.xml</webXml>
@@ -2033,7 +2042,7 @@ only found in cxf
 
                         NOTE: targetPath is broken for webResources (as documented)
                         -->
-                        <webResources>
+                         <webResources>
                             <resource>
                                 <directory>${project.build.outputDirectory}</directory>
                                 <includes>



Mime
View raw message