Fix maven build
Change-Id: I0d6a233260c9e59cc573077965f456815fe8f6b7
diff --git a/apps/t3/app/pom.xml b/apps/t3/app/pom.xml
index 592a6c1..afe1ea4 100644
--- a/apps/t3/app/pom.xml
+++ b/apps/t3/app/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.onosproject</groupId>
- <artifactId>onos-apps</artifactId>
+ <artifactId>onos-apps-t3</artifactId>
<version>1.14.0-SNAPSHOT</version>
</parent>
diff --git a/apps/t3/pom.xml b/apps/t3/pom.xml
index c980f98..a2de3b7 100644
--- a/apps/t3/pom.xml
+++ b/apps/t3/pom.xml
@@ -18,28 +18,15 @@
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>
+
<parent>
- <artifactId>onos-apps</artifactId>
<groupId>org.onosproject</groupId>
+ <artifactId>onos-apps</artifactId>
<version>1.14.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
</parent>
- <groupId>org.onosproject</groupId>
<artifactId>onos-apps-t3</artifactId>
- <version>1.14.0-SNAPSHOT</version>
- <packaging>bundle</packaging>
-
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <onos.version>1.14.0-SNAPSHOT</onos.version>
- <onos.app.name>org.onosproject.t3</onos.app.name>
- <onos.app.title>Trellis Troubleshooting Toolkit</onos.app.title>
- <onos.app.category>Utilities</onos.app.category>
- <onos.app.url>http://onosproject.org</onos.app.url>
- <onos.app.readme>T3 APP and API support to determine the paths of packets</onos.app.readme>
- </properties>
-
+ <packaging>pom</packaging>
<modules>
<module>web</module>
diff --git a/apps/t3/web/pom.xml b/apps/t3/web/pom.xml
index e0c5414..9c72c5d 100644
--- a/apps/t3/web/pom.xml
+++ b/apps/t3/web/pom.xml
@@ -18,15 +18,14 @@
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>
+
<parent>
- <artifactId>onos-apps</artifactId>
<groupId>org.onosproject</groupId>
+ <artifactId>onos-apps-t3</artifactId>
<version>1.14.0-SNAPSHOT</version>
</parent>
- <groupId>org.onosproject</groupId>
<artifactId>onos-apps-t3-web</artifactId>
- <version>1.14.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<description>T3 REST API</description>
@@ -35,13 +34,11 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<onos.version>1.14.0-SNAPSHOT</onos.version>
- <web.context>/onos/v1/t3</web.context>
- <api.version>1.0.0</api.version>
- <api.title>ONOS T3 REST API</api.title>
- <api.description>
- APIs for interacting with the T3 application.
- </api.description>
- <api.package>org.onosproject.t3.rest</api.package>
+ <onos.app.name>org.onosproject.t3</onos.app.name>
+ <onos.app.title>Trellis Troubleshooting Toolkit</onos.app.title>
+ <onos.app.category>Utilities</onos.app.category>
+ <onos.app.url>http://onosproject.org</onos.app.url>
+ <onos.app.readme>T3 APP and API support to determine the paths of packets</onos.app.readme>
</properties>
<dependencies>
@@ -159,62 +156,6 @@
</instructions>
</configuration>
</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>