incubator-sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fmesc...@apache.org
Subject svn commit: r732352 - in /incubator/sling/trunk: commons/log/ commons/testing/ engine/ extensions/httpauth/ extensions/jcrinstall/service/ extensions/jcrinstall/servlet/ extensions/jcrinstall/testing/ jcr/classloader/ jcr/contentloader/ jcr/jackrabbit-...
Date Wed, 07 Jan 2009 14:41:03 GMT
Author: fmeschbe
Date: Wed Jan  7 06:41:02 2009
New Revision: 732352

URL: http://svn.apache.org/viewvc?rev=732352&view=rev
Log:
SLING-811 Reduce DependencyManagement in the parent pom and add explicit versions to the modules

Modified:
    incubator/sling/trunk/commons/log/pom.xml
    incubator/sling/trunk/commons/testing/pom.xml
    incubator/sling/trunk/engine/pom.xml
    incubator/sling/trunk/extensions/httpauth/pom.xml
    incubator/sling/trunk/extensions/jcrinstall/service/pom.xml
    incubator/sling/trunk/extensions/jcrinstall/servlet/pom.xml
    incubator/sling/trunk/extensions/jcrinstall/testing/pom.xml
    incubator/sling/trunk/jcr/classloader/pom.xml
    incubator/sling/trunk/jcr/contentloader/pom.xml
    incubator/sling/trunk/jcr/jackrabbit-server/pom.xml
    incubator/sling/trunk/jcr/ocm/pom.xml
    incubator/sling/trunk/jcr/resource/pom.xml
    incubator/sling/trunk/launchpad/app/pom.xml
    incubator/sling/trunk/launchpad/base/pom.xml
    incubator/sling/trunk/launchpad/jcrapp/pom.xml
    incubator/sling/trunk/launchpad/testing/pom.xml
    incubator/sling/trunk/launchpad/webapp/pom.xml
    incubator/sling/trunk/maven/maven-jspc-plugin/pom.xml
    incubator/sling/trunk/maven/maven-sling-plugin/pom.xml
    incubator/sling/trunk/parent/pom.xml
    incubator/sling/trunk/scripting/core/pom.xml
    incubator/sling/trunk/scripting/javascript/pom.xml
    incubator/sling/trunk/scripting/jsp-taglib/pom.xml
    incubator/sling/trunk/scripting/jsp/pom.xml
    incubator/sling/trunk/scripting/jst/pom.xml

Modified: incubator/sling/trunk/commons/log/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/commons/log/pom.xml?rev=732352&r1=732351&r2=732352&view=diff
==============================================================================
--- incubator/sling/trunk/commons/log/pom.xml (original)
+++ incubator/sling/trunk/commons/log/pom.xml Wed Jan  7 06:41:02 2009
@@ -94,18 +94,21 @@
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>jcl-over-slf4j</artifactId>
+            <version>1.5.2</version>
             <scope>compile</scope>
             <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>log4j-over-slf4j</artifactId>
+            <version>1.5.2</version>
             <scope>compile</scope>
             <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
+            <version>1.5.2</version>
             <scope>compile</scope>
             <optional>true</optional>
         </dependency>

Modified: incubator/sling/trunk/commons/testing/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/commons/testing/pom.xml?rev=732352&r1=732351&r2=732352&view=diff
==============================================================================
--- incubator/sling/trunk/commons/testing/pom.xml (original)
+++ incubator/sling/trunk/commons/testing/pom.xml Wed Jan  7 06:41:02 2009
@@ -93,11 +93,13 @@
         <dependency>
             <groupId>rhino</groupId>
             <artifactId>js</artifactId>
+            <version>1.6R6</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>commons-httpclient</groupId>
             <artifactId>commons-httpclient</artifactId>
+            <version>3.1</version>
             <scope>compile</scope>
             <exclusions>
                 <!-- 

Modified: incubator/sling/trunk/engine/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/engine/pom.xml?rev=732352&r1=732351&r2=732352&view=diff
==============================================================================
--- incubator/sling/trunk/engine/pom.xml (original)
+++ incubator/sling/trunk/engine/pom.xml Wed Jan  7 06:41:02 2009
@@ -120,10 +120,12 @@
         <dependency>
             <groupId>commons-collections</groupId>
             <artifactId>commons-collections</artifactId>
+            <version>3.2.1</version>
         </dependency>
         <dependency>
             <groupId>commons-fileupload</groupId>
             <artifactId>commons-fileupload</artifactId>
+            <version>1.1.1</version>
         </dependency>
         <dependency>
             <groupId>org.apache.felix</groupId>

Modified: incubator/sling/trunk/extensions/httpauth/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/extensions/httpauth/pom.xml?rev=732352&r1=732351&r2=732352&view=diff
==============================================================================
--- incubator/sling/trunk/extensions/httpauth/pom.xml (original)
+++ incubator/sling/trunk/extensions/httpauth/pom.xml Wed Jan  7 06:41:02 2009
@@ -93,6 +93,7 @@
         <dependency>
             <groupId>commons-codec</groupId>
             <artifactId>commons-codec</artifactId>
+            <version>1.3</version>
             <scope>compile</scope>
         </dependency>
 

Modified: incubator/sling/trunk/extensions/jcrinstall/service/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/extensions/jcrinstall/service/pom.xml?rev=732352&r1=732351&r2=732352&view=diff
==============================================================================
--- incubator/sling/trunk/extensions/jcrinstall/service/pom.xml (original)
+++ incubator/sling/trunk/extensions/jcrinstall/service/pom.xml Wed Jan  7 06:41:02 2009
@@ -78,10 +78,6 @@
       <artifactId>org.osgi.compendium</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.felix</groupId>
-      <artifactId>org.apache.felix.configadmin</artifactId>
-    </dependency>
-    <dependency>
       <groupId>org.apache.sling</groupId>
       <artifactId>org.apache.sling.jcr.api</artifactId>
       <version>2.0.2-incubator</version>

Modified: incubator/sling/trunk/extensions/jcrinstall/servlet/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/extensions/jcrinstall/servlet/pom.xml?rev=732352&r1=732351&r2=732352&view=diff
==============================================================================
--- incubator/sling/trunk/extensions/jcrinstall/servlet/pom.xml (original)
+++ incubator/sling/trunk/extensions/jcrinstall/servlet/pom.xml Wed Jan  7 06:41:02 2009
@@ -71,10 +71,6 @@
       <artifactId>org.osgi.compendium</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.felix</groupId>
-      <artifactId>org.apache.felix.configadmin</artifactId>
-    </dependency>
-    <dependency>
       <groupId>org.apache.sling</groupId>
       <artifactId>org.apache.sling.api</artifactId>
       <version>2.0.2-incubator</version>
@@ -85,7 +81,7 @@
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-simple</artifactId>
+      <artifactId>slf4j-api</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.sling</groupId>
@@ -94,4 +90,4 @@
       <scope>provided</scope>
     </dependency>
   </dependencies>
-</project>
\ No newline at end of file
+</project>

Modified: incubator/sling/trunk/extensions/jcrinstall/testing/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/extensions/jcrinstall/testing/pom.xml?rev=732352&r1=732351&r2=732352&view=diff
==============================================================================
--- incubator/sling/trunk/extensions/jcrinstall/testing/pom.xml (original)
+++ incubator/sling/trunk/extensions/jcrinstall/testing/pom.xml Wed Jan  7 06:41:02 2009
@@ -676,11 +676,13 @@
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
+            <version>1.4</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>commons-collections</groupId>
             <artifactId>commons-collections</artifactId>
+            <version>3.2.1</version>
             <scope>provided</scope>
         </dependency>
         
@@ -694,6 +696,7 @@
         <dependency>
             <groupId>org.eclipse.equinox.http</groupId>
             <artifactId>servlet</artifactId>
+            <version>1.0.0-v20070606</version>
             <scope>provided</scope>
         </dependency>
 
@@ -705,16 +708,19 @@
         <dependency>
             <groupId>commons-httpclient</groupId>
             <artifactId>commons-httpclient</artifactId>
+            <version>3.1</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-log4j12</artifactId>
+            <version>1.5.2</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>jcl-over-slf4j</artifactId>
+            <version>1.5.2</version>
             <scope>test</scope>
         </dependency>
 		<dependency>

Modified: incubator/sling/trunk/jcr/classloader/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/jcr/classloader/pom.xml?rev=732352&r1=732351&r2=732352&view=diff
==============================================================================
--- incubator/sling/trunk/jcr/classloader/pom.xml (original)
+++ incubator/sling/trunk/jcr/classloader/pom.xml Wed Jan  7 06:41:02 2009
@@ -114,12 +114,9 @@
             <artifactId>junit</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>jcl-over-slf4j</artifactId>
-        </dependency>
-        <dependency>
             <groupId>commons-collections</groupId>
             <artifactId>commons-collections</artifactId>
+            <version>3.2.1</version>
         </dependency>
         <dependency>
             <groupId>org.apache.felix</groupId>

Modified: incubator/sling/trunk/jcr/contentloader/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/jcr/contentloader/pom.xml?rev=732352&r1=732351&r2=732352&view=diff
==============================================================================
--- incubator/sling/trunk/jcr/contentloader/pom.xml (original)
+++ incubator/sling/trunk/jcr/contentloader/pom.xml Wed Jan  7 06:41:02 2009
@@ -121,11 +121,19 @@
         <dependency>
             <groupId>net.sf.kxml</groupId>
             <artifactId>kxml2</artifactId>
+            <version>2.2.2</version>
             <scope>provided</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>xmlpull</groupId>
+                    <artifactId>xmlpull</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
+            <version>1.4</version>
         </dependency>
     <!-- Testing -->        
         <dependency>

Modified: incubator/sling/trunk/jcr/jackrabbit-server/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/jcr/jackrabbit-server/pom.xml?rev=732352&r1=732351&r2=732352&view=diff
==============================================================================
--- incubator/sling/trunk/jcr/jackrabbit-server/pom.xml (original)
+++ incubator/sling/trunk/jcr/jackrabbit-server/pom.xml Wed Jan  7 06:41:02 2009
@@ -146,22 +146,6 @@
             <groupId>org.apache.felix</groupId>
             <artifactId>org.osgi.compendium</artifactId>
         </dependency>
-
-        <!-- Testing -->
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.felix</groupId>
-            <artifactId>org.apache.felix.framework</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-        </dependency>
-
     </dependencies>
 
 </project>

Modified: incubator/sling/trunk/jcr/ocm/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/jcr/ocm/pom.xml?rev=732352&r1=732351&r2=732352&view=diff
==============================================================================
--- incubator/sling/trunk/jcr/ocm/pom.xml (original)
+++ incubator/sling/trunk/jcr/ocm/pom.xml Wed Jan  7 06:41:02 2009
@@ -197,9 +197,17 @@
             <version>1.5.0</version>
         </dependency>
 
-       <dependency>
+
+        <dependency>
             <groupId>net.sf.kxml</groupId>
             <artifactId>kxml2</artifactId>
+            <version>2.2.2</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>xmlpull</groupId>
+                    <artifactId>xmlpull</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>

Modified: incubator/sling/trunk/jcr/resource/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/jcr/resource/pom.xml?rev=732352&r1=732351&r2=732352&view=diff
==============================================================================
--- incubator/sling/trunk/jcr/resource/pom.xml (original)
+++ incubator/sling/trunk/jcr/resource/pom.xml Wed Jan  7 06:41:02 2009
@@ -136,6 +136,7 @@
         <dependency>
            <groupId>commons-collections</groupId>
            <artifactId>commons-collections</artifactId>
+           <version>3.2.1</version>
         </dependency>
 
         <!-- For the Console Plugin of the JcrResourceResolverFactoryImpl -->
@@ -146,6 +147,7 @@
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.webconsole</artifactId>
+            <version>1.2.0</version>
         </dependency>
 
         <!-- for adapting JCR resources to URLs -->

Modified: incubator/sling/trunk/launchpad/app/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/app/pom.xml?rev=732352&r1=732351&r2=732352&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/app/pom.xml (original)
+++ incubator/sling/trunk/launchpad/app/pom.xml Wed Jan  7 06:41:02 2009
@@ -618,10 +618,9 @@
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.framework</artifactId>
+            <version>1.0.4</version>
             <scope>provided</scope>
         </dependency>
-
-        <!-- the most important bundle after the framework: logging -->
         <dependency>
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.launchpad.base</artifactId>

Modified: incubator/sling/trunk/launchpad/base/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/base/pom.xml?rev=732352&r1=732351&r2=732352&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/base/pom.xml (original)
+++ incubator/sling/trunk/launchpad/base/pom.xml Wed Jan  7 06:41:02 2009
@@ -67,16 +67,14 @@
             <artifactId>org.osgi.compendium</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.eclipse.equinox.http</groupId>
-            <artifactId>servlet</artifactId>
-        </dependency>
-        <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>servlet-api</artifactId>
+            <version>2.5</version>
         </dependency>
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.framework</artifactId>
+            <version>1.0.4</version>
         </dependency>
         <dependency>
             <groupId>org.apache.sling</groupId>

Modified: incubator/sling/trunk/launchpad/jcrapp/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/jcrapp/pom.xml?rev=732352&r1=732351&r2=732352&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/jcrapp/pom.xml (original)
+++ incubator/sling/trunk/launchpad/jcrapp/pom.xml Wed Jan  7 06:41:02 2009
@@ -144,6 +144,7 @@
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.webconsole</artifactId>
+            <version>1.2.2</version>
             <optional>true</optional>
         </dependency>
         <dependency>
@@ -156,16 +157,19 @@
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.scr</artifactId>
+            <version>1.0.6</version>
             <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.configadmin</artifactId>
+            <version>1.0.4</version>
             <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.metatype</artifactId>
+            <version>1.0.0</version>
             <optional>true</optional>
         </dependency>
 
@@ -173,6 +177,7 @@
         <dependency>
             <groupId>org.ops4j.pax.web</groupId>
             <artifactId>pax-web-service</artifactId>
+            <version>0.2.3</version>
             <optional>true</optional>
         </dependency>
 
@@ -231,11 +236,13 @@
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
+            <version>1.4</version>
             <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>commons-collections</groupId>
             <artifactId>commons-collections</artifactId>
+            <version>3.2.1</version>
             <optional>true</optional>
         </dependency>
 

Modified: incubator/sling/trunk/launchpad/testing/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/testing/pom.xml?rev=732352&r1=732351&r2=732352&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/testing/pom.xml (original)
+++ incubator/sling/trunk/launchpad/testing/pom.xml Wed Jan  7 06:41:02 2009
@@ -681,11 +681,13 @@
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
+            <version>1.4</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>commons-collections</groupId>
             <artifactId>commons-collections</artifactId>
+            <version>3.2.1</version>
             <scope>provided</scope>
         </dependency>
         
@@ -699,6 +701,7 @@
         <dependency>
             <groupId>org.eclipse.equinox.http</groupId>
             <artifactId>servlet</artifactId>
+            <version>1.0.0-v20070606</version>
             <scope>provided</scope>
         </dependency>
 
@@ -710,16 +713,19 @@
         <dependency>
             <groupId>commons-httpclient</groupId>
             <artifactId>commons-httpclient</artifactId>
+            <version>3.1</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-log4j12</artifactId>
+            <version>1.5.2</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>jcl-over-slf4j</artifactId>
+            <version>1.5.2</version>
             <scope>test</scope>
         </dependency>
 

Modified: incubator/sling/trunk/launchpad/webapp/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/webapp/pom.xml?rev=732352&r1=732351&r2=732352&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/webapp/pom.xml (original)
+++ incubator/sling/trunk/launchpad/webapp/pom.xml Wed Jan  7 06:41:02 2009
@@ -273,6 +273,7 @@
         <dependency>
             <groupId>org.eclipse.equinox.http</groupId>
             <artifactId>servlet</artifactId>
+            <version>1.0.0-v20070606</version>
             <scope>provided</scope>
             <optional>true</optional>
         </dependency>

Modified: incubator/sling/trunk/maven/maven-jspc-plugin/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/maven/maven-jspc-plugin/pom.xml?rev=732352&r1=732351&r2=732352&view=diff
==============================================================================
--- incubator/sling/trunk/maven/maven-jspc-plugin/pom.xml (original)
+++ incubator/sling/trunk/maven/maven-jspc-plugin/pom.xml Wed Jan  7 06:41:02 2009
@@ -86,6 +86,7 @@
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
+            <version>1.4</version>
             <scope>compile</scope>
         </dependency>
 

Modified: incubator/sling/trunk/maven/maven-sling-plugin/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/maven/maven-sling-plugin/pom.xml?rev=732352&r1=732351&r2=732352&view=diff
==============================================================================
--- incubator/sling/trunk/maven/maven-sling-plugin/pom.xml (original)
+++ incubator/sling/trunk/maven/maven-sling-plugin/pom.xml Wed Jan  7 06:41:02 2009
@@ -71,6 +71,7 @@
         <dependency>
             <groupId>commons-httpclient</groupId>
             <artifactId>commons-httpclient</artifactId>
+            <version>3.1</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
@@ -82,6 +83,7 @@
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
+            <version>1.4</version>
             <scope>compile</scope>
         </dependency>
 

Modified: incubator/sling/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/parent/pom.xml?rev=732352&r1=732351&r2=732352&view=diff
==============================================================================
--- incubator/sling/trunk/parent/pom.xml (original)
+++ incubator/sling/trunk/parent/pom.xml Wed Jan  7 06:41:02 2009
@@ -438,6 +438,8 @@
 
 
     <dependencyManagement>
+    
+        <!-- OSGi Core and Compendium API -->
         <dependencies>
             <dependency>
                 <groupId>org.apache.felix</groupId>
@@ -457,86 +459,15 @@
                     </exclusion>
                 </exclusions>
             </dependency>
-
+            
+            <!-- Web Application API -->
             <dependency>
                 <groupId>javax.servlet</groupId>
                 <artifactId>servlet-api</artifactId>
                 <version>2.4</version>
                 <scope>provided</scope>
             </dependency>
-            <dependency>
-                <groupId>javax.servlet</groupId>
-                <artifactId>jsp-api</artifactId>
-                <version>2.0</version>
-                <scope>provided</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.eclipse.equinox.http</groupId>
-                <artifactId>servlet</artifactId>
-                <version>1.0.0-v20070606</version>
-                <scope>provided</scope>
-            </dependency>
-
-            <dependency>
-                <groupId>commons-codec</groupId>
-                <artifactId>commons-codec</artifactId>
-                <version>1.3</version>
-                <scope>provided</scope>
-            </dependency>
-            <dependency>
-                <groupId>commons-configuration</groupId>
-                <artifactId>commons-configuration</artifactId>
-                <version>1.3</version>
-                <scope>provided</scope>
-            </dependency>
-            <dependency>
-                <groupId>commons-collections</groupId>
-                <artifactId>commons-collections</artifactId>
-                <version>3.2.1</version>
-                <scope>provided</scope>
-            </dependency>
-	        <dependency>
-	            <groupId>commons-httpclient</groupId>
-	            <artifactId>commons-httpclient</artifactId>
-	            <version>3.1</version>
-	            <scope>provided</scope>
-	            <exclusions>
-	                <!-- 
-	                    Same problem as JCR-683: commons-httpclient depends on commons-logging.
Since 
-	                    this webapp uses log4j (see the slf4j-log4j12 dependency below), we
need to
-	                    override this dependency with jcl-over-sflf4j, found below
-	                -->
-	                <exclusion>
-	                    <groupId>commons-logging</groupId>
-	                    <artifactId>commons-logging</artifactId>
-	                </exclusion>
-	            </exclusions>
-	        </dependency>
-            <dependency>
-                <groupId>commons-io</groupId>
-                <artifactId>commons-io</artifactId>
-                <version>1.4</version>
-                <scope>provided</scope>
-            </dependency>
-            <dependency>
-                <groupId>commons-lang</groupId>
-                <artifactId>commons-lang</artifactId>
-                <version>2.3</version>
-                <scope>provided</scope>
-            </dependency>
-            <dependency>
-                <groupId>commons-digester</groupId>
-                <artifactId>commons-digester</artifactId>
-                <version>1.8</version>
-                <scope>provided</scope>
-            </dependency>
-            <dependency>
-                <groupId>commons-fileupload</groupId>
-                <artifactId>commons-fileupload</artifactId>
-                <version>1.1.1</version>
-                <scope>provided</scope>
-            </dependency>
-
+            
             <!-- JCR API -->
             <dependency>
                 <groupId>javax.jcr</groupId>
@@ -544,136 +475,36 @@
                 <version>1.0</version>
                 <scope>provided</scope>
             </dependency>
-
-            <dependency>
-                <groupId>net.sf.kxml</groupId>
-                <artifactId>kxml2</artifactId>
-                <version>2.2.2</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>xmlpull</groupId>
-                        <artifactId>xmlpull</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
-
-            <dependency>
-              <groupId>rhino</groupId>
-              <artifactId>js</artifactId>
-              <version>1.6R6</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.slf4j</groupId>
-                <artifactId>slf4j-simple</artifactId>
-                <version>1.5.2</version>
-                <scope>provided</scope>
-            </dependency>
+            
+            <!-- Basic Logging -->
             <dependency>
                 <groupId>org.slf4j</groupId>
                 <artifactId>slf4j-api</artifactId>
                 <version>1.5.2</version>
                 <scope>provided</scope>
             </dependency>
-            <dependency>
-                <groupId>org.slf4j</groupId>
-                <artifactId>jcl-over-slf4j</artifactId>
-                <version>1.5.2</version>
-                <scope>provided</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.slf4j</groupId>
-                <artifactId>log4j-over-slf4j</artifactId>
-                <version>1.5.2</version>
-                <scope>provided</scope>
-            </dependency>
-	        <dependency>
-	            <groupId>org.slf4j</groupId>
-	            <artifactId>slf4j-log4j12</artifactId>
-                <version>1.5.2</version>
-                <scope>provided</scope>
-	        </dependency>
 
+            <!-- Basic dependencies for Unit Tests -->                
             <dependency>
                 <groupId>junit</groupId>
                 <artifactId>junit</artifactId>
                 <version>4.3</version>
                 <scope>test</scope>
             </dependency>
-
             <dependency>
                 <groupId>org.jmock</groupId>
                 <artifactId>jmock-junit4</artifactId>
                 <version>2.2.0</version>
                 <scope>test</scope>
             </dependency>
-
-            <dependency>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>org.apache.felix.bundlerepository</artifactId>
-                <version>1.0.3</version>
-                <scope>provided</scope>
-            </dependency>
-    
-            <dependency>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>org.apache.felix.framework</artifactId>
-                <version>1.0.4</version>
-                <scope>provided</scope>
-            </dependency>
-   
             <dependency>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>org.apache.felix.eventadmin</artifactId>
-                <version>1.0.0</version>
-                <scope>provided</scope>
-            </dependency>
-        
-            <dependency>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>org.apache.felix.scr</artifactId>
-                <version>1.0.6</version>
-                <scope>provided</scope>
-            </dependency>
-        
-            <dependency>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>org.apache.felix.configadmin</artifactId>
-                <version>1.0.4</version>
-                <scope>provided</scope>
-            </dependency>
-           
-            <dependency>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>org.apache.felix.metatype</artifactId>
-                <version>1.0.0</version>
-                <scope>provided</scope>
-            </dependency>
-
-	        <!-- the web based OSGi framework console and shell service -->
-	        <dependency>
-	            <groupId>org.apache.felix</groupId>
-	            <artifactId>org.apache.felix.webconsole</artifactId>
-	            <version>1.2.2</version>
-	        </dependency>
-	        <dependency>
-	            <groupId>org.apache.felix</groupId>
-	            <artifactId>org.apache.felix.shell</artifactId>
-	            <version>1.0.2</version>
-	        </dependency>
-
-            <!-- HttpService implementation: embedded Jetty -->
-            <dependency>
-                <groupId>org.ops4j.pax.web</groupId>
-                <artifactId>pax-web-service</artifactId>
-                <version>0.2.3</version>
+                <groupId>org.slf4j</groupId>
+                <artifactId>slf4j-simple</artifactId>
+                <version>1.5.2</version>
+                <scope>test</scope>
             </dependency>
+ 
 
-            <dependency>
-                <groupId>nekohtml</groupId>
-                <artifactId>nekohtml</artifactId>
-                <version>1.9.6.2</version>
-            </dependency>
         </dependencies>
     </dependencyManagement>
 

Modified: incubator/sling/trunk/scripting/core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/scripting/core/pom.xml?rev=732352&r1=732351&r2=732352&view=diff
==============================================================================
--- incubator/sling/trunk/scripting/core/pom.xml (original)
+++ incubator/sling/trunk/scripting/core/pom.xml Wed Jan  7 06:41:02 2009
@@ -154,6 +154,7 @@
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.webconsole</artifactId>
+            <version>1.2.0</version>
         </dependency>
 
         <dependency>

Modified: incubator/sling/trunk/scripting/javascript/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/scripting/javascript/pom.xml?rev=732352&r1=732351&r2=732352&view=diff
==============================================================================
--- incubator/sling/trunk/scripting/javascript/pom.xml (original)
+++ incubator/sling/trunk/scripting/javascript/pom.xml Wed Jan  7 06:41:02 2009
@@ -135,6 +135,7 @@
         <dependency>
             <groupId>rhino</groupId>
             <artifactId>js</artifactId>
+            <version>1.6R6</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>

Modified: incubator/sling/trunk/scripting/jsp-taglib/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/scripting/jsp-taglib/pom.xml?rev=732352&r1=732351&r2=732352&view=diff
==============================================================================
--- incubator/sling/trunk/scripting/jsp-taglib/pom.xml (original)
+++ incubator/sling/trunk/scripting/jsp-taglib/pom.xml Wed Jan  7 06:41:02 2009
@@ -95,10 +95,12 @@
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>jsp-api</artifactId>
+            <version>2.0</version>
         </dependency>
         <dependency>
             <groupId>commons-collections</groupId>
             <artifactId>commons-collections</artifactId>
+            <version>3.2.1</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>

Modified: incubator/sling/trunk/scripting/jsp/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/scripting/jsp/pom.xml?rev=732352&r1=732351&r2=732352&view=diff
==============================================================================
--- incubator/sling/trunk/scripting/jsp/pom.xml (original)
+++ incubator/sling/trunk/scripting/jsp/pom.xml Wed Jan  7 06:41:02 2009
@@ -151,6 +151,7 @@
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
+            <version>1.4</version>
         </dependency>
 
         <dependency>
@@ -164,6 +165,7 @@
         <dependency>
             <groupId>commons-collections</groupId>
             <artifactId>commons-collections</artifactId>
+            <version>3.2.1</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>

Modified: incubator/sling/trunk/scripting/jst/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/scripting/jst/pom.xml?rev=732352&r1=732351&r2=732352&view=diff
==============================================================================
--- incubator/sling/trunk/scripting/jst/pom.xml (original)
+++ incubator/sling/trunk/scripting/jst/pom.xml Wed Jan  7 06:41:02 2009
@@ -133,6 +133,7 @@
         <dependency>
             <groupId>nekohtml</groupId>
             <artifactId>nekohtml</artifactId>
+            <version>1.9.6.2</version>
         </dependency>
         <dependency>
             <groupId>xerces</groupId>
@@ -140,11 +141,6 @@
             <version>2.4.0</version>
         </dependency>
         <dependency>
-            <groupId>javax.jcr</groupId>
-            <artifactId>jcr</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>servlet-api</artifactId>
             <scope>provided</scope>
@@ -154,16 +150,6 @@
             <artifactId>slf4j-api</artifactId>
         </dependency>
         <dependency>
-          <groupId>junit</groupId>
-          <artifactId>junit</artifactId>
-          <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-simple</artifactId>
-            <scope>test</scope>
-        </dependency>        
-        <dependency>
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.commons.testing</artifactId>
             <version>2.0.3-incubator-SNAPSHOT</version>



Mime
View raw message