diff options
Diffstat (limited to 'vnf-sdk-function-test')
3 files changed, 4 insertions, 72 deletions
diff --git a/vnf-sdk-function-test/pom.xml b/vnf-sdk-function-test/pom.xml index 2ad2b56..560d444 100644 --- a/vnf-sdk-function-test/pom.xml +++ b/vnf-sdk-function-test/pom.xml @@ -26,6 +26,7 @@ <modelVersion>4.0.0</modelVersion> <artifactId>vnf-sdk-function-test</artifactId> <name>vnfsdk Functional Tests</name> + <version>1.1.0-SNAPSHOT</version> <packaging>jar</packaging> <build> @@ -144,11 +145,6 @@ <artifactId>dropwizard-hibernate</artifactId> <version>1.3.1</version> </dependency> - <dependency> - <groupId>io.dropwizard</groupId> - <artifactId>dropwizard-migrations</artifactId> - <version>1.3.1</version> - </dependency> <!-- lombok --> <dependency> <groupId>org.projectlombok</groupId> @@ -164,17 +160,17 @@ <dependency> <groupId>org.glassfish.jersey.core</groupId> <artifactId>jersey-server</artifactId> - <version>2.26</version> + <version>2.25.1</version> </dependency> <dependency> <groupId>org.glassfish.jersey.media</groupId> <artifactId>jersey-media-multipart</artifactId> - <version>2.26</version> + <version>2.25.1</version> </dependency> <dependency> <groupId>org.glassfish.jersey.containers</groupId> <artifactId>jersey-container-servlet-core</artifactId> - <version>2.26</version> + <version>2.25.1</version> </dependency> <!-- consumer --> <dependency> diff --git a/vnf-sdk-function-test/src/main/java/org/onap/vnfsdk/functest/VnfSdkFuncTestApp.java b/vnf-sdk-function-test/src/main/java/org/onap/vnfsdk/functest/VnfSdkFuncTestApp.java index cb5f681..e77efc1 100644 --- a/vnf-sdk-function-test/src/main/java/org/onap/vnfsdk/functest/VnfSdkFuncTestApp.java +++ b/vnf-sdk-function-test/src/main/java/org/onap/vnfsdk/functest/VnfSdkFuncTestApp.java @@ -21,7 +21,6 @@ import io.dropwizard.Application; import io.dropwizard.db.DataSourceFactory; import io.dropwizard.hibernate.HibernateBundle; import io.dropwizard.hibernate.ScanningHibernateBundle; -import io.dropwizard.migrations.MigrationsBundle; import io.dropwizard.server.SimpleServerFactory; import io.dropwizard.setup.Bootstrap; import io.dropwizard.setup.Environment; @@ -58,12 +57,6 @@ public class VnfSdkFuncTestApp extends Application<VnfSdkFuncTestAppConfiguratio @Override public void initialize(Bootstrap<VnfSdkFuncTestAppConfiguration> bootstrap) { - bootstrap.addBundle(new MigrationsBundle<VnfSdkFuncTestAppConfiguration>() { - @Override - public DataSourceFactory getDataSourceFactory(VnfSdkFuncTestAppConfiguration configuration) { - return configuration.getDataSourceFactory(); - } - }); bootstrap.addBundle(hibernateBundle); } diff --git a/vnf-sdk-function-test/src/main/resources/migrations.xml b/vnf-sdk-function-test/src/main/resources/migrations.xml deleted file mode 100644 index 9ec5510..0000000 --- a/vnf-sdk-function-test/src/main/resources/migrations.xml +++ /dev/null @@ -1,57 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<databaseChangeLog - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns="http://www.liquibase.org/xml/ns/dbchangelog" - xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog - http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.1.xsd"> - - <changeSet id="1" author="Kailun Qin"> - <createTable tableName="TaskRecord"> - <column name="packageID" type="varchar(255)"> - <constraints primaryKey="true" nullable="false"/> - </column> - <column name="taskID" type="varchar(255)"> - <constraints unique="true" foreignKeyName="CaseRecord.taskID" nullable="false"/> - </column> - <column name="envID" type="varchar(255)"> - <constraints nullable="false"/> - </column> - <column name="uploadID" type="varchar(255)"> - <constraints nullable="false"/> - </column> - <column name="operID" type="varchar(255)"> - <constraints nullable="false"/> - </column> - <column name="funcID" type="varchar(255)"> - </column> - <column name="status" type="varchar(255)"> - <constraints nullable="false"/> - </column> - <column name="operFinished" type="varchar(255)"> - <constraints nullable="false"/> - </column> - <column name="operResult" type="varchar(255)"> - <constraints nullable="false"/> - </column> - <column name="OperResultMessage" type="varchar(255)"> - </column> - </createTable> - - <createTable tableName="CaseRecord"> - <column name="taskID" type="varchar(255)"> - <constraints primaryKey="true" nullable="false"/> - </column> - <column name="funcID" type="varchar(255)"> - </column> - <column name="testID" type="varchar(255)"> - </column> - <column name="testResult" type="varchar(255)"> - <constraints nullable="false"/> - </column> - <column name="testDescription" type="varchar(255)"> - <constraints nullable="false"/> - </column> - </createTable> - </changeSet> -</databaseChangeLog> |