diff --git a/dhis-2/dhis-web/dhis-web-apps/pom.xml b/dhis-2/dhis-web/dhis-web-apps/pom.xml index 314a0f3141a4..86219ce61309 100644 --- a/dhis-2/dhis-web/dhis-web-apps/pom.xml +++ b/dhis-2/dhis-web/dhis-web-apps/pom.xml @@ -18,107 +18,56 @@ dhis-web-apps - - - - - local - - - !env.CI - - - - - - - com.github.eirslett - frontend-maven-plugin - 1.15.0 + + + com.github.eirslett + frontend-maven-plugin + 1.6 + + target + + ${project.build.directory} + ${project.artifactId} + ./apps-to-bundle.json + master + + + + + + install node and npm + + install-node-and-npm + + generate-resources - target - - ${project.build.directory} - ${project.artifactId} - ./apps-to-bundle.json - master - + v16.13.2 - - - install node and npm - - install-node-and-npm - - generate-resources - - v20.17.0 - - + - - npm install - - npm - - generate-resources - + + npm install + + npm + + generate-resources + - - bundle-apps - - npm - - generate-resources - - run bundle-apps - - - - - - - - - - ci - - - env.CI - true - - - - - - org.codehaus.mojo - exec-maven-plugin + + clone apps + + npm + + generate-resources - npm - - run - bundle-apps - - - ${project.build.directory} - ${project.artifactId} - ./apps-to-bundle.json - master - + run bundle-apps - - - bundle-apps - - exec - - package - - - - - - - + + + + + + + diff --git a/dhis-2/pom.xml b/dhis-2/pom.xml index 2b10a730f7a8..722f97407742 100644 --- a/dhis-2/pom.xml +++ b/dhis-2/pom.xml @@ -64,7 +64,7 @@ - ${project.basedir}/src/main/java @@ -79,7 +79,7 @@ https://sonarcloud.io -Xmx2024m --illegal-access=permit - false @@ -229,7 +229,6 @@ 3.1.2 3.11.0 - 3.4.1 3.3.1 3.0.0-M7 3.5.0 @@ -1643,8 +1642,8 @@ ${mockito.version} test - org.mockito @@ -1889,11 +1888,6 @@ maven-surefire-plugin ${maven-surefire-plugin.version} - - org.codehaus.mojo - exec-maven-plugin - ${maven-exec-plugin.version} - org.apache.maven.plugins maven-failsafe-plugin