X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=apiroute%2Fapiroute-service%2Fpom.xml;h=13a3d4b054b5d22a2ce7347beb764f046f1a9de5;hb=71648c4240e33deff04b6d96b3fab4d8d710b14c;hp=c0346a308dba6a6bd1074c49166e88d7e64fa211;hpb=18352a47ee8f6e4fbb499dc1eee20587b1e53439;p=msb%2Fapigateway.git

diff --git a/apiroute/apiroute-service/pom.xml b/apiroute/apiroute-service/pom.xml
index c0346a3..13a3d4b 100644
--- a/apiroute/apiroute-service/pom.xml
+++ b/apiroute/apiroute-service/pom.xml
@@ -12,17 +12,22 @@
 	<parent>
 		<groupId>org.onap.msb.apigateway.apiroute</groupId>
 		<artifactId>apiroute-parent</artifactId>
-		<version>1.2.5-SNAPSHOT</version>
+		<version>1.6.0-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.onap.msb.apigateway.apiroute</groupId>
 	<artifactId>apiroute-service</artifactId>
 	<name>onap/msb/apigateway/apiroute/apiroute-service</name>
 	<packaging>jar</packaging>
-	<version>1.2.5-SNAPSHOT</version>
+	<version>1.6.0-SNAPSHOT</version>
 
 
 	<dependencies>
+	    <dependency>
+            <groupId>org.javassist</groupId>
+            <artifactId>javassist</artifactId>
+            <version>3.23.1-GA</version>
+        </dependency>
 		<dependency>
 			<groupId>io.dropwizard</groupId>
 			<artifactId>dropwizard-core</artifactId>
@@ -53,12 +58,14 @@
 		<dependency>
 			<groupId>org.powermock</groupId>
 			<artifactId>powermock-module-junit4</artifactId>
+			<version>2.0.0</version>
 			<scope>test</scope>
 		</dependency>
 
 		<dependency>
 			<groupId>org.powermock</groupId>
-			<artifactId>powermock-api-mockito</artifactId>
+			<artifactId>powermock-api-mockito2</artifactId>
+			<version>2.0.0</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
@@ -177,196 +184,6 @@
 					</execution>
 				</executions>
 			</plugin>
-
-			<!-- JSON -->
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>properties-maven-plugin</artifactId>
-				<version>1.0.0</version>
-				<executions>
-					<execution>
-						<phase>initialize</phase>
-						<goals>
-							<goal>read-project-properties</goal>
-						</goals>
-						<configuration>
-							<files>
-								<file>${basedir}/src/main/resources/swagger.properties</file>
-							</files>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>com.github.kongchen</groupId>
-				<artifactId>swagger-maven-plugin</artifactId>
-				<version>3.1.4</version>
-				<configuration>
-					<apiSources>
-						<apiSource>
-							<locations>${api-rest-package}</locations>
-							<schemes>
-								<scheme>http</scheme>
-								<scheme>https</scheme>
-							</schemes>
-							<host>${api-host-ip}:${api-host-port}</host>
-							<basePath>${api-base-path}</basePath>
-							<info>
-								<title>${api-title}</title>
-								<version>${api-version}</version>
-								<description>${api-description}</description>
-								<license>
-									<name>${api-license}</name>
-								</license>
-							</info>
-							<swaggerDirectory>${basedir}/src/main/resources</swaggerDirectory>
-						</apiSource>
-					</apiSources>
-				</configuration>
-				<executions>
-					<execution>
-						<phase>compile</phase>
-						<goals>
-							<goal>generate</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-install-plugin</artifactId>
-				<version>2.3.1</version>
-				<executions>
-					<execution>
-						<id>install-file-id</id>
-						<phase>install</phase>
-						<goals>
-							<goal>install-file</goal>
-						</goals>
-						<configuration>
-							<file>${basedir}/src/main/resources/swagger.json</file>
-							<groupId>${project.groupId}</groupId>
-							<artifactId>${project.artifactId}-swagger-schema</artifactId>
-							<version>${project.version}</version>
-							<packaging>json</packaging>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-
-			<!-- SDK -->
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-antrun-plugin</artifactId>
-				<version>1.8</version>
-				<executions>
-					<execution>
-						<phase>initialize</phase>
-						<id>ant-create-script</id>
-						<configuration>
-							<exportAntProperties>true</exportAntProperties>
-							<tasks>
-								<taskdef resource="net/sf/antcontrib/antlib.xml"
-									classpathref="maven.plugin.classpath" />
-								<condition property="is_windows" value="true">
-									<os family="windows" />
-								</condition>
-								<condition property="isLinux" value="true">
-									<os family="unix" />
-								</condition>
-								<if>
-									<equals arg1="${is_windows}" arg2="true" />
-									<then>
-										<property name="swagger.sdk.script.file" value="generated-source-script.bat" />
-										<echo
-											file="${project.build.directory}${file.separator}generated-source-script.bat"
-											append="true"
-											message="cd ${project.build.directory}${file.separator}generated-sources${line.separator}" />
-										<echo
-											file="${project.build.directory}${file.separator}generated-source-script.bat"
-											append="true"
-											message="mvn clean install -Dmaven.test.skip=true${line.separator}" />
-									</then>
-									<else>
-										<property name="swagger.sdk.script.file" value="generated-source-script.sh" />
-										<echo
-											file="${project.build.directory}${file.separator}generated-source-script.sh"
-											append="true"
-											message="cd ${project.build.directory}${file.separator}generated-sources${line.separator}" />
-										<echo
-											file="${project.build.directory}${file.separator}generated-source-script.sh"
-											append="true"
-											message="mvn clean install -Dmaven.test.skip=true${line.separator}" />
-										<chmod
-											file="${project.build.directory}${file.separator}generated-source-script.sh"
-											perm="755" />
-									</else>
-								</if>
-							</tasks>
-						</configuration>
-						<goals>
-							<goal>run</goal>
-						</goals>
-					</execution>
-				</executions>
-				<dependencies>
-					<dependency>
-						<groupId>ant-contrib</groupId>
-						<artifactId>ant-contrib</artifactId>
-						<version>1.0b3</version>
-						<exclusions>
-							<exclusion>
-								<artifactId>ant</artifactId>
-								<groupId>ant</groupId>
-							</exclusion>
-						</exclusions>
-					</dependency>
-				</dependencies>
-			</plugin>
-			<plugin>
-				<groupId>io.swagger</groupId>
-				<artifactId>swagger-codegen-maven-plugin</artifactId>
-				<version>2.2.1</version>
-				<executions>
-					<execution>
-						<goals>
-							<goal>generate</goal>
-						</goals>
-						<configuration>
-							<inputSpec>${basedir}/src/main/resources/swagger.json</inputSpec>
-							<output>${project.build.directory}/generated-sources</output>
-							<language>java</language>
-							<configOptions>
-								<dateLibrary>joda</dateLibrary>
-							</configOptions>
-							<library>jersey2</library>
-							<groupId>${project.groupId}</groupId>
-							<artifactId>${project.artifactId}</artifactId>
-							<artifactVersion>${project.version}</artifactVersion>
-							<modelPackage>${project.groupId}.${project.artifactId}.client.model</modelPackage>
-							<apiPackage>${project.groupId}.${project.artifactId}.client.api</apiPackage>
-							<invokerPackage>${project.groupId}.${project.artifactId}.client.invoker</invokerPackage>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<artifactId>exec-maven-plugin</artifactId>
-				<groupId>org.codehaus.mojo</groupId>
-				<version>1.5.0</version>
-				<executions>
-					<execution>
-						<id>swagger-generate-sources</id>
-						<phase>generate-sources</phase>
-						<goals>
-							<goal>exec</goal>
-						</goals>
-						<configuration>
-							<executable>${project.build.directory}${file.separator}${swagger.sdk.script.file}</executable>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-clean-plugin</artifactId>