remove the constant VERSION number (#48)

* remove the constant VERSION number

* get the imagetool version string from pom.xml

Author: xiancao

imagetool/pom.xml

@@ -140,6 +140,12 @@
                     <argLine> 
                         -Xmx1024m -XX:MaxPermSize=256m
                     </argLine>
+                    <systemProperties>
+                        <property>
+                            <name>imagetoolversion</name>
+                            <value>${project.version}</value>
+                        </property>
+                    </systemProperties>
                 </configuration>
                 <executions>
                     <execution>

imagetool/src/test/java/com/oracle/weblogic/imagetool/integration/BaseTest.java

@@ -15,7 +15,6 @@
 public class BaseTest {
 
     protected static final Logger logger = Logger.getLogger(ITImagetool.class.getName());
-    protected static final String VERSION = "1.0.1";
     protected static final String PS = File.pathSeparator;
     protected static final String FS = File.separator;
     private static final String OCIR_SERVER = "phx.ocir.io";
@@ -33,6 +32,8 @@ public class BaseTest {
     private static String imagetoolZipfile = "";
     private static int maxIterations = 50;
     private static int waitTime = 5;
+    private static String IMAGETOOLZIPFILE_PREFIX = "imagetool-";
+    private static String IMAGETOOLZIPFILE_SUFFIX = ".zip";
 
     protected static void initialize() throws Exception {
         logger.info("Initializing the tests ...");
@@ -50,7 +51,7 @@ protected static void initialize() throws Exception {
             wlsImgCacheDir = System.getenv("HOME") + FS + "cache";
         }
 
-        imagetoolZipfile = "imagetool-" + VERSION + "-SNAPSHOT.zip";
+        imagetoolZipfile = getImagetoolZipfile();
 
         imagetool = "java -cp \"" + getImagetoolHome() + FS + "lib" + FS + "*\" -Djava.util.logging.config.file=" +
                 getImagetoolHome() + FS + "bin" + FS + "logging.properties com.oracle.weblogic.imagetool.cli.CLIDriver";
@@ -153,8 +154,10 @@ protected static String getTargetDir() {
         return getProjectRoot() + FS + "target";
     }
 
-    protected static String getImagetoolHome() {
-        return getProjectRoot() + FS + "imagetool-" + VERSION + "-SNAPSHOT";
+    protected static String getImagetoolHome() throws Exception {
+        int endIndex = getImagetoolZipfile().length() - IMAGETOOLZIPFILE_SUFFIX.length();
+        String imagetooldir = getImagetoolZipfile().substring(0, endIndex);
+        return getProjectRoot() + FS + imagetooldir;
     }
 
     protected static String getInstallerCacheDir() {
@@ -316,4 +319,9 @@ private static void checkCmdInLoop(String cmd, String matchStr)
             }
         }
     }
+
+    private static String getImagetoolZipfile() throws Exception {
+        String version = System.getProperty("imagetoolversion");
+        return IMAGETOOLZIPFILE_PREFIX + version + IMAGETOOLZIPFILE_SUFFIX;
+    }
 }