Add missing licence headers and move model dependencies into models
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1673029 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/pom.xml b/pom.xml
index d7d78bc..ea1215a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -379,14 +379,6 @@
</profiles>
<dependencies>
- <dependency>
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.launchpad</artifactId>
- <version>8-SNAPSHOT</version>
- <type>slingfeature</type>
- <classifier>slingfeature</classifier>
- </dependency>
-
<!-- The integration tests -->
<dependency>
<groupId>org.apache.sling</groupId>
@@ -395,14 +387,6 @@
<scope>test</scope>
</dependency>
- <!-- The test services bundles -->
- <dependency>
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.launchpad.test-bundles</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- <type>slingfeature</type>
- </dependency>
-
<!-- Dependencies for the Test Build and Run -->
<dependency>
<groupId>javax.jcr</groupId>
diff --git a/src/main/provisioning/model.txt b/src/main/provisioning/model.txt
index d22bef6..09054e0 100644
--- a/src/main/provisioning/model.txt
+++ b/src/main/provisioning/model.txt
@@ -1,6 +1,29 @@
+#
+# 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=launchpad-testing]
- # additional configuration for testing
+# Dependencies
+[artifacts]
+ org.apache.sling/org.apache.sling.launchpad/8-SNAPSHOT/slingstart
+ org.apache.sling/org.apache.sling.launchpad.test-bundles/0.0.1-SNAPSHOT/slingfeature
+
+# additional configuration for testing
[configurations]
integrationTestsConfig
message="This test config should be loaded at startup"
