get liquibase version from project property

forge · Jul 3, 2015 · f03fe34 · f03fe34
1 parent be86271
commit f03fe34
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 21 deletions.
diff --git a/src/main/java/org/jboss/forge/addon/dbma/facet/DBMAFacetImpl.java b/src/main/java/org/jboss/forge/addon/dbma/facet/DBMAFacetImpl.java
@@ -80,8 +80,6 @@ public void createMigrationDirectory()
       ResourcesFacet resourcesFacet = getFaceted().getFacet(ResourcesFacet.class);
       resourcesFacet.getResourceDirectory().getOrCreateChildDirectory(Constants.DBMA_MIGRATION_DIRECTORY_NAME);
    }
-
-
 
    @Override
    public boolean isInstalled()
@@ -94,14 +92,18 @@ && getFaceted().getFacet(ResourcesFacet.class).getResourceDirectory()
 
    public void setPropertiesFile(ConnectionProfile connection)
    {
+      String liquibaseVersion = getFaceted().getFacet(MetadataFacet.class).getDirectProperty(
+               Constants.LIQUIBASE_VERSION_PROPERTY_NAME);
       DBMAPropertiesBuilder pBuilder = DBMAPropertiesBuilder.create();
-      pBuilder.setConnection(connection).setLiquibaseVersion(Constants.LIQUIBASE_DEFAULT_VERSION);
+
+      pBuilder.setConnection(connection).setLiquibaseVersion(liquibaseVersion);
 
       ResourcesFacet projectResourcesFacet = getFaceted().getFacet(ResourcesFacet.class);
       DirectoryResource migrationDir = projectResourcesFacet.getResourceDirectory().getChildDirectory(
                Constants.DBMA_MIGRATION_DIRECTORY_NAME);
 
-      FileResource<?> propertiesFile = migrationDir.getChild(Constants.DBMA_PROPERTIES_FILE_NAME).reify(FileResource.class);
+      FileResource<?> propertiesFile = migrationDir.getChild(Constants.DBMA_PROPERTIES_FILE_NAME).reify(
+               FileResource.class);
       propertiesFile.setContents(pBuilder.toString());
    }
 
@@ -129,7 +131,7 @@ public List<String> getLiquibaseVersions()
    {
       List<String> versions = new ArrayList<String>();
       versions.add(Constants.LIQUIBASE_DEFAULT_VERSION);
-      
+
       return versions;
 
    }

diff --git a/src/test/java/org/jboss/forge/addon/commands/SetupCommandTest.java b/src/test/java/org/jboss/forge/addon/commands/SetupCommandTest.java