On Monday 06 March 2017 12:27:28 Julian Sedding wrote: > Thanks for reverting these changes, Olli. I meant to do the same for > some time, but never got around to it. > > I think this idea need more thought and work before it can become truly > useful.
Should we add a reverse patch containing your work to SLING-6473? Regards, O. > Regards > Julian > > On Sat, Mar 4, 2017 at 2:58 PM, <o...@apache.org> wrote: > > Author: olli > > Date: Sat Mar 4 13:58:36 2017 > > New Revision: 1785487 > > > > URL: http://svn.apache.org/viewvc?rev=1785487&view=rev > > Log: > > SLING-6473 Create a VersionResolver that provides versions from > > provisioning model files > > > > remove VersionResolver until matching Options are also provided by > > provisioning model> > > Removed: > > sling/trunk/testing/org.apache.sling.testing.paxexam/src/main/java/org > > /apache/sling/testing/paxexam/ProvisioningModelVersionResolver.java > > sling/trunk/testing/org.apache.sling.testing.paxexam/src/test/java/or > > g/apache/sling/testing/paxexam/ProvisioningModelVersionResolverTest.ja > > va > > sling/trunk/testing/org.apache.sling.testing.paxexam/src/test/resourc > > es/> > > Modified: > > sling/trunk/testing/org.apache.sling.testing.paxexam/pom.xml > > sling/trunk/testing/org.apache.sling.testing.paxexam/src/test/java/org > > /apache/sling/testing/paxexam/SlingOptionsTestSupport.java> > > Modified: sling/trunk/testing/org.apache.sling.testing.paxexam/pom.xml > > URL: > > http://svn.apache.org/viewvc/sling/trunk/testing/org.apache.sling.testing > > .paxexam/pom.xml?rev=1785487&r1=1785486&r2=1785487&view=diff > > ========================================================================= > > ===== --- sling/trunk/testing/org.apache.sling.testing.paxexam/pom.xml > > (original) +++ > > sling/trunk/testing/org.apache.sling.testing.paxexam/pom.xml Sat Mar 4 > > 13:58:36 2017 @@ -105,13 +105,6 @@ > > > > <artifactId>osgi.cmpn</artifactId> > > <scope>provided</scope> > > > > </dependency> > > > > - <dependency> > > - <groupId>org.apache.sling</groupId> > > - <artifactId>org.apache.sling.provisioning.model</artifactId> > > - <version>1.0.0</version> > > - <scope>provided</scope> > > - <optional>true</optional> > > - </dependency> > > > > <!-- Apache Felix --> > > <dependency> > > > > <groupId>org.apache.felix</groupId> > > > > @@ -153,12 +146,6 @@ > > > > <version>${org.ops4j.pax.exam.version}</version> > > <scope>test</scope> > > > > </dependency> > > > > - <dependency> > > - <groupId>org.slf4j</groupId> > > - <artifactId>slf4j-simple</artifactId> > > - <version>1.7.13</version> > > - <scope>test</scope> > > - </dependency> > > > > </dependencies> > > > > </project> > > > > Modified: > > sling/trunk/testing/org.apache.sling.testing.paxexam/src/test/java/org/ap > > ache/sling/testing/paxexam/SlingOptionsTestSupport.java URL: > > http://svn.apache.org/viewvc/sling/trunk/testing/org.apache.sling.testing > > .paxexam/src/test/java/org/apache/sling/testing/paxexam/SlingOptionsTestSu > > pport.java?rev=1785487&r1=1785486&r2=1785487&view=diff > > ========================================================================= > > ===== --- > > sling/trunk/testing/org.apache.sling.testing.paxexam/src/test/java/org/ap > > ache/sling/testing/paxexam/SlingOptionsTestSupport.java (original) +++ > > sling/trunk/testing/org.apache.sling.testing.paxexam/src/test/java/org/ap > > ache/sling/testing/paxexam/SlingOptionsTestSupport.java Sat Mar 4 > > 13:58:36 2017 @@ -18,13 +18,11 @@ > > > > */ > > > > package org.apache.sling.testing.paxexam; > > > > - > > > > import org.ops4j.pax.exam.CoreOptions; > > import org.ops4j.pax.exam.Option; > > > > import static org.ops4j.pax.exam.CoreOptions.composite; > > import static org.ops4j.pax.exam.CoreOptions.keepCaches; > > > > -import static org.ops4j.pax.exam.CoreOptions.mavenBundle; > > > > public abstract class SlingOptionsTestSupport extends TestSupport {
