incubator-sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bdelacre...@apache.org
Subject svn commit: r1079844 - in /sling/trunk/testing/junit: core/pom.xml scriptable/pom.xml
Date Wed, 09 Mar 2011 15:40:48 GMT
Author: bdelacretaz
Date: Wed Mar  9 15:40:48 2011
New Revision: 1079844

URL: http://svn.apache.org/viewvc?rev=1079844&view=rev
Log:
SLING-2026 - avoid duplication of junit classes in junit core bundle

Modified:
    sling/trunk/testing/junit/core/pom.xml
    sling/trunk/testing/junit/scriptable/pom.xml

Modified: sling/trunk/testing/junit/core/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/testing/junit/core/pom.xml?rev=1079844&r1=1079843&r2=1079844&view=diff
==============================================================================
--- sling/trunk/testing/junit/core/pom.xml (original)
+++ sling/trunk/testing/junit/core/pom.xml Wed Mar  9 15:40:48 2011
@@ -58,14 +58,16 @@
                         <Bundle-Activator>org.apache.sling.junit.Activator</Bundle-Activator>
                         <Export-Package>
                             org.apache.sling.junit;version=${project.version},
-                            org.apache.sling.junit.annotations;version=${project.version},
+                            org.apache.sling.junit.annotations;version=${project.version}
+                        </Export-Package>
+                        <_exportcontents>
                             junit.framework;version=${junit.version},
                             org.junit;version=${junit.version},
                             org.junit.matchers.*;version=${junit.version},
                             org.junit.rules.*;version=${junit.version},
                             org.junit.runner.*;version=${junit.version},
                             org.junit.runners.*;version=${junit.version}
-                        </Export-Package>
+                        </_exportcontents>
                         <Private-Package>org.apache.sling.junit.impl.*</Private-Package>
                         <Embed-Dependency>*;artifactId=junit</Embed-Dependency>
                     </instructions>
@@ -108,7 +110,7 @@
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
             <version>${junit.version}</version>
-            <scope>compile</scope>
+            <scope>provided</scope>
         </dependency>
     </dependencies>
 </project>

Modified: sling/trunk/testing/junit/scriptable/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/testing/junit/scriptable/pom.xml?rev=1079844&r1=1079843&r2=1079844&view=diff
==============================================================================
--- sling/trunk/testing/junit/scriptable/pom.xml (original)
+++ sling/trunk/testing/junit/scriptable/pom.xml Wed Mar  9 15:40:48 2011
@@ -108,6 +108,12 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.8.2</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>servlet-api</artifactId>
         </dependency>



Mime
View raw message