svn commit: r1779207 - in /sling/trunk/testing/org.apache.sling.testing.paxexam: pom.xml src/test/java/org/apache/sling/testing/paxexam/SlingOptionsTestSupport.java src/test/resources/test-dependencies.txt

[js...@apache.org]

Author: jsedding
Date: Tue Jan 17 16:26:04 2017
New Revision: 1779207

URL: http://svn.apache.org/viewvc?rev=1779207&view=rev
Log:
SLING-6473 - Create a VersionResolver that provides versions from provisioning model files

- fix oversights: rat warning and make provisioning model dependency optional

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
    sling/trunk/testing/org.apache.sling.testing.paxexam/src/test/resources/test-dependencies.txt

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=1779207&r1=1779206&r2=1779207&view=diff
==============================================================================
--- sling/trunk/testing/org.apache.sling.testing.paxexam/pom.xml (original)
+++ sling/trunk/testing/org.apache.sling.testing.paxexam/pom.xml Tue Jan 17 16:26:04 2017
@@ -108,8 +108,9 @@
     <dependency>
       <groupId>org.apache.sling</groupId>
       <artifactId>org.apache.sling.provisioning.model</artifactId>
-      <version>1.8.0</version>
+      <version>1.0.0</version>
       <scope>provided</scope>
+      <optional>true</optional>
     </dependency>
     <!-- Apache Felix -->
     <dependency>

Modified: sling/trunk/testing/org.apache.sling.testing.paxexam/src/test/java/org/apache/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/SlingOptionsTestSupport.java?rev=1779207&r1=1779206&r2=1779207&view=diff
==============================================================================
--- sling/trunk/testing/org.apache.sling.testing.paxexam/src/test/java/org/apache/sling/testing/paxexam/SlingOptionsTestSupport.java (original)
+++ sling/trunk/testing/org.apache.sling.testing.paxexam/src/test/java/org/apache/sling/testing/paxexam/SlingOptionsTestSupport.java Tue Jan 17 16:26:04 2017
@@ -24,6 +24,7 @@ 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 {
 

Modified: sling/trunk/testing/org.apache.sling.testing.paxexam/src/test/resources/test-dependencies.txt
URL: http://svn.apache.org/viewvc/sling/trunk/testing/org.apache.sling.testing.paxexam/src/test/resources/test-dependencies.txt?rev=1779207&r1=1779206&r2=1779207&view=diff
==============================================================================
--- sling/trunk/testing/org.apache.sling.testing.paxexam/src/test/resources/test-dependencies.txt (original)
+++ sling/trunk/testing/org.apache.sling.testing.paxexam/src/test/resources/test-dependencies.txt Tue Jan 17 16:26:04 2017
@@ -1,3 +1,21 @@
+#
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#
 [feature name=test]
 # Dependencies
 [artifacts]