Merge "Add missing copyright text"
authorTony Tkacik <ttkacik@cisco.com>
Thu, 7 May 2015 09:56:54 +0000 (09:56 +0000)
committerGerrit Code Review <gerrit@opendaylight.org>
Thu, 7 May 2015 09:56:54 +0000 (09:56 +0000)
1  2 
features/akka/pom.xml

diff --combined features/akka/pom.xml
index 743babf58981fb85044fb57c043b13d1142c371a,e2568684803f342f59c39e40b1ef4109d35a1cda..142e50bbc4242ebf21ffc58d42557c3461f0fb09
@@@ -1,6 -1,6 +1,6 @@@
  <?xml version="1.0" encoding="UTF-8"?>
  <!--
-  Necessary TODO: Put your copyright here.
+  Copyright (c) 2014, 2015 Cisco Systems, Inc. and others.  All rights reserved.
  
   This program and the accompanying materials are made available under the
   terms of the Eclipse Public License v1.0 which accompanies this distribution,
@@@ -10,7 -10,7 +10,7 @@@
     <parent>
      <groupId>org.opendaylight.controller</groupId>
      <artifactId>commons.opendaylight</artifactId>
 -    <version>1.5.0-SNAPSHOT</version>
 +    <version>1.6.0-SNAPSHOT</version>
      <relativePath>../../opendaylight/commons/opendaylight</relativePath>
     </parent>
     <artifactId>features-akka</artifactId>
        <features.file>features.xml</features.file>
        <!-- Optional TODO: 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>
 -      <karaf.version>3.0.1</karaf.version>
 -      <feature.test.version>0.7.0-SNAPSHOT</feature.test.version>
 -      <karaf.empty.version>1.5.0-SNAPSHOT</karaf.empty.version>
 +      <branding.version>1.2.0-SNAPSHOT</branding.version>
 +      <karaf.resources.version>1.6.0-SNAPSHOT</karaf.resources.version>
 +      <karaf.version>3.0.3</karaf.version>
 +      <feature.test.version>0.8.0-SNAPSHOT</feature.test.version>
 +      <karaf.empty.version>1.6.0-SNAPSHOT</karaf.empty.version>
        <surefire.version>2.16</surefire.version>
     </properties>
     <dependencies>
          <dependency>
            <groupId>org.opendaylight.yangtools</groupId>
            <artifactId>features-yangtools</artifactId>
 -          <version>0.7.0-SNAPSHOT</version>
 +          <version>0.8.0-SNAPSHOT</version>
            <classifier>features</classifier>
            <type>xml</type>
          </dependency>
          <dependency>
            <groupId>org.opendaylight.controller</groupId>
            <artifactId>features-mdsal</artifactId>
 -          <version>1.2.0-SNAPSHOT</version>
 +          <version>1.3.0-SNAPSHOT</version>
            <classifier>features</classifier>
            <type>xml</type>
          </dependency>
          <dependency>
            <groupId>org.opendaylight.openflowplugin</groupId>
            <artifactId>features-openflowplugin</artifactId>
 -          <version>0.1.0-SNAPSHOT</version>
 +          <version>0.2.0-SNAPSHOT</version>
            <classifier>features</classifier>
            <type>xml</type>
          </dependency>