Merge branch 'feat/updatepom' into 'develop'

udpate pom

See merge request o2oa/o2oa!528

o2server/pom.xml

@@ -474,12 +474,6 @@
 					<packagingExcludes>persistence.xml,WEB-INF/lib/**,META-INF
 					</packagingExcludes>
 					<failOnMissingWebXml>false</failOnMissingWebXml>
-					<webResources>
-						<resource>
-							<directory>ext</directory>
-							<targetPath>WEB-INF/ext</targetPath>
-						</resource>
-					</webResources>
 				</configuration>
 			</plugin>
 			<plugin>
@@ -612,57 +606,57 @@
 			<dependency>
 				<groupId>org.apache.ftpserver</groupId>
 				<artifactId>ftpserver-core</artifactId>
-				<version>1.1.1</version>
+				<version>1.2.0</version>
 			</dependency>
 			<dependency>
 				<groupId>org.apache.ftpserver</groupId>
 				<artifactId>ftplet-api</artifactId>
-				<version>1.1.1</version>
+				<version>1.2.0</version>
 			</dependency>
 			<dependency>
 				<groupId>org.apache.cxf</groupId>
 				<artifactId>cxf-core</artifactId>
-				<version>3.3.10</version>
+				<version>3.5.2</version>
 			</dependency>
 			<dependency>
 				<groupId>org.apache.cxf</groupId>
 				<artifactId>cxf-rt-frontend-jaxws</artifactId>
-				<version>3.3.10</version>
+				<version>3.5.2</version>
 			</dependency>
 			<dependency>
 				<groupId>org.apache.cxf</groupId>
 				<artifactId>cxf-rt-frontend-simple</artifactId>
-				<version>3.3.10</version>
+				<version>3.5.2</version>
 			</dependency>
 			<dependency>
 				<groupId>org.apache.cxf</groupId>
 				<artifactId>cxf-rt-wsdl</artifactId>
-				<version>3.3.10</version>
+				<version>3.5.2</version>
 			</dependency>
 			<dependency>
 				<groupId>org.apache.cxf</groupId>
 				<artifactId>cxf-rt-databinding-jaxb</artifactId>
-				<version>3.3.10</version>
+				<version>3.5.2</version>
 			</dependency>
 			<dependency>
 				<groupId>org.apache.cxf</groupId>
 				<artifactId>cxf-rt-transports-http</artifactId>
-				<version>3.3.10</version>
+				<version>3.5.2</version>
 			</dependency>
 			<dependency>
 				<groupId>org.apache.cxf</groupId>
 				<artifactId>cxf-rt-bindings-soap</artifactId>
-				<version>3.3.10</version>
+				<version>3.5.2</version>
 			</dependency>
 			<dependency>
 				<groupId>org.apache.cxf</groupId>
 				<artifactId>cxf-rt-bindings-xml</artifactId>
-				<version>3.3.10</version>
+				<version>3.5.2</version>
 			</dependency>
 			<dependency>
 				<groupId>org.apache.cxf</groupId>
 				<artifactId>cxf-rt-ws-addr</artifactId>
-				<version>3.3.10</version>
+				<version>3.5.2</version>
 			</dependency>
 
 			<dependency>

o2server/start_aix.sh

@@ -26,7 +26,7 @@ if [ -d ${current_dir}/local/update ]; then
 			fi
 		done
 		for A in "start" "stop" "restart" "console" "service"; do
-			for B in "_windows.bat" "_linux.sh" "_macos.sh" "_arm.sh" "_mips.sh" "_raspi.sh" "_aix.sh"; do
+			for B in "_windows.bat" "_linux.sh" "_linux_docker.sh" "_macos.sh" "_arm.sh" "_mips.sh" "_raspi.sh" "_aix.sh"; do
 				if [ -f ${current_dir}/local/update/o2server/$A$B ]; then
 					echo "update ${current_dir}/$A$B."
 					cp -f -p ${current_dir}/local/update/o2server/$A$B ${current_dir}/

o2server/start_aix_debug.sh

@@ -32,7 +32,7 @@ then
 		done
 		for A in "start" "stop" "restart" "console" "service"
 		do
-			for B in "_windows.bat" "_linux.sh" "_macos.sh" "_arm.sh" "_mips.sh" "_raspi.sh" "_aix.sh"
+			for B in "_windows.bat" "_linux.sh" "_linux_docker.sh" "_macos.sh" "_arm.sh" "_mips.sh" "_raspi.sh" "_aix.sh"
 			do
 				if [ -f ${current_dir}/local/update/o2server/$A$B ]; then
 					echo "update ${current_dir}/$A$B."

o2server/start_arm.sh

@@ -26,7 +26,7 @@ if [ -d ${current_dir}/local/update ]; then
 			fi
 		done
 		for A in "start" "stop" "restart" "console" "service"; do
-			for B in "_windows.bat" "_linux.sh" "_macos.sh" "_arm.sh" "_mips.sh" "_raspi.sh" "_aix.sh"; do
+			for B in "_windows.bat" "_linux.sh" "_linux_docker.sh" "_macos.sh" "_arm.sh" "_mips.sh" "_raspi.sh" "_aix.sh"; do
 				if [ -f ${current_dir}/local/update/o2server/$A$B ]; then
 					echo "update ${current_dir}/$A$B."
 					cp -f -p ${current_dir}/local/update/o2server/$A$B ${current_dir}/

o2server/start_arm_debug.sh

@@ -26,7 +26,7 @@ if [ -d ${current_dir}/local/update ]; then
 			fi
 		done
 		for A in "start" "stop" "restart" "console" "service"; do
-			for B in "_windows.bat" "_linux.sh" "_macos.sh" "_arm.sh" "_mips.sh" "_raspi.sh" "_aix.sh"; do
+			for B in "_windows.bat" "_linux.sh" "_linux_docker.sh" "_macos.sh" "_arm.sh" "_mips.sh" "_raspi.sh" "_aix.sh"; do
 				if [ -f ${current_dir}/local/update/o2server/$A$B ]; then
 					echo "update ${current_dir}/$A$B."
 					cp -f -p ${current_dir}/local/update/o2server/$A$B ${current_dir}/

o2server/start_linux.sh

@@ -26,7 +26,7 @@ if [ -d ${current_dir}/local/update ]; then
 			fi
 		done
 		for A in "start" "stop" "restart" "console" "service"; do
-			for B in "_windows.bat" "_linux.sh" "_macos.sh" "_arm.sh" "_mips.sh" "_raspi.sh" "_aix.sh"; do
+			for B in "_windows.bat" "_linux.sh" "_linux_docker.sh" "_macos.sh" "_arm.sh" "_mips.sh" "_raspi.sh" "_aix.sh"; do
 				if [ -f ${current_dir}/local/update/o2server/$A$B ]; then
 					echo "update ${current_dir}/$A$B."
 					cp -f -p ${current_dir}/local/update/o2server/$A$B ${current_dir}/

o2server/start_linux_debug.sh

@@ -26,7 +26,7 @@ if [ -d ${current_dir}/local/update ]; then
 			fi
 		done
 		for A in "start" "stop" "restart" "console" "service"; do
-			for B in "_windows.bat" "_linux.sh" "_macos.sh" "_arm.sh" "_mips.sh" "_raspi.sh" "_aix.sh"; do
+			for B in "_windows.bat" "_linux.sh" "_linux_docker.sh" "_macos.sh" "_arm.sh" "_mips.sh" "_raspi.sh" "_aix.sh"; do
 				if [ -f ${current_dir}/local/update/o2server/$A$B ]; then
 					echo "update ${current_dir}/$A$B."
 					cp -f -p ${current_dir}/local/update/o2server/$A$B ${current_dir}/

o2server/start_linux_min.sh

@@ -32,7 +32,7 @@ then
 		done
 		for A in "start" "stop" "restart" "console" "service"
 		do
-			for B in "_windows.bat" "_linux.sh" "_macos.sh" "_arm.sh" "_mips.sh" "_raspi.sh" "_aix.sh"
+			for B in "_windows.bat" "_linux.sh" "_linux_docker.sh" "_macos.sh" "_arm.sh" "_mips.sh" "_raspi.sh" "_aix.sh"
 			do
 				if [ -f ${current_dir}/local/update/o2server/$A$B ]; then
 					echo "update ${current_dir}/$A$B."

o2server/start_macos.sh

@@ -27,7 +27,7 @@ if [ -d ${current_dir}/local/update ]; then
 			fi
 		done
 		for A in "start" "stop" "restart" "console" "service"; do
-			for B in "_windows.bat" "_linux.sh" "_macos.sh" "_arm.sh" "_mips.sh" "_raspi.sh" "_aix.sh"; do
+			for B in "_windows.bat" "_linux.sh" "_linux_docker.sh" "_macos.sh" "_arm.sh" "_mips.sh" "_raspi.sh" "_aix.sh"; do
 				if [ -f ${current_dir}/local/update/o2server/$A$B ]; then
 					echo "update ${current_dir}/$A$B."
 					cp -f -p ${current_dir}/local/update/o2server/$A$B ${current_dir}/

o2server/start_macos_debug.sh

@@ -27,7 +27,7 @@ if [ -d ${current_dir}/local/update ]; then
 			fi
 		done
 		for A in "start" "stop" "restart" "console" "service"; do
-			for B in "_windows.bat" "_linux.sh" "_macos.sh" "_arm.sh" "_mips.sh" "_raspi.sh" "_aix.sh"; do
+			for B in "_windows.bat" "_linux.sh" "_linux_docker.sh" "_macos.sh" "_arm.sh" "_mips.sh" "_raspi.sh" "_aix.sh"; do
 				if [ -f ${current_dir}/local/update/o2server/$A$B ]; then
 					echo "update ${current_dir}/$A$B."
 					cp -f -p ${current_dir}/local/update/o2server/$A$B ${current_dir}/

o2server/start_mips.sh

@@ -26,7 +26,7 @@ if [ -d ${current_dir}/local/update ]; then
 			fi
 		done
 		for A in "start" "stop" "restart" "console" "service"; do
-			for B in "_windows.bat" "_linux.sh" "_macos.sh" "_arm.sh" "_mips.sh" "_raspi.sh" "_aix.sh"; do
+			for B in "_windows.bat" "_linux.sh" "_linux_docker.sh" "_macos.sh" "_arm.sh" "_mips.sh" "_raspi.sh" "_aix.sh"; do
 				if [ -f ${current_dir}/local/update/o2server/$A$B ]; then
 					echo "update ${current_dir}/$A$B."
 					cp -f -p ${current_dir}/local/update/o2server/$A$B ${current_dir}/

o2server/start_mips_debug.sh

@@ -26,7 +26,7 @@ if [ -d ${current_dir}/local/update ]; then
 			fi
 		done
 		for A in "start" "stop" "restart" "console" "service"; do
-			for B in "_windows.bat" "_linux.sh" "_macos.sh" "_arm.sh" "_mips.sh" "_raspi.sh" "_aix.sh"; do
+			for B in "_windows.bat" "_linux.sh" "_linux_docker.sh" "_macos.sh" "_arm.sh" "_mips.sh" "_raspi.sh" "_aix.sh"; do
 				if [ -f ${current_dir}/local/update/o2server/$A$B ]; then
 					echo "update ${current_dir}/$A$B."
 					cp -f -p ${current_dir}/local/update/o2server/$A$B ${current_dir}/

o2server/start_raspi.sh

@@ -26,7 +26,7 @@ if [ -d ${current_dir}/local/update ]; then
 			fi
 		done
 		for A in "start" "stop" "restart" "console" "service"; do
-			for B in "_windows.bat" "_linux.sh" "_macos.sh" "_arm.sh" "_mips.sh" "_raspi.sh" "_aix.sh"; do
+			for B in "_windows.bat" "_linux.sh" "_linux_docker.sh" "_macos.sh" "_arm.sh" "_mips.sh" "_raspi.sh" "_aix.sh"; do
 				if [ -f ${current_dir}/local/update/o2server/$A$B ]; then
 					echo "update ${current_dir}/$A$B."
 					cp -f -p ${current_dir}/local/update/o2server/$A$B ${current_dir}/

o2server/start_raspi_debug.sh

@@ -26,7 +26,7 @@ if [ -d ${current_dir}/local/update ]; then
 			fi
 		done
 		for A in "start" "stop" "restart" "console" "service"; do
-			for B in "_windows.bat" "_linux.sh" "_macos.sh" "_arm.sh" "_mips.sh" "_raspi.sh" "_aix.sh"; do
+			for B in "_windows.bat" "_linux.sh" "_linux_docker.sh" "_macos.sh" "_arm.sh" "_mips.sh" "_raspi.sh" "_aix.sh"; do
 				if [ -f ${current_dir}/local/update/o2server/$A$B ]; then
 					echo "update ${current_dir}/$A$B."
 					cp -f -p ${current_dir}/local/update/o2server/$A$B ${current_dir}/

o2server/start_windows.bat

@@ -21,7 +21,7 @@ if exist "%~dp0local\update" (
 			)	
 		)
 		for  %%A in (start,stop,restart,console,service) do (
-			for  %%B in (_windows.bat,_linux.sh,_macos.sh,_arm.sh,_mips.sh,_raspi.sh,_aix.sh) do (
+			for  %%B in (_windows.bat,_linux.sh,_linux_docker.sh,_macos.sh,_arm.sh,_mips.sh,_raspi.sh,_aix.sh) do (
 				if exist "%~dp0local\update\o2server\%%A%%B" (
 					echo update %~dp0%%A%%B
 					copy "%~dp0local\update\o2server\%%A%%B" "%~dp0"

o2server/start_windows_debug.bat

@@ -21,7 +21,7 @@ if exist "%~dp0local\update" (
 			)	
 		)
 		for  %%A in (start,stop,restart,console,service) do (
-			for  %%B in (_windows.bat,_linux.sh,_macos.sh,_arm.sh,_mips.sh,_raspi.sh,_aix.sh) do (
+			for  %%B in (_windows.bat,_linux.sh,_linux_docker.sh,_macos.sh,_arm.sh,_mips.sh,_raspi.sh,_aix.sh) do (
 				if exist "%~dp0local\update\o2server\%%A%%B" (
 					echo update %~dp0%%A%%B
 					copy "%~dp0local\update\o2server\%%A%%B" "%~dp0"

o2server/x_jpush_assemble_control/pom.xml

@@ -131,6 +131,18 @@
 						</configuration>
 					</execution>
 				</executions>
+			</plugin>
+				<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-war-plugin</artifactId>
+				<configuration>
+					<webResources>
+						<resource>
+							<directory>ext</directory>
+							<targetPath>WEB-INF/ext</targetPath>
+						</resource>
+					</webResources>
+				</configuration>
 			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>