summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick Brady <patrick.brady@att.com>2019-09-10 12:55:45 -0700
committerPatrick Brady <patrick.brady@att.com>2019-09-10 12:58:04 -0700
commitfc942d29a74a843ccf1cd202091e6d9704bbed29 (patch)
treeb1be0b7f8444f48da6dd1bdad3b76c8d93ae3b13
parentaa9685086bc7c9094aca1f11280f9db2434810d7 (diff)
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
-rw-r--r--appc-core/appc-common-bundle/pom.xml4
-rw-r--r--appc-sdc-listener/appc-yang-generator/pom.xml15
2 files changed, 2 insertions, 17 deletions
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
@@ -90,21 +90,6 @@ limitations under the License.
<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>
<version>3.6.1</version>
<configuration>