geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r921195 - in /geronimo/server/trunk: framework/ framework/configs/client-system/src/main/history/ framework/configs/j2ee-system/src/main/history/ framework/configs/jsr88-cli/src/main/history/ framework/configs/karaf-framework/ framework/con...
Date Wed, 10 Mar 2010 00:40:47 GMT
Author: djencks
Date: Wed Mar 10 00:40:46 2010
New Revision: 921195

URL: http://svn.apache.org/viewvc?rev=921195&view=rev
Log:
don't include junit in our server

Modified:
    geronimo/server/trunk/framework/configs/client-system/src/main/history/dependencies.xml
    geronimo/server/trunk/framework/configs/j2ee-system/src/main/history/dependencies.xml
    geronimo/server/trunk/framework/configs/jsr88-cli/src/main/history/dependencies.xml
    geronimo/server/trunk/framework/configs/karaf-framework/pom.xml
    geronimo/server/trunk/framework/configs/karaf-framework/src/main/history/dependencies.xml
    geronimo/server/trunk/framework/configs/online-deployer/src/main/history/dependencies.xml
    geronimo/server/trunk/framework/configs/shutdown/src/main/history/dependencies.xml
    geronimo/server/trunk/framework/modules/testsupport-common/pom.xml
    geronimo/server/trunk/framework/pom.xml
    geronimo/server/trunk/plugins/j2ee/jsr88-war-configurer/src/main/history/dependencies.xml

Modified: geronimo/server/trunk/framework/configs/client-system/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/client-system/src/main/history/dependencies.xml?rev=921195&r1=921194&r2=921195&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/client-system/src/main/history/dependencies.xml
(original)
+++ geronimo/server/trunk/framework/configs/client-system/src/main/history/dependencies.xml
Wed Mar 10 00:40:46 2010
@@ -17,11 +17,6 @@
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>junit</groupId>
-        <artifactId>junit</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
         <groupId>org.apache.felix</groupId>
         <artifactId>org.apache.felix.bundlerepository</artifactId>
         <type>jar</type>

Modified: geronimo/server/trunk/framework/configs/j2ee-system/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/j2ee-system/src/main/history/dependencies.xml?rev=921195&r1=921194&r2=921195&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/j2ee-system/src/main/history/dependencies.xml
(original)
+++ geronimo/server/trunk/framework/configs/j2ee-system/src/main/history/dependencies.xml
Wed Mar 10 00:40:46 2010
@@ -17,11 +17,6 @@
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>junit</groupId>
-        <artifactId>junit</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
         <groupId>org.apache.felix</groupId>
         <artifactId>org.apache.felix.bundlerepository</artifactId>
         <type>jar</type>

Modified: geronimo/server/trunk/framework/configs/jsr88-cli/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/jsr88-cli/src/main/history/dependencies.xml?rev=921195&r1=921194&r2=921195&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/jsr88-cli/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/framework/configs/jsr88-cli/src/main/history/dependencies.xml Wed
Mar 10 00:40:46 2010
@@ -17,11 +17,6 @@
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>junit</groupId>
-        <artifactId>junit</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
         <groupId>org.apache.felix</groupId>
         <artifactId>org.apache.felix.bundlerepository</artifactId>
         <type>jar</type>

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=921195&r1=921194&r2=921195&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/karaf-framework/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/karaf-framework/pom.xml Wed Mar 10 00:40:46 2010
@@ -98,11 +98,11 @@
                 <scope>import</scope>
             </dependency>
 
-            <dependency>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>org.apache.felix.configadmin</artifactId>
-                <version>${felix.configadmin.version}</version>
-            </dependency>
+            <!--<dependency>-->
+                <!--<groupId>org.apache.felix</groupId>-->
+                <!--<artifactId>org.apache.felix.configadmin</artifactId>-->
+                <!--<version>${felix.configadmin.version}</version>-->
+            <!--</dependency>-->
 
             <dependency>
                 <groupId>org.apache.felix</groupId>
@@ -349,10 +349,22 @@
         <dependency>
             <groupId>org.apache.felix.karaf.deployer</groupId>
             <artifactId>org.apache.felix.karaf.deployer.blueprint</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.servicemix.bundles</groupId>
+                    <artifactId>org.apache.servicemix.bundles.junit</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.apache.felix.karaf.deployer</groupId>
             <artifactId>org.apache.felix.karaf.deployer.features</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.servicemix.bundles</groupId>
+                    <artifactId>org.apache.servicemix.bundles.junit</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.apache.felix.karaf.features</groupId>

Modified: geronimo/server/trunk/framework/configs/karaf-framework/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/karaf-framework/src/main/history/dependencies.xml?rev=921195&r1=921194&r2=921195&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/karaf-framework/src/main/history/dependencies.xml
(original)
+++ geronimo/server/trunk/framework/configs/karaf-framework/src/main/history/dependencies.xml
Wed Mar 10 00:40:46 2010
@@ -17,11 +17,6 @@
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>junit</groupId>
-        <artifactId>junit</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
         <groupId>org.apache.aries</groupId>
         <artifactId>org.apache.aries.util</artifactId>
         <type>jar</type>
@@ -343,11 +338,6 @@
     </dependency>
     <dependency>
         <groupId>org.apache.servicemix.bundles</groupId>
-        <artifactId>org.apache.servicemix.bundles.junit</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.servicemix.bundles</groupId>
         <artifactId>org.apache.servicemix.bundles.woodstox</artifactId>
         <type>jar</type>
     </dependency>

Modified: geronimo/server/trunk/framework/configs/online-deployer/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/online-deployer/src/main/history/dependencies.xml?rev=921195&r1=921194&r2=921195&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/online-deployer/src/main/history/dependencies.xml
(original)
+++ geronimo/server/trunk/framework/configs/online-deployer/src/main/history/dependencies.xml
Wed Mar 10 00:40:46 2010
@@ -17,11 +17,6 @@
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>junit</groupId>
-        <artifactId>junit</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
         <groupId>org.apache.felix</groupId>
         <artifactId>org.apache.felix.bundlerepository</artifactId>
         <type>jar</type>

Modified: geronimo/server/trunk/framework/configs/shutdown/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/shutdown/src/main/history/dependencies.xml?rev=921195&r1=921194&r2=921195&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/shutdown/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/framework/configs/shutdown/src/main/history/dependencies.xml Wed
Mar 10 00:40:46 2010
@@ -17,11 +17,6 @@
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>junit</groupId>
-        <artifactId>junit</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
         <groupId>org.apache.felix</groupId>
         <artifactId>org.apache.felix.bundlerepository</artifactId>
         <type>jar</type>

Modified: geronimo/server/trunk/framework/modules/testsupport-common/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/testsupport-common/pom.xml?rev=921195&r1=921194&r2=921195&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/testsupport-common/pom.xml (original)
+++ geronimo/server/trunk/framework/modules/testsupport-common/pom.xml Wed Mar 10 00:40:46
2010
@@ -37,7 +37,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <scope>compile</scope>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>

Modified: geronimo/server/trunk/framework/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/pom.xml?rev=921195&r1=921194&r2=921195&view=diff
==============================================================================
--- geronimo/server/trunk/framework/pom.xml (original)
+++ geronimo/server/trunk/framework/pom.xml Wed Mar 10 00:40:46 2010
@@ -39,7 +39,7 @@
             <dependency>
                 <groupId>org.eclipse</groupId>
                 <artifactId>osgi</artifactId>
-                <version>3.5.0.v20090520</version>
+                <version>3.5.1.v20090827</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.felix</groupId>
@@ -69,6 +69,11 @@
                         <groupId>org.apache.felix</groupId>
                         <artifactId>org.osgi.core</artifactId>
                     </exclusion>
+                    <exclusion>
+                        <!-- see FELIX-2179  -->
+                        <groupId>junit</groupId>
+                        <artifactId>junit</artifactId>
+                    </exclusion>
                 </exclusions>
             </dependency>
             <dependency>
@@ -79,7 +84,7 @@
                     <exclusion>
                         <groupId>org.apache.felix</groupId>
                         <artifactId>org.osgi.core</artifactId>
-		    </exclusion>
+                    </exclusion>
                     <exclusion>
                         <groupId>org.apache.felix</groupId>
                         <artifactId>org.osgi.compendium</artifactId>
@@ -87,7 +92,7 @@
                     <exclusion>
                         <groupId>org.apache.felix</groupId>
                         <artifactId>org.apache.felix.shell</artifactId>
-		    </exclusion>
+                    </exclusion>
                     <exclusion>
                         <groupId>org.osgi</groupId>
                         <artifactId>org.osgi.core</artifactId>
@@ -159,37 +164,37 @@
             </dependency>
             <!-- overridden dependencies -->
             <!--<dependency>-->
-                <!--<groupId>org.apache.geronimo.components</groupId>-->
-                <!--<artifactId>geronimo-jaspi</artifactId>-->
-                <!--<version>1.1-SNAPSHOT</version>-->
-                <!--<exclusions>-->
-                    <!--<exclusion>-->
-                        <!--<groupId>org.apache.geronimo.specs</groupId>-->
-                        <!--<artifactId>geronimo-jaxb_2.1_spec</artifactId>-->
-                    <!--</exclusion>-->
-                    <!--<exclusion>-->
-                        <!--<groupId>org.apache.geronimo.specs</groupId>-->
-                        <!--<artifactId>geronimo-stax-api_1.0_spec</artifactId>-->
-                    <!--</exclusion>-->
-                    <!--<exclusion>-->
-                        <!--<groupId>com.envoisolutions.sxc</groupId>-->
-                        <!--<artifactId>sxc-jaxb</artifactId>-->
-                    <!--</exclusion>-->
-                    <!--<exclusion>-->
-                        <!--<groupId>org.codehaus.woodstox</groupId>-->
-                        <!--<artifactId>wstx-asl</artifactId>-->
-                    <!--</exclusion>-->
-                    <!--<exclusion>-->
-                        <!--<groupId>com.sun.xml.bind</groupId>-->
-                        <!--<artifactId>jaxb-impl</artifactId>-->
-                    <!--</exclusion>-->
-                <!--</exclusions>-->
+            <!--<groupId>org.apache.geronimo.components</groupId>-->
+            <!--<artifactId>geronimo-jaspi</artifactId>-->
+            <!--<version>1.1-SNAPSHOT</version>-->
+            <!--<exclusions>-->
+            <!--<exclusion>-->
+            <!--<groupId>org.apache.geronimo.specs</groupId>-->
+            <!--<artifactId>geronimo-jaxb_2.1_spec</artifactId>-->
+            <!--</exclusion>-->
+            <!--<exclusion>-->
+            <!--<groupId>org.apache.geronimo.specs</groupId>-->
+            <!--<artifactId>geronimo-stax-api_1.0_spec</artifactId>-->
+            <!--</exclusion>-->
+            <!--<exclusion>-->
+            <!--<groupId>com.envoisolutions.sxc</groupId>-->
+            <!--<artifactId>sxc-jaxb</artifactId>-->
+            <!--</exclusion>-->
+            <!--<exclusion>-->
+            <!--<groupId>org.codehaus.woodstox</groupId>-->
+            <!--<artifactId>wstx-asl</artifactId>-->
+            <!--</exclusion>-->
+            <!--<exclusion>-->
+            <!--<groupId>com.sun.xml.bind</groupId>-->
+            <!--<artifactId>jaxb-impl</artifactId>-->
+            <!--</exclusion>-->
+            <!--</exclusions>-->
             <!--</dependency>-->
 
             <!--<dependency>-->
-                <!--<groupId>org.apache.geronimo.bundles</groupId>-->
-                <!--<artifactId>plexus-archiver</artifactId>-->
-                <!--<version>1.0.9_1-SNAPSHOT</version>-->
+            <!--<groupId>org.apache.geronimo.bundles</groupId>-->
+            <!--<artifactId>plexus-archiver</artifactId>-->
+            <!--<version>1.0.9_1-SNAPSHOT</version>-->
             <!--</dependency>-->
             <dependency>
                 <groupId>org.apache.geronimo.bundles</groupId>
@@ -202,9 +207,9 @@
                 <version>0.7.2_1-SNAPSHOT</version>
             </dependency>
             <!--<dependency>-->
-                <!--<groupId>org.apache.geronimo.bundles</groupId>-->
-                <!--<artifactId>plexus-utils</artifactId>-->
-                <!--<version>1.5.15_1-SNAPSHOT</version>-->
+            <!--<groupId>org.apache.geronimo.bundles</groupId>-->
+            <!--<artifactId>plexus-utils</artifactId>-->
+            <!--<version>1.5.15_1-SNAPSHOT</version>-->
             <!--</dependency>-->
             <dependency>
                 <groupId>org.apache.servicemix.bundles</groupId>
@@ -215,6 +220,10 @@
                         <groupId>commons-logging</groupId>
                         <artifactId>commons-logging</artifactId>
                     </exclusion>
+                    <exclusion>
+                        <groupId>junit</groupId>
+                        <artifactId>junit</artifactId>
+                    </exclusion>
                 </exclusions>
             </dependency>
             <dependency>
@@ -226,6 +235,12 @@
                 <groupId>org.apache.servicemix.bundles</groupId>
                 <artifactId>org.apache.servicemix.bundles.jline</artifactId>
                 <version>0.9.94_1</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>junit</groupId>
+                        <artifactId>junit</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
             <dependency>
                 <groupId>org.apache.servicemix.bundles</groupId>

Modified: geronimo/server/trunk/plugins/j2ee/jsr88-war-configurer/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/jsr88-war-configurer/src/main/history/dependencies.xml?rev=921195&r1=921194&r2=921195&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/jsr88-war-configurer/src/main/history/dependencies.xml
(original)
+++ geronimo/server/trunk/plugins/j2ee/jsr88-war-configurer/src/main/history/dependencies.xml
Wed Mar 10 00:40:46 2010
@@ -17,11 +17,6 @@
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>junit</groupId>
-        <artifactId>junit</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
         <groupId>org.apache.felix</groupId>
         <artifactId>org.apache.felix.bundlerepository</artifactId>
         <type>jar</type>



Mime
View raw message