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/pom.xml b/http/pom.xml
index e1c5b97..9afbd4d 100644
--- a/http/pom.xml
+++ b/http/pom.xml
@@ -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>