You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by dj...@apache.org on 2010/02/27 22:49:19 UTC

svn commit: r917053 - in /incubator/aries/trunk: application/ application/application-itests/ application/eba-maven-plugin/ ariestrader-sample/ ariestrader-sample/modules/ariestrader-util/ ariestrader-sample/modules/ariestrader-util/src/main/java/org/a...

Author: djencks
Date: Sat Feb 27 21:49:18 2010
New Revision: 917053

URL: http://svn.apache.org/viewvc?rev=917053&view=rev
Log:
ARIES-173 upgrade a few versions and put some in parent dependency management.  More to go.

Modified:
    incubator/aries/trunk/application/application-itests/pom.xml
    incubator/aries/trunk/application/eba-maven-plugin/pom.xml
    incubator/aries/trunk/application/pom.xml
    incubator/aries/trunk/ariestrader-sample/modules/ariestrader-util/pom.xml
    incubator/aries/trunk/ariestrader-sample/modules/ariestrader-util/src/main/java/org/apache/aries/samples/ariestrader/util/Log.java
    incubator/aries/trunk/ariestrader-sample/pom.xml
    incubator/aries/trunk/blueprint/blueprint-itests/pom.xml
    incubator/aries/trunk/blueprint/pom.xml
    incubator/aries/trunk/jmx/jmx-blueprint-core/pom.xml
    incubator/aries/trunk/jmx/jmx-core/pom.xml
    incubator/aries/trunk/jmx/pom.xml
    incubator/aries/trunk/jndi/pom.xml
    incubator/aries/trunk/jpa/jpa-blueprint-aries/pom.xml
    incubator/aries/trunk/jpa/jpa-blueprint-itest/pom.xml
    incubator/aries/trunk/jpa/jpa-container-context/pom.xml
    incubator/aries/trunk/jpa/jpa-container-itest/pom.xml
    incubator/aries/trunk/jpa/jpa-context-itest/pom.xml
    incubator/aries/trunk/jpa/pom.xml
    incubator/aries/trunk/parent/default-parent/pom.xml
    incubator/aries/trunk/samples/blog-sample/blog-assembly/pom.xml
    incubator/aries/trunk/samples/blog-sample/blog-servlet/pom.xml
    incubator/aries/trunk/samples/blueprint-sample-idverifier/blueprint-sample-idverifier-assembly/pom.xml
    incubator/aries/trunk/samples/helloworld-samples/blueprint-helloworld/blueprint-helloworld-assembly/pom.xml
    incubator/aries/trunk/samples/transaction-sample/transaction-assembly/pom.xml
    incubator/aries/trunk/spi-fly/pom.xml
    incubator/aries/trunk/testsupport/pom.xml
    incubator/aries/trunk/transaction/transaction-blueprint/pom.xml
    incubator/aries/trunk/transaction/transaction-manager/pom.xml
    incubator/aries/trunk/util/pom.xml
    incubator/aries/trunk/web/pom.xml
    incubator/aries/trunk/web/web-itests/pom.xml

Modified: incubator/aries/trunk/application/application-itests/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-itests/pom.xml?rev=917053&r1=917052&r2=917053&view=diff
==============================================================================
--- incubator/aries/trunk/application/application-itests/pom.xml (original)
+++ incubator/aries/trunk/application/application-itests/pom.xml Sat Feb 27 21:49:18 2010
@@ -104,11 +104,12 @@
             <artifactId>pax-exam-junit</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.ops4j.pax.exam</groupId>
-            <artifactId>pax-exam-container-default</artifactId>
-            <scope>test</scope>
-        </dependency>
+        <!-- duplicate -->
+        <!--<dependency>-->
+            <!--<groupId>org.ops4j.pax.exam</groupId>-->
+            <!--<artifactId>pax-exam-container-default</artifactId>-->
+            <!--<scope>test</scope>-->
+        <!--</dependency>-->
 
         <dependency>
             <groupId>org.osgi</groupId>

Modified: incubator/aries/trunk/application/eba-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/eba-maven-plugin/pom.xml?rev=917053&r1=917052&r2=917053&view=diff
==============================================================================
--- incubator/aries/trunk/application/eba-maven-plugin/pom.xml (original)
+++ incubator/aries/trunk/application/eba-maven-plugin/pom.xml Sat Feb 27 21:49:18 2010
@@ -42,27 +42,27 @@
         <dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-plugin-api</artifactId>
-            <version>2.0</version>
+            <version>3.0-alpha-6</version>
         </dependency>
         <dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-project</artifactId>
-            <version>2.0</version>
+            <version>3.0-alpha-2</version>
         </dependency>
         <dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-artifact</artifactId>
-            <version>2.0.4</version>
+            <version>3.0-alpha-6</version>
         </dependency>
         <dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-archiver</artifactId>
-            <version>2.3</version>
+            <version>2.4</version>
         </dependency>
         <dependency>
             <groupId>org.apache.maven.shared</groupId>
             <artifactId>maven-plugin-testing-harness</artifactId>
-            <version>1.0-beta-1</version>
+            <version>1.1</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

Modified: incubator/aries/trunk/application/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/pom.xml?rev=917053&r1=917052&r2=917053&view=diff
==============================================================================
--- incubator/aries/trunk/application/pom.xml (original)
+++ incubator/aries/trunk/application/pom.xml Sat Feb 27 21:49:18 2010
@@ -43,13 +43,8 @@
             <dependency>
                 <groupId>asm</groupId>
                 <artifactId>asm-all</artifactId>
-                <version>3.1</version>
+                <version>3.2</version>
             </dependency>
-			<dependency>
-				<groupId>junit</groupId>
-				<artifactId>junit</artifactId>
-				<version>4.5</version>
-			</dependency>
             <dependency>
                 <groupId>org.apache.aries</groupId>
                 <artifactId>org.apache.aries.util</artifactId>
@@ -106,75 +101,6 @@
                 </exclusions>
                 <version>1.0.2</version>
             </dependency>
-            <dependency>
-                <groupId>org.ops4j.pax.exam</groupId>
-                <artifactId>pax-exam</artifactId>
-                <version>1.2.0</version>
-            </dependency>
-            <dependency>
-                <groupId>org.ops4j.pax.exam</groupId>
-                <artifactId>pax-exam-container-default</artifactId>
-                <version>1.2.0</version>
-            </dependency>
-            <dependency>
-                <groupId>org.ops4j.pax.exam</groupId>
-                <artifactId>pax-exam-junit</artifactId>
-                <version>1.2.0</version>
-            </dependency>
-            <dependency>
-                <groupId>org.ops4j.pax.logging</groupId>
-                <artifactId>pax-logging-api</artifactId>
-                <version>1.4</version>
-            </dependency>
-            <dependency>
-                <groupId>org.ops4j.pax.logging</groupId>
-                <artifactId>pax-logging-service</artifactId>
-                <version>1.4</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>com.sun.jdmk</groupId>
-                        <artifactId>jmxtools</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>com.sun.jmx</groupId>
-                        <artifactId>jmxri</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>javax.mail</groupId>
-                        <artifactId>mail</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
-            <dependency>
-                <groupId>org.ops4j.pax.swissbox</groupId>
-                <artifactId>pax-swissbox-tinybundles</artifactId>
-                <version>1.2.0</version>
-            </dependency>
-            <dependency>
-                <groupId>org.ops4j.pax.url</groupId>
-                <artifactId>pax-url-mvn</artifactId>
-                <version>1.0.0</version>
-            </dependency>
-            <dependency>
-                <groupId>org.osgi</groupId>
-                <artifactId>org.osgi.core</artifactId>
-                <version>4.2.0</version>
-            </dependency>
-            <dependency>
-                <groupId>org.osgi</groupId>
-                <artifactId>org.osgi.compendium</artifactId>
-                <version>4.2.0</version>
-            </dependency>
-            <dependency>
-                <groupId>org.slf4j</groupId>
-                <artifactId>slf4j-api</artifactId>
-                <version>1.5.6</version>
-            </dependency>
-            <dependency>
-                <groupId>org.slf4j</groupId>
-                <artifactId>slf4j-simple</artifactId>
-                <version>1.5.6</version>
-            </dependency>
 
             <!-- internal -->
             <dependency>
@@ -235,7 +161,6 @@
 		<module>application-itests</module>
 		<module>application-obr-resolver</module>
 		<module>application-install</module>
-		<module>eba-maven-plugin</module>
 	</modules>
 
 </project>

Modified: incubator/aries/trunk/ariestrader-sample/modules/ariestrader-util/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/ariestrader-sample/modules/ariestrader-util/pom.xml?rev=917053&r1=917052&r2=917053&view=diff
==============================================================================
--- incubator/aries/trunk/ariestrader-sample/modules/ariestrader-util/pom.xml (original)
+++ incubator/aries/trunk/ariestrader-sample/modules/ariestrader-util/pom.xml Sat Feb 27 21:49:18 2010
@@ -32,8 +32,8 @@
 
     <dependencies>
         <dependency>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
             <scope>provided</scope>
         </dependency>
     </dependencies>
@@ -52,7 +52,7 @@
                         </Export-Package>
                         <Import-Package>
                             org.apache.aries.samples.ariestrader.util,
-                            org.apache.commons.logging,
+                            org.slf4j,
                             javax.naming
                         </Import-Package>
                     </instructions>

Modified: incubator/aries/trunk/ariestrader-sample/modules/ariestrader-util/src/main/java/org/apache/aries/samples/ariestrader/util/Log.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/ariestrader-sample/modules/ariestrader-util/src/main/java/org/apache/aries/samples/ariestrader/util/Log.java?rev=917053&r1=917052&r2=917053&view=diff
==============================================================================
--- incubator/aries/trunk/ariestrader-sample/modules/ariestrader-util/src/main/java/org/apache/aries/samples/ariestrader/util/Log.java (original)
+++ incubator/aries/trunk/ariestrader-sample/modules/ariestrader-util/src/main/java/org/apache/aries/samples/ariestrader/util/Log.java Sat Feb 27 21:49:18 2010
@@ -16,13 +16,14 @@
  */
 package org.apache.aries.samples.ariestrader.util;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.util.Collection;
 import java.util.Iterator;
-import org.apache.commons.logging.*;
-import org.apache.aries.samples.ariestrader.*;
 
 public class Log {
-	private final static org.apache.commons.logging.Log log = LogFactory.getLog(Log.class);
+	private final static Logger log = LoggerFactory.getLogger(Log.class);
 //A general purpose, high performance logging, tracing, statistic service
 
 	public static void log(String message)
@@ -193,7 +194,7 @@
 		
 	/**
 	 * Sets the trace
-	 * @param trace The trace to set
+	 * @param traceValue The trace to set
 	 */
 	public static void setTrace(boolean traceValue)
 	{
@@ -201,7 +202,7 @@
 	}
 	/**
 	 * Sets the trace value for Trade actions only
-	 * @param trace The trace to set
+	 * @param traceValue The trace to set
 	 */
 	public static void setActionTrace(boolean traceValue)
 	{

Modified: incubator/aries/trunk/ariestrader-sample/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/ariestrader-sample/pom.xml?rev=917053&r1=917052&r2=917053&view=diff
==============================================================================
--- incubator/aries/trunk/ariestrader-sample/pom.xml (original)
+++ incubator/aries/trunk/ariestrader-sample/pom.xml Sat Feb 27 21:49:18 2010
@@ -48,7 +48,7 @@
             <dependency>
                 <groupId>commons-logging</groupId>
                 <artifactId>commons-logging</artifactId>
-                <version>1.0.4</version>
+                <version>99.0-does-not-exist</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
@@ -97,7 +97,7 @@
                 <groupId>org.apache.openjpa</groupId>
                 <artifactId>openjpa-persistence-jdbc</artifactId>
                 <!--<version>1.2.1</version>-->
-                <version>2.0.0-SNAPSHOT</version>
+                <version>2.0.0-beta</version>
             </dependency>
             <dependency>
                 <groupId>net.sourceforge.serp</groupId>
@@ -113,12 +113,12 @@
             <dependency>
                 <groupId>commons-lang</groupId>
                 <artifactId>commons-lang</artifactId>
-                <version>2.4</version>
+                <version>2.5</version>
             </dependency>
             <dependency>
                 <groupId>commons-pool</groupId>
                 <artifactId>commons-pool</artifactId>
-                <version>1.5.3</version>
+                <version>1.5.4</version>
             </dependency>
             <dependency>
                 <groupId>commons-collections</groupId>
@@ -133,7 +133,7 @@
             <dependency>
                 <groupId>org.apache.servicemix.bundles</groupId>
                 <artifactId>org.apache.servicemix.bundles.cglib</artifactId>
-                <version>2.1_3_2</version>
+                <version>2.1_3_4</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.felix</groupId>

Modified: incubator/aries/trunk/blueprint/blueprint-itests/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/blueprint/blueprint-itests/pom.xml?rev=917053&r1=917052&r2=917053&view=diff
==============================================================================
--- incubator/aries/trunk/blueprint/blueprint-itests/pom.xml (original)
+++ incubator/aries/trunk/blueprint/blueprint-itests/pom.xml Sat Feb 27 21:49:18 2010
@@ -129,7 +129,7 @@
       <dependency>
           <groupId>asm</groupId>
           <artifactId>asm-all</artifactId>
-          <version>3.1</version>
+          <version>3.2</version>
           <scope>test</scope>
       </dependency>
         <!--<dependency>

Modified: incubator/aries/trunk/blueprint/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/blueprint/pom.xml?rev=917053&r1=917052&r2=917053&view=diff
==============================================================================
--- incubator/aries/trunk/blueprint/pom.xml (original)
+++ incubator/aries/trunk/blueprint/pom.xml Sat Feb 27 21:49:18 2010
@@ -101,49 +101,14 @@
             <dependency>
                 <groupId>junit</groupId>
                 <artifactId>junit</artifactId>
-                <version>4.5</version>
+                <version>4.8.1</version>
             </dependency>
             <!-- Use an OSGi enabled cglib version, so that BND can find the version information
                  and we can use it in integration tests -->
             <dependency>
                 <groupId>org.apache.servicemix.bundles</groupId>
                 <artifactId>org.apache.servicemix.bundles.cglib</artifactId>
-                <version>2.1_3_2</version>
-            </dependency>
-            <dependency>
-                <groupId>org.slf4j</groupId>
-                <artifactId>slf4j-api</artifactId>
-                <version>1.5.6</version>
-            </dependency>
-            <dependency>
-                <groupId>org.slf4j</groupId>
-                <artifactId>slf4j-simple</artifactId>
-                <version>1.5.6</version>
-            </dependency>
-            <dependency>
-                <groupId>org.ops4j.pax.exam</groupId>
-                <artifactId>pax-exam</artifactId>
-                <version>1.1.0</version>
-            </dependency>
-            <dependency>
-                <groupId>org.ops4j.pax.exam</groupId>
-                <artifactId>pax-exam-junit</artifactId>
-                <version>1.1.0</version>
-            </dependency>
-            <dependency>
-                <groupId>org.ops4j.pax.exam</groupId>
-                <artifactId>pax-exam-container-default</artifactId>
-                <version>1.1.0</version>
-            </dependency>
-            <dependency>
-                <groupId>org.ops4j.pax.exam</groupId>
-                <artifactId>pax-exam-junit-extender-impl</artifactId>
-                <version>1.1.0</version>
-            </dependency>
-            <dependency>
-                <groupId>org.ops4j.pax.runner</groupId>
-                <artifactId>pax-runner-no-jcl</artifactId>
-                <version>1.1.1</version>
+                <version>2.1_3_4</version>
             </dependency>
             <!-- TODO: We need felix 2.0.0 which is not supported by pax exam yet,
                  so tests are only enabled on equinox for now
@@ -163,14 +128,9 @@
                 <version>1.4</version>
             </dependency>
             <dependency>
-                <groupId>org.ops4j.pax.logging</groupId>
-                <artifactId>pax-logging-service</artifactId>
-                <version>1.4</version>
-            </dependency>
-            <dependency>
                 <groupId>org.ops4j.pax.url</groupId>
                 <artifactId>pax-url-mvn</artifactId>
-                <version>1.0.0</version>
+                <version>1.1.2</version>
             </dependency>
             <dependency>
                 <groupId>org.eclipse</groupId>
@@ -180,12 +140,12 @@
             <dependency>
                 <groupId>log4j</groupId>
                 <artifactId>log4j</artifactId>
-                <version>1.2.14</version>
+                <version>1.2.15</version>
             </dependency>
             <dependency>
                 <groupId>asm</groupId>
                 <artifactId>asm-all</artifactId>
-                <version>3.1</version>
+                <version>3.2</version>
             </dependency>
         </dependencies>
     </dependencyManagement>

Modified: incubator/aries/trunk/jmx/jmx-blueprint-core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/jmx/jmx-blueprint-core/pom.xml?rev=917053&r1=917052&r2=917053&view=diff
==============================================================================
--- incubator/aries/trunk/jmx/jmx-blueprint-core/pom.xml (original)
+++ incubator/aries/trunk/jmx/jmx-blueprint-core/pom.xml Sat Feb 27 21:49:18 2010
@@ -57,7 +57,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.7</version>
+            <version>4.8.1</version>
             <scope>test</scope>
         </dependency>
         <dependency>

Modified: incubator/aries/trunk/jmx/jmx-core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/jmx/jmx-core/pom.xml?rev=917053&r1=917052&r2=917053&view=diff
==============================================================================
--- incubator/aries/trunk/jmx/jmx-core/pom.xml (original)
+++ incubator/aries/trunk/jmx/jmx-core/pom.xml Sat Feb 27 21:49:18 2010
@@ -49,7 +49,7 @@
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-all</artifactId>
-            <version>1.8.1</version>
+            <version>1.8.2</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

Modified: incubator/aries/trunk/jmx/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/jmx/pom.xml?rev=917053&r1=917052&r2=917053&view=diff
==============================================================================
--- incubator/aries/trunk/jmx/pom.xml (original)
+++ incubator/aries/trunk/jmx/pom.xml Sat Feb 27 21:49:18 2010
@@ -71,80 +71,6 @@
                 <artifactId>org.apache.aries.jmx.blueprint</artifactId>
                 <version>${version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.osgi</groupId>
-                <artifactId>org.osgi.core</artifactId>
-                <version>4.2.0</version>
-            </dependency>
-            <dependency>
-                <groupId>org.osgi</groupId>
-                <artifactId>org.osgi.compendium</artifactId>
-                <version>4.2.0</version>
-            </dependency>
-            <dependency>
-                <groupId>junit</groupId>
-                <artifactId>junit</artifactId>
-                <version>4.5</version>
-            </dependency>
-            <dependency>
-                <groupId>org.ops4j.pax.exam</groupId>
-                <artifactId>pax-exam</artifactId>
-                <version>1.2.0</version>
-            </dependency>
-            <dependency>
-                <groupId>org.ops4j.pax.exam</groupId>
-                <artifactId>pax-exam-junit</artifactId>
-                <version>1.2.0</version>
-            </dependency>
-            <dependency>
-                <groupId>org.ops4j.pax.exam</groupId>
-                <artifactId>pax-exam-container-default</artifactId>
-                <version>1.2.0</version>
-            </dependency>
-			<dependency>
-				<groupId>org.ops4j.pax.swissbox</groupId>
-				<artifactId>pax-swissbox-tinybundles</artifactId>
-				<version>1.2.0</version>
-			</dependency>
-            <dependency>
-                <groupId>org.ops4j.pax.logging</groupId>
-                <artifactId>pax-logging-api</artifactId>
-                <version>1.4</version>
-            </dependency>
-            <dependency>
-                <groupId>org.ops4j.pax.logging</groupId>
-                <artifactId>pax-logging-service</artifactId>
-                <version>1.4</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>com.sun.jdmk</groupId>
-                        <artifactId>jmxtools</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>com.sun.jmx</groupId>
-                        <artifactId>jmxri</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>javax.mail</groupId>
-                        <artifactId>mail</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
-            <dependency>
-                <groupId>org.ops4j.pax.url</groupId>
-                <artifactId>pax-url-mvn</artifactId>
-                <version>1.0.0</version>
-            </dependency>
-            <dependency>
-                <groupId>org.slf4j</groupId>
-                <artifactId>slf4j-api</artifactId>
-                <version>1.5.6</version>
-            </dependency>
-            <dependency>
-                <groupId>org.slf4j</groupId>
-                <artifactId>slf4j-simple</artifactId>
-                <version>1.5.6</version>
-            </dependency>
         </dependencies>
     </dependencyManagement>
     

Modified: incubator/aries/trunk/jndi/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/jndi/pom.xml?rev=917053&r1=917052&r2=917053&view=diff
==============================================================================
--- incubator/aries/trunk/jndi/pom.xml (original)
+++ incubator/aries/trunk/jndi/pom.xml Sat Feb 27 21:49:18 2010
@@ -71,7 +71,7 @@
             <dependency>
                 <groupId>junit</groupId>
                 <artifactId>junit</artifactId>
-                <version>4.5</version>
+                <version>4.8.1</version>
             </dependency>
         </dependencies>
     </dependencyManagement>

Modified: incubator/aries/trunk/jpa/jpa-blueprint-aries/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/jpa/jpa-blueprint-aries/pom.xml?rev=917053&r1=917052&r2=917053&view=diff
==============================================================================
--- incubator/aries/trunk/jpa/jpa-blueprint-aries/pom.xml (original)
+++ incubator/aries/trunk/jpa/jpa-blueprint-aries/pom.xml Sat Feb 27 21:49:18 2010
@@ -73,7 +73,7 @@
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-simple</artifactId>
-      <version>1.5.6</version>
+      <version>1.5.11</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

Modified: incubator/aries/trunk/jpa/jpa-blueprint-itest/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/jpa/jpa-blueprint-itest/pom.xml?rev=917053&r1=917052&r2=917053&view=diff
==============================================================================
--- incubator/aries/trunk/jpa/jpa-blueprint-itest/pom.xml (original)
+++ incubator/aries/trunk/jpa/jpa-blueprint-itest/pom.xml Sat Feb 27 21:49:18 2010
@@ -49,31 +49,28 @@
     <dependency>
       <groupId>org.ops4j.pax.exam</groupId>
       <artifactId>pax-exam-container-default</artifactId>
-      <version>1.1.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.ops4j.pax.exam</groupId>
       <artifactId>pax-exam-junit</artifactId>
-      <version>1.1.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.aries</groupId>
       <artifactId>org.apache.aries.util</artifactId>
-      <version>${version}</version>
+      <version>1.0.0-incubating-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.aries.blueprint</groupId>
       <artifactId>org.apache.aries.blueprint</artifactId>
-      <version>${version}</version>
+      <version>1.0.0-incubating-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.ops4j.pax.url</groupId>
       <artifactId>pax-url-mvn</artifactId>
-      <version>1.0.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>

Modified: incubator/aries/trunk/jpa/jpa-container-context/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/jpa/jpa-container-context/pom.xml?rev=917053&r1=917052&r2=917053&view=diff
==============================================================================
--- incubator/aries/trunk/jpa/jpa-container-context/pom.xml (original)
+++ incubator/aries/trunk/jpa/jpa-container-context/pom.xml Sat Feb 27 21:49:18 2010
@@ -77,7 +77,7 @@
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-simple</artifactId>
-      <version>1.5.6</version>
+      <version>1.5.11</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

Modified: incubator/aries/trunk/jpa/jpa-container-itest/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/jpa/jpa-container-itest/pom.xml?rev=917053&r1=917052&r2=917053&view=diff
==============================================================================
--- incubator/aries/trunk/jpa/jpa-container-itest/pom.xml (original)
+++ incubator/aries/trunk/jpa/jpa-container-itest/pom.xml Sat Feb 27 21:49:18 2010
@@ -49,31 +49,28 @@
     <dependency>
       <groupId>org.ops4j.pax.exam</groupId>
       <artifactId>pax-exam-container-default</artifactId>
-      <version>1.1.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.ops4j.pax.exam</groupId>
       <artifactId>pax-exam-junit</artifactId>
-      <version>1.1.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.aries</groupId>
       <artifactId>org.apache.aries.util</artifactId>
-      <version>${version}</version>
+      <version>1.0.0-incubating-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.aries.blueprint</groupId>
       <artifactId>org.apache.aries.blueprint</artifactId>
-      <version>${version}</version>
+      <version>1.0.0-incubating-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.ops4j.pax.url</groupId>
       <artifactId>pax-url-mvn</artifactId>
-      <version>1.0.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -139,7 +136,7 @@
     <dependency>
       <groupId>commons-lang</groupId>
       <artifactId>commons-lang</artifactId>
-      <version>2.4</version>
+      <version>2.5</version>
     </dependency> 
     <dependency>
       <groupId>commons-collections</groupId>
@@ -150,7 +147,7 @@
     <dependency>
       <groupId>commons-pool</groupId>
       <artifactId>commons-pool</artifactId>
-      <version>1.5.3</version>
+      <version>1.5.4</version>
       <scope>test</scope>
     </dependency>  
     <dependency>

Modified: incubator/aries/trunk/jpa/jpa-context-itest/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/jpa/jpa-context-itest/pom.xml?rev=917053&r1=917052&r2=917053&view=diff
==============================================================================
--- incubator/aries/trunk/jpa/jpa-context-itest/pom.xml (original)
+++ incubator/aries/trunk/jpa/jpa-context-itest/pom.xml Sat Feb 27 21:49:18 2010
@@ -49,31 +49,28 @@
     <dependency>
       <groupId>org.ops4j.pax.exam</groupId>
       <artifactId>pax-exam-container-default</artifactId>
-      <version>1.1.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.ops4j.pax.exam</groupId>
       <artifactId>pax-exam-junit</artifactId>
-      <version>1.1.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.aries</groupId>
       <artifactId>org.apache.aries.util</artifactId>
-      <version>${version}</version>
+      <version>1.0.0-incubating-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.aries.blueprint</groupId>
       <artifactId>org.apache.aries.blueprint</artifactId>
-      <version>${version}</version>
+      <version>1.0.0-incubating-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.ops4j.pax.url</groupId>
       <artifactId>pax-url-mvn</artifactId>
-      <version>1.0.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -145,7 +142,7 @@
     <dependency>
       <groupId>commons-lang</groupId>
       <artifactId>commons-lang</artifactId>
-      <version>2.4</version>
+      <version>2.5</version>
     </dependency> 
     <dependency>
       <groupId>commons-collections</groupId>
@@ -156,7 +153,7 @@
     <dependency>
       <groupId>commons-pool</groupId>
       <artifactId>commons-pool</artifactId>
-      <version>1.5.3</version>
+      <version>1.5.4</version>
       <scope>test</scope>
     </dependency>  
     <dependency>

Modified: incubator/aries/trunk/jpa/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/jpa/pom.xml?rev=917053&r1=917052&r2=917053&view=diff
==============================================================================
--- incubator/aries/trunk/jpa/pom.xml (original)
+++ incubator/aries/trunk/jpa/pom.xml Sat Feb 27 21:49:18 2010
@@ -67,19 +67,19 @@
             <dependency>
                 <groupId>org.slf4j</groupId>
                 <artifactId>slf4j-api</artifactId>
-                <version>1.5.6</version>
+                <version>1.5.11</version>
             </dependency>
 
             <dependency>
                 <groupId>org.slf4j</groupId>
                 <artifactId>slf4j-simple</artifactId>
-                <version>1.5.6</version>
+                <version>1.5.11</version>
             </dependency>
 
             <dependency>
                 <groupId>junit</groupId>
                 <artifactId>junit</artifactId>
-                <version>4.5</version>
+                <version>4.8.1</version>
             </dependency>
 
             <dependency>

Modified: incubator/aries/trunk/parent/default-parent/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/parent/default-parent/pom.xml?rev=917053&r1=917052&r2=917053&view=diff
==============================================================================
--- incubator/aries/trunk/parent/default-parent/pom.xml (original)
+++ incubator/aries/trunk/parent/default-parent/pom.xml Sat Feb 27 21:49:18 2010
@@ -33,6 +33,106 @@
     <version>1.0.0-incubating-SNAPSHOT</version>
     <packaging>pom</packaging>
 
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>junit</groupId>
+                <artifactId>junit</artifactId>
+                <version>4.8.1</version>
+            </dependency>
+            <dependency>
+                <groupId>org.ops4j.pax.exam</groupId>
+                <artifactId>pax-exam</artifactId>
+                <version>1.2.0</version>
+            </dependency>
+            <dependency>
+                <groupId>org.ops4j.pax.exam</groupId>
+                <artifactId>pax-exam-container-default</artifactId>
+                <version>1.2.0</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>commons-logging</groupId>
+                        <artifactId>commons-logging</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+            <dependency>
+                <groupId>org.ops4j.pax.exam</groupId>
+                <artifactId>pax-exam-junit</artifactId>
+                <version>1.2.0</version>
+            </dependency>
+            <dependency>
+                <groupId>org.ops4j.pax.exam</groupId>
+                <artifactId>pax-exam-junit-extender-impl</artifactId>
+                <version>1.2.0</version>
+            </dependency>
+            <dependency>
+                <groupId>org.ops4j.pax.logging</groupId>
+                <artifactId>pax-logging-api</artifactId>
+                <version>1.4</version>
+            </dependency>
+            <dependency>
+                <groupId>org.ops4j.pax.logging</groupId>
+                <artifactId>pax-logging-service</artifactId>
+                <version>1.4</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>com.sun.jdmk</groupId>
+                        <artifactId>jmxtools</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>com.sun.jmx</groupId>
+                        <artifactId>jmxri</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>javax.mail</groupId>
+                        <artifactId>mail</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>log4j</groupId>
+                        <artifactId>log4j</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+            <dependency>
+                <groupId>org.ops4j.pax.runner</groupId>
+                <artifactId>pax-runner-no-jcl</artifactId>
+                <version>1.4.0</version>
+            </dependency>
+            <dependency>
+                <groupId>org.ops4j.pax.swissbox</groupId>
+                <artifactId>pax-swissbox-tinybundles</artifactId>
+                <version>1.2.0</version>
+            </dependency>
+            <dependency>
+                <groupId>org.ops4j.pax.url</groupId>
+                <artifactId>pax-url-mvn</artifactId>
+                <version>1.1.2</version>
+            </dependency>
+            <dependency>
+                <groupId>org.osgi</groupId>
+                <artifactId>org.osgi.core</artifactId>
+                <version>4.2.0</version>
+            </dependency>
+            <dependency>
+                <groupId>org.osgi</groupId>
+                <artifactId>org.osgi.compendium</artifactId>
+                <version>4.2.0</version>
+            </dependency>
+            <dependency>
+                <groupId>org.slf4j</groupId>
+                <artifactId>slf4j-api</artifactId>
+                <version>1.5.11</version>
+            </dependency>
+            <dependency>
+                <groupId>org.slf4j</groupId>
+                <artifactId>slf4j-simple</artifactId>
+                <version>1.5.11</version>
+            </dependency>
+            
+        </dependencies>
+    </dependencyManagement>
+
     <build>
         <resources>
             <resource>

Modified: incubator/aries/trunk/samples/blog-sample/blog-assembly/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples/blog-sample/blog-assembly/pom.xml?rev=917053&r1=917052&r2=917053&view=diff
==============================================================================
--- incubator/aries/trunk/samples/blog-sample/blog-assembly/pom.xml (original)
+++ incubator/aries/trunk/samples/blog-sample/blog-assembly/pom.xml Sat Feb 27 21:49:18 2010
@@ -57,13 +57,6 @@
         <dependency>
             <groupId>org.ops4j.pax.logging</groupId>
             <artifactId>pax-logging-service</artifactId>
-            <version>1.4</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>log4j</groupId>
-                    <artifactId>log4j</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
 
         <dependency>

Modified: incubator/aries/trunk/samples/blog-sample/blog-servlet/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples/blog-sample/blog-servlet/pom.xml?rev=917053&r1=917052&r2=917053&view=diff
==============================================================================
--- incubator/aries/trunk/samples/blog-sample/blog-servlet/pom.xml (original)
+++ incubator/aries/trunk/samples/blog-sample/blog-servlet/pom.xml Sat Feb 27 21:49:18 2010
@@ -56,7 +56,7 @@
 	 	<dependency>
 			<groupId>org.mortbay.jetty</groupId>
 			<artifactId>servlet-api-2.5</artifactId>
-			<version>6.1.5</version>
+			<version>6.1.14</version>
 		</dependency>
 	</dependencies>
 </project>

Modified: incubator/aries/trunk/samples/blueprint-sample-idverifier/blueprint-sample-idverifier-assembly/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples/blueprint-sample-idverifier/blueprint-sample-idverifier-assembly/pom.xml?rev=917053&r1=917052&r2=917053&view=diff
==============================================================================
--- incubator/aries/trunk/samples/blueprint-sample-idverifier/blueprint-sample-idverifier-assembly/pom.xml (original)
+++ incubator/aries/trunk/samples/blueprint-sample-idverifier/blueprint-sample-idverifier-assembly/pom.xml Sat Feb 27 21:49:18 2010
@@ -37,13 +37,13 @@
 		<dependency>
 			<groupId>org.apache.felix</groupId>
 			<artifactId>org.apache.felix.main</artifactId>
-			<version>2.0.2</version>
+			<version>2.0.4</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.apache.felix</groupId>
 			<artifactId>org.apache.felix.shell</artifactId>
-			<version>1.4.1</version>
+			<version>1.4.2</version>
 		</dependency>
 
 		<dependency>
@@ -61,7 +61,7 @@
 		<dependency>
 			<groupId>org.apache.felix</groupId>
 			<artifactId>org.apache.felix.eventadmin</artifactId>
-			<version>1.0.0</version>
+			<version>1.2.2</version>
 		</dependency>
 
 		<dependency>
@@ -73,13 +73,6 @@
 		<dependency>
 			<groupId>org.ops4j.pax.logging</groupId>
 			<artifactId>pax-logging-service</artifactId>
-			<version>1.4</version>
-			<exclusions>
-				<exclusion>
-					<groupId>log4j</groupId>
-					<artifactId>log4j</artifactId>
-				</exclusion>
-			</exclusions>
 		</dependency>
 
 		<dependency>

Modified: incubator/aries/trunk/samples/helloworld-samples/blueprint-helloworld/blueprint-helloworld-assembly/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples/helloworld-samples/blueprint-helloworld/blueprint-helloworld-assembly/pom.xml?rev=917053&r1=917052&r2=917053&view=diff
==============================================================================
--- incubator/aries/trunk/samples/helloworld-samples/blueprint-helloworld/blueprint-helloworld-assembly/pom.xml (original)
+++ incubator/aries/trunk/samples/helloworld-samples/blueprint-helloworld/blueprint-helloworld-assembly/pom.xml Sat Feb 27 21:49:18 2010
@@ -1,34 +1,34 @@
 <?xml version="1.0" encoding="UTF-8"?>
-	<!--
-		* Licensed to the Apache Software Foundation (ASF) under one * or more
-		contributor license agreements. See the NOTICE file * distributed with
-		this work for additional information * regarding copyright ownership.
-		The ASF licenses this file * to you under the Apache License, Version
-		2.0 (the * "License"); you may not use this file except in compliance
-		* with the License. You may obtain a copy of the License at * *
-		http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by
-		applicable law or agreed to in writing, * software distributed under
-		the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES
-		OR CONDITIONS OF ANY * KIND, either express or implied. See the
-		License for the * specific language governing permissions and
-		limitations * under the License.
-	-->
+<!--
+        * Licensed to the Apache Software Foundation (ASF) under one * or more
+        contributor license agreements. See the NOTICE file * distributed with
+        this work for additional information * regarding copyright ownership.
+        The ASF licenses this file * to you under the Apache License, Version
+        2.0 (the * "License"); you may not use this file except in compliance
+        * with the License. You may obtain a copy of the License at * *
+        http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by
+        applicable law or agreed to in writing, * software distributed under
+        the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES
+        OR CONDITIONS OF ANY * KIND, either express or implied. See the
+        License for the * specific language governing permissions and
+        limitations * under the License.
+    -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
-	<modelVersion>4.0.0</modelVersion>
+    <modelVersion>4.0.0</modelVersion>
 
-	<parent>
-		<groupId>org.apache.aries.samples</groupId>
-		<artifactId>blueprint-helloworld</artifactId>
-		<version>1.0.0-incubating-SNAPSHOT</version>
-	</parent>
+    <parent>
+        <groupId>org.apache.aries.samples</groupId>
+        <artifactId>blueprint-helloworld</artifactId>
+        <version>1.0.0-incubating-SNAPSHOT</version>
+    </parent>
 
-	<artifactId>blueprint-helloworld-assembly</artifactId>
-	<name>Apache Aries Blueprint HelloWorld Assembly</name>
-	<packaging>pom</packaging>
+    <artifactId>blueprint-helloworld-assembly</artifactId>
+    <name>Apache Aries Blueprint HelloWorld Assembly</name>
+    <packaging>pom</packaging>
 
-	    <dependencies>
+    <dependencies>
 
         <dependency>
             <groupId>org.eclipse</groupId>
@@ -51,19 +51,11 @@
         <dependency>
             <groupId>org.ops4j.pax.logging</groupId>
             <artifactId>pax-logging-api</artifactId>
-            <version>1.4</version>
         </dependency>
 
         <dependency>
             <groupId>org.ops4j.pax.logging</groupId>
             <artifactId>pax-logging-service</artifactId>
-            <version>1.4</version>
-            <exclusions>
-                <exclusion>
-                   <groupId>log4j</groupId>
-                   <artifactId>log4j</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
 
         <dependency>
@@ -112,7 +104,7 @@
         </resources>
 
         <plugins>
-	            <plugin>
+            <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-resources-plugin</artifactId>
                 <configuration>
@@ -137,7 +129,7 @@
                         <id>copy</id>
                         <phase>package</phase>
                         <goals>
-                           <goal>copy-dependencies</goal>
+                            <goal>copy-dependencies</goal>
                         </goals>
                         <configuration>
                             <excludeTransitive>true</excludeTransitive>
@@ -148,7 +140,7 @@
             </plugin>
         </plugins>
     </build>
-	
+
 </project>
 
         

Modified: incubator/aries/trunk/samples/transaction-sample/transaction-assembly/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples/transaction-sample/transaction-assembly/pom.xml?rev=917053&r1=917052&r2=917053&view=diff
==============================================================================
--- incubator/aries/trunk/samples/transaction-sample/transaction-assembly/pom.xml (original)
+++ incubator/aries/trunk/samples/transaction-sample/transaction-assembly/pom.xml Sat Feb 27 21:49:18 2010
@@ -58,13 +58,6 @@
 		<dependency>
 			<groupId>org.ops4j.pax.logging</groupId>
 			<artifactId>pax-logging-service</artifactId>
-			<version>1.4</version>
-			<exclusions>
-				<exclusion>
-					<groupId>log4j</groupId>
-					<artifactId>log4j</artifactId>
-				</exclusion>
-			</exclusions>
 		</dependency>
 
 		<dependency>

Modified: incubator/aries/trunk/spi-fly/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/spi-fly/pom.xml?rev=917053&r1=917052&r2=917053&view=diff
==============================================================================
--- incubator/aries/trunk/spi-fly/pom.xml (original)
+++ incubator/aries/trunk/spi-fly/pom.xml Sat Feb 27 21:49:18 2010
@@ -57,7 +57,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.5</version>
+            <version>4.8.1</version>
             <scope>test</scope>
         </dependency>
         <dependency>

Modified: incubator/aries/trunk/testsupport/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/testsupport/pom.xml?rev=917053&r1=917052&r2=917053&view=diff
==============================================================================
--- incubator/aries/trunk/testsupport/pom.xml (original)
+++ incubator/aries/trunk/testsupport/pom.xml Sat Feb 27 21:49:18 2010
@@ -51,7 +51,7 @@
             <dependency>
                 <groupId>junit</groupId>
                 <artifactId>junit</artifactId>
-                <version>4.5</version>
+                <version>4.8.1</version>
             </dependency>
         </dependencies>
     </dependencyManagement>

Modified: incubator/aries/trunk/transaction/transaction-blueprint/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/transaction/transaction-blueprint/pom.xml?rev=917053&r1=917052&r2=917053&view=diff
==============================================================================
--- incubator/aries/trunk/transaction/transaction-blueprint/pom.xml (original)
+++ incubator/aries/trunk/transaction/transaction-blueprint/pom.xml Sat Feb 27 21:49:18 2010
@@ -62,7 +62,7 @@
         <dependency>
           <groupId>junit</groupId>
           <artifactId>junit</artifactId>
-          <version>4.7</version>
+          <version>4.8.1</version>
           <scope>test</scope>
         </dependency>
         <dependency>
@@ -74,12 +74,12 @@
         <dependency>
           <groupId>org.slf4j</groupId>
           <artifactId>slf4j-api</artifactId>
-          <version>1.5.6</version>
+          <version>1.5.11</version>
         </dependency>
         <dependency>
           <groupId>org.slf4j</groupId>
           <artifactId>slf4j-simple</artifactId>
-          <version>1.5.6</version>
+          <version>1.5.11</version>
           <scope>test</scope>
         </dependency>
     </dependencies>

Modified: incubator/aries/trunk/transaction/transaction-manager/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/transaction/transaction-manager/pom.xml?rev=917053&r1=917052&r2=917053&view=diff
==============================================================================
--- incubator/aries/trunk/transaction/transaction-manager/pom.xml (original)
+++ incubator/aries/trunk/transaction/transaction-manager/pom.xml Sat Feb 27 21:49:18 2010
@@ -51,7 +51,7 @@
         <dependency>
             <groupId>org.apache.geronimo.components</groupId>
             <artifactId>geronimo-transaction</artifactId>
-            <version>2.1.2</version>
+            <version>2.1.3</version>
         </dependency>
         <dependency>
             <groupId>org.objectweb.howl</groupId>

Modified: incubator/aries/trunk/util/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/util/pom.xml?rev=917053&r1=917052&r2=917053&view=diff
==============================================================================
--- incubator/aries/trunk/util/pom.xml (original)
+++ incubator/aries/trunk/util/pom.xml Sat Feb 27 21:49:18 2010
@@ -66,7 +66,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.5</version>
+            <version>4.8.1</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

Modified: incubator/aries/trunk/web/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/web/pom.xml?rev=917053&r1=917052&r2=917053&view=diff
==============================================================================
--- incubator/aries/trunk/web/pom.xml (original)
+++ incubator/aries/trunk/web/pom.xml Sat Feb 27 21:49:18 2010
@@ -59,13 +59,13 @@
             <dependency>
                 <groupId>junit</groupId>
                 <artifactId>junit</artifactId>
-                <version>4.5</version>
+                <version>4.8.1</version>
             </dependency>
 
             <dependency>
                 <groupId>asm</groupId>
                 <artifactId>asm-all</artifactId>
-                <version>3.1</version>
+                <version>3.2</version>
             </dependency>
 
             <dependency>
@@ -80,25 +80,6 @@
                 <version>1.4</version>
             </dependency>
 
-            <dependency>
-                <groupId>org.ops4j.pax.logging</groupId>
-                <artifactId>pax-logging-service</artifactId>
-                <version>1.4</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>com.sun.jdmk</groupId>
-                        <artifactId>jmxtools</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>com.sun.jmx</groupId>
-                        <artifactId>jmxri</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>javax.mail</groupId>
-                        <artifactId>mail</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
         </dependencies>
     </dependencyManagement>
 </project>

Modified: incubator/aries/trunk/web/web-itests/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/web/web-itests/pom.xml?rev=917053&r1=917052&r2=917053&view=diff
==============================================================================
--- incubator/aries/trunk/web/web-itests/pom.xml (original)
+++ incubator/aries/trunk/web/web-itests/pom.xml Sat Feb 27 21:49:18 2010
@@ -53,7 +53,7 @@
     <dependency>
       <groupId>org.apache.aries.blueprint</groupId>
       <artifactId>org.apache.aries.blueprint.sample</artifactId>
-      <version>${version}</version>
+      <version>1.0.0-incubating-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -65,13 +65,13 @@
     <dependency>
       <groupId>org.apache.aries</groupId>
       <artifactId>org.apache.aries.util</artifactId>
-      <version>${version}</version>
+      <version>1.0.0-incubating-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.aries.blueprint</groupId>
       <artifactId>org.apache.aries.blueprint</artifactId>
-      <version>${version}</version>
+      <version>1.0.0-incubating-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -87,31 +87,26 @@
     <dependency>
       <groupId>org.ops4j.pax.exam</groupId>
       <artifactId>pax-exam</artifactId>
-      <version>1.1.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.ops4j.pax.exam</groupId>
       <artifactId>pax-exam-junit</artifactId>
-      <version>1.1.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.ops4j.pax.exam</groupId>
       <artifactId>pax-exam-container-default</artifactId>
-      <version>1.1.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.ops4j.pax.swissbox</groupId>
       <artifactId>pax-swissbox-tinybundles</artifactId>
-      <version>1.2.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.ops4j.pax.url</groupId>
       <artifactId>pax-url-mvn</artifactId>
-      <version>1.0.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>