BIGTOP-775. In Groovy 1.8 the behavior of a getters of static fields changed slightly

5 files changed, 9 insertions, 9 deletions

diff --git a/bigtop-test-framework/src/main/groovy/org/apache/bigtop/itest/pmanager/AptCmdLinePackageManager.groovy b/bigtop-test-framework/src/main/groovy/org/apache/bigtop/itest/pmanager/AptCmdLinePackageManager.groovy
index d8bbe7e7..ff911fcc 100644
--- a/bigtop-test-framework/src/main/groovy/org/apache/bigtop/itest/pmanager/AptCmdLinePackageManager.groovy
+++ b/bigtop-test-framework/src/main/groovy/org/apache/bigtop/itest/pmanager/AptCmdLinePackageManager.groovy
@@ -20,8 +20,8 @@ package org.apache.bigtop.itest.pmanager
 
 class AptCmdLinePackageManager extends PackageManager {
   // FIXME: NB export DEBIAN_FRONTEND=noninteractive
-  static String type  = "apt";
-  static String repository_registry = "/etc/apt/sources.list.d/%s.list";
+  String type  = "apt";
+  String repository_registry = "/etc/apt/sources.list.d/%s.list";
 
   private static final ROOT_URL = "http://us.archive.ubuntu.com/ubuntu/";
 
diff --git a/bigtop-test-framework/src/main/groovy/org/apache/bigtop/itest/pmanager/PackageManager.groovy b/bigtop-test-framework/src/main/groovy/org/apache/bigtop/itest/pmanager/PackageManager.groovy
index 468990de..c8a61786 100644
--- a/bigtop-test-framework/src/main/groovy/org/apache/bigtop/itest/pmanager/PackageManager.groovy
+++ b/bigtop-test-framework/src/main/groovy/org/apache/bigtop/itest/pmanager/PackageManager.groovy
@@ -171,13 +171,13 @@ public abstract class PackageManager {
    * type of a package manager. expected to be overwritten by concrete subclasses implementing
    * particular package managers (yum, apt, zypper, etc.)
    */
-  static String type  = "abstract"
+  String type  = "abstract"
 
   /**
    * A registry location for repositories to be added to. Currently all the package managers
    * we have to support can be handled by treating this as a subdirectory in a local filesystem.
    */
-  static String repository_registry = "/tmp/%s.repo"
+  String repository_registry = "/tmp/%s.repo"
 
   Shell shRoot = new Shell("/bin/bash -s", "root")
   Shell shUser = new Shell("/bin/bash -s")
diff --git a/bigtop-test-framework/src/main/groovy/org/apache/bigtop/itest/pmanager/UrpmiCmdLinePackageManager.groovy b/bigtop-test-framework/src/main/groovy/org/apache/bigtop/itest/pmanager/UrpmiCmdLinePackageManager.groovy
index 2cf8eea7..544131e9 100644
--- a/bigtop-test-framework/src/main/groovy/org/apache/bigtop/itest/pmanager/UrpmiCmdLinePackageManager.groovy
+++ b/bigtop-test-framework/src/main/groovy/org/apache/bigtop/itest/pmanager/UrpmiCmdLinePackageManager.groovy
@@ -21,7 +21,7 @@ package org.apache.bigtop.itest.pmanager
 import org.apache.bigtop.itest.posix.Service
 
 class UrpmiCmdLinePackageManager extends PackageManager {
-  static String type  = "urpmi";
+  String type  = "urpmi";
   
   public void setDefaults(String defaults) {}
 
diff --git a/bigtop-test-framework/src/main/groovy/org/apache/bigtop/itest/pmanager/YumCmdLinePackageManager.groovy b/bigtop-test-framework/src/main/groovy/org/apache/bigtop/itest/pmanager/YumCmdLinePackageManager.groovy
index 5d55dc2f..32eae693 100644
--- a/bigtop-test-framework/src/main/groovy/org/apache/bigtop/itest/pmanager/YumCmdLinePackageManager.groovy
+++ b/bigtop-test-framework/src/main/groovy/org/apache/bigtop/itest/pmanager/YumCmdLinePackageManager.groovy
@@ -21,8 +21,8 @@ package org.apache.bigtop.itest.pmanager
 import org.apache.bigtop.itest.posix.Service
 
 class YumCmdLinePackageManager extends PackageManager {
-  static String type  = "yum";
-  static String repository_registry = "/etc/yum.repos.d/%s.repo";
+  String type  = "yum";
+  String repository_registry = "/etc/yum.repos.d/%s.repo";
 
   public void setDefaults(String defaults) {}
 
diff --git a/bigtop-test-framework/src/main/groovy/org/apache/bigtop/itest/pmanager/ZypperCmdLinePackageManager.groovy b/bigtop-test-framework/src/main/groovy/org/apache/bigtop/itest/pmanager/ZypperCmdLinePackageManager.groovy
index 2bfcb841..22d02db9 100644
--- a/bigtop-test-framework/src/main/groovy/org/apache/bigtop/itest/pmanager/ZypperCmdLinePackageManager.groovy
+++ b/bigtop-test-framework/src/main/groovy/org/apache/bigtop/itest/pmanager/ZypperCmdLinePackageManager.groovy
@@ -21,8 +21,8 @@ package org.apache.bigtop.itest.pmanager
 import org.apache.bigtop.itest.posix.Service
 
 class ZypperCmdLinePackageManager extends PackageManager {
-  static String type  = "zypper";
-  static String repository_registry = "/etc/zypp/repos.d/%s.repo";
+  String type  = "zypper";
+  String repository_registry = "/etc/zypp/repos.d/%s.repo";
   
   private String key_opts = "--gpg-auto-import-keys";