From 84fdf011425fa80bc0d564f9ae9f1ca6e061fd51 Mon Sep 17 00:00:00 2001
From: wangzilun <964606955@qq.com>
Date: Mon, 21 Feb 2022 14:24:15 +0800
Subject: [PATCH] 测试
---
Jenkinsfile | 2 +-
src/main/webapp/WEB-INF/web.xml | 10 ++++++++++
pom.xml | 9 ---------
3 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 69d5e1e..7df47cc 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -86,7 +86,7 @@
####maven编译部署#####
mvn clean package -U
##处理结果包
- cd *-webapp/target
+ cd */target
old_version_all=\$(find . -iname "\${projectName}.java"| xargs sed -nr 's/^[^0-9]*\\"(([0-9]+\\.)*[0-9]+.*-[0-9]+)\\".*;/\\1/p\')
dir_name=\${projectName}"-"\$old_version_all
echo "dir_name \$dir_name"
diff --git a/pom.xml b/pom.xml
index 10bb12e..d13d285 100644
--- a/pom.xml
+++ b/pom.xml
@@ -37,15 +37,6 @@
<testFailureIgnore>true</testFailureIgnore>
</configuration>
</plugin>
- <plugin>
- <artifactId>maven-war-plugin</artifactId>
- <groupId>org.apache.maven.plugins</groupId>
- <version>2.2</version>
- <configuration>
- <!--如果想在没有web.xml文件的情况下构建WAR，请设置为false。-->
- <failOnMissingWebXml>false</failOnMissingWebXml>
- </configuration>
- </plugin>
</plugins>
</build>
</project>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
new file mode 100644
index 0000000..1babcc8
--- /dev/null
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,10 @@
+<!DOCTYPE web-app PUBLIC
+ "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
+ "http://java.sun.com/dtd/web-app_2_3.dtd" >
+
+<web-app xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
+ version="3.0">
+</web-app>
--
Gitblit v1.9.1