You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by fm...@apache.org on 2011/12/05 16:22:27 UTC
svn commit: r1210494 - in /felix/trunk/http: ./ api/ base/
base/src/test/resources/org/apache/felix/http/base/internal/context/
bridge/ bundle/ cometd/ jetty/ jetty/src/main/resources/OSGI-INF/metatype/
parent/ proxy/ samples/bridge/ samples/bridge/src...
Author: fmeschbe
Date: Mon Dec 5 15:22:27 2011
New Revision: 1210494
URL: http://svn.apache.org/viewvc?rev=1210494&view=rev
Log:
FELIX-3258 Refer to new parent POM and reduce reactor POM to just listing child modules
Modified:
felix/trunk/http/api/pom.xml
felix/trunk/http/base/pom.xml
felix/trunk/http/base/src/test/resources/org/apache/felix/http/base/internal/context/resource.txt
felix/trunk/http/bridge/pom.xml
felix/trunk/http/bundle/pom.xml
felix/trunk/http/cometd/pom.xml
felix/trunk/http/jetty/pom.xml
felix/trunk/http/jetty/src/main/resources/OSGI-INF/metatype/metatype.xml
felix/trunk/http/parent/pom.xml
felix/trunk/http/pom.xml
felix/trunk/http/proxy/pom.xml
felix/trunk/http/samples/bridge/pom.xml
felix/trunk/http/samples/bridge/src/main/webapp/WEB-INF/framework.properties
felix/trunk/http/samples/bridge/src/main/webapp/WEB-INF/web.xml
felix/trunk/http/samples/cometd/pom.xml
felix/trunk/http/samples/filter/pom.xml
felix/trunk/http/samples/whiteboard/pom.xml
felix/trunk/http/whiteboard/pom.xml
Modified: felix/trunk/http/api/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/http/api/pom.xml?rev=1210494&r1=1210493&r2=1210494&view=diff
==============================================================================
--- felix/trunk/http/api/pom.xml (original)
+++ felix/trunk/http/api/pom.xml Mon Dec 5 15:22:27 2011
@@ -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 Api</name>
<artifactId>org.apache.felix.http.api</artifactId>
+ <version>2.2.1-SNAPSHOT</version>
<packaging>jar</packaging>
<build>
Modified: felix/trunk/http/base/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/http/base/pom.xml?rev=1210494&r1=1210493&r2=1210494&view=diff
==============================================================================
--- felix/trunk/http/base/pom.xml (original)
+++ felix/trunk/http/base/pom.xml Mon Dec 5 15:22:27 2011
@@ -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 Base</name>
<artifactId>org.apache.felix.http.base</artifactId>
+ <version>2.2.1-SNAPSHOT</version>
<packaging>jar</packaging>
<build>
Modified: felix/trunk/http/base/src/test/resources/org/apache/felix/http/base/internal/context/resource.txt
URL: http://svn.apache.org/viewvc/felix/trunk/http/base/src/test/resources/org/apache/felix/http/base/internal/context/resource.txt?rev=1210494&r1=1210493&r2=1210494&view=diff
==============================================================================
--- felix/trunk/http/base/src/test/resources/org/apache/felix/http/base/internal/context/resource.txt (original)
+++ felix/trunk/http/base/src/test/resources/org/apache/felix/http/base/internal/context/resource.txt Mon Dec 5 15:22:27 2011
@@ -1 +1,17 @@
+/*
+ * 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.
+ */
Dummy resource...
Modified: felix/trunk/http/bridge/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/http/bridge/pom.xml?rev=1210494&r1=1210493&r2=1210494&view=diff
==============================================================================
--- felix/trunk/http/bridge/pom.xml (original)
+++ felix/trunk/http/bridge/pom.xml Mon Dec 5 15:22:27 2011
@@ -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 Bridge</name>
<artifactId>org.apache.felix.http.bridge</artifactId>
+ <version>2.2.1-SNAPSHOT</version>
<packaging>jar</packaging>
<build>
Modified: felix/trunk/http/bundle/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/http/bundle/pom.xml?rev=1210494&r1=1210493&r2=1210494&view=diff
==============================================================================
--- felix/trunk/http/bundle/pom.xml (original)
+++ felix/trunk/http/bundle/pom.xml Mon Dec 5 15:22:27 2011
@@ -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 Bundle</name>
<artifactId>org.apache.felix.http.bundle</artifactId>
+ <version>2.2.1-SNAPSHOT</version>
<packaging>jar</packaging>
<build>
Modified: felix/trunk/http/cometd/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/http/cometd/pom.xml?rev=1210494&r1=1210493&r2=1210494&view=diff
==============================================================================
--- felix/trunk/http/cometd/pom.xml (original)
+++ felix/trunk/http/cometd/pom.xml Mon Dec 5 15:22:27 2011
@@ -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 Cometd</name>
<artifactId>org.apache.felix.http.cometd</artifactId>
+ <version>2.2.1-SNAPSHOT</version>
<packaging>jar</packaging>
<build>
Modified: felix/trunk/http/jetty/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/http/jetty/pom.xml?rev=1210494&r1=1210493&r2=1210494&view=diff
==============================================================================
--- felix/trunk/http/jetty/pom.xml (original)
+++ felix/trunk/http/jetty/pom.xml Mon Dec 5 15:22:27 2011
@@ -21,9 +21,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.http</artifactId>
- <version>2.2.0</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 Jetty</name>
Modified: felix/trunk/http/jetty/src/main/resources/OSGI-INF/metatype/metatype.xml
URL: http://svn.apache.org/viewvc/felix/trunk/http/jetty/src/main/resources/OSGI-INF/metatype/metatype.xml?rev=1210494&r1=1210493&r2=1210494&view=diff
==============================================================================
--- felix/trunk/http/jetty/src/main/resources/OSGI-INF/metatype/metatype.xml (original)
+++ felix/trunk/http/jetty/src/main/resources/OSGI-INF/metatype/metatype.xml Mon Dec 5 15:22:27 2011
@@ -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.
+-->
<metatype:MetaData xmlns:metatype="http://www.osgi.org/xmlns/metatype/v1.0.0" localization="OSGI-INF/metatype/metatype">
<OCD id="org.apache.felix.http" name="%org.apache.felix.http.jetty.internal.JettyConfig.name" description="%org.apache.felix.http.jetty.internal.JettyConfig.description">
<AD id="org.apache.felix.http.host" type="String" default="0.0.0.0" name="%org.apache.felix.http.host.name" description="%org.apache.felix.http.host.description"/>
Modified: felix/trunk/http/parent/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/http/parent/pom.xml?rev=1210494&r1=1210493&r2=1210494&view=diff
==============================================================================
--- felix/trunk/http/parent/pom.xml (original)
+++ felix/trunk/http/parent/pom.xml Mon Dec 5 15:22:27 2011
@@ -30,7 +30,7 @@
<name>Apache Felix Http Parent POM</name>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.http.parent</artifactId>
- <version>3-SNAPSHOT</version>
+ <version>1-SNAPSHOT</version>
<packaging>pom</packaging>
<prerequisites>
@@ -98,7 +98,7 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
- <version>2.3</version>
+ <version>2.5</version>
<scope>provided</scope>
</dependency>
<dependency>
Modified: felix/trunk/http/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/http/pom.xml?rev=1210494&r1=1210493&r2=1210494&view=diff
==============================================================================
--- felix/trunk/http/pom.xml (original)
+++ felix/trunk/http/pom.xml Mon Dec 5 15:22:27 2011
@@ -17,86 +17,27 @@
under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.felix</groupId>
<artifactId>felix-parent</artifactId>
- <version>1.2.0</version>
+ <version>2.1</version>
<relativePath>../pom/pom.xml</relativePath>
</parent>
+ <name>Apache Felix Http Reactor</name>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.http</artifactId>
+ <version>3-SNAPSHOT</version>
<packaging>pom</packaging>
- <name>Apache Felix Http</name>
- <version>2.2.1-SNAPSHOT</version>
-
- <prerequisites>
- <maven>2.0.7</maven>
- </prerequisites>
-
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- </properties>
-
- <build>
- <resources>
- <resource>
- <directory>${basedir}/src/main/resources</directory>
- </resource>
- <resource>
- <targetPath>META-INF</targetPath>
- <directory>${basedir}</directory>
- <includes>
- <include>LICENSE</include>
- <include>NOTICE</include>
- <include>DEPENDENCIES</include>
- </includes>
- </resource>
- </resources>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- <compilerVersion>1.5</compilerVersion>
- </configuration>
- </plugin>
- </plugins>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <version>2.0.1</version>
- <executions>
- <execution>
- <id>bundle</id>
- <phase>package</phase>
- <goals>
- <goal>bundle</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <instructions>
- <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
- <Bundle-Version>${pom.version}</Bundle-Version>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
<modules>
<module>api</module>
<module>base</module>
<module>bridge</module>
<module>jetty</module>
+ <module>parent</module>
<module>proxy</module>
<module>whiteboard</module>
<module>cometd</module>
@@ -106,39 +47,4 @@
<module>samples/whiteboard</module>
<module>samples/cometd</module>
</modules>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.5</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
- <version>1.8.0</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.5</version>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- <version>4.0.0</version>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- <version>4.0.0</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
</project>
Modified: felix/trunk/http/proxy/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/http/proxy/pom.xml?rev=1210494&r1=1210493&r2=1210494&view=diff
==============================================================================
--- felix/trunk/http/proxy/pom.xml (original)
+++ felix/trunk/http/proxy/pom.xml Mon Dec 5 15:22:27 2011
@@ -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 Proxy</name>
<artifactId>org.apache.felix.http.proxy</artifactId>
+ <version>2.2.1-SNAPSHOT</version>
<packaging>jar</packaging>
<build>
Modified: felix/trunk/http/samples/bridge/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/http/samples/bridge/pom.xml?rev=1210494&r1=1210493&r2=1210494&view=diff
==============================================================================
--- felix/trunk/http/samples/bridge/pom.xml (original)
+++ felix/trunk/http/samples/bridge/pom.xml Mon Dec 5 15:22:27 2011
@@ -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>
Modified: felix/trunk/http/samples/bridge/src/main/webapp/WEB-INF/framework.properties
URL: http://svn.apache.org/viewvc/felix/trunk/http/samples/bridge/src/main/webapp/WEB-INF/framework.properties?rev=1210494&r1=1210493&r2=1210494&view=diff
==============================================================================
--- felix/trunk/http/samples/bridge/src/main/webapp/WEB-INF/framework.properties (original)
+++ felix/trunk/http/samples/bridge/src/main/webapp/WEB-INF/framework.properties Mon Dec 5 15:22:27 2011
@@ -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 = \
Modified: felix/trunk/http/samples/bridge/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/felix/trunk/http/samples/bridge/src/main/webapp/WEB-INF/web.xml?rev=1210494&r1=1210493&r2=1210494&view=diff
==============================================================================
--- felix/trunk/http/samples/bridge/src/main/webapp/WEB-INF/web.xml (original)
+++ felix/trunk/http/samples/bridge/src/main/webapp/WEB-INF/web.xml Mon Dec 5 15:22:27 2011
@@ -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>
Modified: felix/trunk/http/samples/cometd/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/http/samples/cometd/pom.xml?rev=1210494&r1=1210493&r2=1210494&view=diff
==============================================================================
--- felix/trunk/http/samples/cometd/pom.xml (original)
+++ felix/trunk/http/samples/cometd/pom.xml Mon Dec 5 15:22:27 2011
@@ -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>
Modified: felix/trunk/http/samples/filter/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/http/samples/filter/pom.xml?rev=1210494&r1=1210493&r2=1210494&view=diff
==============================================================================
--- felix/trunk/http/samples/filter/pom.xml (original)
+++ felix/trunk/http/samples/filter/pom.xml Mon Dec 5 15:22:27 2011
@@ -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>
Modified: felix/trunk/http/samples/whiteboard/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/http/samples/whiteboard/pom.xml?rev=1210494&r1=1210493&r2=1210494&view=diff
==============================================================================
--- felix/trunk/http/samples/whiteboard/pom.xml (original)
+++ felix/trunk/http/samples/whiteboard/pom.xml Mon Dec 5 15:22:27 2011
@@ -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>
Modified: felix/trunk/http/whiteboard/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/http/whiteboard/pom.xml?rev=1210494&r1=1210493&r2=1210494&view=diff
==============================================================================
--- felix/trunk/http/whiteboard/pom.xml (original)
+++ felix/trunk/http/whiteboard/pom.xml Mon Dec 5 15:22:27 2011
@@ -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 Whiteboard</name>
<artifactId>org.apache.felix.http.whiteboard</artifactId>
+ <version>2.2.1-SNAPSHOT</version>
<packaging>jar</packaging>
<build>