diff --git a/.gitignore b/.gitignore index 4646b5b27c..7940d56168 100644 --- a/.gitignore +++ b/.gitignore @@ -32,5 +32,4 @@ qywx.json ### flattened .flattened-pom.xml -.node/ **/jmeter/lib/ext \ No newline at end of file diff --git a/backend/.gitignore b/backend/.gitignore index 5d81d691f5..eee38fec81 100644 --- a/backend/.gitignore +++ b/backend/.gitignore @@ -24,8 +24,8 @@ yarn-error.log* *.sw? -src/main/resources/static -src/main/resources/public +app/src/main/resources/static +app/src/main/resources/public target diff --git a/backend/app/pom.xml b/backend/app/pom.xml index 2956340a6e..a2e03a870a 100644 --- a/backend/app/pom.xml +++ b/backend/app/pom.xml @@ -100,6 +100,55 @@ + + maven-clean-plugin + + + + src/main/resources/static + + ** + + false + + + src/main/resources/public + + ** + + false + + + + + + org.apache.maven.plugins + maven-antrun-plugin + + + main-class-placement + generate-resources + + ${skipAntRunForJenkins} + + + + + + + + + + + + + + + run + + + + org.apache.maven.plugins maven-dependency-plugin diff --git a/frontend/.gitignore b/frontend/.gitignore index d951558d99..d70f6e55fd 100644 --- a/frontend/.gitignore +++ b/frontend/.gitignore @@ -4,3 +4,7 @@ dist-ssr *.local .history coverage +.node/ +package-lock.json +pnpm-lock.yaml +yarn.lock \ No newline at end of file diff --git a/frontend/pom.xml b/frontend/pom.xml index 092cc4bce4..5cb596e0f5 100644 --- a/frontend/pom.xml +++ b/frontend/pom.xml @@ -25,7 +25,7 @@ frontend-maven-plugin ${frontend-maven-plugin.version} - node + .node @@ -42,17 +42,16 @@ - - install @@ -64,7 +63,7 @@ run build - --> + diff --git a/pom.xml b/pom.xml index b1b61a7740..1cb74d7dee 100644 --- a/pom.xml +++ b/pom.xml @@ -90,8 +90,8 @@ 4.5.14 1.12.1 - v16.10.0 - 8.12.1 + v16.20.0 + 8.19.4 false 2.9.0