Fixes for maven build on dhcprelay and packet-stats apps
Change-Id: I67e4e29ee9773ef3a231d3441a886e2a0cf698dd
diff --git a/apps/dhcprelay/pom.xml b/apps/dhcprelay/pom.xml
index 0f7a24f..1536839 100644
--- a/apps/dhcprelay/pom.xml
+++ b/apps/dhcprelay/pom.xml
@@ -28,16 +28,6 @@
<description>DHCP Relay Agent</description>
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <onos.app.name>org.onosproject.dhcprelay</onos.app.name>
- <onos.app.title>DHCP Relay Agent App</onos.app.title>
- <onos.app.origin>ONOS Community</onos.app.origin>
- <onos.app.category>default</onos.app.category>
- <onos.app.url>http://onosproject.org</onos.app.url>
- <onos.app.readme>DHCP Relay Agent Application.</onos.app.readme>
- </properties>
-
<modules>
<module>web</module>
<module>app</module>
diff --git a/apps/dhcprelay/web/pom.xml b/apps/dhcprelay/web/pom.xml
index 138375c..8c0366b 100644
--- a/apps/dhcprelay/web/pom.xml
+++ b/apps/dhcprelay/web/pom.xml
@@ -92,6 +92,12 @@
<dependency>
<groupId>org.onosproject</groupId>
+ <artifactId>onos-apps-dhcprelay-app</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.onosproject</groupId>
<artifactId>onos-apps-route-service-api</artifactId>
<version>${project.version}</version>
<scope>test</scope>
diff --git a/apps/packet-stats/app/pom.xml b/apps/packet-stats/app/pom.xml
index cbc6574..be44ac6 100644
--- a/apps/packet-stats/app/pom.xml
+++ b/apps/packet-stats/app/pom.xml
@@ -24,7 +24,6 @@
<version>1.13.8-SNAPSHOT</version>
</parent>
- <groupId>org.onosproject</groupId>
<artifactId>onos-apps-packet-stats-app</artifactId>
<version>1.13.8-SNAPSHOT</version>
<packaging>bundle</packaging>
@@ -47,7 +46,7 @@
<dependency>
<groupId>org.onosproject</groupId>
<artifactId>onos-incubator-api</artifactId>
- <version>1.9.0</version>
+ <version>${onos.version}</version>
</dependency>
<dependency>
<groupId>org.onosproject</groupId>
@@ -112,70 +111,5 @@
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <version>3.0.1</version>
- <extensions>true</extensions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.5.1</version>
- <configuration>
- <source>1.8</source>
- <target>1.8</target>
- </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>
- <plugin>
- <groupId>org.onosproject</groupId>
- <artifactId>onos-maven-plugin</artifactId>
- <version>1.10</version>
- <executions>
- <execution>
- <id>cfg</id>
- <phase>generate-resources</phase>
- <goals>
- <goal>cfg</goal>
- </goals>
- </execution>
- <execution>
- <id>swagger</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>swagger</goal>
- </goals>
- </execution>
- <execution>
- <id>app</id>
- <phase>package</phase>
- <goals>
- <goal>app</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
+
</project>
diff --git a/apps/packet-stats/pom.xml b/apps/packet-stats/pom.xml
index c7d976a..d5c3b89 100644
--- a/apps/packet-stats/pom.xml
+++ b/apps/packet-stats/pom.xml
@@ -19,12 +19,9 @@
<artifactId>onos-apps</artifactId>
<version>1.13.8-SNAPSHOT</version>
<groupId>org.onosproject</groupId>
- <relativePath>../pom.xml</relativePath>
</parent>
- <groupId>org.onosproject</groupId>
<artifactId>onos-apps-packet-stats</artifactId>
- <version>1.13.8-SNAPSHOT</version>
<packaging>pom</packaging>
<description>ONOS OSGi bundle archetype</description>
diff --git a/apps/packet-stats/web/pom.xml b/apps/packet-stats/web/pom.xml
index 6498a48..ea108ca 100644
--- a/apps/packet-stats/web/pom.xml
+++ b/apps/packet-stats/web/pom.xml
@@ -97,71 +97,4 @@
<classifier>tests</classifier>
</dependency>
</dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <version>3.0.1</version>
- <extensions>true</extensions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.5.1</version>
- <configuration>
- <source>1.8</source>
- <target>1.8</target>
- </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>
- <plugin>
- <groupId>org.onosproject</groupId>
- <artifactId>onos-maven-plugin</artifactId>
- <version>1.10</version>
- <executions>
- <execution>
- <id>cfg</id>
- <phase>generate-resources</phase>
- <goals>
- <goal>cfg</goal>
- </goals>
- </execution>
- <execution>
- <id>swagger</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>swagger</goal>
- </goals>
- </execution>
- <execution>
- <id>app</id>
- <phase>package</phase>
- <goals>
- <goal>app</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
</project>