BUG 5370 - changes required by java8

- powermockito versions are removed
  so this commit depends on Change 35210

Change-Id: I81f43b6d49a45308d85a9f29c22c3fb95b739d0e
Signed-off-by: Matej Perina <matej.perina@pantheon.sk>

diff --git a/groupbasedpolicy/src/main/java/org/opendaylight/controller/config/yang/config/groupbasedpolicy/StatisticsManagerImplModule.java b/groupbasedpolicy/src/main/java/org/opendaylight/controller/config/yang/config/groupbasedpolicy/StatisticsManagerImplModule.java
index cf09e09c35f8f6eaf657accebfb5612170ee6510..81f0d6179d57c91449120939ab334c03e4a5429d 100644 (file)
--- a/groupbasedpolicy/src/main/java/org/opendaylight/controller/config/yang/config/groupbasedpolicy/StatisticsManagerImplModule.java
+++ b/groupbasedpolicy/src/main/java/org/opendaylight/controller/config/yang/config/groupbasedpolicy/StatisticsManagerImplModule.java
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2015 Cisco Systems, Inc.  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,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ */
+
+/*
+* Generated file
+*
+* Generated from: yang module name: groupbasedpolicy-cfg yang module local name: policy-validator-registry-impl
+* Generated by: org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator
+* Generated at: Thu Dec 10 17:52:04 CET 2015
+*
+* Do not modify this file unless it is present under src/main directory
+*/
 package org.opendaylight.controller.config.yang.config.groupbasedpolicy;
 
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;

diff --git a/groupbasedpolicy/src/main/java/org/opendaylight/controller/config/yang/config/groupbasedpolicy/StatisticsManagerImplModuleFactory.java b/groupbasedpolicy/src/main/java/org/opendaylight/controller/config/yang/config/groupbasedpolicy/StatisticsManagerImplModuleFactory.java
index 19c50378c817a76b9f06b12757615f5e5b5c0c53..71e4e02c21a874ed8ae3311bf43191d959506372 100644 (file)
--- a/groupbasedpolicy/src/main/java/org/opendaylight/controller/config/yang/config/groupbasedpolicy/StatisticsManagerImplModuleFactory.java
+++ b/groupbasedpolicy/src/main/java/org/opendaylight/controller/config/yang/config/groupbasedpolicy/StatisticsManagerImplModuleFactory.java
@@ -1,9 +1,17 @@
+/*
+ * Copyright (c) 2015 Cisco Systems, Inc.  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,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ */
+
 /*
 * Generated file
 *
-* Generated from: yang module name: groupbasedpolicy-cfg yang module local name: statistics-manager-impl
+* Generated from: yang module name: groupbasedpolicy-cfg yang module local name: policy-validator-registry-impl
 * Generated by: org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator
-* Generated at: Mon Dec 14 14:12:17 CET 2015
+* Generated at: Thu Dec 10 17:52:04 CET 2015
 *
 * Do not modify this file unless it is present under src/main directory
 */

diff --git a/renderers/faas/pom.xml b/renderers/faas/pom.xml
index 222b9616f2fdc779c867126baa7f1696a7fc6f02..f92f8dea20f25984b5fe186f496037e357709d3a 100644 (file)
--- a/renderers/faas/pom.xml
+++ b/renderers/faas/pom.xml
@@ -20,7 +20,6 @@
   <properties>
     <openflowplugin.version>0.3.0-SNAPSHOT</openflowplugin.version>
     <faas.version>1.1.0-SNAPSHOT</faas.version>
-    <powermock.version>1.5.2</powermock.version>
   </properties>
 
   <dependencies>
@@ -49,19 +48,16 @@
     <dependency>
       <groupId>org.powermock</groupId>
       <artifactId>powermock-core</artifactId>
-      <version>${powermock.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.powermock</groupId>
       <artifactId>powermock-module-junit4</artifactId>
-      <version>${powermock.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.powermock</groupId>
       <artifactId>powermock-api-mockito</artifactId>
-      <version>${powermock.version}</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

diff --git a/renderers/iovisor/pom.xml b/renderers/iovisor/pom.xml
index 4c699d59d3a9117f3cd53cf9620507e1a6c84f18..1be4a1bf10855fc8456cec85bcaeffd95fd31902 100644 (file)
--- a/renderers/iovisor/pom.xml
+++ b/renderers/iovisor/pom.xml
@@ -17,10 +17,6 @@
   <artifactId>iovisor-renderer</artifactId>
   <packaging>bundle</packaging>
 
-  <properties>
-    <powermock.version>1.5.2</powermock.version>
-  </properties>
-
   <dependencies>
     <dependency>
       <groupId>org.opendaylight.mdsal.model</groupId>
@@ -75,19 +71,16 @@
     <dependency>
       <groupId>org.powermock</groupId>
       <artifactId>powermock-core</artifactId>
-      <version>${powermock.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.powermock</groupId>
       <artifactId>powermock-module-junit4</artifactId>
-      <version>${powermock.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.powermock</groupId>
       <artifactId>powermock-api-mockito</artifactId>
-      <version>${powermock.version}</version>
       <scope>test</scope>
     </dependency>
   </dependencies>