incubator-sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bdelacre...@apache.org
Subject svn commit: r1169774 - in /sling/trunk/testing: samples/integration-tests/pom.xml tools/pom.xml
Date Mon, 12 Sep 2011 14:43:09 GMT
Author: bdelacretaz
Date: Mon Sep 12 14:43:08 2011
New Revision: 1169774

URL: http://svn.apache.org/viewvc?rev=1169774&view=rev
Log:
SLING-2220 - org.apache.http.* are not required imports for sling testing tools bundle

Modified:
    sling/trunk/testing/samples/integration-tests/pom.xml
    sling/trunk/testing/tools/pom.xml

Modified: sling/trunk/testing/samples/integration-tests/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/testing/samples/integration-tests/pom.xml?rev=1169774&r1=1169773&r2=1169774&view=diff
==============================================================================
--- sling/trunk/testing/samples/integration-tests/pom.xml (original)
+++ sling/trunk/testing/samples/integration-tests/pom.xml Mon Sep 12 14:43:08 2011
@@ -226,6 +226,8 @@
                         <sling.additional.bundle.4>org.apache.sling.testing.samples.failingtests</sling.additional.bundle.4>
                         <sling.additional.bundle.5>org.apache.sling.junit.remote</sling.additional.bundle.5>
                         <sling.additional.bundle.6>org.apache.sling.testing.tools</sling.additional.bundle.6>
+                        <sling.additional.bundle.7>httpclient-osgi</sling.additional.bundle.7>
+                        <sling.additional.bundle.8>httpcore-osgi</sling.additional.bundle.8>
                     </systemPropertyVariables>
                 </configuration>
             </plugin>
@@ -271,6 +273,20 @@
             <scope>provided</scope>
         </dependency>
         
+        <!-- sling testing tools bundles requires httpclient -->
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient-osgi</artifactId>
+            <version>4.1.2</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpcore-osgi</artifactId>
+            <version>4.1.2</version>
+            <scope>provided</scope>
+        </dependency>
+        
         <!-- actual dependencies -->
         <dependency>
             <groupId>org.apache.sling</groupId>

Modified: sling/trunk/testing/tools/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/testing/tools/pom.xml?rev=1169774&r1=1169773&r2=1169774&view=diff
==============================================================================
--- sling/trunk/testing/tools/pom.xml (original)
+++ sling/trunk/testing/tools/pom.xml Mon Sep 12 14:43:08 2011
@@ -55,7 +55,6 @@
                         </Export-Package>
                         <Import-Package>
                             org.apache.commons.exec.*; resolution:=optional,
-                            org.apache.http.*; resolution:=optional,
                             *
                         </Import-Package>
                     </instructions>



Mime
View raw message