This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to annotated tag org.apache.sling.testing.paxexam-0.0.4 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-paxexam.git
commit 5b43121f51425e9d312e462db36a9c7d6c4ff277 Author: Julian Sedding <[email protected]> AuthorDate: Tue Jan 17 16:26:04 2017 +0000 SLING-6473 - Create a VersionResolver that provides versions from provisioning model files - fix oversights: rat warning and make provisioning model dependency optional git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/testing/org.apache.sling.testing.paxexam@1779207 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 3 ++- .../sling/testing/paxexam/SlingOptionsTestSupport.java | 1 + src/test/resources/test-dependencies.txt | 18 ++++++++++++++++++ 3 files changed, 21 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 36b8580..2ab6026 100644 --- a/pom.xml +++ b/pom.xml @@ -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> diff --git a/src/test/java/org/apache/sling/testing/paxexam/SlingOptionsTestSupport.java b/src/test/java/org/apache/sling/testing/paxexam/SlingOptionsTestSupport.java index d0e08b6..13f8b5a 100644 --- a/src/test/java/org/apache/sling/testing/paxexam/SlingOptionsTestSupport.java +++ b/src/test/java/org/apache/sling/testing/paxexam/SlingOptionsTestSupport.java @@ -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 { diff --git a/src/test/resources/test-dependencies.txt b/src/test/resources/test-dependencies.txt index b418373..fa43db7 100644 --- a/src/test/resources/test-dependencies.txt +++ b/src/test/resources/test-dependencies.txt @@ -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] -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
