You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by ga...@apache.org on 2010/01/17 23:40:22 UTC

svn commit: r900232 - in /incubator/aries/trunk/web: pom.xml web-itests/.classpath web-itests/.project web-itests/.settings/ web-itests/pom.xml

Author: gawor
Date: Sun Jan 17 22:40:21 2010
New Revision: 900232

URL: http://svn.apache.org/viewvc?rev=900232&view=rev
Log:
minor pom updates and remove eclipse project files

Removed:
    incubator/aries/trunk/web/web-itests/.classpath
    incubator/aries/trunk/web/web-itests/.project
    incubator/aries/trunk/web/web-itests/.settings/
Modified:
    incubator/aries/trunk/web/pom.xml
    incubator/aries/trunk/web/web-itests/pom.xml

Modified: incubator/aries/trunk/web/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/web/pom.xml?rev=900232&r1=900231&r2=900232&view=diff
==============================================================================
--- incubator/aries/trunk/web/pom.xml (original)
+++ incubator/aries/trunk/web/pom.xml Sun Jan 17 22:40:21 2010
@@ -45,6 +45,12 @@
             </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>
@@ -61,6 +67,32 @@
                 <artifactId>org.apache.aries.testsupport.unit</artifactId>
                 <version>1.0.0-incubating-SNAPSHOT</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>
         </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=900232&r1=900231&r2=900232&view=diff
==============================================================================
--- incubator/aries/trunk/web/web-itests/pom.xml (original)
+++ incubator/aries/trunk/web/web-itests/pom.xml Sun Jan 17 22:40:21 2010
@@ -48,7 +48,6 @@
     <dependency>
       <groupId>org.osgi</groupId>
       <artifactId>org.osgi.compendium</artifactId>
-      <version>4.2.0</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -78,13 +77,11 @@
     <dependency>
       <groupId>org.ops4j.pax.logging</groupId>
       <artifactId>pax-logging-api</artifactId>
-      <version>1.4</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.ops4j.pax.logging</groupId>
       <artifactId>pax-logging-service</artifactId>
-      <version>1.4</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -123,11 +120,6 @@
       <version>${version}</version>
       <scope>provided</scope>
     </dependency>
-    <dependency>
-			<groupId>log4j</groupId>
-			<artifactId>log4j</artifactId>
-			<version>1.2.14</version>
-    </dependency>
   </dependencies>
 
   <build>