Cleanup netty and ahc bundle manifests and p2 metadata

Removed unnecessary optional dependencies and made non-optional
dependencies as required in MANIFEST.MF

Removed now redudant p2.inf files. These were used to suppress optional
dependencies from being installed.

Made sure each build produces bundles with new unique qualifier

Signed-off-by: Igor Fedorenko <igor@ifedorenko.com>

3 files changed, 18 insertions, 29 deletions

diff --git a/org.jboss.netty/META-INF/MANIFEST.MF b/org.jboss.netty/META-INF/MANIFEST.MF
index eee3833e..521978bb 100644
--- a/org.jboss.netty/META-INF/MANIFEST.MF
+++ b/org.jboss.netty/META-INF/MANIFEST.MF
@@ -102,7 +102,7 @@ Created-By: Apache Maven Bundle Plugin
 Bundle-BuddyPolicy: registered
 Bundle-Vendor: JBoss
 Build-Jdk: 1.6.0_23
-Bundle-Version: 3.2.4.Final
+Bundle-Version: 3.2.4.qualifier
 Eclipse-BuddyPolicy: registered
 Bnd-LastModified: 1297082336492
 Bundle-ManifestVersion: 2
@@ -118,13 +118,9 @@ Bundle-Description: The Netty project is an effort to provide an async
  and UDP socket server.
 Bundle-DocURL: http://www.jboss.org/netty/
 Bundle-SymbolicName: org.jboss.netty
-Import-Package: com.google.protobuf;resolution:=optional,
- javax.net.ssl;resolution:=optional,
+Import-Package: javax.net.ssl;resolution:=optional,
  javax.servlet;resolution:=optional,
  javax.servlet.http;resolution:=optional,
- org.apache.commons.logging;resolution:=optional,
- org.apache.log4j;resolution:=optional,
- org.jboss.logging;resolution:=optional,
  org.jboss.netty.bootstrap;version="[3.2,4)";resolution:=optional,
  org.jboss.netty.buffer;version="[3.2,4)";resolution:=optional,
  org.jboss.netty.handler.codec.frame;version="[3.2,4)";resolution:=optional,
@@ -138,7 +134,7 @@ Import-Package: com.google.protobuf;resolution:=optional,
  org.osgi.framework;version="[1.5,2)";resolution:=optional,
  org.osgi.service.log;version="[1.3,2)";resolution:=optional,
  org.osgi.util.tracker;version="[1.4,2)";resolution:=optional,
- org.slf4j;version="[1.5.0,2.0.0)";resolution:=optional
+ org.slf4j;version="[1.5.0,2.0.0)"
 Main-Class: org.jboss.netty.util.Version
 Bundle-ClassPath: netty-3.2.4.Final.jar
 Bundle-RequiredExecutionEnvironment: J2SE-1.5,
diff --git a/org.jboss.netty/META-INF/p2.inf b/org.jboss.netty/META-INF/p2.inf
deleted file mode 100644
index dfe3b7bc..00000000
--- a/org.jboss.netty/META-INF/p2.inf
+++ /dev/null
@@ -1,21 +0,0 @@
-# Set all requirements for logging packages to not greedy 
- requires.0.namespace = java.package
- requires.0.name = org.apache.commons.logging
- requires.0.greedy = false
- requires.0.optional = true
- 
- requires.1.namespace = java.package
- requires.1.name = org.apache.log4j
- requires.1.greedy = false
- requires.1.optional = true
- 
- requires.2.namespace = java.package
- requires.2.name = org.jboss.logging
- requires.2.greedy = false
- requires.2.optional = true
- 
- requires.3.namespace = java.package
- requires.3.name = org.slf4j
- requires.3.greedy = false
- requires.3.optional = true
- 
\ No newline at end of file
diff --git a/org.jboss.netty/pom.xml b/org.jboss.netty/pom.xml
index f82d3597..d244cf0a 100644
--- a/org.jboss.netty/pom.xml
+++ b/org.jboss.netty/pom.xml
@@ -6,7 +6,8 @@
   which accompanies this distribution, and is available at
   http://www.eclipse.org/legal/epl-v10.html
 -->
-<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/xsd/maven-4.0.0.xsd">
+<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/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
@@ -19,4 +20,17 @@
   <artifactId>org.jboss.netty</artifactId>
   <packaging>eclipse-plugin</packaging>
 
+  <build>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>org.sonatype.tycho</groupId>
+          <artifactId>maven-osgi-packaging-plugin</artifactId>
+          <configuration>
+            <format>'Final-'yyyyMMddHHmm</format>
+          </configuration>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+  </build>
 </project>