Merge "Add copyright messages for java files"
authorTony Tkacik <ttkacik@cisco.com>
Fri, 20 Jun 2014 12:14:32 +0000 (12:14 +0000)
committerGerrit Code Review <gerrit@opendaylight.org>
Fri, 20 Jun 2014 12:14:32 +0000 (12:14 +0000)
1  2 
opendaylight/commons/opendaylight/pom.xml

index 3f1fa38ebd8631d4e0c4b1917088a91edb637c7c,73ae6de2413df9ee900a26a711eda3c17c840221..61febcfdc527c4d6b16aa242a8619ba0fb3e03b2
@@@ -20,8 -20,8 +20,8 @@@
      <appauth.version>0.4.2-SNAPSHOT</appauth.version>
      <archetype-app-northbound>0.0.1-SNAPSHOT</archetype-app-northbound>
      <aries.util.version>1.1.0</aries.util.version>
 -    <!-- Controller Modules Versions -->
      <arphandler.version>0.5.2-SNAPSHOT</arphandler.version>
 +    <!-- Controller Modules Versions -->
      <arphandler.version>0.5.2-SNAPSHOT</arphandler.version>
      <asm.version>4.1</asm.version>
      <!-- Plugin Versions -->
      <clustering.stub.version>0.4.2-SNAPSHOT</clustering.stub.version>
      <clustering.test.version>0.4.2-SNAPSHOT</clustering.test.version>
      <commmons.northbound.version>0.4.2-SNAPSHOT</commmons.northbound.version>
 -    <commons.checkstyle.version>0.0.3-SNAPSHOT</commons.checkstyle.version>
      <!-- Third Party Versions -->
 +    <commons.catalina>7.0.32.v201211201336</commons.catalina>
 +    <commons.catalina.ha>7.0.32.v201211201952</commons.catalina.ha>
 +    <commons.catalina.tribes>7.0.32.v201211201952</commons.catalina.tribes>
 +    <commons.checkstyle.version>0.0.3-SNAPSHOT</commons.checkstyle.version>
      <commons.codec.version>1.7</commons.codec.version>
 +    <commons.coyote>7.0.32.v201211201952</commons.coyote>
 +    <commons.el>7.0.32.v201211081135</commons.el>
      <commons.fileupload.version>1.2.2</commons.fileupload.version>
      <commons.httpclient.version>0.1.2-SNAPSHOT</commons.httpclient.version>
      <commons.io.version>2.4</commons.io.version>
 +    <commons.jasper>7.0.32.v201211201952</commons.jasper>
 +    <commons.juli.version>7.0.32.v201211081135</commons.juli.version>
      <commons.lang.version>3.1</commons.lang.version>
      <commons.logback_settings.version>0.0.2-SNAPSHOT</commons.logback_settings.version>
      <commons.net.version>3.0.1</commons.net.version>
@@@ -56,8 -49,6 +56,8 @@@
      <commons.opendaylight.concepts.version>0.5.2-SNAPSHOT</commons.opendaylight.concepts.version>
      <commons.opendaylight.version>1.4.2-SNAPSHOT</commons.opendaylight.version>
      <commons.parent.version>1.0.2-SNAPSHOT</commons.parent.version>
 +    <commons.tomcat.api>7.0.32.v201211081135</commons.tomcat.api>
 +    <commons.tomcat.util>7.0.32.v201211201952</commons.tomcat.util>
      <compiler.version>2.3.2</compiler.version>
      <concepts.version>0.5.2-SNAPSHOT</concepts.version>
      <config.version>0.2.5-SNAPSHOT</config.version>
          <artifactId>akka-remote_${scala.version}</artifactId>
          <version>${akka.version}</version>
        </dependency>
+       <dependency>
+         <groupId>com.typesafe.akka</groupId>
+         <artifactId>akka-testkit_${scala.version}</artifactId>
+         <version>${akka.version}</version>
+       </dependency>
        <dependency>
          <groupId>commons-codec</groupId>
          <artifactId>commons-codec</artifactId>
        <dependency>
          <groupId>orbit</groupId>
          <artifactId>org.apache.catalina</artifactId>
 -        <version>7.0.32.v201211201336</version>
 +        <version>${commons.catalina}</version>
        </dependency>
        <dependency>
          <groupId>orbit</groupId>
          <artifactId>org.apache.catalina.ha</artifactId>
 -        <version>7.0.32.v201211201952</version>
 +        <version>${commons.catalina.ha}</version>
        </dependency>
        <dependency>
          <groupId>orbit</groupId>
          <artifactId>org.apache.catalina.tribes</artifactId>
 -        <version>7.0.32.v201211201952</version>
 +        <version>${commons.catalina.tribes}</version>
        </dependency>
        <dependency>
          <groupId>orbit</groupId>
          <artifactId>org.apache.coyote</artifactId>
 -        <version>7.0.32.v201211201952</version>
 +        <version>${commons.coyote}</version>
        </dependency>
        <dependency>
          <groupId>orbit</groupId>
          <artifactId>org.apache.el</artifactId>
 -        <version>7.0.32.v201211081135</version>
 +        <version>${commons.el}</version>
        </dependency>
        <dependency>
          <groupId>orbit</groupId>
          <artifactId>org.apache.jasper</artifactId>
 -        <version>7.0.32.v201211201952</version>
 +        <version>${commons.jasper}</version>
        </dependency>
        <dependency>
          <groupId>orbit</groupId>
          <artifactId>org.apache.juli.extras</artifactId>
 -        <version>7.0.32.v201211081135</version>
 +        <version>${commons.juli.version}</version>
        </dependency>
        <dependency>
          <groupId>orbit</groupId>
          <artifactId>org.apache.tomcat.api</artifactId>
 -        <version>7.0.32.v201211081135</version>
 +        <version>${commons.tomcat.api}</version>
        </dependency>
        <dependency>
          <groupId>orbit</groupId>
          <artifactId>org.apache.tomcat.util</artifactId>
 -        <version>7.0.32.v201211201952</version>
 +        <version>${commons.tomcat.util}</version>
        </dependency>
        <dependency>
          <groupId>org.aopalliance</groupId>