Author: olli Date: Wed Sep 21 12:40:45 2016 New Revision: 1761724 URL: http://svn.apache.org/viewvc?rev=1761724&view=rev Log: SLING-5999 JcrResourceBundleProvider should move to new ResourceChangeListener API
fix test setup Modified: sling/trunk/bundles/extensions/i18n/pom.xml Modified: sling/trunk/bundles/extensions/i18n/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/i18n/pom.xml?rev=1761724&r1=1761723&r2=1761724&view=diff ============================================================================== --- sling/trunk/bundles/extensions/i18n/pom.xml (original) +++ sling/trunk/bundles/extensions/i18n/pom.xml Wed Sep 21 12:40:45 2016 @@ -39,7 +39,6 @@ <properties> <exam.version>4.9.1</exam.version> - <url.version>2.4.7</url.version> <org.ops4j.pax.logging.DefaultServiceLog.level>INFO</org.ops4j.pax.logging.DefaultServiceLog.level> </properties> @@ -65,7 +64,7 @@ SLING-INF/nodetypes/jcrlanguage.cnd, SLING-INF/nodetypes/message.cnd </Sling-Nodetypes> - <!-- embed the commons.osgi bundle as described in http://njbartlett.name/2014/05/26/static-linking.html, + <!-- embed the commons.osgi bundle as described in http://njbartlett.name/2014/05/26/static-linking.html, to make this bundle compatible with older versions of Sling --> <Conditional-Package>org.apache.sling.commons.osgi</Conditional-Package> <Embed-Dependency> @@ -122,6 +121,18 @@ </configuration> </plugin> <plugin> + <groupId>org.apache.servicemix.tooling</groupId> + <artifactId>depends-maven-plugin</artifactId> + <version>1.3.1</version> + <executions> + <execution> + <goals> + <goal>generate-depends-file</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> <artifactId>maven-clean-plugin</artifactId> <configuration> <filesets> @@ -142,10 +153,17 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> + <scope>test</scope> </dependency> <dependency> <groupId>org.osgi</groupId> <artifactId>osgi.core</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>osgi.cmpn</artifactId> + <scope>provided</scope> </dependency> <dependency> <groupId>org.osgi</groupId> @@ -162,6 +180,7 @@ <dependency> <groupId>javax.servlet</groupId> <artifactId>javax.servlet-api</artifactId> + <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.jackrabbit</groupId> @@ -184,6 +203,7 @@ <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> + <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.sling</groupId> @@ -249,26 +269,32 @@ </dependency> <dependency> <groupId>org.ops4j.pax.exam</groupId> - <artifactId>pax-exam-container-native</artifactId> + <artifactId>pax-exam</artifactId> <version>${exam.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.ops4j.pax.exam</groupId> - <artifactId>pax-exam-junit4</artifactId> + <artifactId>pax-exam-cm</artifactId> <version>${exam.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.ops4j.pax.exam</groupId> - <artifactId>pax-exam-link-mvn</artifactId> + <artifactId>pax-exam-container-forked</artifactId> <version>${exam.version}</version> <scope>test</scope> </dependency> <dependency> - <groupId>org.ops4j.pax.url</groupId> - <artifactId>pax-url-aether</artifactId> - <version>${url.version}</version> + <groupId>org.ops4j.pax.exam</groupId> + <artifactId>pax-exam-junit4</artifactId> + <version>${exam.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.ops4j.pax.exam</groupId> + <artifactId>pax-exam-link-mvn</artifactId> + <version>${exam.version}</version> <scope>test</scope> </dependency> <dependency>