From 5b7d406dd33304f7e1299db1df552d9072941a26 Mon Sep 17 00:00:00 2001 From: Chen Zhang <340355960@qq.com> Date: Mon, 23 Aug 2021 20:35:24 +0800 Subject: [PATCH] Improve MAVEN build Performance --- ninja-core/pom.xml | 70 +++---------------- ninja-jaxy-routes/pom.xml | 6 +- ninja-maven-plugin/pom.xml | 7 +- ninja-metrics-ganglia/pom.xml | 10 +-- ninja-metrics-influxdb/pom.xml | 10 +-- ninja-metrics-librato/pom.xml | 10 +-- ninja-postoffice/pom.xml | 5 +- .../build-run-jetty.sh | 2 +- .../build-run-tomcat.sh | 2 +- .../build-run-wildfly.sh | 2 +- ninja-servlet-integration-test/pom.xml | 10 +-- .../pom.xml | 20 ++---- ninja-standalone/pom.xml | 5 +- ninja-test-utilities/pom.xml | 32 ++------- 14 files changed, 31 insertions(+), 160 deletions(-) diff --git a/ninja-core/pom.xml b/ninja-core/pom.xml index cbda654932..368f53740b 100644 --- a/ninja-core/pom.xml +++ b/ninja-core/pom.xml @@ -99,12 +99,7 @@ guice - - com.google.inject.extensions - guice-assistedinject - - - + com.fasterxml.jackson.core jackson-core @@ -136,18 +131,8 @@ - - org.slf4j - jcl-over-slf4j - - - - org.slf4j - log4j-over-slf4j - - - + commons-io commons-io @@ -173,25 +158,14 @@ - - org.hibernate - hibernate-validator - - - + com.fasterxml.jackson.dataformat jackson-dataformat-xml - - com.fasterxml.woodstox - woodstox-core - - - net.sf.ehcache ehcache-core @@ -204,28 +178,12 @@ - - org.flywaydb - flyway-core - - - - - com.google.inject.extensions - guice-persist - + + - - org.hibernate - hibernate-entitymanager - - - org.hibernate - hibernate-c3p0 - - + org.hamcrest java-hamcrest @@ -246,22 +204,10 @@ mockito-core - - org.powermock - powermock-module-junit4 - - - org.powermock - powermock-api-mockito2 - - - - javax.xml.bind - jaxb-api - 2.3.0 - + + diff --git a/ninja-jaxy-routes/pom.xml b/ninja-jaxy-routes/pom.xml index 85a8ce8126..ac7d6f6bbf 100644 --- a/ninja-jaxy-routes/pom.xml +++ b/ninja-jaxy-routes/pom.xml @@ -31,11 +31,7 @@ reflections - - org.ninjaframework - ninja-test-utilities - test - + diff --git a/ninja-maven-plugin/pom.xml b/ninja-maven-plugin/pom.xml index 31ef89981c..1f1aef103b 100644 --- a/ninja-maven-plugin/pom.xml +++ b/ninja-maven-plugin/pom.xml @@ -77,12 +77,7 @@ 3.1.0 test - - org.apache.maven - maven-compat - 3.1.0 - test - + org.mockito mockito-core diff --git a/ninja-metrics-ganglia/pom.xml b/ninja-metrics-ganglia/pom.xml index 9554179160..ef36ecdbda 100644 --- a/ninja-metrics-ganglia/pom.xml +++ b/ninja-metrics-ganglia/pom.xml @@ -59,15 +59,9 @@ and limitations under the License. --> - - junit - junit - + - - org.mockito - mockito-core - + diff --git a/ninja-metrics-influxdb/pom.xml b/ninja-metrics-influxdb/pom.xml index aa5b1c397a..fd57b9797c 100644 --- a/ninja-metrics-influxdb/pom.xml +++ b/ninja-metrics-influxdb/pom.xml @@ -59,15 +59,9 @@ and limitations under the License. --> - - junit - junit - + - - org.mockito - mockito-core - + diff --git a/ninja-metrics-librato/pom.xml b/ninja-metrics-librato/pom.xml index b881ccc3df..584b40e543 100644 --- a/ninja-metrics-librato/pom.xml +++ b/ninja-metrics-librato/pom.xml @@ -59,15 +59,9 @@ and limitations under the License. --> - - junit - junit - + - - org.mockito - mockito-core - + diff --git a/ninja-postoffice/pom.xml b/ninja-postoffice/pom.xml index 21969106a5..e12a7edc47 100644 --- a/ninja-postoffice/pom.xml +++ b/ninja-postoffice/pom.xml @@ -45,10 +45,7 @@ junit - - org.mockito - mockito-core - + com.icegreen diff --git a/ninja-servlet-integration-test/build-run-jetty.sh b/ninja-servlet-integration-test/build-run-jetty.sh index 47dcfccd70..4103075a13 100755 --- a/ninja-servlet-integration-test/build-run-jetty.sh +++ b/ninja-servlet-integration-test/build-run-jetty.sh @@ -1,5 +1,5 @@ #!/bin/sh -mvn package -DskipTests=true +mvn -T 1C package -DskipTests=true docker build -f Dockerfile.jetty --tag=ninja-jetty . docker run -it -p 8080:8080 ninja-jetty diff --git a/ninja-servlet-integration-test/build-run-tomcat.sh b/ninja-servlet-integration-test/build-run-tomcat.sh index 26bab255bb..f1c35ba549 100755 --- a/ninja-servlet-integration-test/build-run-tomcat.sh +++ b/ninja-servlet-integration-test/build-run-tomcat.sh @@ -1,5 +1,5 @@ #!/bin/sh -mvn clean package -DskipTests=true +mvn -T 1C clean package -DskipTests=true docker build -f Dockerfile.tomcat --tag=ninja-tomcat2 . docker run -it -p 8080:8080 ninja-tomcat2 \ No newline at end of file diff --git a/ninja-servlet-integration-test/build-run-wildfly.sh b/ninja-servlet-integration-test/build-run-wildfly.sh index 122fc8f780..20998a54d8 100755 --- a/ninja-servlet-integration-test/build-run-wildfly.sh +++ b/ninja-servlet-integration-test/build-run-wildfly.sh @@ -1,5 +1,5 @@ #!/bin/sh -mvn package -DskipTests=true +mvn -T 1C package -DskipTests=true docker build -f Dockerfile.wildfly --tag=ninja-wildfly . docker run -it -p 8080:8080 ninja-wildfly diff --git a/ninja-servlet-integration-test/pom.xml b/ninja-servlet-integration-test/pom.xml index 7c991574d6..ed9493d55c 100644 --- a/ninja-servlet-integration-test/pom.xml +++ b/ninja-servlet-integration-test/pom.xml @@ -147,15 +147,9 @@ - - org.webjars - bootstrap - - - org.mindrot - jbcrypt - + + org.ninjaframework diff --git a/ninja-servlet-jpa-blog-integration-test/pom.xml b/ninja-servlet-jpa-blog-integration-test/pom.xml index ee13b18d6f..8b87c2ec68 100644 --- a/ninja-servlet-jpa-blog-integration-test/pom.xml +++ b/ninja-servlet-jpa-blog-integration-test/pom.xml @@ -158,25 +158,13 @@ - - org.webjars - tinymce-jquery - + - - org.webjars - bootstrap - + - - com.h2database - h2 - + - - org.ninjaframework - ninja-servlet - + org.ninjaframework diff --git a/ninja-standalone/pom.xml b/ninja-standalone/pom.xml index 226e5e2e5d..0f8d6df148 100644 --- a/ninja-standalone/pom.xml +++ b/ninja-standalone/pom.xml @@ -76,10 +76,7 @@ compile - - javax.websocket - javax.websocket-api - + junit diff --git a/ninja-test-utilities/pom.xml b/ninja-test-utilities/pom.xml index d29bc1f4b0..f684926cf8 100644 --- a/ninja-test-utilities/pom.xml +++ b/ninja-test-utilities/pom.xml @@ -41,11 +41,7 @@ compile - - org.ninjaframework - ninja-standalone - compile - + org.ninjaframework @@ -55,11 +51,7 @@ - - org.hamcrest - java-hamcrest - compile - + org.assertj @@ -84,25 +76,9 @@ fluentlenium-junit compile - - org.seleniumhq.selenium - htmlunit-driver - compile - - - - org.eclipse.jetty - jetty-client - ${jetty.version} - - - org.eclipse.jetty.websocket - websocket-client - ${jetty.version} - - + + org.apache.httpcomponents httpclient