Fix issues with loading OLT app
Change-Id: I8fecd4307a5ab504447430394dae89d27635a31a
diff --git a/api/pom.xml b/api/pom.xml
index b54c81a..ccba5fa 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -50,16 +50,11 @@
<build>
<plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Export-Package>org.onosproject.olt</Export-Package>
- </instructions>
- </configuration>
- </plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ </plugin>
</plugins>
</build>
</project>
diff --git a/app/features.xml b/app/features.xml
index 6385521..a5472eb 100644
--- a/app/features.xml
+++ b/app/features.xml
@@ -19,6 +19,6 @@
description="${project.description}">
<feature>onos-api</feature>
<bundle>mvn:${project.groupId}/olt-api/${project.version}</bundle>
- <bundle>mvn:${project.groupId}/olt/${project.version}</bundle>
+ <bundle>mvn:${project.groupId}/${project.artifactId}/${project.version}</bundle>
</feature>
</features>
diff --git a/app/pom.xml b/app/pom.xml
index 4b4afc5..3c1209a 100644
--- a/app/pom.xml
+++ b/app/pom.xml
@@ -122,6 +122,25 @@
</instructions>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-scr-plugin</artifactId>
+ <version>1.21.0</version>
+ <executions>
+ <execution>
+ <id>generate-scr-srcdescriptor</id>
+ <goals>
+ <goal>scr</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <supportedProjectTypes>
+ <supportedProjectType>bundle</supportedProjectType>
+ <supportedProjectType>war</supportedProjectType>
+ </supportedProjectTypes>
+ </configuration>
+ </plugin>
</plugins>
</build>
</project>