changed pom structure, removed dependency on controller parent pom

Change-Id: I13a084328291cb32e698a84a378b3d1c22e16cf3
Signed-off-by: Michal Rehak <mirehak@cisco.com>

diff --git a/commons/pom.xml b/commons/pom.xml
index 73ebe47aacbaa6b5f40ae9654a3fdd2706579dc5..ee91bf3e58f6608f7fa20b8dcf680ba3894ce876 100755 (executable)
--- a/commons/pom.xml
+++ b/commons/pom.xml
@@ -6,26 +6,158 @@
     <prerequisites>
         <maven>3.0</maven>
     </prerequisites>
-    <parent>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>commons.opendaylight</artifactId>
-        <version>1.4.1-SNAPSHOT</version>
-    </parent>
     <groupId>org.opendaylight.openflowplugin</groupId>
-    <artifactId>commons.openflowplugin</artifactId>
+    <artifactId>openflowplugin-commons</artifactId>
     <version>0.0.1-SNAPSHOT</version>
     <packaging>pom</packaging>
 
+    <scm>
+      <connection>scm:git:ssh://git.opendaylight.org:29418/openflowplugin.git</connection>
+      <developerConnection>scm:git:ssh://git.opendaylight.org:29418/openflowplugin.git</developerConnection>
+      <url>https://wiki.opendaylight.org/view/OpenDaylight_OpenFlow_Plugin:Main</url>
+      <tag>HEAD</tag>
+    </scm>
+
+    <distributionManagement>
+      <!-- OpenDayLight Released artifact -->
+      <repository>
+        <id>opendaylight-release</id>
+        <url>${nexusproxy}/repositories/opendaylight.release/</url>
+      </repository>
+      <!-- OpenDayLight Snapshot artifact -->
+      <snapshotRepository>
+        <id>opendaylight-snapshot</id>
+        <url>${nexusproxy}/repositories/opendaylight.snapshot/</url>
+      </snapshotRepository>
+      <!-- Site deployment -->
+      <!-- site>
+           <id>website</id>
+           <url>${sitedeploy}</url>
+           </site -->
+    </distributionManagement>
+
     <properties>
       <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
+      <slf4j.version>1.7.2</slf4j.version>
+      <logback.version>1.0.9</logback.version>
+      <nexusproxy>http://nexus.opendaylight.org/content</nexusproxy>
+      <openflowjava.version>0.1-SNAPSHOT</openflowjava.version>
+      <controller.model.version>1.0-SNAPSHOT</controller.model.version>
     </properties>
 
     <dependencyManagement>
       <dependencies>
+        <dependency>
+          <groupId>org.javassist</groupId>
+          <artifactId>javassist</artifactId>
+          <version>3.17.1-GA</version>
+        </dependency>
+
+        <dependency>
+          <groupId>com.google.guava</groupId>
+          <artifactId>guava</artifactId>
+          <version>14.0.1</version>
+        </dependency>
+        <dependency>
+          <groupId>equinoxSDK381</groupId>
+          <artifactId>org.eclipse.osgi</artifactId>
+          <version>3.8.1.v20120830-144521</version>
+        </dependency>
+        <dependency>
+          <groupId>org.opendaylight.openflowjava</groupId>
+          <artifactId>openflow-protocol-impl</artifactId>
+          <version>${openflowjava.version}</version>
+        </dependency>
+        <dependency>
+          <groupId>org.opendaylight.openflowjava</groupId>
+          <artifactId>openflow-protocol-api</artifactId>
+          <version>${openflowjava.version}</version>
+        </dependency>
+        <dependency>
+          <groupId>org.opendaylight.openflowjava</groupId>
+          <artifactId>openflow-protocol-spi</artifactId>
+          <version>${openflowjava.version}</version>
+        </dependency>
+        <dependency>
+          <groupId>org.opendaylight.openflowjava</groupId>
+          <artifactId>simple-client</artifactId>
+          <version>${openflowjava.version}</version>
+        </dependency>
+
+        <dependency>
+          <groupId>org.opendaylight.controller</groupId>
+          <artifactId>sal</artifactId>
+          <version>0.5.1-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+          <groupId>org.opendaylight.controller</groupId>
+          <artifactId>sal.connection</artifactId>
+          <version>0.1.1-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+          <groupId>org.opendaylight.controller.thirdparty</groupId>
+          <artifactId>org.openflow.openflowj</artifactId>
+          <version>1.0.2-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+          <groupId>org.opendaylight.controller.model</groupId>
+          <artifactId>model-flow-base</artifactId>
+          <version>${controller.model.version}</version>
+        </dependency>
+        <dependency>
+          <groupId>org.opendaylight.controller.model</groupId>
+          <artifactId>model-flow-service</artifactId>
+          <version>${controller.model.version}</version>
+        </dependency>
+        <dependency>
+          <groupId>org.opendaylight.controller.model</groupId>
+          <artifactId>model-flow-statistics</artifactId>
+          <version>${controller.model.version}</version>
+        </dependency>
+        <dependency>
+          <groupId>org.opendaylight.controller.model</groupId>
+          <artifactId>model-inventory</artifactId>
+          <version>${controller.model.version}</version>
+        </dependency>
+        <dependency>
+          <groupId>org.opendaylight.controller</groupId>
+          <artifactId>sal-binding-api</artifactId>
+          <version>${controller.model.version}</version>
+        </dependency>
+
         <dependency>
           <groupId>org.slf4j</groupId>
           <artifactId>slf4j-log4j12</artifactId>
-          <version>1.7.2</version>
+          <version>${slf4j.version}</version>
+        </dependency>
+        <dependency>
+          <groupId>org.slf4j</groupId>
+          <artifactId>log4j-over-slf4j</artifactId>
+          <version>${slf4j.version}</version>
+        </dependency>
+        <dependency>
+          <groupId>ch.qos.logback</groupId>
+          <artifactId>logback-core</artifactId>
+          <version>${logback.version}</version>
+        </dependency>
+        <dependency>
+          <groupId>ch.qos.logback</groupId>
+          <artifactId>logback-classic</artifactId>
+          <version>${logback.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.opendaylight.yangtools.thirdparty</groupId>
+            <artifactId>xtend-lib-osgi</artifactId>
+            <version>2.4.3</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+          <groupId>junit</groupId>
+          <artifactId>junit</artifactId>
+          <version>4.8.1</version>
+          <scope>test</scope>
         </dependency>
       </dependencies>
     </dependencyManagement>
@@ -41,7 +173,13 @@
                 <target>1.7</target>
               </configuration>
             </plugin>
+            <plugin>
+              <groupId>org.ops4j.pax.exam</groupId>
+              <artifactId>maven-paxexam-plugin</artifactId>
+              <version>1.2.4</version>
+            </plugin>
           </plugins>
+
         </pluginManagement>
     </build>
 
@@ -61,30 +199,49 @@
     </profiles>
 
     <repositories>
-        <!-- OpenDayLight Released artifact -->
-        <repository>
-            <id>opendaylight-release</id>
-            <name>opendaylight-release</name>
-            <url>http://nexus.opendaylight.org/content/repositories/opendaylight.release/</url>
-        </repository>
-        <!-- OpenDayLight Snapshot artifact -->
-        <repository>
-            <id>opendaylight-snapshot</id>
-            <name>opendaylight-snapshot</name>
-            <url>http://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/</url>
-        </repository>
+      <repository>
+        <id>opendaylight-release</id>
+        <name>opendaylight-release</name>
+        <url>${nexusproxy}/repositories/opendaylight.release/</url>
+        <snapshots>
+          <enabled>false</enabled>
+        </snapshots>
+      </repository>
+      <repository>
+        <id>opendaylight-snapshot</id>
+        <name>opendaylight-snapshot</name>
+        <url>${nexusproxy}/repositories/opendaylight.snapshot/</url>
+        <releases>
+          <enabled>false</enabled>
+        </releases>
+      </repository>
+      <repository>
+        <id>thirdparty</id>
+        <name>thirdparty</name>
+        <url>${nexusproxy}/repositories/thirdparty/</url>
+        <snapshots>
+          <enabled>false</enabled>
+        </snapshots>
+      </repository>
+
     </repositories>
 
     <pluginRepositories>
-    <pluginRepository>
-        <id>central2</id>
-        <name>central2</name>
-        <url>http://nexus.opendaylight.org/content/repositories/central2/</url>
-    </pluginRepository>
-    <pluginRepository>
+      <pluginRepository>
+        <id>opendaylight-central</id>
+        <name>opendaylight-central</name>
+        <url>${nexusproxy}/repositories/central/</url>
+        <snapshots>
+          <enabled>false</enabled>
+        </snapshots>
+      </pluginRepository>
+      <pluginRepository>
         <id>opendaylight-snapshot</id>
         <name>central2</name>
-        <url>http://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/</url>
-    </pluginRepository>
+        <url>${nexusproxy}/repositories/opendaylight.snapshot/</url>
+        <releases>
+          <enabled>false</enabled>
+        </releases>
+      </pluginRepository>
     </pluginRepositories>
 </project>
\ No newline at end of file

diff --git a/openflow_netty/pom.xml b/openflow_netty/pom.xml
index d6f3dc4dcfcb55fb526f61d069c23408ea640c07..6e85591012107d9af8830bd4dc92e0003baf113b 100644 (file)
--- a/openflow_netty/pom.xml
+++ b/openflow_netty/pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.opendaylight.openflowplugin</groupId>
-        <artifactId>commons.openflowplugin</artifactId>
+        <artifactId>openflowplugin-commons</artifactId>
         <version>0.0.1-SNAPSHOT</version>
         <relativePath>../commons</relativePath>
     </parent>

diff --git a/openflowplugin-it/pom.xml b/openflowplugin-it/pom.xml
index 63105f102fbdd7ba7dca005b533dccf3beaf0993..bf4252e04ac3c3977d764e7a787d2bf313820405 100644 (file)
--- a/openflowplugin-it/pom.xml
+++ b/openflowplugin-it/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.opendaylight.openflowplugin</groupId>
-        <artifactId>commons.openflowplugin</artifactId>
+        <artifactId>openflowplugin-commons</artifactId>
         <version>0.0.1-SNAPSHOT</version>
         <relativePath>../commons</relativePath>
     </parent>
@@ -19,7 +19,6 @@
             <plugin>
                 <groupId>org.ops4j.pax.exam</groupId>
                 <artifactId>maven-paxexam-plugin</artifactId>
-                <version>1.2.4</version>
                 <executions>
                     <execution>
                         <id>generate-config</id>
@@ -92,13 +91,11 @@
         <dependency>
             <groupId>org.opendaylight.openflowjava</groupId>
             <artifactId>openflow-protocol-impl</artifactId>
-            <version>0.1-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.openflowjava</groupId>
             <artifactId>simple-client</artifactId>
-            <version>0.1-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
@@ -110,7 +107,6 @@
         <dependency>
             <groupId>org.opendaylight.yangtools.thirdparty</groupId>
             <artifactId>xtend-lib-osgi</artifactId>
-            <version>2.4.3</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -134,7 +130,6 @@
         <dependency>
             <groupId>equinoxSDK381</groupId>
             <artifactId>org.eclipse.osgi</artifactId>
-            <version>3.8.1.v20120830-144521</version>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/pom.xml b/openflowplugin-parent/pom.xml
similarity index 75%
rename from pom.xml
rename to openflowplugin-parent/pom.xml
index aea3a23f60da4ec89f4ed2bb3fbd3a22a2ee3eb3..227ed55873482dad8b293f7e6e6c41baeb9db90e 100644 (file)
--- a/pom.xml
+++ b/openflowplugin-parent/pom.xml
@@ -8,11 +8,10 @@
     <packaging>pom</packaging>
 
     <modules>
-      <module>commons</module>
-      <module>openflow_netty</module>
-      <module>openflowplugin</module>
-      <module>openflowplugin-it</module>
+      <module>../commons</module>
+      <module>../openflow_netty</module>
+      <module>../openflowplugin</module>
+      <module>../openflowplugin-it</module>
     </modules>
-
 </project>
 

diff --git a/openflowplugin/pom.xml b/openflowplugin/pom.xml
index 8fd2d8167781b195b9d963e33d615b0baa36a8b1..55fd5d2f500e68960c663b23ce0ecbf620885ed7 100644 (file)
--- a/openflowplugin/pom.xml
+++ b/openflowplugin/pom.xml
@@ -4,22 +4,19 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.opendaylight.openflowplugin</groupId>
-        <artifactId>commons.openflowplugin</artifactId>
+        <artifactId>openflowplugin-commons</artifactId>
         <version>0.0.1-SNAPSHOT</version>
         <relativePath>../commons</relativePath>
     </parent>
 
     <artifactId>openflowplugin</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <properties>
         <yang.prototype.version>1.0-SNAPSHOT</yang.prototype.version>
         <yang.version>0.5.9-SNAPSHOT</yang.version>
-        <openflow-protocol.version>0.1-SNAPSHOT</openflow-protocol.version>
     </properties>
 
-
     <build>
         <plugins>
             <plugin>
@@ -61,39 +58,32 @@
             <version>1.0.2-SNAPSHOT</version>
         </dependency>
         <dependency>
-            <artifactId>model-flow-base</artifactId>
             <groupId>org.opendaylight.controller.model</groupId>
-            <version>1.0-SNAPSHOT</version>
+            <artifactId>model-flow-base</artifactId>
         </dependency>
         <dependency>
-            <artifactId>model-flow-service</artifactId>
             <groupId>org.opendaylight.controller.model</groupId>
-            <version>1.0-SNAPSHOT</version>
+            <artifactId>model-flow-service</artifactId>
         </dependency>
         <dependency>
-            <artifactId>model-flow-statistics</artifactId>
             <groupId>org.opendaylight.controller.model</groupId>
-            <version>1.0-SNAPSHOT</version>
+            <artifactId>model-flow-statistics</artifactId>
         </dependency>
         <dependency>
-            <artifactId>model-inventory</artifactId>
             <groupId>org.opendaylight.controller.model</groupId>
-            <version>1.0-SNAPSHOT</version>
+            <artifactId>model-inventory</artifactId>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-binding-api</artifactId>
-            <version>1.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.openflowjava</groupId>
             <artifactId>openflow-protocol-api</artifactId>
-            <version>${openflow-protocol.version}</version>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.openflowjava</groupId>
             <artifactId>openflow-protocol-spi</artifactId>
-            <version>${openflow-protocol.version}</version>
         </dependency>
 
         <dependency>
@@ -109,13 +99,11 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.8.1</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-log4j12</artifactId>
-            <version>${slf4j.version}</version>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>

diff --git a/samples/sample-consumer/pom.xml b/samples/sample-consumer/pom.xml
index b4382fd2b22a7618cd0a30938e73e58f1cc14ee2..0c354934edb41b0899bee50545fc49c2581650d3 100644 (file)
--- a/samples/sample-consumer/pom.xml
+++ b/samples/sample-consumer/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.opendaylight.openflowplugin</groupId>
-        <artifactId>commons.openflowplugin</artifactId>
+        <artifactId>openflowplugin-commons</artifactId>
         <version>0.0.1-SNAPSHOT</version>
         <relativePath>../../commons</relativePath>
     </parent>