You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ra...@apache.org on 2015/07/17 14:24:11 UTC
svn commit: r1691534 - in /sling/trunk/bundles/scripting/core: pom.xml
src/test/java/org/apache/sling/scripting/core/impl/BindingsValuesProvidersByContextIT.java
Author: radu
Date: Fri Jul 17 12:24:11 2015
New Revision: 1691534
URL: http://svn.apache.org/r1691534
Log:
trivial: added support for depends-maven-plugin
* this limits changes for BindingsValuesProvidersByContextIT when updating existing dependencies
Modified:
sling/trunk/bundles/scripting/core/pom.xml
sling/trunk/bundles/scripting/core/src/test/java/org/apache/sling/scripting/core/impl/BindingsValuesProvidersByContextIT.java
Modified: sling/trunk/bundles/scripting/core/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/core/pom.xml?rev=1691534&r1=1691533&r2=1691534&view=diff
==============================================================================
--- sling/trunk/bundles/scripting/core/pom.xml (original)
+++ sling/trunk/bundles/scripting/core/pom.xml Fri Jul 17 12:24:11 2015
@@ -93,6 +93,18 @@
</systemProperties>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.servicemix.tooling</groupId>
+ <artifactId>depends-maven-plugin</artifactId>
+ <version>1.2</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>generate-depends-file</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
<reporting>
Modified: sling/trunk/bundles/scripting/core/src/test/java/org/apache/sling/scripting/core/impl/BindingsValuesProvidersByContextIT.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/core/src/test/java/org/apache/sling/scripting/core/impl/BindingsValuesProvidersByContextIT.java?rev=1691534&r1=1691533&r2=1691534&view=diff
==============================================================================
--- sling/trunk/bundles/scripting/core/src/test/java/org/apache/sling/scripting/core/impl/BindingsValuesProvidersByContextIT.java (original)
+++ sling/trunk/bundles/scripting/core/src/test/java/org/apache/sling/scripting/core/impl/BindingsValuesProvidersByContextIT.java Fri Jul 17 12:24:11 2015
@@ -22,6 +22,7 @@ import static org.junit.Assert.assertEqu
import static org.junit.Assert.assertTrue;
import static org.ops4j.pax.exam.CoreOptions.bundle;
import static org.ops4j.pax.exam.CoreOptions.junitBundles;
+import static org.ops4j.pax.exam.CoreOptions.maven;
import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
import static org.ops4j.pax.exam.CoreOptions.options;
import static org.ops4j.pax.exam.CoreOptions.provision;
@@ -58,6 +59,9 @@ import org.osgi.framework.ServiceRegistr
@RunWith(PaxExam.class)
public class BindingsValuesProvidersByContextIT {
+ private static final String FELIX_GID = "org.apache.felix";
+ private static final String SLING_GID = "org.apache.sling";
+
@Inject
private BindingsValuesProvidersByContext bvpProvider;
@@ -70,34 +74,35 @@ public class BindingsValuesProvidersByCo
public Option[] config() {
final String localRepo = System.getProperty("maven.repo.local", "");
- final String bundleFileName = System.getProperty( "bundle.file.name", "BUNDLE_FILE_NOT_SET" );
- final File bundleFile = new File( bundleFileName );
- if(!bundleFile.canRead()) {
- throw new IllegalArgumentException( "Cannot read from bundle file " + bundleFile.getAbsolutePath());
+ final String bundleFileName = System.getProperty("bundle.file.name", "BUNDLE_FILE_NOT_SET");
+ final File bundleFile = new File(bundleFileName);
+ if (!bundleFile.canRead()) {
+ throw new IllegalArgumentException("Cannot read from bundle file " + bundleFile.getAbsolutePath());
}
return options(
- when( localRepo.length() > 0 ).useOptions(
+ when(localRepo.length() > 0).useOptions(
systemProperty("org.ops4j.pax.url.mvn.localRepository").value(localRepo)
),
provision(
bundle(bundleFile.toURI().toString()),
mavenBundle("org.apache.felix", "org.apache.felix.scr", "1.6.2"),
mavenBundle("org.apache.felix", "org.apache.felix.eventadmin", "1.3.2"),
- mavenBundle("org.apache.felix", "org.apache.felix.webconsole", "3.1.8"),
+ mavenBundle(maven().groupId(FELIX_GID).artifactId("org.apache.felix.webconsole").versionAsInProject()),
+
+ mavenBundle(maven().groupId(SLING_GID).artifactId("org.apache.sling.scripting.api").versionAsInProject()),
- mavenBundle("org.apache.sling", "org.apache.sling.scripting.api", "2.1.7-SNAPSHOT"),
- mavenBundle("org.apache.sling", "org.apache.sling.commons.threads", "3.1.0"),
- mavenBundle("org.apache.sling", "org.apache.sling.api", "2.4.2"),
- mavenBundle("org.apache.sling", "org.apache.sling.commons.mime", "2.1.4"),
- mavenBundle("org.apache.sling", "org.apache.sling.commons.osgi", "2.2.0"),
+ mavenBundle(maven().groupId(SLING_GID).artifactId("org.apache.sling.commons.threads").versionAsInProject()),
+ mavenBundle(maven().groupId(SLING_GID).artifactId("org.apache.sling.api").versionAsInProject()),
+ mavenBundle(maven().groupId(SLING_GID).artifactId("org.apache.sling.commons.mime").versionAsInProject()),
+ mavenBundle(maven().groupId(SLING_GID).artifactId("org.apache.sling.commons.osgi").versionAsInProject()),
mavenBundle("org.mortbay.jetty", "servlet-api-2.5", "6.1.14"),
- mavenBundle("commons-io", "commons-io", "2.4"),
- mavenBundle("commons-lang", "commons-lang", "2.4")
+ mavenBundle(maven().groupId("commons-io").artifactId("commons-io").versionAsInProject()),
+ mavenBundle(maven().groupId("commons-lang").artifactId("commons-lang").versionAsInProject())
),
junitBundles()
- );
+ );
}
@Before