FELIX-3258 Refer to new parent POM and reduce reactor POM to just listing child modules
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1210494 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/http/samples/bridge/pom.xml b/http/samples/bridge/pom.xml
index a272f91..11d9227 100644
--- a/http/samples/bridge/pom.xml
+++ b/http/samples/bridge/pom.xml
@@ -21,13 +21,14 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.http</artifactId>
- <version>2.2.1-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
+ <artifactId>org.apache.felix.http.parent</artifactId>
+ <version>1-SNAPSHOT</version>
+ <relativePath>../../parent/pom.xml</relativePath>
</parent>
<name>Apache Felix Http Samples - Bridge</name>
<artifactId>org.apache.felix.http.samples.bridge</artifactId>
+ <version>2.2.1-SNAPSHOT</version>
<packaging>war</packaging>
<build>
diff --git a/http/samples/bridge/src/main/webapp/WEB-INF/framework.properties b/http/samples/bridge/src/main/webapp/WEB-INF/framework.properties
index 48ec827..904b336 100644
--- a/http/samples/bridge/src/main/webapp/WEB-INF/framework.properties
+++ b/http/samples/bridge/src/main/webapp/WEB-INF/framework.properties
@@ -1,3 +1,22 @@
+#
+# 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.
+#
+
org.osgi.framework.storage.clean = onFirstInit
org.osgi.framework.system.packages = \
diff --git a/http/samples/bridge/src/main/webapp/WEB-INF/web.xml b/http/samples/bridge/src/main/webapp/WEB-INF/web.xml
index ad0c845..8625236 100644
--- a/http/samples/bridge/src/main/webapp/WEB-INF/web.xml
+++ b/http/samples/bridge/src/main/webapp/WEB-INF/web.xml
@@ -1,4 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
"http://java.sun.com/dtd/web-app_2_3.dtd">
<web-app>
diff --git a/http/samples/cometd/pom.xml b/http/samples/cometd/pom.xml
index 20be53c..f650fbd 100644
--- a/http/samples/cometd/pom.xml
+++ b/http/samples/cometd/pom.xml
@@ -21,13 +21,14 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.http</artifactId>
- <version>2.2.1-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
+ <artifactId>org.apache.felix.http.parent</artifactId>
+ <version>1-SNAPSHOT</version>
+ <relativePath>../../parent/pom.xml</relativePath>
</parent>
<name>Apache Felix Http Samples - Cometd</name>
<artifactId>org.apache.felix.http.samples.cometd</artifactId>
+ <version>2.2.1-SNAPSHOT</version>
<packaging>jar</packaging>
<build>
diff --git a/http/samples/filter/pom.xml b/http/samples/filter/pom.xml
index 5194319..b69a5c8 100644
--- a/http/samples/filter/pom.xml
+++ b/http/samples/filter/pom.xml
@@ -21,13 +21,14 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.http</artifactId>
- <version>2.2.1-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
+ <artifactId>org.apache.felix.http.parent</artifactId>
+ <version>1-SNAPSHOT</version>
+ <relativePath>../../parent/pom.xml</relativePath>
</parent>
<name>Apache Felix Http Samples - Filter</name>
<artifactId>org.apache.felix.http.samples.filter</artifactId>
+ <version>2.2.1-SNAPSHOT</version>
<packaging>jar</packaging>
<build>
diff --git a/http/samples/whiteboard/pom.xml b/http/samples/whiteboard/pom.xml
index e57074c..f603990 100644
--- a/http/samples/whiteboard/pom.xml
+++ b/http/samples/whiteboard/pom.xml
@@ -21,13 +21,14 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.http</artifactId>
- <version>2.2.1-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
+ <artifactId>org.apache.felix.http.parent</artifactId>
+ <version>1-SNAPSHOT</version>
+ <relativePath>../../parent/pom.xml</relativePath>
</parent>
<name>Apache Felix Http Samples - Whiteboard</name>
<artifactId>org.apache.felix.http.samples.whiteboard</artifactId>
+ <version>2.2.1-SNAPSHOT</version>
<packaging>jar</packaging>
<build>