diff --git a/pom.xml b/pom.xml index afe24610..543edbed 100644 --- a/pom.xml +++ b/pom.xml @@ -411,6 +411,32 @@ true + + + org.apache.maven.plugins + maven-surefire-plugin + 2.18.1 + + true + + + + org.apache.maven.plugins + maven-war-plugin + + + + ${basedir}/../service/src/main/resources/lib + WEB-INF/lib/ + false + + + **/*.jar + + + + + diff --git a/service/pom.xml b/service/pom.xml index 0a7f3138..d47eef74 100644 --- a/service/pom.xml +++ b/service/pom.xml @@ -26,14 +26,14 @@ pubbaseapp_nccloud_rtLevel 1 system - ${basedir}/src/main/webapp/WEB-INF/lib/pubbaseapp_nccloud_rtLevel-1.jar + ${basedir}/src/main/resources/lib/pubbaseapp_nccloud_rtLevel-1.jar com.hzya.bipyonyoulog yonyoulog 1 system - ${basedir}/src/main/webapp/WEB-INF/lib/yonyoulog.jar + ${basedir}/src/main/resources/lib/yonyoulog.jar @@ -41,7 +41,7 @@ bcprov 1 system - ${basedir}/src/main/webapp/WEB-INF/lib/bcprov-jdk15on-1.70.jar + ${basedir}/src/main/resources/lib/bcprov-jdk15on-1.70.jar @@ -49,7 +49,7 @@ DataApiSdk 1 system - ${basedir}/src/main/webapp/WEB-INF/lib/DataApiSdk-jar-with-dependencies.jar + ${basedir}/src/main/resources/lib/DataApiSdk-jar-with-dependencies.jar diff --git a/service/src/main/webapp/WEB-INF/lib/DataApiSdk-jar-with-dependencies.jar b/service/src/main/resources/lib/DataApiSdk-jar-with-dependencies.jar similarity index 100% rename from service/src/main/webapp/WEB-INF/lib/DataApiSdk-jar-with-dependencies.jar rename to service/src/main/resources/lib/DataApiSdk-jar-with-dependencies.jar diff --git a/service/src/main/webapp/WEB-INF/lib/bcprov-jdk15on-1.57.jar b/service/src/main/resources/lib/bcprov-jdk15on-1.57.jar similarity index 100% rename from service/src/main/webapp/WEB-INF/lib/bcprov-jdk15on-1.57.jar rename to service/src/main/resources/lib/bcprov-jdk15on-1.57.jar diff --git a/service/src/main/webapp/WEB-INF/lib/bcprov-jdk15on-1.70.jar b/service/src/main/resources/lib/bcprov-jdk15on-1.70.jar similarity index 100% rename from service/src/main/webapp/WEB-INF/lib/bcprov-jdk15on-1.70.jar rename to service/src/main/resources/lib/bcprov-jdk15on-1.70.jar diff --git a/service/src/main/webapp/WEB-INF/lib/pubbaseapp_nccloud_rtLevel-1.jar b/service/src/main/resources/lib/pubbaseapp_nccloud_rtLevel-1.jar similarity index 100% rename from service/src/main/webapp/WEB-INF/lib/pubbaseapp_nccloud_rtLevel-1.jar rename to service/src/main/resources/lib/pubbaseapp_nccloud_rtLevel-1.jar diff --git a/service/src/main/webapp/WEB-INF/lib/yonyoulog.jar b/service/src/main/resources/lib/yonyoulog.jar similarity index 100% rename from service/src/main/webapp/WEB-INF/lib/yonyoulog.jar rename to service/src/main/resources/lib/yonyoulog.jar