Cleaning POMs

Change-Id: Ifb9e7dc1ed7be2160500020fb18a1d285e6ddf6f
Signed-off-by: Reinaldo Penno <[email protected]>

diff --git a/features-sfc-netconf/src/main/resources/features.xml b/features-sfc-netconf/src/main/resources/features.xml
index 6a937b85c228a32b4f0742f7bc9cb2eb8aab12bd..4cc269d91e5cb3ad87c866022023f9b47ed031da 100644 (file)
--- a/features-sfc-netconf/src/main/resources/features.xml
+++ b/features-sfc-netconf/src/main/resources/features.xml
@@ -14,7 +14,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <repository>mvn:org.opendaylight.sfc/features-sfc/${project.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.controller/features-netconf-connector/${mdsal.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.controller/features-restconf/${mdsal.version}/xml/features</repository>
-    <feature name='odl-sfc-netconf' version='${project.version}' description='OpenDaylight :: OpenvSwitch '>
+    <feature name='odl-sfc-netconf' version='${project.version}' description='OpenDaylight :: Netconf '>
           <!--
             Necessary TODO:
             List all of the user consumable features you define in this feature file here.
@@ -26,11 +26,12 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
             <feature version='${project.version}'>odl-sfc-model</feature>
         -->
         <feature version='${project.version}'>odl-sfc-provider</feature>
-        <feature version='${project.version}'>odl-sfc-model</feature>
-        <feature version="${mdsal.version}">odl-restconf</feature>
-        <feature version='${mdsal.version}'>odl-mdsal-broker</feature>
+        <!--<feature version='${project.version}'>odl-sfc-model</feature>-->
+        <!--<feature version='${mdsal.version}'>odl-mdsal-broker</feature>-->
+        <feature version='${mdsal.version}'>odl-netconf-connector-all</feature>
         <feature version='${mdsal.version}'>odl-netconf-connector-ssh</feature>
         <feature version='${mdsal.version}'>odl-netconf-mdsal</feature>
+        <!--<feature version="${mdsal.version}">odl-restconf</feature>        -->
         <bundle>mvn:org.opendaylight.sfc/sfc-netconf/${project.version}</bundle>
     </feature>
     

diff --git a/features-sfc-ovs/src/main/resources/features.xml b/features-sfc-ovs/src/main/resources/features.xml
index 119f9d64caec64c4e9dbe0cfc0c68f488f59ac4e..82dfa9295b1377d1a012bea29945345094fbd9ac 100644 (file)
--- a/features-sfc-ovs/src/main/resources/features.xml
+++ b/features-sfc-ovs/src/main/resources/features.xml
@@ -25,8 +25,8 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
             <feature version='${project.version}'>odl-sfc-model</feature>
         -->
         <feature version='${project.version}'>odl-sfc-provider</feature>
-        <feature version='${project.version}'>odl-sfc-model</feature>
-        <feature version='${mdsal.version}'>odl-mdsal-broker</feature>
+        <!--<feature version='${project.version}'>odl-sfc-model</feature>-->
+        <!--<feature version='${mdsal.version}'>odl-mdsal-broker</feature>-->
         <feature version='${ovsdb.southbound.version}'>odl-ovsdb-southbound-api</feature>
         <feature version='${ovsdb.southbound.version}'>odl-ovsdb-southbound-impl</feature>
         <bundle>mvn:org.opendaylight.sfc/sfc-ovs/${project.version}</bundle>

diff --git a/features-sfc-sb-rest/src/main/resources/features.xml b/features-sfc-sb-rest/src/main/resources/features.xml
index ac4ece0817c94cd851d389d8c8f57b3e3c297c0d..617cd4c5e735fbffcf91f30b049dc827e8e0f807 100755 (executable)
--- a/features-sfc-sb-rest/src/main/resources/features.xml
+++ b/features-sfc-sb-rest/src/main/resources/features.xml
@@ -24,8 +24,8 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
             <feature version='${project.version}'>odl-sfc-model</feature>
         -->
         <feature version='${project.version}'>odl-sfc-provider</feature>
-        <feature version='${project.version}'>odl-sfc-model</feature>
-        <feature version="${mdsal.version}">odl-mdsal-broker</feature>
+        <!--<feature version='${project.version}'>odl-sfc-model</feature>-->
+        <!--<feature version="${mdsal.version}">odl-mdsal-broker</feature>-->
         <bundle>mvn:org.opendaylight.sfc/sfc-sb-rest/${project.version}</bundle>
     </feature>
     

diff --git a/features-sfclisp/src/main/resources/features.xml b/features-sfclisp/src/main/resources/features.xml
index 3da6c375fafb40ab001fc24a21f70ec4b21fc041..f8b0ac9bb164bd681d34eadb8fa1932c34e9d6b7 100644 (file)
--- a/features-sfclisp/src/main/resources/features.xml
+++ b/features-sfclisp/src/main/resources/features.xml
@@ -10,7 +10,7 @@
 
        <feature name='odl-sfclisp' version='${project.version}' description='OpenDaylight :: sfclisp :: all'>
                <feature version='${project.version}'>odl-sfc-provider</feature>
-        <feature version='${project.version}'>odl-sfc-model</feature>
+        <!--<feature version='${project.version}'>odl-sfc-model</feature>-->
         <feature version='${lisp.version}'>odl-lispflowmapping-mappingservice</feature>
         <!--
         <bundle>mvn:org.sonatype.sisu/sisu-guava/0.9.9</bundle>

diff --git a/features-sfcofl2/src/main/resources/features.xml b/features-sfcofl2/src/main/resources/features.xml
index 57fc6e9fea20fa57f3b9543abbad737d6ec5c40d..9361e043d292a4ccf776018e406f88dfab2e9c9a 100644 (file)
--- a/features-sfcofl2/src/main/resources/features.xml
+++ b/features-sfcofl2/src/main/resources/features.xml
@@ -25,9 +25,12 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
             <feature version='${project.version}'>odl-sfc-provider</feature>
             <feature version='${project.version}'>odl-sfc-model</feature>
         -->
+
+
+        <configfile finalname="etc/opendaylight/karaf/80-sfc.xml">mvn:org.opendaylight.sfc/sfc-config/${project.version}/xml/config</configfile>
         <feature version='${project.version}'>odl-sfc-provider</feature>
-        <feature version='${project.version}'>odl-sfc-model</feature>
-        <feature version="${mdsal.version}">odl-mdsal-broker</feature>
+        <!--<feature version='${project.version}'>odl-sfc-model</feature>-->
+        <!--<feature version="${mdsal.version}">odl-mdsal-broker</feature>-->
         <feature version='${feature.openflowplugin.version}'>odl-openflowplugin-all</feature>
         <feature version='${feature.openflowplugin.version}'>odl-openflowplugin-nxm-extensions</feature>
         <bundle>mvn:org.opendaylight.sfc/sfcofl2/${project.version}</bundle>

diff --git a/features/src/main/resources/features.xml b/features/src/main/resources/features.xml
index 92366422bd83389a0474eb33263070eb3c297b5d..9ea0230d0f3be7e59e53daf378b5540e8642f155 100644 (file)
--- a/features/src/main/resources/features.xml
+++ b/features/src/main/resources/features.xml
@@ -25,7 +25,7 @@
 
     <feature name='odl-sfc-core' version='${project.version}' description='OpenDaylight :: sfc :: Core'>
         <feature version='${project.version}'>odl-sfc-provider</feature>
-        <feature version='${project.version}'>odl-sfc-model</feature>
+        <!--<feature version='${project.version}'>odl-sfc-model</feature>-->
     </feature>
 
     <!--
@@ -40,13 +40,13 @@
         It's also nice to list inside a feature, first the features it needs, then the bundles it needs, then the configfiles.
     -->
 
-    <feature name='odl-sfcofl2' version='${project.version}' description='OpenDaylight :: sfc :: OpenFlowL2 '>
-        <feature version='${feature.openflowplugin.version}'>odl-openflowplugin-all</feature>
-        <feature version='${feature.openflowplugin.version}'>odl-openflowplugin-nxm-extensions</feature>
-        <feature version='${project.version}'>odl-sfc-provider</feature>
-        <configfile finalname="etc/opendaylight/karaf/80-sfc.xml">mvn:org.opendaylight.sfc/sfc-config/${project.version}/xml/config</configfile>
-        <bundle>mvn:org.opendaylight.sfc/sfcofl2/${project.version}</bundle>
-    </feature>
+    <!--<feature name='odl-sfcofl2' version='${project.version}' description='OpenDaylight :: sfc :: OpenFlowL2 '>-->
+        <!--<feature version='${feature.openflowplugin.version}'>odl-openflowplugin-all</feature>-->
+        <!--<feature version='${feature.openflowplugin.version}'>odl-openflowplugin-nxm-extensions</feature>-->
+        <!--<feature version='${project.version}'>odl-sfc-provider</feature>-->
+        <!--<configfile finalname="etc/opendaylight/karaf/80-sfc.xml">mvn:org.opendaylight.sfc/sfc-config/${project.version}/xml/config</configfile>-->
+        <!--<bundle>mvn:org.opendaylight.sfc/sfcofl2/${project.version}</bundle>-->
+    <!--</feature>-->
     <!--
     <feature name='odl-sfc-ovs' version='${project.version}' description='OpenDaylight :: sfc :: OpenvSwitch '>
         <feature version='${ovsdb.southbound.version}'>odl-ovsdb-southbound-api</feature>
@@ -58,7 +58,7 @@
     -->
     <feature name='odl-sfc-ui' version='${project.version}' description='OpenDaylight :: sfc :: UI'>
         <feature version='${project.version}'>odl-sfc-provider</feature>
-        <feature>odl-restconf</feature>
+        <!--<feature version="${mdsal.version}">odl-restconf</feature>-->
         <feature>http</feature>
         <!--<feature version='${webconsole.version}'>webconsole</feature>-->
         <feature>webconsole</feature>
@@ -67,9 +67,9 @@
 
     <feature name='odl-sfc-provider' version='${project.version}' description='OpenDaylight :: sfc :: Provider '>
         <feature version='${mdsal.version}'>odl-mdsal-broker</feature>
+        <feature version="${mdsal.version}">odl-restconf</feature>
         <feature version='${mdsal.version}'>odl-mdsal-apidocs</feature>
         <feature version='${project.version}'>odl-sfc-model</feature>
-        <feature version='${mdsal.version}'>odl-netconf-connector-all</feature>
         <configfile finalname="etc/opendaylight/karaf/80-sfc.xml">mvn:org.opendaylight.sfc/sfc-config/${project.version}/xml/config</configfile>
         <configfile finalname="configuration/startup/sfc_provider_config.json">mvn:org.opendaylight.sfc/sfc-jsonconfig/${project.version}/xml/config</configfile>
         <configfile finalname="configuration/startup/bootstrap/service-function-forwarders.json">mvn:org.opendaylight.sfc/sfc-jsonconfig/${project.version}/xml/config-sff</configfile>

diff --git a/pom.xml b/pom.xml
index 5aaa0dba7f9f3de303644f64012889b9d99575f9..340bfe37a28925ca33463213b6c5b3df80c04295 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -28,6 +28,7 @@
     </scm>
     -->
 
+
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
@@ -146,6 +147,26 @@
                 </execution>
               </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-enforcer-plugin</artifactId>
+                <version>${enforcer.version}</version>
+                <executions>
+                    <execution>
+                        <id>enforce-maven</id>
+                        <goals>
+                            <goal>enforce</goal>
+                        </goals>
+                        <configuration>
+                            <rules>
+                                <requireMavenVersion>
+                                    <version>3.1.1</version>
+                                </requireMavenVersion>
+                            </rules>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
         <pluginManagement>
             <plugins>
@@ -224,6 +245,11 @@
                    <artifactId>jacoco-maven-plugin</artifactId>
                    <version>${jacoco.version}</version>
                 </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-surefire-plugin</artifactId>
+                    <version>${maven.surefire.version}</version>
+                </plugin>
             </plugins>
         </pluginManagement>
     </build>

diff --git a/sfc-karaf/pom.xml b/sfc-karaf/pom.xml
index 85f7214ff16f5ca50c62658b215178cffaac932b..30379dc2fd5331a06321331417383f5ff3eccdcb 100755 (executable)
--- a/sfc-karaf/pom.xml
+++ b/sfc-karaf/pom.xml
@@ -10,24 +10,27 @@
   <artifactId>sfc-karaf</artifactId>
   <packaging>pom</packaging>
   <prerequisites>
-    <maven>3.0</maven>
+    <maven>3.2</maven>
   </prerequisites>
-  <properties>
-    <!-- Move these properties to your parent pom and possibly DependencyManagement section of your parent pom -->
-    <branding.version>1.1.0-SNAPSHOT</branding.version>
-    <karaf.resources.version>1.5.0-SNAPSHOT</karaf.resources.version>
-    <!--<pax.logging.version>1.7.4</pax.logging.version>-->
-    <!--<karaf.version>3.0.1</karaf.version>-->
-    <!--<pax.logging.version>1.7.4</pax.logging.version>-->
-  </properties>
-
   <dependencies>
     <!-- Basic Karaf dependencies -->
     <dependency>
+      <!-- scope is compile so all features (there is only one) are installed
+            into startup.properties and the feature repo itself is not installed -->
       <groupId>org.apache.karaf.features</groupId>
       <artifactId>framework</artifactId>
       <version>${karaf.version}</version>
       <type>kar</type>
+      <exclusions>
+        <exclusion>
+          <groupId>org.osgi</groupId>
+          <artifactId>org.osgi.core</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.sshd</groupId>
+          <artifactId>sshd-core</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.apache.karaf.features</groupId>
@@ -35,9 +38,15 @@
       <version>${karaf.version}</version>
       <classifier>features</classifier>
       <type>xml</type>
-      <scope>runtime</scope>
     </dependency>
 
+    <!--<dependency>-->
+      <!--<groupId>org.apache.karaf.webconsole</groupId>-->
+      <!--<artifactId>webconsole</artifactId>-->
+      <!--<version>${webconsole.version}</version>-->
+      <!--<type>pom</type>-->
+    <!--</dependency>-->
+
     <!-- ODL Branding -->
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
@@ -61,7 +70,7 @@
       <scope>runtime</scope>
     </dependency>
     <dependency>
-      <groupId>org.opendaylight.sfc</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>features-sfc</artifactId>
       <version>${project.version}</version>
       <classifier>features</classifier>
@@ -69,7 +78,7 @@
       <scope>runtime</scope>
     </dependency>
     <dependency>
-      <groupId>org.opendaylight.sfc</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>features-sfc-sb-rest</artifactId>
       <version>${project.version}</version>
       <classifier>features</classifier>
@@ -77,7 +86,7 @@
       <scope>runtime</scope>
     </dependency>
     <dependency>
-      <groupId>org.opendaylight.sfc</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>features-sfc-ovs</artifactId>
       <version>${project.version}</version>
       <classifier>features</classifier>
@@ -85,7 +94,7 @@
       <scope>runtime</scope>
     </dependency>
     <dependency>
-      <groupId>org.opendaylight.sfc</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>features-sfc-netconf</artifactId>
       <version>${project.version}</version>
       <classifier>features</classifier>
@@ -93,7 +102,7 @@
       <scope>runtime</scope>
     </dependency>
     <dependency>
-      <groupId>org.opendaylight.sfc</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>features-sfclisp</artifactId>
       <version>${project.version}</version>
       <classifier>features</classifier>
@@ -101,7 +110,7 @@
       <scope>runtime</scope>
     </dependency>
     <dependency>
-      <groupId>org.opendaylight.sfc</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>features-sfcofl2</artifactId>
       <version>${project.version}</version>
       <classifier>features</classifier>
@@ -146,83 +155,90 @@
         <type>jar</type>
         <scope>compile</scope>
     </dependency>
+
+      <dependency>
+        <groupId>org.ops4j.pax.swissbox</groupId>
+        <artifactId>pax-swissbox-bnd</artifactId>
+        <version>1.8.0</version>
+      </dependency>
+
     <!-- Start -->
-    <dependency>
-        <groupId>com.sun.jersey</groupId>
-        <artifactId>jersey-client</artifactId>
-        <version>${jersey.version}</version>
-    </dependency>
-    <dependency>
-        <groupId>com.sun.jersey</groupId>
-        <artifactId>jersey-json</artifactId>
-        <version>1.18.1</version>
-    </dependency>
-    <dependency>
-        <groupId>com.google.code.gson</groupId>
-        <artifactId>gson</artifactId>
-        <version>${gson.version}</version>
-    </dependency>
-    <dependency>
-        <groupId>com.fasterxml.jackson.core</groupId>
-        <artifactId>jackson-annotations</artifactId>
-        <version>${jackson.version}</version>
-    </dependency>
-    <dependency>
-        <groupId>com.fasterxml.jackson.core</groupId>
-        <artifactId>jackson-core</artifactId>
-        <version>${jackson.version}</version>
-    </dependency>
-    <dependency>
-        <groupId>com.fasterxml.jackson.core</groupId>
-        <artifactId>jackson-databind</artifactId>
-        <version>${jackson.version}</version>
-    </dependency>
-    <dependency>
-        <groupId>com.fasterxml.jackson.datatype</groupId>
-        <artifactId>jackson-datatype-json-org</artifactId>
-        <version>${jackson.version}</version>
-    </dependency>
+    <!--<dependency>-->
+        <!--<groupId>com.sun.jersey</groupId>-->
+        <!--<artifactId>jersey-client</artifactId>-->
+        <!--<version>${jersey.version}</version>-->
+    <!--</dependency>-->
+    <!--<dependency>-->
+        <!--<groupId>com.sun.jersey</groupId>-->
+        <!--<artifactId>jersey-json</artifactId>-->
+        <!--<version>1.18.1</version>-->
+    <!--</dependency>-->
+    <!--<dependency>-->
+        <!--<groupId>com.google.code.gson</groupId>-->
+        <!--<artifactId>gson</artifactId>-->
+        <!--<version>${gson.version}</version>-->
+    <!--</dependency>-->
+    <!--<dependency>-->
+        <!--<groupId>com.fasterxml.jackson.core</groupId>-->
+        <!--<artifactId>jackson-annotations</artifactId>-->
+        <!--<version>${jackson.version}</version>-->
+    <!--</dependency>-->
+    <!--<dependency>-->
+        <!--<groupId>com.fasterxml.jackson.core</groupId>-->
+        <!--<artifactId>jackson-core</artifactId>-->
+        <!--<version>${jackson.version}</version>-->
+    <!--</dependency>-->
+    <!--<dependency>-->
+        <!--<groupId>com.fasterxml.jackson.core</groupId>-->
+        <!--<artifactId>jackson-databind</artifactId>-->
+        <!--<version>${jackson.version}</version>-->
+    <!--</dependency>-->
+    <!--<dependency>-->
+        <!--<groupId>com.fasterxml.jackson.datatype</groupId>-->
+        <!--<artifactId>jackson-datatype-json-org</artifactId>-->
+        <!--<version>${jackson.version}</version>-->
+    <!--</dependency>-->
 
-    <dependency>
-        <groupId>com.fasterxml.jackson.jaxrs</groupId>
-        <artifactId>jackson-jaxrs-base</artifactId>
-        <version>${jackson.version}</version>
-    </dependency>
-    <dependency>
-        <groupId>com.fasterxml.jackson.jaxrs</groupId>
-        <artifactId>jackson-jaxrs-json-provider</artifactId>
-        <version>${jackson.version}</version>
-    </dependency>
-    <dependency>
-        <groupId>com.fasterxml.jackson.module</groupId>
-        <artifactId>jackson-module-jaxb-annotations</artifactId>
-        <version>${jackson.version}</version>
-    </dependency>
-    <dependency>
-        <groupId>org.glassfish</groupId>
-        <artifactId>javax.json</artifactId>
-        <version>1.0.4</version>
-    </dependency>
-    <dependency>
-      <groupId>org.ops4j.pax.logging</groupId>
-      <artifactId>pax-logging-api</artifactId>
-      <version>${pax.logging.api.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.ops4j.pax.logging</groupId>
-      <artifactId>pax-logging-service</artifactId>
-      <version>${pax.logging.service.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.ovsdb</groupId>
-      <artifactId>southbound-api</artifactId>
-      <version>${ovsdb.southbound.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.ovsdb</groupId>
-      <artifactId>southbound-impl</artifactId>
-      <version>${ovsdb.southbound.version}</version>
-    </dependency>
+    <!--<dependency>-->
+        <!--<groupId>com.fasterxml.jackson.jaxrs</groupId>-->
+        <!--<artifactId>jackson-jaxrs-base</artifactId>-->
+        <!--<version>${jackson.version}</version>-->
+    <!--</dependency>-->
+    <!--<dependency>-->
+        <!--<groupId>com.fasterxml.jackson.jaxrs</groupId>-->
+        <!--<artifactId>jackson-jaxrs-json-provider</artifactId>-->
+        <!--<version>${jackson.version}</version>-->
+    <!--</dependency>-->
+    <!--<dependency>-->
+        <!--<groupId>com.fasterxml.jackson.module</groupId>-->
+        <!--<artifactId>jackson-module-jaxb-annotations</artifactId>-->
+        <!--<version>${jackson.version}</version>-->
+    <!--</dependency>-->
+    <!--<dependency>-->
+        <!--<groupId>org.glassfish</groupId>-->
+        <!--<artifactId>javax.json</artifactId>-->
+        <!--<version>1.0.4</version>-->
+    <!--</dependency>-->
+    <!--<dependency>-->
+      <!--<groupId>org.ops4j.pax.logging</groupId>-->
+      <!--<artifactId>pax-logging-api</artifactId>-->
+      <!--<version>${pax.logging.api.version}</version>-->
+    <!--</dependency>-->
+    <!--<dependency>-->
+      <!--<groupId>org.ops4j.pax.logging</groupId>-->
+      <!--<artifactId>pax-logging-service</artifactId>-->
+      <!--<version>${pax.logging.service.version}</version>-->
+    <!--</dependency>-->
+    <!--<dependency>-->
+      <!--<groupId>org.opendaylight.ovsdb</groupId>-->
+      <!--<artifactId>southbound-api</artifactId>-->
+      <!--<version>${ovsdb.southbound.version}</version>-->
+    <!--</dependency>-->
+    <!--<dependency>-->
+      <!--<groupId>org.opendaylight.ovsdb</groupId>-->
+      <!--<artifactId>southbound-impl</artifactId>-->
+      <!--<version>${ovsdb.southbound.version}</version>-->
+    <!--</dependency>-->
 
     <!-- Project local feautures -->
     <!--
@@ -323,6 +339,29 @@
       </plugins>
     </pluginManagement>
     <plugins>
+      <plugin>
+        <artifactId>maven-resources-plugin</artifactId>
+        <version>2.6</version>
+        <executions>
+          <execution>
+            <id>copy-resources</id>
+            <!-- here the phase you need -->
+            <phase>prepare-package</phase>
+            <goals>
+              <goal>copy-resources</goal>
+            </goals>
+            <configuration>
+              <outputDirectory>${basedir}/target/assembly</outputDirectory>
+              <resources>
+                <resource>
+                  <directory>src/main/assembly</directory>
+                </resource>
+              </resources>
+              <overwrite>true</overwrite>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
       <plugin>
         <groupId>org.apache.karaf.tooling</groupId>
         <artifactId>karaf-maven-plugin</artifactId>
@@ -331,16 +370,16 @@
         <configuration>
           <bootFeatures>
             <feature>standard</feature>
-            <feature>webconsole</feature>
-            <feature>odl-restconf</feature>
-            <feature>odl-mdsal-apidocs</feature>
+            <!--<feature>webconsole</feature>-->
+            <!--<feature>odl-restconf</feature>-->
+            <!--<feature>odl-mdsal-apidocs</feature>-->
             <feature>odl-sfc-core</feature>
-            <!--<feature>odl-sfc-test-consumer</feature>-->
-            <!--<feature>odl-sfc-ui</feature>-->
-            <!--<feature>odl-sfcofl2</feature>-->
-            <!--<feature>odl-sfc-sb-rest</feature>-->
-            <!--<feature>odl-sfc-ovs</feature>-->
-            <!--<feature>odl-sfc-netconf</feature>-->
+            <feature>odl-sfc-test-consumer</feature>
+            <feature>odl-sfc-ui</feature>
+            <feature>odl-sfcofl2</feature>
+            <feature>odl-sfc-sb-rest</feature>
+            <feature>odl-sfc-ovs</feature>
+            <feature>odl-sfc-netconf</feature>
             <!-- 
               Add entries here for the features you want in your local distro
               Note: odl-restconf is a separate feature from odl-mdsal-broker.
@@ -367,35 +406,24 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-dependency-plugin</artifactId>
-        <version>2.6</version>
+        <version>2.8</version>
         <executions>
           <execution>
             <id>copy</id>
             <goals>
               <goal>copy</goal>
             </goals>
+            <!-- here the phase you need -->
             <phase>generate-resources</phase>
             <configuration>
               <artifactItems>
                 <artifactItem>
                   <groupId>org.opendaylight.controller</groupId>
                   <artifactId>karaf.branding</artifactId>
-                  <version>${branding.version}</version>
+                  <version>${karaf.branding.version}</version>
                   <outputDirectory>target/assembly/lib</outputDirectory>
                   <destFileName>karaf.branding-${branding.version}.jar</destFileName>
                 </artifactItem>
-                <artifactItem>
-                    <groupId>org.ops4j.pax.logging</groupId>
-                    <artifactId>pax-logging-api</artifactId>
-                    <version>${pax.logging.api.version}</version>
-                    <outputDirectory>${project.build.directory}/assembly/system/org/ops4j/pax/logging/pax-logging-api/${pax.logging.api.version}</outputDirectory>
-                </artifactItem>
-                <artifactItem>
-                    <groupId>org.ops4j.pax.logging</groupId>
-                    <artifactId>pax-logging-service</artifactId>
-                    <version>${pax.logging.service.version}</version>
-                  <outputDirectory>${project.build.directory}/assembly/system/org/ops4j/pax/logging/pax-logging-service/${pax.logging.service.version}</outputDirectory>
-                </artifactItem>
               </artifactItems>
             </configuration>
           </execution>
@@ -406,12 +434,29 @@
             </goals>
             <phase>prepare-package</phase>
             <configuration>
-             <outputDirectory>${project.build.directory}/assembly</outputDirectory>
-             <groupId>org.opendaylight.controller</groupId>
-             <includeArtifactIds>opendaylight-karaf-resources</includeArtifactIds>
-             <excludes>META-INF\/**</excludes>
-             <excludeTransitive>true</excludeTransitive>
-             <ignorePermissions>false</ignorePermissions>
+              <outputDirectory>${project.build.directory}/assembly</outputDirectory>
+              <groupId>org.opendaylight.controller</groupId>
+              <includeArtifactIds>opendaylight-karaf-resources</includeArtifactIds>
+              <excludes>META-INF\/**</excludes>
+              <excludeTransitive>true</excludeTransitive>
+              <ignorePermissions>false</ignorePermissions>
+            </configuration>
+          </execution>
+          <execution>
+            <id>copy-dependencies</id>
+            <phase>prepare-package</phase>
+            <goals>
+              <goal>copy-dependencies</goal>
+            </goals>
+            <configuration>
+              <outputDirectory>${project.build.directory}/assembly/system</outputDirectory>
+              <excludeArtifactIds>distribution.vtn-coordinator</excludeArtifactIds>
+              <overWriteReleases>false</overWriteReleases>
+              <overWriteSnapshots>true</overWriteSnapshots>
+              <overWriteIfNewer>true</overWriteIfNewer>
+              <useRepositoryLayout>true</useRepositoryLayout>
+              <addParentPoms>true</addParentPoms>
+              <copyPom>true</copyPom>
             </configuration>
           </execution>
         </executions>
@@ -420,27 +465,27 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-antrun-plugin</artifactId>
         <executions>
-            <execution>
-                <phase>prepare-package</phase>
-                <goals>
-                    <goal>run</goal>
-                </goals>
-                <configuration>
-                  <tasks>
-                    <chmod perm="755">
-                        <fileset dir="${project.build.directory}/assembly/bin">
-                          <include name="karaf" />
-                          <include name="instance" />
-                          <include name="start" />
-                          <include name="stop" />
-                          <include name="status" />
-                          <include name="client" />
-                          <include name="shell" />
-                        </fileset>
-                    </chmod>
-                  </tasks>
-                </configuration>
-            </execution>
+          <execution>
+            <phase>prepare-package</phase>
+            <goals>
+              <goal>run</goal>
+            </goals>
+            <configuration>
+              <tasks>
+                <chmod perm="755">
+                  <fileset dir="${project.build.directory}/assembly/bin">
+                    <include name="karaf"/>
+                    <include name="instance"/>
+                    <include name="start"/>
+                    <include name="stop"/>
+                    <include name="status"/>
+                    <include name="client"/>
+                    <include name="shell"/>
+                  </fileset>
+                </chmod>
+              </tasks>
+            </configuration>
+          </execution>
         </executions>
       </plugin>
       <plugin>

diff --git a/sfc-model/pom.xml b/sfc-model/pom.xml
index d086d5493f1769e2a897156a6f62f66a9c2bcdc0..b2cd6251a33d3128ec38033b16a58cbb38241405 100644 (file)
--- a/sfc-model/pom.xml
+++ b/sfc-model/pom.xml
@@ -64,7 +64,7 @@
                             org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.packet.fields.rev140625.*;
                             org.opendaylight.yang.gen.v1.urn.intel.params.xml.ns.sf.desc.mon.rev141201.*;
                             org.opendaylight.yang.gen.v1.urn.intel.params.xml.ns.sf.desc.mon.rpt.rev141105.*;
-                            org.opendaylight.yang.gen.v1.urn.intel.params.xml.ns.yang.sfc.sfst.rev150312.*
+                            org.opendaylight.yang.gen.v1.urn.intel.params.xml.ns.yang.sfc.sfst.rev150312.*;
                         </Export-Package>
                         <Bundle-Name>${project.groupId}.${project.artifactId}</Bundle-Name>
                     </instructions>

diff --git a/sfc-netconf/pom.xml b/sfc-netconf/pom.xml
index 5e910f27cd67226ffab1f896c5ed64bf6f9e237e..25df142cb73921d7c172c06f4d57d64275349aa2 100755 (executable)
--- a/sfc-netconf/pom.xml
+++ b/sfc-netconf/pom.xml
@@ -47,8 +47,8 @@
                 <version>${compiler.version}</version>
                 <inherited>true</inherited>
                 <configuration>
-                    <source>1.7</source>
-                    <target>1.7</target>
+                    <source>${maven.compiler.source}</source>
+                    <target>${maven.compiler.target}</target>
                 </configuration>
             </plugin>
             <plugin>
@@ -139,51 +139,51 @@
     </build>
 
     <dependencies>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>config-api</artifactId>
-            <version>${config.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal-binding-api</artifactId>
-            <version>${mdsal.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal-common-api</artifactId>
-            <version>${mdsal.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal-binding-config</artifactId>
-            <version>${mdsal.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal-binding-util</artifactId>
-            <version>${mdsal.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal-broker-impl</artifactId>
-            <version>${mdsal.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal-common</artifactId>
-            <version>${mdsal.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal-common-util</artifactId>
-            <version>${mdsal.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>sfc-model</artifactId>
-            <version>${project.version}</version>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>org.opendaylight.controller</groupId>-->
+            <!--<artifactId>config-api</artifactId>-->
+            <!--<version>${config.version}</version>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>org.opendaylight.controller</groupId>-->
+            <!--<artifactId>sal-binding-api</artifactId>-->
+            <!--<version>${mdsal.version}</version>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>org.opendaylight.controller</groupId>-->
+            <!--<artifactId>sal-common-api</artifactId>-->
+            <!--<version>${mdsal.version}</version>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>org.opendaylight.controller</groupId>-->
+            <!--<artifactId>sal-binding-config</artifactId>-->
+            <!--<version>${mdsal.version}</version>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>org.opendaylight.controller</groupId>-->
+            <!--<artifactId>sal-binding-util</artifactId>-->
+            <!--<version>${mdsal.version}</version>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>org.opendaylight.controller</groupId>-->
+            <!--<artifactId>sal-broker-impl</artifactId>-->
+            <!--<version>${mdsal.version}</version>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>org.opendaylight.controller</groupId>-->
+            <!--<artifactId>sal-common</artifactId>-->
+            <!--<version>${mdsal.version}</version>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>org.opendaylight.controller</groupId>-->
+            <!--<artifactId>sal-common-util</artifactId>-->
+            <!--<version>${mdsal.version}</version>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>${project.groupId}</groupId>-->
+            <!--<artifactId>sfc-model</artifactId>-->
+            <!--<version>${project.version}</version>-->
+        <!--</dependency>-->
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>sfc-provider</artifactId>
@@ -194,16 +194,16 @@
             <artifactId>sal-netconf-connector</artifactId>
             <version>${mdsal.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller.model</groupId>
-            <artifactId>model-inventory</artifactId>
-            <version>${mdsal.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.yangtools.model</groupId>
-            <artifactId>ietf-topology</artifactId>
-            <version>${ietf.topology.version}</version>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>org.opendaylight.controller.model</groupId>-->
+            <!--<artifactId>model-inventory</artifactId>-->
+            <!--<version>${mdsal.version}</version>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>org.opendaylight.yangtools.model</groupId>-->
+            <!--<artifactId>ietf-topology</artifactId>-->
+            <!--<version>${ietf.topology.version}</version>-->
+        <!--</dependency>-->
     </dependencies>
 
 </project>

diff --git a/sfc-ovs/pom.xml b/sfc-ovs/pom.xml
index a0832104c445c90aeeb4ced4ce4b160c3e62e361..87f4ceecbb06d67c6577269c709ea11cae9c2653 100755 (executable)
--- a/sfc-ovs/pom.xml
+++ b/sfc-ovs/pom.xml
@@ -47,8 +47,8 @@
                 <version>${compiler.version}</version>
                 <inherited>true</inherited>
                 <configuration>
-                    <source>1.7</source>
-                    <target>1.7</target>
+                    <source>${maven.compiler.source}</source>
+                    <target>${maven.compiler.target}</target>
                 </configuration>
             </plugin>
             <plugin>
@@ -139,51 +139,51 @@
     </build>
 
     <dependencies>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>config-api</artifactId>
-            <version>${config.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal-binding-api</artifactId>
-            <version>${mdsal.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal-common-api</artifactId>
-            <version>${mdsal.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal-binding-config</artifactId>
-            <version>${mdsal.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal-binding-util</artifactId>
-            <version>${mdsal.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal-broker-impl</artifactId>
-            <version>${mdsal.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal-common</artifactId>
-            <version>${mdsal.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal-common-util</artifactId>
-            <version>${mdsal.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>sfc-model</artifactId>
-            <version>${project.version}</version>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>org.opendaylight.controller</groupId>-->
+            <!--<artifactId>config-api</artifactId>-->
+            <!--<version>${config.version}</version>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>org.opendaylight.controller</groupId>-->
+            <!--<artifactId>sal-binding-api</artifactId>-->
+            <!--<version>${mdsal.version}</version>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>org.opendaylight.controller</groupId>-->
+            <!--<artifactId>sal-common-api</artifactId>-->
+            <!--<version>${mdsal.version}</version>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>org.opendaylight.controller</groupId>-->
+            <!--<artifactId>sal-binding-config</artifactId>-->
+            <!--<version>${mdsal.version}</version>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>org.opendaylight.controller</groupId>-->
+            <!--<artifactId>sal-binding-util</artifactId>-->
+            <!--<version>${mdsal.version}</version>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>org.opendaylight.controller</groupId>-->
+            <!--<artifactId>sal-broker-impl</artifactId>-->
+            <!--<version>${mdsal.version}</version>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>org.opendaylight.controller</groupId>-->
+            <!--<artifactId>sal-common</artifactId>-->
+            <!--<version>${mdsal.version}</version>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>org.opendaylight.controller</groupId>-->
+            <!--<artifactId>sal-common-util</artifactId>-->
+            <!--<version>${mdsal.version}</version>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>${project.groupId}</groupId>-->
+            <!--<artifactId>sfc-model</artifactId>-->
+            <!--<version>${project.version}</version>-->
+        <!--</dependency>-->
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>sfc-provider</artifactId>

diff --git a/sfc-provider/pom.xml b/sfc-provider/pom.xml
index 630304ac68d448c342d381c9d4ce298ed2445b79..6b47388743b10e9e2b8f64f7419399936fdffe90 100755 (executable)
--- a/sfc-provider/pom.xml
+++ b/sfc-provider/pom.xml
@@ -85,12 +85,12 @@
             <version>${config.version}</version>
             <type>test-jar</type>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>yang-jmx-generator-plugin</artifactId>
-            <version>${config.version}</version>
-            <scope>compile</scope>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>org.opendaylight.controller</groupId>-->
+            <!--<artifactId>yang-jmx-generator-plugin</artifactId>-->
+            <!--<version>${config.version}</version>-->
+            <!--<scope>compile</scope>-->
+        <!--</dependency>-->
         <dependency>
             <groupId>org.osgi</groupId>
             <artifactId>org.osgi.core</artifactId>
@@ -236,8 +236,8 @@
                 <version>${compiler.version}</version>
                 <inherited>true</inherited>
                 <configuration>
-                    <source>1.7</source>
-                    <target>1.7</target>
+                    <source>${maven.compiler.source}</source>
+                    <target>${maven.compiler.target}</target>
                 </configuration>
             </plugin>
             <plugin>
@@ -251,6 +251,9 @@
                         <Export-Package>
                             org.opendaylight.sfc.provider.*;
                         </Export-Package>
+                        <Import-Package>
+                            Import-Package: org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.*;
+                        </Import-Package>
                         <Bundle-Name>${project.groupId}.${project.artifactId}</Bundle-Name>
                     </instructions>
                 </configuration>

diff --git a/sfc-sb-rest/pom.xml b/sfc-sb-rest/pom.xml
index dc5821f2d4e539da827e979b4c1e27eb3d5d88c3..1e99f9d8c3fe82e8270bf00c79886057be2298ff 100755 (executable)
--- a/sfc-sb-rest/pom.xml
+++ b/sfc-sb-rest/pom.xml
@@ -139,52 +139,52 @@
     </build>
 
     <dependencies>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>config-api</artifactId>
-            <version>${config.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal-binding-api</artifactId>
-            <version>${mdsal.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal-common-api</artifactId>
-            <version>${mdsal.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal-binding-config</artifactId>
-            <version>${mdsal.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal-binding-util</artifactId>
-            <version>${mdsal.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal-broker-impl</artifactId>
-            <version>${mdsal.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal-common</artifactId>
-            <version>${mdsal.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal-common-util</artifactId>
-            <version>${mdsal.version}</version>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>org.opendaylight.controller</groupId>-->
+            <!--<artifactId>config-api</artifactId>-->
+            <!--<version>${config.version}</version>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>org.opendaylight.controller</groupId>-->
+            <!--<artifactId>sal-binding-api</artifactId>-->
+            <!--<version>${mdsal.version}</version>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>org.opendaylight.controller</groupId>-->
+            <!--<artifactId>sal-common-api</artifactId>-->
+            <!--<version>${mdsal.version}</version>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>org.opendaylight.controller</groupId>-->
+            <!--<artifactId>sal-binding-config</artifactId>-->
+            <!--<version>${mdsal.version}</version>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>org.opendaylight.controller</groupId>-->
+            <!--<artifactId>sal-binding-util</artifactId>-->
+            <!--<version>${mdsal.version}</version>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>org.opendaylight.controller</groupId>-->
+            <!--<artifactId>sal-broker-impl</artifactId>-->
+            <!--<version>${mdsal.version}</version>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>org.opendaylight.controller</groupId>-->
+            <!--<artifactId>sal-common</artifactId>-->
+            <!--<version>${mdsal.version}</version>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>org.opendaylight.controller</groupId>-->
+            <!--<artifactId>sal-common-util</artifactId>-->
+            <!--<version>${mdsal.version}</version>-->
+        <!--</dependency>-->
 
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>sfc-model</artifactId>
-            <version>${project.version}</version>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>${project.groupId}</groupId>-->
+            <!--<artifactId>sfc-model</artifactId>-->
+            <!--<version>${project.version}</version>-->
+        <!--</dependency>-->
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>sfc-provider</artifactId>
@@ -208,12 +208,12 @@
             <version>${powermock.version}</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>${junit.version}</version>
-            <scope>test</scope>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>junit</groupId>-->
+            <!--<artifactId>junit</artifactId>-->
+            <!--<version>${junit.version}</version>-->
+            <!--<scope>test</scope>-->
+        <!--</dependency>-->
     </dependencies>
 
 </project>

diff --git a/sfclisp/pom.xml b/sfclisp/pom.xml
index 3b4ba4d9ff42f876ffb608ed2d0f6822917f180f..abbec627f0e1e50809b5badcd9c5086ede1e0591 100755 (executable)
--- a/sfclisp/pom.xml
+++ b/sfclisp/pom.xml
@@ -12,78 +12,81 @@
     <packaging>bundle</packaging>
 
     <dependencies>
-
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>sfc-model</artifactId>
+            <artifactId>sfc-provider</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
-          <groupId>${project.groupId}</groupId>
-          <artifactId>sfc-provider</artifactId>
-           <version>${project.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.lispflowmapping</groupId>
             <artifactId>mappingservice.api</artifactId>
             <version>1.2.0-SNAPSHOT</version>
         </dependency>
-
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-            <version>${slf4j.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>config-api</artifactId>
-            <version>${config.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal-binding-api</artifactId>
-            <version>${mdsal.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.sonatype.sisu</groupId>
             <artifactId>sisu-guava</artifactId>
             <version>0.9.9</version>
         </dependency>
-       <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal-common-api</artifactId>
-            <version>${mdsal.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal-binding-config</artifactId>
-            <version>${mdsal.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal-binding-util</artifactId>
-            <version>${mdsal.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal-broker-impl</artifactId>
-            <version>${mdsal.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal-common</artifactId>
-            <version>${mdsal.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal-common-util</artifactId>
-            <version>${mdsal.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.core</artifactId>
-            <version>${osgi.core.version}</version>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>${project.groupId}</groupId>-->
+            <!--<artifactId>sfc-model</artifactId>-->
+            <!--<version>${project.version}</version>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>org.slf4j</groupId>-->
+            <!--<artifactId>slf4j-api</artifactId>-->
+            <!--<version>${slf4j.version}</version>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>org.opendaylight.controller</groupId>-->
+            <!--<artifactId>config-api</artifactId>-->
+            <!--<version>${config.version}</version>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>org.opendaylight.controller</groupId>-->
+            <!--<artifactId>sal-binding-api</artifactId>-->
+            <!--<version>${mdsal.version}</version>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>org.sonatype.sisu</groupId>-->
+            <!--<artifactId>sisu-guava</artifactId>-->
+            <!--<version>0.9.9</version>-->
+        <!--</dependency>-->
+       <!--<dependency>-->
+            <!--<groupId>org.opendaylight.controller</groupId>-->
+            <!--<artifactId>sal-common-api</artifactId>-->
+            <!--<version>${mdsal.version}</version>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>org.opendaylight.controller</groupId>-->
+            <!--<artifactId>sal-binding-config</artifactId>-->
+            <!--<version>${mdsal.version}</version>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>org.opendaylight.controller</groupId>-->
+            <!--<artifactId>sal-binding-util</artifactId>-->
+            <!--<version>${mdsal.version}</version>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>org.opendaylight.controller</groupId>-->
+            <!--<artifactId>sal-broker-impl</artifactId>-->
+            <!--<version>${mdsal.version}</version>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>org.opendaylight.controller</groupId>-->
+            <!--<artifactId>sal-common</artifactId>-->
+            <!--<version>${mdsal.version}</version>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>org.opendaylight.controller</groupId>-->
+            <!--<artifactId>sal-common-util</artifactId>-->
+            <!--<version>${mdsal.version}</version>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>org.osgi</groupId>-->
+            <!--<artifactId>org.osgi.core</artifactId>-->
+            <!--<version>${osgi.core.version}</version>-->
+        <!--</dependency>-->
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>
@@ -101,8 +104,8 @@
                 <version>${compiler.version}</version>
                 <inherited>true</inherited>
                 <configuration>
-                    <source>1.7</source>
-                    <target>1.7</target>
+                    <source>${maven.compiler.source}</source>
+                    <target>${maven.compiler.target}</target>
                 </configuration>
             </plugin>
             <plugin>

diff --git a/sfcofl2/pom.xml b/sfcofl2/pom.xml
index 4e7a3d154e1c37bd7bcafa1cda931bf573fa9ae7..e773d7fdc80787eda7633fadb3e8253b7e77a1f1 100755 (executable)
--- a/sfcofl2/pom.xml
+++ b/sfcofl2/pom.xml
@@ -18,56 +18,56 @@
 
     <dependencies>
 
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>sfc-model</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-            <version>${slf4j.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>config-api</artifactId>
-            <version>${config.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal-binding-api</artifactId>
-            <version>${mdsal.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal-common-api</artifactId>
-            <version>${mdsal.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal-binding-config</artifactId>
-            <version>${mdsal.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal-binding-util</artifactId>
-            <version>${mdsal.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal-broker-impl</artifactId>
-            <version>${mdsal.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal-common</artifactId>
-            <version>${mdsal.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal-common-util</artifactId>
-            <version>${mdsal.version}</version>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>${project.groupId}</groupId>-->
+            <!--<artifactId>sfc-model</artifactId>-->
+            <!--<version>${project.version}</version>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>org.slf4j</groupId>-->
+            <!--<artifactId>slf4j-api</artifactId>-->
+            <!--<version>${slf4j.version}</version>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>org.opendaylight.controller</groupId>-->
+            <!--<artifactId>config-api</artifactId>-->
+            <!--<version>${config.version}</version>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>org.opendaylight.controller</groupId>-->
+            <!--<artifactId>sal-binding-api</artifactId>-->
+            <!--<version>${mdsal.version}</version>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>org.opendaylight.controller</groupId>-->
+            <!--<artifactId>sal-common-api</artifactId>-->
+            <!--<version>${mdsal.version}</version>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>org.opendaylight.controller</groupId>-->
+            <!--<artifactId>sal-binding-config</artifactId>-->
+            <!--<version>${mdsal.version}</version>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>org.opendaylight.controller</groupId>-->
+            <!--<artifactId>sal-binding-util</artifactId>-->
+            <!--<version>${mdsal.version}</version>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>org.opendaylight.controller</groupId>-->
+            <!--<artifactId>sal-broker-impl</artifactId>-->
+            <!--<version>${mdsal.version}</version>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>org.opendaylight.controller</groupId>-->
+            <!--<artifactId>sal-common</artifactId>-->
+            <!--<version>${mdsal.version}</version>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>org.opendaylight.controller</groupId>-->
+            <!--<artifactId>sal-common-util</artifactId>-->
+            <!--<version>${mdsal.version}</version>-->
+        <!--</dependency>-->
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>sfc-provider</artifactId>
@@ -113,11 +113,11 @@
           <artifactId>openflowplugin</artifactId>
           <version>${openflowplugin.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller.model</groupId>
-            <artifactId>model-inventory</artifactId>
-            <version>${mdsal.version}</version>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>org.opendaylight.controller.model</groupId>-->
+            <!--<artifactId>model-inventory</artifactId>-->
+            <!--<version>${mdsal.version}</version>-->
+        <!--</dependency>-->
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>yang-jmx-generator</artifactId>
@@ -190,61 +190,61 @@
             <artifactId>munge-maven-plugin</artifactId>
             <version>1.0</version>
         </dependency>
-        <dependency>
-            <groupId>com.sun.jersey</groupId>
-            <artifactId>jersey-client</artifactId>
-            <version>1.17</version>
-        </dependency>
-        <dependency>
-            <groupId>com.sun.jersey</groupId>
-            <artifactId>jersey-json</artifactId>
-            <version>1.19</version>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>com.sun.jersey</groupId>-->
+            <!--<artifactId>jersey-client</artifactId>-->
+            <!--<version>1.17</version>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>com.sun.jersey</groupId>-->
+            <!--<artifactId>jersey-json</artifactId>-->
+            <!--<version>1.19</version>-->
+        <!--</dependency>-->
         <dependency>
             <groupId>commons-lang</groupId>
             <artifactId>commons-lang</artifactId>
             <version>${commons.lang.version}</version>
         </dependency>
-        <dependency>
-            <groupId>com.google.code.gson</groupId>
-            <artifactId>gson</artifactId>
-            <version>${gson.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-annotations</artifactId>
-            <version>${jackson.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-core</artifactId>
-            <version>${jackson.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
-            <version>${jackson.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.datatype</groupId>
-            <artifactId>jackson-datatype-json-org</artifactId>
-            <version>${jackson.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.jaxrs</groupId>
-            <artifactId>jackson-jaxrs-base</artifactId>
-            <version>${jackson.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.jaxrs</groupId>
-            <artifactId>jackson-jaxrs-json-provider</artifactId>
-            <version>${jackson.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.module</groupId>
-            <artifactId>jackson-module-jaxb-annotations</artifactId>
-            <version>${jackson.version}</version>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>com.google.code.gson</groupId>-->
+            <!--<artifactId>gson</artifactId>-->
+            <!--<version>${gson.version}</version>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>com.fasterxml.jackson.core</groupId>-->
+            <!--<artifactId>jackson-annotations</artifactId>-->
+            <!--<version>${jackson.version}</version>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>com.fasterxml.jackson.core</groupId>-->
+            <!--<artifactId>jackson-core</artifactId>-->
+            <!--<version>${jackson.version}</version>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>com.fasterxml.jackson.core</groupId>-->
+            <!--<artifactId>jackson-databind</artifactId>-->
+            <!--<version>${jackson.version}</version>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>com.fasterxml.jackson.datatype</groupId>-->
+            <!--<artifactId>jackson-datatype-json-org</artifactId>-->
+            <!--<version>${jackson.version}</version>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>com.fasterxml.jackson.jaxrs</groupId>-->
+            <!--<artifactId>jackson-jaxrs-base</artifactId>-->
+            <!--<version>${jackson.version}</version>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>com.fasterxml.jackson.jaxrs</groupId>-->
+            <!--<artifactId>jackson-jaxrs-json-provider</artifactId>-->
+            <!--<version>${jackson.version}</version>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>com.fasterxml.jackson.module</groupId>-->
+            <!--<artifactId>jackson-module-jaxb-annotations</artifactId>-->
+            <!--<version>${jackson.version}</version>-->
+        <!--</dependency>-->
         <dependency>
             <groupId>org.glassfish</groupId>
             <artifactId>javax.json</artifactId>
@@ -290,8 +290,8 @@
                 <version>${compiler.version}</version>
                 <inherited>true</inherited>
                 <configuration>
-                    <source>1.7</source>
-                    <target>1.7</target>
+                    <source>${maven.compiler.source}</source>
+                    <target>${maven.compiler.target}</target>
                 </configuration>
             </plugin>
             <plugin>