Bumped a couple of plugin versions, and removed a couple of overridden versions.
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1636551 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/http/parent/pom.xml b/http/parent/pom.xml
index 865612c..0a30d00 100755
--- a/http/parent/pom.xml
+++ b/http/parent/pom.xml
@@ -34,7 +34,7 @@
<packaging>pom</packaging>
<prerequisites>
- <maven>2.0.7</maven>
+ <maven>2.2.1</maven>
</prerequisites>
<properties>
diff --git a/http/pom.xml b/http/pom.xml
index ef6af8e..7b5b096 100644
--- a/http/pom.xml
+++ b/http/pom.xml
@@ -37,6 +37,10 @@
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/felix/trunk/http</developerConnection>
<url>http://svn.apache.org/viewvc/felix/trunk/http/</url>
</scm>
+
+ <prerequisites>
+ <maven>2.2.1</maven>
+ </prerequisites>
<modules>
<module>api</module>
diff --git a/http/samples/bridge/pom.xml b/http/samples/bridge/pom.xml
index 16bae04..5b49cb2 100644
--- a/http/samples/bridge/pom.xml
+++ b/http/samples/bridge/pom.xml
@@ -42,7 +42,7 @@
<plugin>
<groupId>org.mortbay.jetty</groupId>
<artifactId>maven-jetty-plugin</artifactId>
- <version>6.1.10</version>
+ <version>6.1.26</version>
<configuration>
<contextPath>/</contextPath>
</configuration>
@@ -93,7 +93,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
- <version>2.0.4</version>
<executions>
<execution>
<id>attach-sources</id>
diff --git a/http/samples/cometd/pom.xml b/http/samples/cometd/pom.xml
index cb280f2..cf2341d 100644
--- a/http/samples/cometd/pom.xml
+++ b/http/samples/cometd/pom.xml
@@ -63,7 +63,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
- <version>2.0.4</version>
<executions>
<execution>
<id>attach-sources</id>
diff --git a/http/samples/filter/pom.xml b/http/samples/filter/pom.xml
index 8762c3a..3fbde4f 100644
--- a/http/samples/filter/pom.xml
+++ b/http/samples/filter/pom.xml
@@ -59,7 +59,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
- <version>2.0.4</version>
<executions>
<execution>
<id>attach-sources</id>
diff --git a/http/samples/whiteboard/pom.xml b/http/samples/whiteboard/pom.xml
index 9e4cf3e..6b2e3df 100644
--- a/http/samples/whiteboard/pom.xml
+++ b/http/samples/whiteboard/pom.xml
@@ -59,7 +59,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
- <version>2.0.4</version>
<executions>
<execution>
<id>attach-sources</id>