Revert OSGi changes on master

tomravn · tomravn · commit a0a2863e4e69 · 2015-04-28T09:51:20.000+01:00
diff --git a/pom.xml b/pom.xml
@@ -33,8 +33,6 @@
     
     <version>2.0-SNAPSHOT</version>
 
-    <packaging>bundle</packaging>
-
     <name>Exchange Web Services Java API</name>
     <description>Exchange Web Services (EWS) Java API</description>
 
@@ -167,13 +165,13 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpclient-osgi</artifactId>
+            <artifactId>httpclient</artifactId>
             <version>${httpclient.version}</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpcore-osgi</artifactId>
+            <artifactId>httpcore</artifactId>
             <version>${httpcore.version}</version>
         </dependency>
 
@@ -313,26 +311,6 @@
                     </execution>
                 </executions>
             </plugin>
-
-            <!-- Bundle plugin for adding OSGi info to MANIFEST -->
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <version>2.3.7</version>
-                <extensions>true</extensions>
-                <configuration>
-                    <instructions>
-                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-                        <Bundle-Version>${project.version}</Bundle-Version>
-                        <Export-Package>
-                            microsoft.exchange.webservices.data*;version=${project.version}
-                        </Export-Package>
-                        <Import-Package>
-                            *
-                        </Import-Package>
-                    </instructions>
-                </configuration>
-            </plugin>
             <!-- Deployment / build plugins END -->
         </plugins>
         <!-- Used to bump all of the various core plugins up to Maven current.
