X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fcommons%2Fhttpclient%2Fpom.xml;h=07d3cdda96a00c24316b1939b37f27985576b6b1;hp=c078884ccf5c50c0ddb5e367ea8124f03b39b05c;hb=66249d6ccc367fad055a269f561860d2d96af385;hpb=3948bedd0129e44c0943bd77c91806425645cd72

diff --git a/opendaylight/commons/httpclient/pom.xml b/opendaylight/commons/httpclient/pom.xml
index c078884ccf..07d3cdda96 100644
--- a/opendaylight/commons/httpclient/pom.xml
+++ b/opendaylight/commons/httpclient/pom.xml
@@ -7,28 +7,41 @@
     <version>1.4.2-SNAPSHOT</version>
     <relativePath>../../commons/opendaylight</relativePath>
   </parent>
-  <scm>
-    <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
-    <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
-    <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:Main</url>
-    <tag>HEAD</tag>
-  </scm>
 
   <artifactId>commons.httpclient</artifactId>
   <version>0.1.2-SNAPSHOT</version>
   <packaging>bundle</packaging>
+  <dependencies>
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+      <version>1.1.3</version>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.httpcomponents</groupId>
+      <artifactId>httpclient</artifactId>
+      <version>4.3</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.httpcomponents</groupId>
+      <artifactId>httpcore</artifactId>
+      <version>4.3</version>
+    </dependency>
+  </dependencies>
 
   <build>
     <plugins>
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>${bundle.plugin.version}</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>
-            <Import-Package>
-            javax.crypto,
+            <Import-Package>javax.crypto,
             javax.crypto.spec,
             javax.net,
             javax.net.ssl,
@@ -38,14 +51,9 @@
             org.ietf.jgss,
             !org.apache.commons.codec.*,
             !org.apache.log,
-            !org.apache.avalon.framework.*
-            </Import-Package>
-            <Export-Package>
-              org.opendaylight.controller.commons.httpclient
-            </Export-Package>
-            <Embed-Dependency>
-              httpclient,httpcore,commons-logging
-            </Embed-Dependency>
+            !org.apache.avalon.framework.*</Import-Package>
+            <Export-Package>org.opendaylight.controller.commons.httpclient</Export-Package>
+            <Embed-Dependency>httpclient,httpcore,commons-logging</Embed-Dependency>
             <Embed-Transitive>false</Embed-Transitive>
           </instructions>
           <manifestLocation>${project.basedir}/META-INF</manifestLocation>
@@ -55,6 +63,10 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-checkstyle-plugin</artifactId>
         <version>${checkstyle.version}</version>
+        <configuration>
+          <failsOnError>true</failsOnError>
+          <configLocation>controller/checkstyle.xml</configLocation>
+        </configuration>
         <dependencies>
           <dependency>
             <groupId>org.opendaylight.controller</groupId>
@@ -62,32 +74,13 @@
             <version>0.0.3-SNAPSHOT</version>
           </dependency>
         </dependencies>
-        <configuration>
-          <failsOnError>true</failsOnError>
-          <configLocation>controller/checkstyle.xml</configLocation>
-        </configuration>
       </plugin>
     </plugins>
   </build>
-  <dependencies>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.httpcomponents</groupId>
-      <artifactId>httpclient</artifactId>
-      <version>4.3</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.httpcomponents</groupId>
-      <artifactId>httpcore</artifactId>
-    <version>4.3</version>
-    </dependency>
-    <dependency>
-      <groupId>commons-logging</groupId>
-      <artifactId>commons-logging</artifactId>
-      <version>1.1.3</version>
-    </dependency>
-  </dependencies>
+  <scm>
+    <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
+    <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
+    <tag>HEAD</tag>
+    <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:Main</url>
+  </scm>
 </project>