geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rickmcgu...@apache.org
Subject svn commit: r966754 - in /geronimo/server/trunk: ./ framework/ framework/configs/karaf-framework/ framework/configs/karaf-framework/src/main/filtered-resources/etc/ plugins/client/client/src/main/history/ plugins/openejb/openejb-deployer/src/main/histo...
Date Thu, 22 Jul 2010 17:06:56 GMT
Author: rickmcguire
Date: Thu Jul 22 17:06:56 2010
New Revision: 966754

URL: http://svn.apache.org/viewvc?rev=966754&view=rev
Log:
upgrade to new bundle versions, switch to the 3.1.0-SNAPSHOT version of Felix

Modified:
    geronimo/server/trunk/framework/configs/karaf-framework/pom.xml
    geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/config.properties
    geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/startup.properties
    geronimo/server/trunk/framework/pom.xml
    geronimo/server/trunk/plugins/client/client/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/openejb/openejb-deployer/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/openejb/openejb/src/main/history/dependencies.xml
    geronimo/server/trunk/pom.xml

Modified: geronimo/server/trunk/framework/configs/karaf-framework/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/karaf-framework/pom.xml?rev=966754&r1=966753&r2=966754&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/karaf-framework/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/karaf-framework/pom.xml Thu Jul 22 17:06:56 2010
@@ -45,7 +45,7 @@
         <felix.compendium.version>1.2.0</felix.compendium.version>
         <felix.configadmin.version>1.2.4</felix.configadmin.version>
         <felix.fileinstall.version>3.0.0</felix.fileinstall.version>
-        <felix.framework.version>3.0.1</felix.framework.version>
+        <felix.framework.version>3.1.0-SNAPSHOT</felix.framework.version>
         <felix.gogo.version>0.4.0</felix.gogo.version>
         <felix.osgi.version>1.4.0</felix.osgi.version>
         <felix.plugin.version>2.1.0</felix.plugin.version>

Modified: geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/config.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/config.properties?rev=966754&r1=966753&r2=966754&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/config.properties
(original)
+++ geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/config.properties
Thu Jul 22 17:06:56 2010
@@ -20,7 +20,7 @@
 #
 # Framework selection properties
 #
-karaf.framework=felix
+#karaf.framework=felix
 karaf.framework=equinox
 
 karaf.framework.equinox=repository/org/eclipse/osgi/${equinox.version}/osgi-${equinox.version}.jar

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=966754&r1=966753&r2=966754&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 Jul 22 17:06:56 2010
@@ -69,11 +69,11 @@ org/apache/geronimo/bundles/jaxb-impl/2.
 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/geronimo-jaxb_2.2_spec-1.0.jar=40
 org/apache/geronimo/specs/geronimo-stax-api_1.2_spec/1.0/geronimo-stax-api_1.2_spec-1.0.jar=40
-org/apache/geronimo/bundles/woodstox/3.2.9_1/woodstox-3.2.9_1.jar=40
+org/apache/geronimo/bundles/woodstox/${woodstoxVersion}/woodstox-${woodstoxVersion}.jar=40
 asm/asm-all/3.2/asm-all-3.2.jar=40
 commons-cli/commons-cli/1.2/commons-cli-1.2.jar=40
-org/apache/geronimo/bundles/sxc-jaxb/0.7.2_1/sxc-jaxb-0.7.2_1.jar=40
-org/apache/geronimo/bundles/sxc-runtime/0.7.2_1/sxc-runtime-0.7.2_1.jar=40
+org/apache/geronimo/bundles/sxc-jaxb/${sxcVersion}/sxc-jaxb-${sxcVersion}.jar=40
+org/apache/geronimo/bundles/sxc-runtime/${sxcVersion}/sxc-runtime-${sxcVersion}.jar=40
 org/apache/xbean/xbean-finder/${xbeanVersion}/xbean-finder-${xbeanVersion}.jar=40
 org/apache/xbean/xbean-reflect/${xbeanVersion}/xbean-reflect-${xbeanVersion}.jar=40
 org/apache/felix/org.apache.felix.bundlerepository/${felix.bundlerepository.version}/org.apache.felix.bundlerepository-${felix.bundlerepository.version}.jar=40

Modified: geronimo/server/trunk/framework/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/pom.xml?rev=966754&r1=966753&r2=966754&view=diff
==============================================================================
--- geronimo/server/trunk/framework/pom.xml (original)
+++ geronimo/server/trunk/framework/pom.xml Thu Jul 22 17:06:56 2010
@@ -45,7 +45,7 @@
             <dependency>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>org.apache.felix.framework</artifactId>
-                <version>3.0.1</version>
+                <version>3.1.0-SNAPSHOT</version>
                 <exclusions>
                     <exclusion>
                         <groupId>org.osgi</groupId>
@@ -113,13 +113,13 @@
             <dependency>
                 <groupId>org.apache.geronimo.bundles</groupId>
                 <artifactId>sxc-jaxb</artifactId>
-                <version>0.7.2_1</version>
+                <version>${sxcVersion}</version>
             </dependency>
 
             <dependency>
                 <groupId>org.apache.geronimo.bundles</groupId>
                 <artifactId>sxc-runtime</artifactId>
-                <version>0.7.2_1</version>
+                <version>${sxcVersion}</version>
             </dependency>
 
             <dependency>

Modified: geronimo/server/trunk/plugins/client/client/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/client/client/src/main/history/dependencies.xml?rev=966754&r1=966753&r2=966754&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/client/client/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/client/client/src/main/history/dependencies.xml Thu Jul
22 17:06:56 2010
@@ -7,6 +7,16 @@
         <type>car</type>
     </module-id>
     <dependency>
+        <groupId>commons-beanutils</groupId>
+        <artifactId>commons-beanutils</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>commons-collections</groupId>
+        <artifactId>commons-collections</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
         <groupId>org.apache.aries</groupId>
         <artifactId>org.apache.aries.util</artifactId>
         <type>jar</type>
@@ -17,6 +27,11 @@
         <type>jar</type>
     </dependency>
     <dependency>
+        <groupId>org.apache.bval</groupId>
+        <artifactId>org.apache.bval.bundle</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
         <groupId>org.apache.commons</groupId>
         <artifactId>commons-math</artifactId>
         <type>jar</type>

Modified: geronimo/server/trunk/plugins/openejb/openejb-deployer/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/openejb-deployer/src/main/history/dependencies.xml?rev=966754&r1=966753&r2=966754&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/openejb-deployer/src/main/history/dependencies.xml
(original)
+++ geronimo/server/trunk/plugins/openejb/openejb-deployer/src/main/history/dependencies.xml
Thu Jul 22 17:06:56 2010
@@ -36,4 +36,9 @@
         <artifactId>openejb-osgi-core</artifactId>
         <type>jar</type>
     </dependency>
+    <dependency>
+        <groupId>org.osgi</groupId>
+        <artifactId>org.osgi.core</artifactId>
+        <type>jar</type>
+    </dependency>
 </plugin-artifact>

Modified: geronimo/server/trunk/plugins/openejb/openejb/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/openejb/src/main/history/dependencies.xml?rev=966754&r1=966753&r2=966754&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/openejb/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/openejb/openejb/src/main/history/dependencies.xml Thu Jul
22 17:06:56 2010
@@ -122,11 +122,6 @@
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.xbean</groupId>
-        <artifactId>xbean-bundleutils</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
         <groupId>org.apache.yoko</groupId>
         <artifactId>yoko-spec-corba</artifactId>
         <type>jar</type>

Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=966754&r1=966753&r2=966754&view=diff
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Thu Jul 22 17:06:56 2010
@@ -72,7 +72,7 @@
 
         <openejbVersion>3.2-SNAPSHOT</openejbVersion>
         <openjpaVersion>2.0.0</openjpaVersion>
-        <derbyVersion>10.5.3.0_1</derbyVersion>
+        <derbyVersion>10.6.1.0</derbyVersion>
         <cxfVersion>2.1.10</cxfVersion>
         <axis2Version>1.5</axis2Version>
         <axiomVersion>1.2.8</axiomVersion>
@@ -85,6 +85,8 @@
 
         <monitoringConsoleVersion>${project.version}</monitoringConsoleVersion>
         <pax.logging.version>1.5.2</pax.logging.version>
+        <woodstoxVersion>3.2.9_1</woodstoxVersion>
+        <sxcVersion>0.7.3_1</sxcVersion>
 
         <!-- Deployers -->
         <gbeanDeployerBootstrap>org.apache.geronimo.framework/geronimo-gbean-deployer-bootstrap/${project.version}/car
@@ -531,13 +533,13 @@
             <dependency>
                 <groupId>org.apache.geronimo.bundles</groupId>
                 <artifactId>aspectjrt</artifactId>
-                <version>1.6.2_1</version>
+                <version>1.6.8_1</version>
             </dependency>
 
             <dependency>
                 <groupId>org.apache.geronimo.bundles</groupId>
                 <artifactId>aspectjweaver</artifactId>
-                <version>1.6.2_1</version>
+                <version>1.6.8_1</version>
             </dependency>
 
             <dependency>
@@ -1256,7 +1258,7 @@
             <dependency>
                 <groupId>org.apache.geronimo.bundles</groupId>
                 <artifactId>woodstox</artifactId>
-                <version>3.2.9_1</version>
+                <version>${woodstoxVersion}</version>
             </dependency>
 
             <dependency>
@@ -1298,29 +1300,6 @@
             </dependency>
 
             <dependency>
-                <groupId>com.envoisolutions.sxc</groupId>
-                <artifactId>sxc-jaxb</artifactId>
-                <version>0.7.3</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>stax</groupId>
-                        <artifactId>stax-api</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
-            <dependency>
-                <groupId>com.envoisolutions.sxc</groupId>
-                <artifactId>sxc-runtime</artifactId>
-                <version>0.7.3</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>stax</groupId>
-                        <artifactId>stax-api</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
-
-            <dependency>
                 <groupId>org.apache.geronimo.bundles</groupId>
                 <artifactId>axiom-api</artifactId>
                 <version>${axiomVersion}_1-SNAPSHOT</version>



Mime
View raw message