Bump to odlparent 3.1.1

[controller.git] / opendaylight / config / config-it-base / pom.xml

diff --git a/opendaylight/config/config-it-base/pom.xml b/opendaylight/config/config-it-base/pom.xml
index 6c34e9137c8d073b200df717a90447a0230b31cb..2893908bd73b4003e99eabd38454145e34eba389 100644 (file)
--- a/opendaylight/config/config-it-base/pom.xml
+++ b/opendaylight/config/config-it-base/pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml version="1.0" encoding="UTF-8"?>

-<!-- vi: set et smarttab sw=4 tabstop=4: --><!--
+<!-- vi: set et smarttab sw=4 tabstop=4: -->
+<!--

 Copyright (c) 2014 Cisco Systems, Inc. and others.  All rights reserved.
 
 This program and the accompanying materials are made available under the
 Copyright (c) 2014 Cisco Systems, Inc. and others.  All rights reserved.
 
 This program and the accompanying materials are made available under the


@@ -11,12 +12,17 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>config-parent</artifactId>
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>config-parent</artifactId>

-    <version>0.5.0-SNAPSHOT</version>
+    <version>0.8.3-SNAPSHOT</version>

     <relativePath>../config-parent</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>config-it-base</artifactId>
   <packaging>bundle</packaging>
     <relativePath>../config-parent</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>config-it-base</artifactId>
   <packaging>bundle</packaging>

+
+  <properties>
+    <opendaylight.karaf.version>3.1.1</opendaylight.karaf.version>
+  </properties>
+

   <dependencyManagement>
     <dependencies>
       <dependency>
   <dependencyManagement>
     <dependencies>
       <dependency>


@@ -33,51 +39,67 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>config-util</artifactId>
     </dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>config-util</artifactId>
     </dependency>

+    <dependency>
+      <groupId>org.opendaylight.odlparent</groupId>
+      <artifactId>opendaylight-karaf-empty</artifactId>
+      <version>3.1.1</version>
+      <type>zip</type>
+    </dependency>
+

     <!-- Dependencies for pax exam karaf container -->
     <dependency>
     <!-- Dependencies for pax exam karaf container -->
     <dependency>

-        <groupId>org.ops4j.pax.exam</groupId>
-        <artifactId>pax-exam-container-karaf</artifactId>
-        <scope>compile</scope>
+      <groupId>org.ops4j.pax.exam</groupId>
+      <artifactId>pax-exam-container-karaf</artifactId>
+      <scope>compile</scope>

     </dependency>
     <dependency>
     </dependency>
     <dependency>

-        <groupId>org.ops4j.pax.exam</groupId>
-        <artifactId>pax-exam-junit4</artifactId>
-        <scope>compile</scope>
+      <groupId>org.ops4j.pax.exam</groupId>
+      <artifactId>pax-exam-junit4</artifactId>
+      <scope>compile</scope>

     </dependency>
     <dependency>
     </dependency>
     <dependency>

-        <groupId>org.ops4j.pax.exam</groupId>
-        <artifactId>pax-exam</artifactId>
-        <scope>compile</scope>
+      <groupId>org.ops4j.pax.exam</groupId>
+      <artifactId>pax-exam</artifactId>
+      <scope>compile</scope>

     </dependency>
     <dependency>
     </dependency>
     <dependency>

-        <groupId>org.ops4j.pax.url</groupId>
-        <artifactId>pax-url-aether</artifactId>
-        <scope>compile</scope>
+      <groupId>org.ops4j.pax.url</groupId>
+      <artifactId>pax-url-aether</artifactId>
+      <scope>compile</scope>

     </dependency>
     <dependency>
     </dependency>
     <dependency>

-        <groupId>javax.inject</groupId>
-        <artifactId>javax.inject</artifactId>
-        <version>1</version>
-        <scope>compile</scope>
+      <groupId>javax.inject</groupId>
+      <artifactId>javax.inject</artifactId>
+      <scope>compile</scope>

     </dependency>
     <dependency>
     </dependency>
     <dependency>

-        <groupId>org.apache.karaf.features</groupId>
-        <artifactId>org.apache.karaf.features.core</artifactId>
-        <version>${karaf.version}</version>
-        <scope>compile</scope>
+      <groupId>org.apache.karaf.features</groupId>
+      <artifactId>org.apache.karaf.features.core</artifactId>
+      <version>${karaf.version}</version>
+      <scope>compile</scope>

     </dependency>
     <dependency>
     </dependency>
     <dependency>

-        <groupId>org.osgi</groupId>
-        <artifactId>org.osgi.core</artifactId>
-        <scope>compile</scope>
+      <groupId>org.osgi</groupId>
+      <artifactId>org.osgi.core</artifactId>
+      <scope>compile</scope>

     </dependency>
     <dependency>
     </dependency>
     <dependency>

-        <groupId>junit</groupId>
-        <artifactId>junit</artifactId>
-        <scope>compile</scope>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>compile</scope>

     </dependency>
   </dependencies>
     </dependency>
   </dependencies>

+

   <build>
   <build>

+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-checkstyle-plugin</artifactId>
+        <configuration>
+          <propertyExpansion>checkstyle.violationSeverity=error</propertyExpansion>
+        </configuration>
+      </plugin>
+    </plugins>

     <resources>
       <resource>
         <directory>src/main/resources</directory>
     <resources>
       <resource>
         <directory>src/main/resources</directory>