diff --git a/framework/pom.xml b/framework/pom.xml index fcb4096d009..ca2a4f35445 100644 --- a/framework/pom.xml +++ b/framework/pom.xml @@ -28,10 +28,9 @@ install - src - test ipc + rest diff --git a/framework/rest/pom.xml b/framework/rest/pom.xml new file mode 100644 index 00000000000..dc2a580b4cc --- /dev/null +++ b/framework/rest/pom.xml @@ -0,0 +1,44 @@ + + 4.0.0 + + org.apache.cloudstack + cloudstack-framework + 4.1.0-SNAPSHOT + ../pom.xml + + cloud-framework-rest + CloudStack Framework for Providing REST + + install + src + test + + + + com.fasterxml.jackson.module + jackson-module-jaxb-annotations + 2.1.1 + + + com.fasterxml.jackson.core + jackson-annotations + 2.1.1 + + + com.fasterxml.jackson.core + jackson-core + 2.1.1 + + + com.fasterxml.jackson.core + jackson-databind + 2.1.1 + + + com.fasterxml.jackson.jaxrs + jackson-jaxrs-json-provider + 2.1.1 + + + diff --git a/server/src/com/cloud/upgrade/dao/Upgrade40to41.java b/server/src/com/cloud/upgrade/dao/Upgrade40to41.java index 5067f39d011..90f9e1723f3 100644 --- a/server/src/com/cloud/upgrade/dao/Upgrade40to41.java +++ b/server/src/com/cloud/upgrade/dao/Upgrade40to41.java @@ -26,58 +26,58 @@ import java.sql.Connection; */ public class Upgrade40to41 extends Upgrade30xBase implements DbUpgrade { - /** - * - */ - public Upgrade40to41() { - // TODO Auto-generated constructor stub - } + /** + * + */ + public Upgrade40to41() { + // TODO Auto-generated constructor stub + } - /* (non-Javadoc) - * @see com.cloud.upgrade.dao.DbUpgrade#getUpgradableVersionRange() - */ - @Override - public String[] getUpgradableVersionRange() { - return new String[] { "4.0.0", "4.1.0" }; - } + /* (non-Javadoc) + * @see com.cloud.upgrade.dao.DbUpgrade#getUpgradableVersionRange() + */ + @Override + public String[] getUpgradableVersionRange() { + return new String[] { "4.0.0", "4.1.0" }; + } - /* (non-Javadoc) - * @see com.cloud.upgrade.dao.DbUpgrade#getUpgradedVersion() - */ - @Override - public String getUpgradedVersion() { - return "4.1.0"; - } + /* (non-Javadoc) + * @see com.cloud.upgrade.dao.DbUpgrade#getUpgradedVersion() + */ + @Override + public String getUpgradedVersion() { + return "4.1.0"; + } - /* (non-Javadoc) - * @see com.cloud.upgrade.dao.DbUpgrade#supportsRollingUpgrade() - */ - @Override - public boolean supportsRollingUpgrade() { - return false; - } + /* (non-Javadoc) + * @see com.cloud.upgrade.dao.DbUpgrade#supportsRollingUpgrade() + */ + @Override + public boolean supportsRollingUpgrade() { + return false; + } - /* (non-Javadoc) - * @see com.cloud.upgrade.dao.DbUpgrade#getPrepareScripts() - */ - @Override - public File[] getPrepareScripts() { - return new File[0]; - } + /* (non-Javadoc) + * @see com.cloud.upgrade.dao.DbUpgrade#getPrepareScripts() + */ + @Override + public File[] getPrepareScripts() { + return new File[0]; + } - /* (non-Javadoc) - * @see com.cloud.upgrade.dao.DbUpgrade#performDataMigration(java.sql.Connection) - */ - @Override - public void performDataMigration(Connection conn) { - } + /* (non-Javadoc) + * @see com.cloud.upgrade.dao.DbUpgrade#performDataMigration(java.sql.Connection) + */ + @Override + public void performDataMigration(Connection conn) { + } - /* (non-Javadoc) - * @see com.cloud.upgrade.dao.DbUpgrade#getCleanupScripts() - */ - @Override - public File[] getCleanupScripts() { - return new File[0]; - } + /* (non-Javadoc) + * @see com.cloud.upgrade.dao.DbUpgrade#getCleanupScripts() + */ + @Override + public File[] getCleanupScripts() { + return new File[0]; + } }