Code Review / appc.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Merge of new rebased code
[appc.git] / appc-adapters / appc-iaas-adapter / appc-iaas-adapter-bundle / pom.xml
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/pom.xml b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/pom.xml
index db08ff1..061ec5a 100644 (file)
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/pom.xml
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/pom.xml
@@ -16,84 +16,137 @@
                        <groupId>org.openecomp.appc</groupId>
                        <artifactId>appc-common</artifactId>
                        <version>${project.version}</version>
-                       <classifier>jar-with-dependencies</classifier>
                        <scope>compile</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.openecomp.appc</groupId>
-                       <artifactId>appc-common</artifactId>
-                       <version>${project.version}</version>
-                       <scope>test</scope>
-               </dependency>
-               <dependency>
-                       <groupId>javax</groupId>
-                       <artifactId>javaee-api</artifactId>
-                       <version>7.0</version>
-               </dependency>
-
-               <dependency>
-                       <groupId>com.att.cdp</groupId>
-                       <artifactId>cdp-pal-common</artifactId>
-                       <scope>compile</scope>
-               </dependency>
-
-               <dependency>
-                       <groupId>com.att.cdp</groupId>
-                       <artifactId>cdp-pal-openstack</artifactId>
-                       <scope>compile</scope>
-               </dependency>
-
-               <dependency>
-                       <groupId>javax.ws.rs</groupId>
-                       <artifactId>javax.ws.rs-api</artifactId>
-                       </dependency>
-
-               <!-- Jersey support needed for OpenStack connector and API version logic -->
-               <dependency>
-                       <groupId>com.sun.jersey</groupId>
-                       <artifactId>jersey-client</artifactId>
-                       </dependency>
-
-               <dependency>
-                       <groupId>com.sun.jersey</groupId>
-                       <artifactId>jersey-json</artifactId>
-                       </dependency>
-
-               <dependency>
-                       <groupId>javax.xml.bind</groupId>
-                       <artifactId>jaxb-api</artifactId>
-                       <version>2.1</version>
-               </dependency>
-
-               <dependency>
-                       <groupId>javax.xml</groupId>
-                       <artifactId>jaxp-api</artifactId>
-                       <version>1.4.2</version>
-               </dependency>
-
-               <!-- Needed to run test cases -->
-               <dependency>
-                       <groupId>org.glassfish.jersey.core</groupId>
-                       <artifactId>jersey-common</artifactId>
-                       <version>2.9.1</version>
-               </dependency>
-
-               <dependency>
-                       <groupId>org.codehaus.jackson</groupId>
-                       <artifactId>jackson-jaxrs</artifactId>
-                       <version>1.9.12</version>
-               </dependency>
-
-               <dependency>
-                       <groupId>commons-codec</groupId>
-                       <artifactId>commons-codec</artifactId>
-                       </dependency>
-
-               <dependency>
-                       <groupId>org.apache.httpcomponents</groupId>
-                       <artifactId>httpclient</artifactId>
-                       <version>4.5.1</version>
-               </dependency>
+            <exclusions>
+                <exclusion>
+                    <groupId>javax</groupId>
+                    <artifactId>javaee-api</artifactId>
+                </exclusion>
+            </exclusions>
+               </dependency>
+        
+        <dependency>
+            <groupId>com.att.cdp</groupId>
+            <artifactId>cdp-pal-openstack</artifactId>
+            <scope>compile</scope>
+        </dependency>
+
+        <dependency>
+          <groupId>org.glassfish.jersey.core</groupId>
+          <artifactId>jersey-common</artifactId>
+          <version>2.25.1</version>
+          <scope>compile</scope>
+        </dependency>
+
+
+        <dependency>
+          <groupId>org.glassfish.jersey.core</groupId>
+          <artifactId>jersey-client</artifactId>
+          <version>2.25.1</version>
+          <scope>compile</scope>
+        </dependency>
+        
+        <dependency>
+          <groupId>org.glassfish.jersey.core</groupId>
+          <artifactId>jersey-server</artifactId>
+          <version>2.25.1</version>
+          <scope>compile</scope>
+        </dependency>
+                
+<!--        <dependency> -->
+<!--            <groupId>javax</groupId> -->
+<!--            <artifactId>javaee-api</artifactId> -->
+<!--            <version>7.0</version> -->
+<!--        </dependency> -->
+              
+        <dependency>
+            <groupId>javax.ws.rs</groupId>
+            <artifactId>javax.ws.rs-api</artifactId>
+            <version>2.0.1</version>
+            <scope>compile</scope>
+        </dependency>
+        
+<!--         <dependency> -->
+<!--             <groupId>org.glassfish.jersey.containers</groupId> -->
+<!--             <artifactId>jersey-container-servlet</artifactId> -->
+<!--              <version>2.25.1</version> -->
+<!--          <scope>provided</scope> -->
+<!--         </dependency> -->
+        
+        <dependency>
+            <groupId>org.glassfish.jersey.connectors</groupId>
+            <artifactId>jersey-grizzly-connector</artifactId>
+            <version>2.25.1</version>
+            <scope>compile</scope>
+        </dependency>
+<!--         <dependency> -->
+<!--             <groupId>org.glassfish.jersey.media</groupId> -->
+<!--             <artifactId>jersey-media-json-jackson</artifactId> -->
+<!--             <version>2.25.1</version> -->
+<!--         </dependency> -->
+        
+<!--         <dependency> -->
+<!--             <groupId>com.fasterxml.jackson.jaxrs</groupId> -->
+<!--             <artifactId>jackson-jaxrs-base</artifactId> -->
+<!--         </dependency> -->
+        
+        <dependency>
+            <groupId>javax.xml</groupId>
+            <artifactId>jaxp-api</artifactId>
+            <version>1.4.2</version>
+            <scope>compile</scope>
+        </dependency>        
+
+       <dependency>
+           <groupId>javax.xml.bind</groupId>
+           <artifactId>jaxb-api</artifactId>
+           <version>2.2</version>
+           <scope>compile</scope>
+       </dependency>
+
+        <dependency>
+            <groupId>org.openecomp.sdnc.core</groupId>
+            <artifactId>sli-common</artifactId>
+            <scope>provided</scope>
+            <!-- Added exclusion to prevent missing dependency issue on dblib -->
+            <exclusions>
+                <exclusion>
+                    <groupId>org.openecomp.sdnc.core</groupId>
+                    <artifactId>dblib-provider</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>org.openecomp.sdnc.core</groupId>
+            <artifactId>sli-provider</artifactId>
+            <scope>provided</scope>
+            <!-- Added exclusion to prevent missing dependency issue on dblib -->
+            <exclusions>
+                <exclusion>
+                    <groupId>org.openecomp.sdnc.core</groupId>
+                    <artifactId>dblib-provider</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>        
+
+
+<!--           <dependency> -->
+<!--                   <groupId>org.codehaus.jackson</groupId> -->
+<!--                   <artifactId>jackson-jaxrs</artifactId> -->
+<!--                   <version>1.9.12</version> -->
+<!--           </dependency> -->
+
+<!--           <dependency> -->
+<!--                   <groupId>commons-codec</groupId> -->
+<!--                   <artifactId>commons-codec</artifactId> -->
+<!--                   </dependency> -->
+
+<!--           <dependency> -->
+<!--                   <groupId>org.apache.httpcomponents</groupId> -->
+<!--                   <artifactId>httpclient</artifactId> -->
+<!--                   <version>4.5.1</version> -->
+<!--           </dependency> -->
 
                <dependency>
                        <groupId>junit</groupId>
@@ -101,80 +154,56 @@
                        <scope>test</scope>
                </dependency>
 
-               <dependency>
-                       <groupId>org.openecomp.sdnc.core</groupId>
-                       <artifactId>sli-common</artifactId>
-                       <scope>compile</scope>
-                       <!-- Added exclusion to prevent missing dependency issue on dblib -->
-                       <exclusions>
-                               <exclusion>
-                                       <groupId>org.openecomp.sdnc.core</groupId>
-                                       <artifactId>dblib-provider</artifactId>
-                               </exclusion>
-                       </exclusions>
-               </dependency>
-
-               <dependency>
-                       <groupId>org.openecomp.sdnc.core</groupId>
-                       <artifactId>sli-provider</artifactId>
-                       <scope>compile</scope>
-                       <!-- Added exclusion to prevent missing dependency issue on dblib -->
-                       <exclusions>
-                               <exclusion>
-                                       <groupId>org.openecomp.sdnc.core</groupId>
-                                       <artifactId>dblib-provider</artifactId>
-                               </exclusion>
-                       </exclusions>
-               </dependency>
-
-               <dependency>
-                       <groupId>equinoxSDK381</groupId>
-                       <artifactId>org.eclipse.osgi</artifactId>
-               </dependency>
 
-               <dependency>
-                       <groupId>org.slf4j</groupId>
-                       <artifactId>slf4j-api</artifactId>
-               </dependency>
 
-               <dependency>
-                       <groupId>org.slf4j</groupId>
-                       <artifactId>jcl-over-slf4j</artifactId>
-                       </dependency>
-
-               <dependency>
-                       <groupId>mysql</groupId>
-                       <artifactId>mysql-connector-java</artifactId>
-                       <version>5.1.31</version>
-                       <type>jar</type>
-                       <scope>compile</scope>
-               </dependency>
-
-               <dependency>
-                       <groupId>com.vmware</groupId>
-                       <artifactId>vijava</artifactId>
-                       <version>5.1</version>
-                       <scope>compile</scope>
-               </dependency>
-
-               <dependency>
-                       <groupId>xerces</groupId>
-                       <artifactId>xerces</artifactId>
-                       <version>2.4.0</version>
-                       <scope>provided</scope>
-               </dependency>
-
-               <dependency>
-                       <groupId>org.apache.httpcomponents</groupId>
-                       <artifactId>httpcore</artifactId>
-                       <version>${apache.httpcomponents.version}</version>
-               </dependency>
-
-               <dependency>
-                       <groupId>commons-logging</groupId>
-                       <artifactId>commons-logging</artifactId>
-                       <version>1.2</version>
-               </dependency>
+<!--           <dependency> -->
+<!--                   <groupId>equinoxSDK381</groupId> -->
+<!--                   <artifactId>org.eclipse.osgi</artifactId> -->
+<!--           </dependency> -->
+
+<!--           <dependency> -->
+<!--                   <groupId>org.slf4j</groupId> -->
+<!--                   <artifactId>slf4j-api</artifactId> -->
+<!--           </dependency> -->
+
+<!--           <dependency> -->
+<!--                   <groupId>org.slf4j</groupId> -->
+<!--                   <artifactId>jcl-over-slf4j</artifactId> -->
+<!--                   </dependency> -->
+
+<!--           <dependency> -->
+<!--                   <groupId>mysql</groupId> -->
+<!--                   <artifactId>mysql-connector-java</artifactId> -->
+<!--                   <version>5.1.31</version> -->
+<!--                   <type>jar</type> -->
+<!--                   <scope>compile</scope> -->
+<!--           </dependency> -->
+
+<!--           <dependency> -->
+<!--                   <groupId>com.vmware</groupId> -->
+<!--                   <artifactId>vijava</artifactId> -->
+<!--                   <version>5.1</version> -->
+<!--                   <scope>compile</scope> -->
+<!--           </dependency> -->
+
+<!--           <dependency> -->
+<!--                   <groupId>xerces</groupId> -->
+<!--                   <artifactId>xerces</artifactId> -->
+<!--                   <version>2.4.0</version> -->
+<!--                   <scope>provided</scope> -->
+<!--           </dependency> -->
+
+<!--           <dependency> -->
+<!--                   <groupId>org.apache.httpcomponents</groupId> -->
+<!--                   <artifactId>httpcore</artifactId> -->
+<!--                   <version>${apache.httpcomponents.version}</version> -->
+<!--           </dependency> -->
+
+<!--           <dependency> -->
+<!--                   <groupId>commons-logging</groupId> -->
+<!--                   <artifactId>commons-logging</artifactId> -->
+<!--                   <version>1.2</version> -->
+<!--           </dependency> -->
 
        </dependencies>
 
@@ -188,13 +217,15 @@
                                        <instructions>
                                                <Bundle-SymbolicName>appc-iaas-adapter</Bundle-SymbolicName>
                                                <Bundle-Activator>org.openecomp.appc.adapter.iaas.AppcProviderAdapterActivator</Bundle-Activator>
-                                               <Export-Package>org.openecomp.appc.adapter.iaas</Export-Package>
-                                               <Import-Package>org.openecomp.sdnc.sli.*,org.osgi.framework.*,org.slf4j.*,com.vmware.*,org.apache.xerces.*,javax.net.*,javax.net.ssl.*,org.xml.sax.*,javax.xml.bind.*,javax.naming.*,com.sun.jersey.*</Import-Package>
-                                               <Embed-Dependency>*;scope=compile|runtime;artifactId=!sli-common|org.eclipse.osgi|slf4j-api|jcl-over-slf4j|mysql-connector-java|xml-apis</Embed-Dependency>
+                                               <Export-Package>org.openecomp.appc.adapter.iaas,com.att.cdp.zones.model</Export-Package>
+                        <DynamicImport-Package>javax.*</DynamicImport-Package>
+                        <Import-Package>org.openecomp.sdnc.sli.*,org.osgi.framework.*,org.slf4j.*,javax.net.ssl,org.xml.sax</Import-Package>
+<!--                         <Import-Package>org.openecomp.sdnc.sli.*,org.osgi.framework.*,org.slf4j.*,javax.ws.rs.*,javax.net.*,javax.xml.*,org.xml.*</Import-Package> -->
+<!--                                           <Import-Package>org.openecomp.sdnc.sli.*,org.osgi.framework.*,org.slf4j.*,com.vmware.*,org.apache.xerces.*,javax.net.*,javax.net.ssl.*,org.xml.sax.*,javax.xml.bind.*,javax.naming.*,javax.xml.*</Import-Package> -->
+                        <Embed-Dependency>*;scope=compile|runtime;artifactId=!org.eclipse.osgi|slf4j-api|jcl-over-slf4j|</Embed-Dependency>
+<!--                                           <Embed-Dependency>*;scope=compile|runtime;artifactId=!sli-common|org.eclipse.osgi|slf4j-api|jcl-over-slf4j|mysql-connector-java|xml-apis</Embed-Dependency> -->
                                                <Embed-Transitive>true</Embed-Transitive>
                                        </instructions>
-
-                                       <manifestLocation>${project.basedir}/src/main/resources/META-INF</manifestLocation>
                                </configuration>
                        </plugin>
                </plugins>
ARCHIVED- 2022-02-15 at the request of the project