servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ff...@apache.org
Subject svn commit: r1175383 - in /servicemix/smx4/nmr/trunk: pom.xml testing/support/pom.xml testing/support/src/main/java/org/apache/servicemix/platform/testing/support/AbstractIntegrationTest.java
Date Sun, 25 Sep 2011 12:47:41 GMT
Author: ffang
Date: Sun Sep 25 12:47:40 2011
New Revision: 1175383

URL: http://svn.apache.org/viewvc?rev=1175383&view=rev
Log:
[SMX4-924]should ship servlet api 2.5 but not servlet api 3.0

Modified:
    servicemix/smx4/nmr/trunk/pom.xml
    servicemix/smx4/nmr/trunk/testing/support/pom.xml
    servicemix/smx4/nmr/trunk/testing/support/src/main/java/org/apache/servicemix/platform/testing/support/AbstractIntegrationTest.java

Modified: servicemix/smx4/nmr/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/pom.xml?rev=1175383&r1=1175382&r2=1175383&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/pom.xml Sun Sep 25 12:47:40 2011
@@ -72,7 +72,7 @@
       <!-- Geronimo -->
       <geronimo-jms.version>1.1.1</geronimo-jms.version>
       <geronimo-jta.version>1.1.1</geronimo-jta.version>
-      <geronimo-servlet.version>1.0</geronimo-servlet.version>
+      <geronimo-servlet.version>1.1.2</geronimo-servlet.version>
       
       <!-- Bundles -->
       <ant.bundle.version>1.7.0_4</ant.bundle.version>
@@ -205,7 +205,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-servlet_3.0_spec</artifactId>
+            <artifactId>geronimo-servlet_2.5_spec</artifactId>
             <version>${geronimo-servlet.version}</version>
         </dependency>
                 

Modified: servicemix/smx4/nmr/trunk/testing/support/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/testing/support/pom.xml?rev=1175383&r1=1175382&r2=1175383&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/testing/support/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/testing/support/pom.xml Sun Sep 25 12:47:40 2011
@@ -108,7 +108,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-servlet_3.0_spec</artifactId>
+            <artifactId>geronimo-servlet_2.5_spec</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.servicemix.bundles</groupId>

Modified: servicemix/smx4/nmr/trunk/testing/support/src/main/java/org/apache/servicemix/platform/testing/support/AbstractIntegrationTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/testing/support/src/main/java/org/apache/servicemix/platform/testing/support/AbstractIntegrationTest.java?rev=1175383&r1=1175382&r2=1175383&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/testing/support/src/main/java/org/apache/servicemix/platform/testing/support/AbstractIntegrationTest.java
(original)
+++ servicemix/smx4/nmr/trunk/testing/support/src/main/java/org/apache/servicemix/platform/testing/support/AbstractIntegrationTest.java
Sun Sep 25 12:47:40 2011
@@ -90,7 +90,7 @@ public class AbstractIntegrationTest ext
 
     protected String[] getTestFrameworkBundlesNames() {
         return new String[] {
-            getBundle("org.apache.geronimo.specs", "geronimo-servlet_3.0_spec"),
+            getBundle("org.apache.geronimo.specs", "geronimo-servlet_2.5_spec"),
             getBundle("org.osgi", "org.osgi.core"),
             getBundle("org.osgi", "org.osgi.compendium"),
             getBundle("org.apache.felix", "org.apache.felix.configadmin"),



Mime
View raw message