commit c9fae9fe29b0f46c2d79e210444231c2a9129ff4
author Yuta HIGUCHI <y-higuchi@ak.jp.nec.com> Tue Jan 31 15:21:51 2017 -0800
committer Yuta HIGUCHI <y-higuchi@ak.jp.nec.com> Wed Feb 01 18:10:58 2017 -0800
tree 4b53eb75e4335009280b1dfaf7d98ba68238f6f2
parent dbd2fec053ee15e1080549c4310f28fb335f2c9a

Decouple sample apps

- Each app can now independently specify ONOS version it needs.
- All apps depend on stable version
  except for onos-app-uiref  who has dependency to 1.9.0-SNAPSHOT

Change-Id: Ib4d39901269b036eae4ceae3c41a9c5ad1a29cc1

pom.xml

diff --git a/pom.xml b/pom.xml
index 9de17a5..c0b16a3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,10 +19,11 @@
 
     <parent>
         <groupId>org.onosproject</groupId>
-        <artifactId>onos</artifactId>
-        <version>1.9.0-SNAPSHOT</version>
+        <artifactId>onos-base</artifactId>
+        <version>1</version>
     </parent>
 
+    <groupId>org.onosproject</groupId>
     <artifactId>onos-app-samples</artifactId>
     <version>1.9.0-SNAPSHOT</version>
     <packaging>pom</packaging>
@@ -36,9 +37,7 @@
         <module>ifwd</module>
         <module>ipfix</module>
         <module>oneping</module>
-<!-- exclude failing build
         <module>sdx-l3</module>
--->
         <module>sdx-l2</module>
         <module>tvue</module>
         <module>uiref</module>
@@ -49,10 +48,6 @@
         <module>icona</module>
     </modules>
 
-    <properties>
-        <onos.version>1.9.0-SNAPSHOT</onos.version>
-    </properties>
-
     <!-- FIXME remove before release;
          needed for resolving SNAPSHOT version of the following
          - finding parent pom.xml
@@ -65,6 +60,7 @@
             <releases><enabled>false</enabled></releases>
         </repository>
     </repositories>
+
     <pluginRepositories>
         <pluginRepository>
             <id>snapshots</id>
@@ -73,38 +69,4 @@
         </pluginRepository>
     </pluginRepositories>
 
-    <dependencies>
-        <dependency>
-            <groupId>org.onosproject</groupId>
-            <artifactId>onos-api</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.onosproject</groupId>
-            <artifactId>onlab-osgi</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.felix</groupId>
-            <artifactId>org.apache.felix.scr.annotations</artifactId>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-scr-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.onosproject</groupId>
-                <artifactId>onos-maven-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
 </project>