Code Review / neutron.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | patch | inline | side by side (parent: c2a1d5a)
Move to using parent pom structure 41/15941/3
authorRyan Moats <rmoats@us.ibm.com>
Mon, 2 Mar 2015 19:52:06 +0000 (13:52 -0600)
committerRyan Moats <rmoats@us.ibm.com>
Mon, 2 Mar 2015 20:10:07 +0000 (14:10 -0600)
Change-Id: I7739c988c39bbc75d9192be93906c7162dda4b2f
Signed-off-by: Ryan Moats <rmoats@us.ibm.com>
features/pom.xml patch | blob | history
neutron-spi/pom.xml patch | blob | history
northbound-api/pom.xml patch | blob | history
parent/pom.xml [new file with mode: 0644] patch | blob
pom.xml patch | blob | history
transcriber/pom.xml patch | blob | history

diff --git a/features/pom.xml b/features/pom.xml
index 9059df08110ccf6179ab424e8b4d674775c995e7..a71fe7ee33c586df950b06fe5061f4dabcc27f58 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -2,10 +2,10 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" 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>
-    <groupId>org.opendaylight.controller</groupId>
-    <artifactId>commons.opendaylight</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
-    <relativePath>../../controller/opendaylight/commons/opendaylight</relativePath>
+    <groupId>org.opendaylight.neutron</groupId>
+    <artifactId>project-neutron-parent</artifactId>
+    <version>0.5.0-SNAPSHOT</version>
+    <relativePath>../parent</relativePath>
   </parent>
   <groupId>org.opendaylight.neutron</groupId>
   <artifactId>features-neutron</artifactId>
@@ -37,8 +37,8 @@
       <artifactId>jersey-server</artifactId>
     </dependency>
     <dependency>
-      <groupId>com.sun.jersey</groupId>
-      <artifactId>jersey-servlet</artifactId>
+      <groupId>org.opendaylight.controller.thirdparty</groupId>
+      <artifactId>com.sun.jersey.jersey-servlet</artifactId>
     </dependency>
     <dependency>
       <groupId>org.eclipse.persistence</groupId>
@@ -52,12 +52,6 @@
       <groupId>commons-net</groupId>
       <artifactId>commons-net</artifactId>
     </dependency>
-    <!-- test to validate features.xml -->
-    <dependency>
-      <groupId>org.opendaylight.odlparent</groupId>
-      <artifactId>features-test</artifactId>
-      <version>1.5.0-SNAPSHOT</version>
-    </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>neutron-spi</artifactId>
@@ -74,66 +68,6 @@
       <version>${project.version}</version>
     </dependency>
   </dependencies>
-
-  <build>
-    <resources>
-      <resource>
-        <filtering>true</filtering>
-        <directory>src/main/resources</directory>
-      </resource>
-    </resources>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-resources-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>filter</id>
-            <goals>
-              <goal>resources</goal>
-            </goals>
-            <phase>generate-resources</phase>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>build-helper-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>attach-artifacts</id>
-            <goals>
-              <goal>attach-artifact</goal>
-            </goals>
-            <phase>package</phase>
-            <configuration>
-              <artifacts>
-                <artifact>
-                  <file>${project.build.directory}/classes/${features.file}</file>
-                  <type>xml</type>
-                  <classifier>features</classifier>
-                </artifact>
-              </artifacts>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <systemPropertyVariables>
-            <karaf.distro.groupId>org.opendaylight.controller</karaf.distro.groupId>
-            <karaf.distro.artifactId>opendaylight-karaf-empty</karaf.distro.artifactId>
-            <karaf.distro.version>${commons.opendaylight.version}</karaf.distro.version>
-          </systemPropertyVariables>
-          <dependenciesToScan>
-           <dependency>org.opendaylight.odlparent:features-test</dependency>
-          </dependenciesToScan>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
   <scm>
     <connection>scm:git:ssh://git.opendaylight.org:29418/neutron.git</connection>
     <developerConnection>scm:git:ssh://git.opendaylight.org:29418/neutron.git</developerConnection>
diff --git a/neutron-spi/pom.xml b/neutron-spi/pom.xml
index 788f145ef36779e8a375967b87b6de145af5c2cd..568abfea4b3ffc1b393f7737d0e935d64cedd72f 100644 (file)
--- a/neutron-spi/pom.xml
+++ b/neutron-spi/pom.xml
@@ -2,11 +2,12 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" 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>
-    <groupId>org.opendaylight.controller</groupId>
-    <artifactId>commons.opendaylight</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
-    <relativePath>../../controller/opendaylight/commons/opendaylight</relativePath>
+    <groupId>org.opendaylight.neutron</groupId>
+    <artifactId>project-neutron-parent</artifactId>
+    <version>0.5.0-SNAPSHOT</version>
+    <relativePath>../parent</relativePath>
   </parent>
+
   <groupId>org.opendaylight.neutron</groupId>
   <artifactId>neutron-spi</artifactId>
   <version>0.5.0-SNAPSHOT</version>
diff --git a/northbound-api/pom.xml b/northbound-api/pom.xml
index f7910c47d6b8933e0e345945ded469e422c73b94..e7554b84e806e11164a412e12dc6c6ccd074f9b7 100644 (file)
--- a/northbound-api/pom.xml
+++ b/northbound-api/pom.xml
@@ -2,11 +2,12 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" 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>
-    <groupId>org.opendaylight.controller</groupId>
-    <artifactId>enunciate-parent</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
-    <relativePath>../../controller/opendaylight/commons/enunciate-parent</relativePath>
+    <groupId>org.opendaylight.neutron</groupId>
+    <artifactId>project-neutron-parent</artifactId>
+    <version>0.5.0-SNAPSHOT</version>
+    <relativePath>../parent</relativePath>
   </parent>
+
   <groupId>org.opendaylight.neutron</groupId>
   <artifactId>northbound-api</artifactId>
   <version>0.5.0-SNAPSHOT</version>
@@ -21,8 +22,8 @@
       <artifactId>jersey-server</artifactId>
     </dependency>
     <dependency>
-      <groupId>com.sun.jersey</groupId>
-      <artifactId>jersey-servlet</artifactId>
+      <groupId>org.opendaylight.controller.thirdparty</groupId>
+      <artifactId>com.sun.jersey.jersey-servlet</artifactId>
     </dependency>
     <dependency>
       <groupId>org.codehaus.enunciate</groupId>
@@ -35,7 +36,7 @@
     <dependency>
       <groupId>org.opendaylight.neutron</groupId>
       <artifactId>neutron-spi</artifactId>
-      <version>0.5.0-SNAPSHOT</version>
+      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.osgi</groupId>
diff --git a/parent/pom.xml b/parent/pom.xml
new file mode 100644 (file)
index 0000000..d675a45
--- /dev/null
+++ b/parent/pom.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" 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>
+  <prerequisites>
+    <maven>3.0</maven>
+  </prerequisites>
+
+  <parent>
+    <groupId>org.opendaylight.odlparent</groupId>
+    <artifactId>odlparent</artifactId>
+    <version>1.5.0-SNAPSHOT</version>
+    <relativePath/>
+  </parent>
+
+  <groupId>org.opendaylight.neutron</groupId>
+  <artifactId>project-neutron-parent</artifactId>
+  <version>0.5.0-SNAPSHOT</version>
+  <packaging>pom</packaging>
+  <properties>
+    <aaa.version>0.1.3-SNAPSHOT</aaa.version>
+  </properties>
+  <scm>
+    <connection>scm:git:ssh://git.opendaylight.org:29418/neutron.git</connection>
+    <developerConnection>scm:git:ssh://git.opendaylight.org:29418/neutron.git</developerConnection>
+    <tag>HEAD</tag>
+  </scm>
+</project>
diff --git a/pom.xml b/pom.xml
index 434f07ae974c6c46af470e798291ec5fa76b0aa1..b7ace7e54b56807084b43a20c445a4082f0d8da2 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -8,11 +8,18 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" 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>
+    <groupId>org.opendaylight.neutron</groupId>
+    <artifactId>project-neutron-parent</artifactId>
+    <version>0.5.0-SNAPSHOT</version>
+    <relativePath>parent</relativePath>
+  </parent>
   <groupId>org.opendaylight.neutron</groupId>
   <artifactId>project-neutron</artifactId>
   <version>0.5.0-SNAPSHOT</version>
   <packaging>pom</packaging>
   <modules>
+    <module>parent</module>
     <module>neutron-spi</module>
     <module>northbound-api</module>
     <module>transcriber</module>
diff --git a/transcriber/pom.xml b/transcriber/pom.xml
index 47447dcb0ea8156a9d0f07a65c244351abc370fc..48e0fb9da730464ef0b70291bbc279d455411d51 100644 (file)
--- a/transcriber/pom.xml
+++ b/transcriber/pom.xml
@@ -2,11 +2,12 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" 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>
-    <groupId>org.opendaylight.controller</groupId>
-    <artifactId>commons.opendaylight</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
-    <relativePath>../../controller/opendaylight/commons/opendaylight</relativePath>
+    <groupId>org.opendaylight.neutron</groupId>
+    <artifactId>project-neutron-parent</artifactId>
+    <version>0.5.0-SNAPSHOT</version>
+    <relativePath>../parent</relativePath>
   </parent>
+
   <groupId>org.opendaylight.neutron</groupId>
   <artifactId>transcriber</artifactId>
   <version>0.5.0-SNAPSHOT</version>
@@ -15,7 +16,7 @@
     <dependency>
       <groupId>org.opendaylight.neutron</groupId>
       <artifactId>neutron-spi</artifactId>
-      <version>0.5.0-SNAPSHOT</version>
+      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.osgi</groupId>
Neutron Northbound