update bundle import/export causing linkage errors

Change-Id: Ifb161f411cc8b39be8576ff6c0a982260b4f218b
Issue-ID: APPC-900
Signed-off-by: Ryan Young <ry303t@att.com>

diff --git a/appc-dispatcher/appc-request-handler/appc-request-handler-api/pom.xml b/appc-dispatcher/appc-request-handler/appc-request-handler-api/pom.xml
index 14f1de1..ac3b20a 100644 (file)
--- a/appc-dispatcher/appc-request-handler/appc-request-handler-api/pom.xml
+++ b/appc-dispatcher/appc-request-handler/appc-request-handler-api/pom.xml
@@ -3,7 +3,7 @@
   ============LICENSE_START=======================================================
   ONAP : APPC
   ================================================================================
   ============LICENSE_START=======================================================
   ONAP : APPC
   ================================================================================

-  Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+  Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.

   ================================================================================
   Copyright (C) 2017 Amdocs
   =============================================================================
   ================================================================================
   Copyright (C) 2017 Amdocs
   =============================================================================


@@ -18,8 +18,6 @@
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.

-
-  ECOMP is a trademark and service mark of AT&T Intellectual Property.

   ============LICENSE_END=========================================================
   -->
 <project xmlns="http://maven.apache.org/POM/4.0.0"
   ============LICENSE_END=========================================================
   -->
 <project xmlns="http://maven.apache.org/POM/4.0.0"


@@ -50,7 +48,7 @@
         <dependency>
             <groupId>org.onap.appc</groupId>
             <artifactId>appc-data-access-lib</artifactId>
         <dependency>
             <groupId>org.onap.appc</groupId>
             <artifactId>appc-data-access-lib</artifactId>

-            <version>${project.version}</version>
+           <version>${project.version}</version>

         </dependency>
         <dependency>
             <groupId>org.onap.appc</groupId>
         </dependency>
         <dependency>
             <groupId>org.onap.appc</groupId>


@@ -73,7 +71,7 @@
                         <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
                         <Bundle-Version>${project.version}</Bundle-Version>
                         <Export-Package>
                         <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
                         <Bundle-Version>${project.version}</Bundle-Version>
                         <Export-Package>

-                            org.onap.appc.requesthandler,org.onap.appc.requesthandler.objects,org.onap.appc.transactionrecorder,org.onap.appc.message
+                            org.onap.appc.requesthandler,org.onap.appc.requesthandler.objects,org.onap.appc.message

                         </Export-Package>
                         <Embed-Dependency>
                             javax.json;scope=compile|runtime;inline=false
                         </Export-Package>
                         <Embed-Dependency>
                             javax.json;scope=compile|runtime;inline=false

diff --git a/appc-dispatcher/appc-request-handler/appc-request-handler-core/pom.xml b/appc-dispatcher/appc-request-handler/appc-request-handler-core/pom.xml
index ee6855b..dc6433d 100644 (file)
--- a/appc-dispatcher/appc-request-handler/appc-request-handler-core/pom.xml
+++ b/appc-dispatcher/appc-request-handler/appc-request-handler-core/pom.xml
@@ -18,7 +18,6 @@
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.

-

   ============LICENSE_END=========================================================
   -->
 <project xmlns="http://maven.apache.org/POM/4.0.0"
   ============LICENSE_END=========================================================
   -->
 <project xmlns="http://maven.apache.org/POM/4.0.0"


@@ -140,6 +139,7 @@
                         <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
                         <Bundle-Version>${project.version}</Bundle-Version>
                         <Export-Service>org.onap.appc.requesthandler.RequestHandler</Export-Service>
                         <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
                         <Bundle-Version>${project.version}</Bundle-Version>
                         <Export-Service>org.onap.appc.requesthandler.RequestHandler</Export-Service>

+                        <Export-Package>org.onap.appc.requesthandler*,org.onap.appc.requesthandler.conv,org.onap.appc.validation*,org.onap.messageadapter*</Export-Package>

                         <Import-Package>
                             org.onap.appc.adapter.messaging.*,
                             org.onap.appc.adapter.message.*,
                         <Import-Package>
                             org.onap.appc.adapter.messaging.*,
                             org.onap.appc.adapter.message.*,


@@ -150,7 +150,10 @@
                             org.onap.appc.transactionrecorder,
                             org.onap.appc.transactionrecorder.impl,
                             org.onap.appc.transactionrecorder.objects,
                             org.onap.appc.transactionrecorder,
                             org.onap.appc.transactionrecorder.impl,
                             org.onap.appc.transactionrecorder.objects,

+                            org.onap.appc.rest.client,

                             org.onap.appc.dao.util,
                             org.onap.appc.dao.util,

+                            org.apache.http.params,
+                            !org.onap.appc.requesthandler.conv,

                             *;resolution:=optional
                         </Import-Package>
                     </instructions>
                             *;resolution:=optional
                         </Import-Package>
                     </instructions>

diff --git a/appc-metric/appc-metric-bundle/pom.xml b/appc-metric/appc-metric-bundle/pom.xml
index 920cd4d..9fa89f5 100644 (file)
--- a/appc-metric/appc-metric-bundle/pom.xml
+++ b/appc-metric/appc-metric-bundle/pom.xml
@@ -3,7 +3,7 @@
   ============LICENSE_START=======================================================
   ONAP : APPC
   ================================================================================
   ============LICENSE_START=======================================================
   ONAP : APPC
   ================================================================================

-  Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+  Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.

   Copyright (C) 2017 Amdocs
   ================================================================================
   Licensed under the Apache License, Version 2.0 (the "License");
   Copyright (C) 2017 Amdocs
   ================================================================================
   Licensed under the Apache License, Version 2.0 (the "License");


@@ -18,7 +18,6 @@
   See the License for the specific language governing permissions and
   limitations under the License.
   ============LICENSE_END=========================================================
   See the License for the specific language governing permissions and
   limitations under the License.
   ============LICENSE_END=========================================================

-  ECOMP is a trademark and service mark of AT&T Intellectual Property.

   -->
 <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>
   -->
 <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>


@@ -94,7 +93,7 @@
                         <Embed-Dependency>appc-common,eelf-core,logback-core,logback-classic,appc-data-lib;scope=compile|runtime;inline=false</Embed-Dependency>
                         <Embed-Transitive>true</Embed-Transitive>
                         <Export-Service>org.onap.appc.metricservice.impl.MetricServiceImpl,org.onap.appc.metricservice.MetricService,org.onap.appc.metricservice.policy.*,org.onap.appc.metricservice.metric.*</Export-Service>
                         <Embed-Dependency>appc-common,eelf-core,logback-core,logback-classic,appc-data-lib;scope=compile|runtime;inline=false</Embed-Dependency>
                         <Embed-Transitive>true</Embed-Transitive>
                         <Export-Service>org.onap.appc.metricservice.impl.MetricServiceImpl,org.onap.appc.metricservice.MetricService,org.onap.appc.metricservice.policy.*,org.onap.appc.metricservice.metric.*</Export-Service>

-                        <Export-Package>org.onap.appc.metricservice,org.onap.appc.metricservice.impl,org.onap.appc.metricservice.policy,org.onap.appc.metricservice.publisher,org.onap.appc.metricservice.metric,org.apache.http</Export-Package>
+                        <Export-Package>org.onap.appc.metricservice,org.onap.appc.metricservice.impl,org.onap.appc.metricservice.policy,org.onap.appc.metricservice.publisher,org.onap.appc.metricservice.metric</Export-Package>

                         <Import-Package>!groovy.lang,!javax.*,!org.apache.log,!org.apache.log4j.*,!org.codehaus.jackson.*,!org.codehaus.jackson.map.*,!org.codehaus.commons.compiler,!org.codehaus.groovy.*,!org.apache.commons.lang3,!org.codehaus.janino,!org.jasypt.*,!com.ibm.icu.*,!com.sun.faces.*,*;resolution:=optional</Import-Package>
                     </instructions>
                 </configuration>
                         <Import-Package>!groovy.lang,!javax.*,!org.apache.log,!org.apache.log4j.*,!org.codehaus.jackson.*,!org.codehaus.jackson.map.*,!org.codehaus.commons.compiler,!org.codehaus.groovy.*,!org.apache.commons.lang3,!org.codehaus.janino,!org.jasypt.*,!com.ibm.icu.*,!com.sun.faces.*,*;resolution:=optional</Import-Package>
                     </instructions>
                 </configuration>