From: Patrick Brady <patrick.brady@att.com>
Date: Tue, 10 Sep 2019 19:55:45 +0000 (-0700)
Subject: Fix eelf resource not found
X-Git-Tag: 1.6.3~3
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=fc942d29a74a843ccf1cd202091e6d9704bbed29;p=appc.git

Fix eelf resource not found

The eelf package needs to be exported from appc-common
where the resource bundle is added. Doing this was
causing karaf to crash on install of artifact-handler.
The cause was all of the classes being exported by the
maven shade plugin of appc-yang-generator. Removing the
shade plugin seemed to have no bad consequences.

Change-Id: Ic0758b342b8109e28ec8e11a48b2693cea7b56db
Signed-off-by: Patrick Brady <patrick.brady@att.com>
Issue-ID: APPC-1713
---

diff --git a/appc-core/appc-common-bundle/pom.xml b/appc-core/appc-common-bundle/pom.xml
index 5f2ec9dfd..043da55d0 100644
--- a/appc-core/appc-common-bundle/pom.xml
+++ b/appc-core/appc-common-bundle/pom.xml
@@ -174,8 +174,8 @@
         <configuration>
           <instructions>
             <Bundle-SymbolicName>appc-common-bundle</Bundle-SymbolicName>
-            <Export-Package>org.onap.appc.*</Export-Package>
-            <Embed-Dependency></Embed-Dependency>
+            <Export-Package>org.onap.appc.*, com.att.eelf.*</Export-Package>
+            <Embed-Dependency>eelf-core</Embed-Dependency>
             <Embed-Transitive>true</Embed-Transitive>
           </instructions>
         </configuration>
diff --git a/appc-sdc-listener/appc-yang-generator/pom.xml b/appc-sdc-listener/appc-yang-generator/pom.xml
index 10060b593..57ed6a953 100644
--- a/appc-sdc-listener/appc-yang-generator/pom.xml
+++ b/appc-sdc-listener/appc-yang-generator/pom.xml
@@ -88,21 +88,6 @@ limitations under the License.
     </dependencies>
     <build>
         <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-shade-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>shade</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <finalName>${artifactId}-${version}</finalName>
-                </configuration>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>