diff --git a/.github/ISSUE_TEMPLATE/release_steps.md b/.github/ISSUE_TEMPLATE/release_steps.md index 02de08ab86..adae6c45fd 100644 --- a/.github/ISSUE_TEMPLATE/release_steps.md +++ b/.github/ISSUE_TEMPLATE/release_steps.md @@ -39,7 +39,9 @@ This steps have to be followed always when preparing a new release. ## Before the Release -- [ ] Check `pom.xml` dependencies are all in fixed stable versions ( no `-SNAPSHOT` usage release). +- [ ] Check `pom.xml` dependencies are all in fixed stable versions ( no `-SNAPSHOT` usage release). If not, You use the action [`Update dependencies versions`](https://github.com/geosolutions-it/MapStoreExtension/actions/workflows/update_dependencies_versions.yml) to fix them, setting: + - [ ] the branch to `YYYY.XX.xx` + - [ ] the of geostore, http_proxy and mapfish-print versions accordingly with the [MapStore release calendar](https://github.com/geosolutions-it/MapStore2/wiki/MapStore-Release-Calendars) - [ ] Check that [MapStoreExtension](https://github.com/geosolutions-it/MapStoreExtension) repository is aligned and working - [ ] Test on QA [https://qa-mapstore.geosolutionsgroup.com/mapstore/](https://qa-mapstore.geosolutionsgroup.com/mapstore/) - [ ] Test **everything**, not only the new features diff --git a/.github/workflows/cut_major_branch.yml b/.github/workflows/cut_major_branch.yml index 3f726c34c6..28c15b96bc 100644 --- a/.github/workflows/cut_major_branch.yml +++ b/.github/workflows/cut_major_branch.yml @@ -58,22 +58,6 @@ jobs: BRANCH_NAME="${RELEASE_BRANCH}" echo "creating branch is $BRANCH_NAME" git checkout -b "$BRANCH_NAME" - # Find all pom.xml files and update-dependencies on them - echo "Updating versions on release branch" - # Find all pom.xml files and update-dependencies on them - echo "Updating versions on release branch" - POM_FILES=$(git ls-files . | grep 'pom\.xml$' | grep -v 'project/standard/templates/backend/pom\.xml$'| grep -v 'project/standard/templates/pom\.xml$');# note: exclues one file not involved that is not valid pom.xml, because it is a template - for POM_FILE in $POM_FILES; do - mvn versions:use-dep-version -f $POM_FILE -Dincludes=$MAPFISH_GROUP -DdepVersion=$MAPFISH_VERSION -DforceVersion=true -DgenerateBackupPoms=false -DautoVersionSubmodules=true -Pprinting - mvn versions:use-dep-version -f $POM_FILE -Dincludes=$GEOSTORE_GROUP -DdepVersion=$GEOSTORE_VERSION -DforceVersion=true -DgenerateBackupPoms=false -DautoVersionSubmodules=true -Pprinting - mvn versions:use-dep-version -f $POM_FILE -Dincludes=$HTTP_PROXY_GROUP -DdepVersion=$HTTP_PROXY_VERSION -DforceVersion=true -DgenerateBackupPoms=false -DautoVersionSubmodules=true -Pprinting - done - echo $POM_FILES | xargs git add - if ! git diff-index --quiet HEAD; then - git commit -m "Set versions of main dependencies to a stable version" - else - echo "::notice::No version changes in dependencies to commit. Please make sure to make this version fixed later" - fi git push --set-upstream origin "$BRANCH_NAME" echo "branch created" echo "creating bump changes" @@ -85,7 +69,7 @@ jobs: echo "Java packages versions updated from $OLD_JAVA_VERSION to $NEXT_JAVA_VERSION" ### increase dependency of project to new version echo "Updating project dependency to new version" - mvn versions:use-dep-version -f project/standard/templates/web/pom.xml -Dincludes=it.geosolutions.mapstore -DdepVersion=$NEXT_JAVA_VERSION -DforceVersion=true -DgenerateBackupPoms=false + mvn versions:set-property -f project/standard/templates/web/pom.xml -Dproperty=mapstore-services.version -DnewVersion=$NEXT_JAVA_VERSION -DgenerateBackupPoms=false -DautoVersionSubmodules=true -Pprinting # Increase release minor version echo "Updating project version to new version in package.json" npm version minor --git-tag-version=false diff --git a/.github/workflows/post_release.yml b/.github/workflows/post_release.yml index 27c2ce2062..371a818d78 100644 --- a/.github/workflows/post_release.yml +++ b/.github/workflows/post_release.yml @@ -38,7 +38,7 @@ jobs: echo echo "Restoring snapshot version tp $SNAPSHOT_VERSION" mvn versions:set -DnewVersion=$SNAPSHOT_VERSION -DprocessAllModules -DgenerateBackupPoms=false -Pprinting,binary,printingbundle - mvn versions:use-dep-version -f project/standard/templates/web/pom.xml -Dincludes=it.geosolutions.mapstore -DdepVersion=$SNAPSHOT_VERSION -DforceVersion=true -DgenerateBackupPoms=false + mvn versions:set-property -f project/standard/templates/web/pom.xml -Dproperty=mapstore-services.version -DnewVersion=$SNAPSHOT_VERSION -DgenerateBackupPoms=false -DautoVersionSubmodules=true -Pprinting npm version patch --git-tag-version=false echo "Committing changes" find . -name 'pom.xml' | xargs git add diff --git a/.github/workflows/pre_release.yml b/.github/workflows/pre_release.yml index 32e54b7a59..2604e37fa3 100644 --- a/.github/workflows/pre_release.yml +++ b/.github/workflows/pre_release.yml @@ -77,7 +77,7 @@ jobs: # Update project dependency echo "updating project pom.xml dependency from mapstore packages to version: $JAVA_MODULES_NEW_VERSION" - mvn versions:use-dep-version -f project/standard/templates/web/pom.xml -Dincludes=it.geosolutions.mapstore -DdepVersion=$JAVA_MODULES_NEW_VERSION -DforceVersion=true -DgenerateBackupPoms=false + mvn versions:set-property -f project/standard/templates/web/pom.xml -Dproperty=mapstore-services.version -DnewVersion=$JAVA_MODULES_NEW_VERSION -DgenerateBackupPoms=false -DautoVersionSubmodules=true -Pprinting # Update changelog echo "Updating changelog" update_changelog $LAST_MS_VERSION $NEW_MS_VERSION diff --git a/.github/workflows/update_gs_versions.yml b/.github/workflows/update_dependencies_versions.yml similarity index 67% rename from .github/workflows/update_gs_versions.yml rename to .github/workflows/update_dependencies_versions.yml index 80004d9521..6168ef384b 100644 --- a/.github/workflows/update_gs_versions.yml +++ b/.github/workflows/update_dependencies_versions.yml @@ -44,11 +44,19 @@ jobs: git config user.email github-actions@github.com # Find all pom.xml files and update-dependencies on them echo "Updating versions of dependencies in all pom.xml files to versions mapfish: $MAPFISH_VERSION, geostore: $GEOSTORE_VERSION, http-proxy: $HTTP_PROXY_VERSION" - POM_FILES=$(git ls-files . | grep 'pom\.xml$' | grep -v 'project/standard/templates/backend/pom\.xml$'| grep -v 'project/standard/templates/pom\.xml$');# note: exclues one file not involved that is not valid pom.xml, because it is a template + + ## Update the versions of the dependencies in the project + # updating in main `pom.xml` (the mvn properties `geostore-webapp.version` and `http_proxy.version`, `print-lib.version` contain the versions of the dependencies to update) + mvn versions:set-property -Dproperty=print-lib.version -DnewVersion=$MAPFISH_VERSION -DgenerateBackupPoms=false -DautoVersionSubmodules=true -Pprinting + mvn versions:set-property -Dproperty=geostore-webapp.version -DnewVersion=$GEOSTORE_VERSION -DgenerateBackupPoms=false -DautoVersionSubmodules=true -Pprinting + mvn versions:set-property -Dproperty=http_proxy.version -DnewVersion=$HTTP_PROXY_VERSION -DgenerateBackupPoms=false -DautoVersionSubmodules=true -Pprinting + + ## Update the versions of the dependencies in the project templates + POM_FILES=$(git ls-files project/standard/templates/ | grep 'pom\.xml$') for POM_FILE in $POM_FILES; do - mvn versions:use-dep-version -f $POM_FILE -Dincludes=$MAPFISH_GROUP -DdepVersion=$MAPFISH_VERSION -DforceVersion=true -DgenerateBackupPoms=false -DautoVersionSubmodules=true -Pprinting - mvn versions:use-dep-version -f $POM_FILE -Dincludes=$GEOSTORE_GROUP -DdepVersion=$GEOSTORE_VERSION -DforceVersion=true -DgenerateBackupPoms=false -DautoVersionSubmodules=true -Pprinting - mvn versions:use-dep-version -f $POM_FILE -Dincludes=$HTTP_PROXY_GROUP -DdepVersion=$HTTP_PROXY_VERSION -DforceVersion=true -DgenerateBackupPoms=false -DautoVersionSubmodules=true -Pprinting + mvn versions:set-property -Dproperty=print-lib.version -DnewVersion=$MAPFISH_VERSION -DgenerateBackupPoms=false -DautoVersionSubmodules=true -Pprinting + mvn versions:set-property -Dproperty=geostore-webapp.version -DnewVersion=$GEOSTORE_VERSION -DgenerateBackupPoms=false -DautoVersionSubmodules=true -Pprinting + mvn versions:set-property -Dproperty=http_proxy.version -DnewVersion=$HTTP_PROXY_VERSION -DgenerateBackupPoms=false -DautoVersionSubmodules=true -Pprinting done pr_branch_name="up_versions-${RUN_ID}" echo "Creating a PR on branch: ${pr_branch_name} for ${{ github.ref_name }}" diff --git a/binary/bin-war/pom.xml b/binary/bin-war/pom.xml index 6aa9a39ff0..8ac69b7f35 100644 --- a/binary/bin-war/pom.xml +++ b/binary/bin-war/pom.xml @@ -17,7 +17,7 @@ it.geosolutions.mapstore mapstore-product - 1.8-SNAPSHOT + ${project.version} war runtime diff --git a/binary/pom.xml b/binary/pom.xml index fdc9dad1d8..ac8dd4946a 100644 --- a/binary/pom.xml +++ b/binary/pom.xml @@ -1,168 +1,175 @@ - - 4.0.0 - it.geosolutions.mapstore - mapstore-binary - pom - 1.8-SNAPSHOT - MapStore 2 Binary Module - Project to create the binary package - http://www.geo-solutions.it + + 4.0.0 + + it.geosolutions.mapstore + mapstore-root + 1.8-SNAPSHOT + + it.geosolutions.mapstore + mapstore-binary + pom + MapStore 2 Binary Module + Project to create the binary package + http://www.geo-solutions.it + + UTF-8 + 8.5.96 + ${mapstore2.version} + + + + org.apache.tomcat + tomcat-el-api + ${tomcat.version} + + + org.apache.tomcat + tomcat-jasper + ${tomcat.version} + + + org.apache.tomcat + tomcat-jasper-el + ${tomcat.version} + + + org.apache.tomcat + tomcat-jsp-api + ${tomcat.version} + + + org.apache.tomcat + tomcat-annotations-api + ${tomcat.version} + + + org.apache.tomcat + tomcat-catalina-ant + ${tomcat.version} + + + org.apache.tomcat + tomcat-catalina + ${tomcat.version} + + + org.apache.tomcat + tomcat-servlet-api + ${tomcat.version} + + + org.apache.tomcat + tomcat-api + ${tomcat.version} + + + org.apache.tomcat + tomcat-coyote + ${tomcat.version} + + + org.apache.tomcat + tomcat-dbcp + ${tomcat.version} + + + org.apache.tomcat + tomcat-jdbc + ${tomcat.version} + + + org.apache.tomcat + tomcat-util + ${tomcat.version} + + + org.apache.tomcat + tomcat-websocket + ${tomcat.version} + + + org.apache.tomcat + tomcat-websocket-api + ${tomcat.version} + + - - UTF-8 - 8.5.96 - ${mapstore2.version} - - - - org.apache.tomcat - tomcat-el-api - ${tomcat.version} - - - org.apache.tomcat - tomcat-jasper - ${tomcat.version} - - - org.apache.tomcat - tomcat-jasper-el - ${tomcat.version} - - - org.apache.tomcat - tomcat-jsp-api - ${tomcat.version} - - - org.apache.tomcat - tomcat-annotations-api - ${tomcat.version} - - - org.apache.tomcat - tomcat-catalina-ant - ${tomcat.version} - - - org.apache.tomcat - tomcat-catalina - ${tomcat.version} - - - org.apache.tomcat - tomcat-servlet-api - ${tomcat.version} - - - org.apache.tomcat - tomcat-api - ${tomcat.version} - - - org.apache.tomcat - tomcat-coyote - ${tomcat.version} - - - org.apache.tomcat - tomcat-dbcp - ${tomcat.version} - - - org.apache.tomcat - tomcat-jdbc - ${tomcat.version} - - - org.apache.tomcat - tomcat-util - ${tomcat.version} - - - org.apache.tomcat - tomcat-websocket - ${tomcat.version} - - - org.apache.tomcat - tomcat-websocket-api - ${tomcat.version} - - - - - - - maven-dependency-plugin - - - package - - copy-dependencies - - - - - - maven-antrun-plugin - - - get-untar-jre-copy-db - package - - - - - - - - - - - run - - - - package - - - - - - - - - - run - - - - - - - maven-assembly-plugin - 2.1 - - - bin.xml - - mapstore2-${binary.number} - ${project.build.directory} - - - - make-assembly - install - - single - - - - - - - - bin-war - + + + + maven-dependency-plugin + + + package + + copy-dependencies + + + + + + maven-antrun-plugin + + + get-untar-jre-copy-db + package + + + + + + + + + + + run + + + + package + + + + + + + + + + run + + + + + + + maven-assembly-plugin + 2.1 + + + bin.xml + + mapstore2-${binary.number} + ${project.build.directory} + + + + make-assembly + install + + single + + + + + + + + bin-war + diff --git a/docs/developer-guide/mapstore-migration-guide.md b/docs/developer-guide/mapstore-migration-guide.md index 16deec715a..89e477156a 100644 --- a/docs/developer-guide/mapstore-migration-guide.md +++ b/docs/developer-guide/mapstore-migration-guide.md @@ -22,6 +22,14 @@ This is a list of things to check if you want to update from a previous version ## Migration from 2023.02.02 to 2024.01.00 +### Maven project update + +With this release the maven `pom.xml` files has been restructured to centralize dependencies version in the `dependencyManagement` section and then in some properties in the root `pom.xml` file. +This regards also the projects that now hold the versions of the dependencies in the properties section. +Your projects will work in any case, but we suggest to update your `pom.xml` files to align them to the new structure (see template file in the MapStore2 repository for more details). + +### Database update + The resource metadata has been recently extented to include information about resource creator and editor and to provide the advertises/unadvertised resource functionalities. If your installation has the [database creation mode](https://docs.mapstore.geosolutionsgroup.com/en/latest/developer-guide/database-setup/#database-creation-mode) set to `update` (the default), the columns will be added automatically and you do not have to do any action. If it is set to `validate` instead you will have to run the update scripts. diff --git a/java/pom.xml b/java/pom.xml index 18292b8910..2d2ba983b2 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -1,79 +1,42 @@ - - 4.0.0 - it.geosolutions.mapstore - mapstore-java - pom - 1.8-SNAPSHOT - MapStore 2 - http://www.geo-solutions.it - - - UTF-8 - 5.3.18 - - - - - - org.springframework - spring-framework-bom - ${spring.version} - pom - import - - - - - - - - - - - - - - - - - org.apache.maven.wagon - wagon-ftp - 1.0-beta-2 - - - - - - geosolutions - ftp://maven.geo-solutions.it/ - - - - - - default - - true - - - services - web - - - - printingbundle - - - printingbundle - - - - services - web - printing - - - - - + + 4.0.0 + + it.geosolutions.mapstore + mapstore-root + 1.8-SNAPSHOT + + + it.geosolutions.mapstore + mapstore-java + pom + + MapStore 2 + http://www.geo-solutions.it + + + + default + + true + + + services + web + + + + printingbundle + + + printingbundle + + + + services + web + printing + + + diff --git a/java/printing/pom.xml b/java/printing/pom.xml index 46fa7d9d0d..5a2f3de5df 100644 --- a/java/printing/pom.xml +++ b/java/printing/pom.xml @@ -1,115 +1,87 @@ - - 4.0.0 - it.geosolutions.mapstore - mapstore-print - pom - 1.8-SNAPSHOT - MapStore 2 - Printing extension bundle - http://www.geo-solutions.it + + 4.0.0 + + it.geosolutions.mapstore + mapstore-java + 1.8-SNAPSHOT + - - UTF-8 - DEV - + it.geosolutions.mapstore + mapstore-print + pom - - - - org.mapfish.print - print-lib - 2.4-SNAPSHOT - - + MapStore 2 - Printing extension bundle + http://www.geo-solutions.it - - mapstore-printing - - - maven-dependency-plugin - - - process-classes - - copy-dependencies - - - ${project.build.directory}/mapstore-printing/WEB-INF/lib - - - - - - maven-resources-plugin - 2.6 - - - application-context - process-classes - - copy-resources - - - ${basedir}/target/mapstore-printing/WEB-INF/classes - UTF-8 - - - ${basedir}/webapp - - - - + + + + org.mapfish.print + print-lib + + - - - - org.apache.maven.plugins - maven-assembly-plugin - - - create-distribution - package - - single - - - mapstore-printing - false - - assembly/mapstore-printing.xml - - - - - - - - - - - geosolutions - GeoSolutions Repository - https://maven.geo-solutions.it - - true - - + + mapstore-printing + + + maven-dependency-plugin + + + process-classes + + copy-dependencies + + + ${project.build.directory}/mapstore-printing/WEB-INF/lib + + + + + + maven-resources-plugin + 2.6 + + + application-context + process-classes + + copy-resources + + + ${basedir}/target/mapstore-printing/WEB-INF/classes + UTF-8 + + + ${basedir}/webapp + + + + - - osgeo - Open Source Geospatial Foundation Repository - https://repo.osgeo.org/repository/release/ - - true - - - - - osgeo-snapshot - Open Source Geospatial Foundation Repository - https://repo.osgeo.org/repository/snapshot/ - - true - - - + + + + org.apache.maven.plugins + maven-assembly-plugin + + + create-distribution + package + + single + + + mapstore-printing + false + + assembly/mapstore-printing.xml + + + + + + + diff --git a/java/services/pom.xml b/java/services/pom.xml index 9e55e372ef..5255ba9866 100644 --- a/java/services/pom.xml +++ b/java/services/pom.xml @@ -1,263 +1,162 @@ - - 4.0.0 - it.geosolutions.mapstore - mapstore-services - jar - 1.8-SNAPSHOT - MapStore 2 - Backend Services - http://www.geo-solutions.it - - - UTF-8 - 5.3.10.RELEASE - 5.3.18 - 2.19.0 - 2.13.1 - - - - - - org.springframework - spring-framework-bom - ${spring.version} - pom - import - - - com.github.java-json-tools - json-patch - 1.12 - - - - com.fasterxml.jackson.core - jackson-core - ${jackson-version} - - - - com.fasterxml.jackson.core - jackson-annotations - ${jackson-version} - - - - com.fasterxml.jackson.core - jackson-databind - ${jackson-version} - - - org.apache.logging.log4j - log4j-core - ${log4j-version} - - - org.apache.logging.log4j - log4j-api - ${log4j-version} - - - org.apache.logging.log4j - log4j-slf4j-impl - ${log4j-version} - - - junit - junit - test - 4.13.1 - - - - org.mockito - mockito-all - 1.9.5 - test - - - - - javax.servlet - javax.servlet-api - 3.0.1 - - - - - net.sf.json-lib - json-lib - 2.4 - jdk15 - - - - commons-io - commons-io - 2.1 - - - - - eu.medsea.mimeutil - mime-util - 2.1.3 - - - log4j - log4j - - - org.slf4j - slf4j-api - - - org.slf4j - slf4j-log4j12 - - - - - - - - - - - commons-io - commons-io - - - - - eu.medsea.mimeutil - mime-util - - - org.apache.logging.log4j - log4j-core - - - org.apache.logging.log4j - log4j-api - - - org.apache.logging.log4j - log4j-slf4j-impl - - - - - - - org.springframework - spring-webmvc - - - org.springframework.security - spring-security-core - ${spring.security.version} - - - org.springframework.security - spring-security-web - ${spring.security.version} - - - org.springframework.security - spring-security-config - ${spring.security.version} - - - org.springframework.security - spring-security-ldap - ${spring.security.version} - - - org.springframework - spring-test - test - - - - - junit - junit - test - - - - org.mockito - mockito-all - test - - - - - javax.servlet - javax.servlet-api - - - - - net.sf.json-lib - json-lib - jdk15 - - - - com.fasterxml.jackson.core - jackson-core - - - - com.fasterxml.jackson.core - jackson-annotations - - - - com.fasterxml.jackson.core - jackson-databind - - - - com.github.java-json-tools - json-patch - - - - - - - + + 4.0.0 + + it.geosolutions.mapstore + mapstore-java + 1.8-SNAPSHOT + + + it.geosolutions.mapstore + mapstore-services + jar + + MapStore 2 - Backend Services + http://www.geo-solutions.it + + + + + + commons-io + commons-io + + + + + eu.medsea.mimeutil + mime-util + + + org.apache.logging.log4j + log4j-core + + + org.apache.logging.log4j + log4j-api + + + org.apache.logging.log4j + log4j-slf4j-impl + + + + + + + org.springframework + spring-webmvc + + + org.springframework.security + spring-security-core + + + org.springframework.security + spring-security-web + + + org.springframework.security + spring-security-config + + + org.springframework.security + spring-security-ldap + + + org.springframework + spring-test + test + + + + + junit + junit + test + + + + org.mockito + mockito-all + test + + + + + javax.servlet + javax.servlet-api + + + + + net.sf.json-lib + json-lib + + + + com.fasterxml.jackson.core + jackson-core + + + + com.fasterxml.jackson.core + jackson-annotations + + + + com.fasterxml.jackson.core + jackson-databind + + + + com.github.java-json-tools + json-patch + + + + + + + org.apache.maven.plugins maven-compiler-plugin - 2.0.2 + 3.10.1 - 1.8 - 1.8 + utf8 + 8 + 8 + true + UTF-8 + + true + 128M + 1512M - - - - - - - org.apache.maven.wagon - wagon-ftp - 1.0-beta-2 - - + + + + + + + org.apache.maven.wagon + wagon-ftp + 1.0-beta-2 + + - - geosolutions - ftp://maven.geo-solutions.it/ - + + geosolutions + ftp://maven.geo-solutions.it/ + - - + + diff --git a/java/web/pom.xml b/java/web/pom.xml index 6f5ddf954d..0ebe6a6803 100644 --- a/java/web/pom.xml +++ b/java/web/pom.xml @@ -1,173 +1,123 @@ - - 4.0.0 - it.geosolutions.mapstore - mapstore-webapp - war - 1.8-SNAPSHOT - MapStore 2 - WAR - http://www.geo-solutions.it + + 4.0.0 + + it.geosolutions.mapstore + mapstore-java + 1.8-SNAPSHOT + - - UTF-8 - DEV - 8.5.69 - 5.3.18 - + it.geosolutions.mapstore + mapstore-webapp + war - - - - org.springframework - spring-framework-bom - ${spring.version} - pom - import - - - - junit - junit - test - 4.13.1 - - - - org.mockito - mockito-all - 1.9.5 - - - - javax.servlet - javax.servlet-api - 3.0.1 - - - - net.sf.ehcache - ehcache-web - 2.0.4 - - - - commons-pool - commons-pool - 1.5.4 - - - javax.xml.ws - jaxws-api - 2.3.1 - - - + MapStore 2 - WAR + http://www.geo-solutions.it - - - - it.geosolutions.mapstore - mapstore-services - 1.8-SNAPSHOT - + + + + it.geosolutions.mapstore + mapstore-services + ${project.version} + - - - - - it.geosolutions.geostore - geostore-webapp - 2.2-SNAPSHOT - war - runtime - - - proxy - http_proxy - 1.6-SNAPSHOT - war - runtime - + + + + + it.geosolutions.geostore + geostore-webapp + war + runtime + + + proxy + http_proxy + war + runtime + - - - junit - junit - test - - - - org.mockito - mockito-all - - - - javax.servlet - javax.servlet-api - - - - net.sf.ehcache - ehcache-web - - - - commons-pool - commons-pool - - - javax.xml.ws - jaxws-api - - + + + junit + junit + test + + + + org.mockito + mockito-all + + + + javax.servlet + javax.servlet-api + + + + net.sf.ehcache + ehcache-web + + + + commons-pool + commons-pool + + + javax.xml.ws + jaxws-api + + - - mapstore - - - org.apache.maven.plugins - maven-war-plugin - 2.1.1 - - WEB-INF/lib/commons-codec-1.2.jar, - WEB-INF/lib/commons-io-1.1.jar, - WEB-INF/lib/commons-logging-1.0.4.jar, - WEB-INF/lib/commons-pool-1.3.jar, - WEB-INF/lib/slf4j-api-1.5*.jar, - WEB-INF/lib/slf4j-log4j12-1.5*.jar, - WEB-INF/lib/spring-tx-5.2.15*.jar - - - - it.geosolutions.geostore - geostore-webapp - WEB-INF/classes/geostore-spring-security.xml - - - proxy - http_proxy - - - - - - - - - - - org.apache.maven.wagon - wagon-ftp - 1.0-beta-2 - - - + + mapstore + + + org.apache.maven.plugins + maven-war-plugin + 2.1.1 + + WEB-INF/lib/commons-codec-1.2.jar, + WEB-INF/lib/commons-io-1.1.jar, + WEB-INF/lib/commons-logging-1.0.4.jar, + WEB-INF/lib/commons-pool-1.3.jar, + WEB-INF/lib/slf4j-api-1.5*.jar, + WEB-INF/lib/slf4j-log4j12-1.5*.jar, + WEB-INF/lib/spring-tx-5.2.15*.jar + + + + it.geosolutions.geostore + geostore-webapp + WEB-INF/classes/geostore-spring-security.xml + + + proxy + http_proxy + + + + + + + + + + + org.apache.maven.wagon + wagon-ftp + 1.0-beta-2 + + + - - - geosolutions - ftp://maven.geo-solutions.it/ - - + + + geosolutions + ftp://maven.geo-solutions.it/ + + diff --git a/pom.xml b/pom.xml index 12cf86898f..fc2283c235 100644 --- a/pom.xml +++ b/pom.xml @@ -1,34 +1,322 @@ - - 4.0.0 - it.geosolutions.mapstore - mapstore-root - pom - 1.8-SNAPSHOT - MapStore Root - - - UTF-8 - 8.5.69 - - - - java - product - - - - binary - - - binary - - - + + 4.0.0 + it.geosolutions.mapstore + mapstore-root + pom + 1.8-SNAPSHOT + MapStore Root + + + UTF-8 + DEV + 8.5.69 + 8080 + 2.2-SNAPSHOT + 2.4-SNAPSHOT + 1.6-SNAPSHOT + 5.3.18 + 4.5.13 + 4.13.1 + 1.9.5 + 3.0.1 + 2.0.4 + 1.5.4 + 2.3.1 + 5.6.12 + 2.19.0 + 2.16.1 + 1.12 + 2.4.2-geoserver + 2.1 + 2.1.3 + + + java product - binary - - - + + + + + + org.apache.httpcomponents + httpclient + ${httpclient.version} + + + org.springframework + spring-webmvc + ${spring.version} + + + org.springframework.security + spring-security-core + ${spring.security.version} + + + org.springframework.security + spring-security-web + ${spring.security.version} + + + org.springframework.security + spring-security-config + ${spring.security.version} + + + org.springframework.security + spring-security-ldap + ${spring.security.version} + + + org.springframework + spring-framework-bom + ${spring.version} + pom + import + + + + + junit + junit + test + ${junit.version} + + + + + net.sf.ehcache + ehcache-web + ${ehcache-web.version} + + + + commons-pool + commons-pool + ${commons-pool.version} + + + javax.xml.ws + jaxws-api + ${jaxws-api.version} + + + com.github.java-json-tools + json-patch + ${json-patch.version} + + + + com.fasterxml.jackson.core + jackson-core + ${jackson-version} + + + + com.fasterxml.jackson.core + jackson-annotations + ${jackson-version} + + + + com.fasterxml.jackson.core + jackson-databind + ${jackson-version} + + + org.apache.logging.log4j + log4j-core + ${log4j-version} + + + org.apache.logging.log4j + log4j-api + ${log4j-version} + + + org.apache.logging.log4j + log4j-slf4j-impl + ${log4j-version} + + + + + org.mockito + mockito-all + ${mockito-all.version} + test + + + + + javax.servlet + javax.servlet-api + ${javax.servlet-api.version} + + + + + net.sf.json-lib + json-lib + ${json-lib.version} + + + + commons-io + commons-io + ${commons-io.version} + + + + + + + it.geosolutions.geostore + geostore-webapp + ${geostore-webapp.version} + war + runtime + + + proxy + http_proxy + ${http_proxy.version} + war + runtime + + + + + eu.medsea.mimeutil + mime-util + ${mime-util.version} + + + log4j + log4j + + + org.slf4j + slf4j-api + + + org.slf4j + slf4j-log4j12 + + + + + + + org.mapfish.print + print-lib + ${print-lib.version} + + + + + + + geosolutions + ftp://maven.geo-solutions.it/ + + + + + + + geosolutions + GeoSolutions Repository + https://maven.geo-solutions.it + + true + + + + + + spring-release + Spring Portfolio Release Repository + https://maven.springframework.org/release + + false + + + + spring-external + Spring Portfolio External Repository + https://maven.springframework.org/external + + false + + + + + osgeo + Open Source Geospatial Foundation Repository + https://repo.osgeo.org/repository/release/ + + true + + + + + osgeo-snapshot + Open Source Geospatial Foundation Repository + https://repo.osgeo.org/repository/snapshot/ + + true + + + + + + + binary + + + binary + + + + java + product + binary + + + + + + + + + + + org.apache.maven.wagon + wagon-ftp + 1.0-beta-2 + + + + + org.owasp + dependency-check-maven + 9.0.9 + + true + + + + + + check + + + + + + diff --git a/product/pom.xml b/product/pom.xml index 06f5ed33fc..4e7a67a85a 100644 --- a/product/pom.xml +++ b/product/pom.xml @@ -1,490 +1,441 @@ - - 4.0.0 - it.geosolutions.mapstore - mapstore-product - war - 1.8-SNAPSHOT - MapStore Product Web Application + + 4.0.0 + + it.geosolutions.mapstore + mapstore-root + 1.8-SNAPSHOT + - - UTF-8 - 8.5.69 - 8080 - + it.geosolutions.mapstore + mapstore-product + war - - - - it.geosolutions.mapstore - mapstore-webapp - 1.8-SNAPSHOT - war - runtime - - + MapStore Product Web Application - - mapstore - - - maven-resources-plugin - 2.6 - - - version - process-classes - - copy-resources - - - ${basedir}/target/mapstore - UTF-8 - - - ${basedir}/../web/client - true - - **/version.txt - - - - - - - only index.html - process-classes - - copy-resources - - - ${basedir}/target/mapstore - UTF-8 - - - ${basedir}/../web/client/dist - - index.html - - - - - - - only embedded.html - process-classes - - copy-resources - - - ${basedir}/target/mapstore - UTF-8 - - - ${basedir}/../web/client/dist - - embedded.html - - - - - - - only dashboard-embedded.html - process-classes - - copy-resources - - - ${basedir}/target/mapstore - UTF-8 - - - ${basedir}/../web/client/dist - - dashboard-embedded.html - - - - - - - only geostory-embedded.html - process-classes - - copy-resources - - - ${basedir}/target/mapstore - UTF-8 - - - ${basedir}/../web/client/dist - - geostory-embedded.html - - - - - - - only api.html - process-classes - - copy-resources - - - ${basedir}/target/mapstore - UTF-8 - - - ${basedir}/../web/client/dist - - api.html - - - - - - - html, configuration files and images - process-classes - - copy-resources - - - ${basedir}/target/mapstore - UTF-8 - - - ${basedir}/../web/client - - **/*.html - **/*.json - **/img/* - product/assets/symbols/* - **/*.less - - - node_modules/* - node_modules/**/* - **/test-resources/* - - - - - - - js files - process-classes - - copy-resources - - - ${basedir}/target/mapstore/dist - UTF-8 - - - ${basedir}/../web/client/dist - - - - - - translations - process-classes - - copy-resources - - - ${basedir}/target/mapstore - UTF-8 - - - ${basedir}/../web/client - - translations/* - - - - - - - docs - process-classes - - copy-resources - - - ${basedir}/target/mapstore/docs - UTF-8 - - - ${basedir}/../web/docs - - - - - - printing templates - process-classes - - copy-resources - - - ${basedir}/target/mapstore/printing - UTF-8 - - - ../java/printing/resources/geoserver/print - - - - - - - - org.apache.maven.plugins - maven-war-plugin - 2.1.1 - - - - it.geosolutions.mapstore - mapstore-webapp - - - - - - org.codehaus.cargo - cargo-maven3-plugin - 1.10.2 - - - tomcat8x - - https://repo.maven.apache.org/maven2/org/apache/tomcat/tomcat/8.5.69/tomcat-8.5.69.zip - - - - standalone - - ${project.build.directory}/apache-tomcat-${tomcat.version} - - - ${tomcat.port} - low - - - -Djavax.xml.parsers.SAXParserFactory="com.sun.org.apache.xerces.internal.jaxp.SAXParserFactoryImpl" - - - - - - ${project.groupId} - ${project.artifactId} - war - - /mapstore - - - - - - - - - - dev-custom-port - - - env.MAPSTORE_BACKEND_PORT - - - - - ${env.MAPSTORE_BACKEND_PORT} - - - - printing - - false - - + + + + it.geosolutions.mapstore + mapstore-webapp + ${project.version} + war + runtime + + + + + mapstore - com.coderplus.maven.plugins - copy-rename-maven-plugin - 1.0 + maven-resources-plugin + 2.6 - rename-context - prepare-package + version + process-classes + + copy-resources + + + ${basedir}/target/mapstore + UTF-8 + + + ${basedir}/../web/client + true + + **/version.txt + + + + + + + only index.html + process-classes + + copy-resources + + + ${basedir}/target/mapstore + UTF-8 + + + ${basedir}/../web/client/dist + + index.html + + + + + + + only embedded.html + process-classes - copy + copy-resources - true - ../java/printing/webapp/applicationContext-print.xml - target/mapstore/WEB-INF/classes/applicationContext-print.xml + ${basedir}/target/mapstore + UTF-8 + + + ${basedir}/../web/client/dist + + embedded.html + + + + + + + only dashboard-embedded.html + process-classes + + copy-resources + + + ${basedir}/target/mapstore + UTF-8 + + + ${basedir}/../web/client/dist + + dashboard-embedded.html + + + + + + + only geostory-embedded.html + process-classes + + copy-resources + + + ${basedir}/target/mapstore + UTF-8 + + + ${basedir}/../web/client/dist + + geostory-embedded.html + + + + + + + only api.html + process-classes + + copy-resources + + + ${basedir}/target/mapstore + UTF-8 + + + ${basedir}/../web/client/dist + + api.html + + + + + + + html, configuration files and images + process-classes + + copy-resources + + + ${basedir}/target/mapstore + UTF-8 + + + ${basedir}/../web/client + + **/*.html + **/*.json + **/img/* + product/assets/symbols/* + **/*.less + + + node_modules/* + node_modules/**/* + **/test-resources/* + + + + + + + js files + process-classes + + copy-resources + + + ${basedir}/target/mapstore/dist + UTF-8 + + + ${basedir}/../web/client/dist + + + + + + translations + process-classes + + copy-resources + + + ${basedir}/target/mapstore + UTF-8 + + + ${basedir}/../web/client + + translations/* + + + + + + + docs + process-classes + + copy-resources + + + ${basedir}/target/mapstore/docs + UTF-8 + + + ${basedir}/../web/docs + + + + + + printing templates + process-classes + + copy-resources + + + ${basedir}/target/mapstore/printing + UTF-8 + + + ../java/printing/resources/geoserver/print + + + + org.apache.maven.plugins + maven-war-plugin + 2.1.1 + + + + it.geosolutions.mapstore + mapstore-webapp + + + + + + org.codehaus.cargo + cargo-maven3-plugin + 1.10.2 + + + tomcat8x + + + https://repo.maven.apache.org/maven2/org/apache/tomcat/tomcat/8.5.69/tomcat-8.5.69.zip + + + + + standalone + + ${project.build.directory}/apache-tomcat-${tomcat.version} + + + ${tomcat.port} + low + + + -Djavax.xml.parsers.SAXParserFactory="com.sun.org.apache.xerces.internal.jaxp.SAXParserFactoryImpl" + + + + + + ${project.groupId} + ${project.artifactId} + war + + /mapstore + + + + + - - + + + + + dev-custom-port + + + env.MAPSTORE_BACKEND_PORT + + + + + ${env.MAPSTORE_BACKEND_PORT} + + + + printing + + false + + + + + com.coderplus.maven.plugins + copy-rename-maven-plugin + 1.0 + + + rename-context + prepare-package + + copy + + + true + ../java/printing/webapp/applicationContext-print.xml + target/mapstore/WEB-INF/classes/applicationContext-print.xml + + + + + + + + + - org.apache.httpcomponents - httpclient - 4.5.13 + org.mapfish.print + print-lib + + + commons-codec + commons-codec + + + com.fasterxml.jackson.core + jackson-annotations + + + com.fasterxml.jackson.core + jackson-core + + + com.fasterxml.jackson.core + jackson-databind + + + org.springframework + spring-web + + + org.springframework + spring-context + + - - - - - org.mapfish.print - print-lib - 2.4-SNAPSHOT - - - commons-codec - commons-codec - - - com.fasterxml.jackson.core - jackson-annotations - - - com.fasterxml.jackson.core - jackson-core - - - com.fasterxml.jackson.core - jackson-databind - - - org.springframework - spring-web - - - org.springframework - spring-context - - - - - - - db-security - - - !disable.db.security - - - - - - com.coderplus.maven.plugins - copy-rename-maven-plugin - 1.0 - - - copy-spring-security-db - prepare-package - - copy - - - true - config/db/geostore-spring-security-db.xml - target/mapstore/WEB-INF/classes/geostore-spring-security.xml - - - - - - - - - ldap - - false - - - - - com.coderplus.maven.plugins - copy-rename-maven-plugin - 1.0 - - - copy-spring-security-ldap - prepare-package - - copy - - - true - config/ldap/geostore-spring-security-ldap.xml - target/mapstore/WEB-INF/classes/geostore-spring-security.xml - - - - - - - - - - - - geosolutions - GeoSolutions Repository - https://maven.geo-solutions.it - - true - - - - - - spring-release - Spring Portfolio Release Repository - https://maven.springframework.org/release - - false - - - - spring-external - Spring Portfolio External Repository - https://maven.springframework.org/external - - false - - - - - osgeo - Open Source Geospatial Foundation Repository - https://repo.osgeo.org/repository/release/ - - true - - - - - osgeo-snapshot - Open Source Geospatial Foundation Repository - https://repo.osgeo.org/repository/snapshot/ - - true - - - + + + db-security + + + !disable.db.security + + + + + + com.coderplus.maven.plugins + copy-rename-maven-plugin + 1.0 + + + copy-spring-security-db + prepare-package + + copy + + + true + config/db/geostore-spring-security-db.xml + target/mapstore/WEB-INF/classes/geostore-spring-security.xml + + + + + + + + + + ldap + + false + + + + + com.coderplus.maven.plugins + copy-rename-maven-plugin + 1.0 + + + copy-spring-security-ldap + prepare-package + + copy + + + true + config/ldap/geostore-spring-security-ldap.xml + target/mapstore/WEB-INF/classes/geostore-spring-security.xml + + + + + + + + + diff --git a/project/standard/templates/web/pom.xml b/project/standard/templates/web/pom.xml index 05004a6433..c271139993 100644 --- a/project/standard/templates/web/pom.xml +++ b/project/standard/templates/web/pom.xml @@ -15,6 +15,10 @@ UTF-8 8.5.69 8080 + 1.8-SNAPSHOT + 2.1-SNAPSHOT + 1.6-SNAPSHOT + 1.4-SNAPSHOT @@ -22,7 +26,7 @@ it.geosolutions.mapstore mapstore-services - 1.8-SNAPSHOT + ${mapstore-services.version} @@ -31,14 +35,14 @@ it.geosolutions.geostore geostore-webapp - 2.2-SNAPSHOT + ${geostore-webapp.version} war runtime proxy http_proxy - 1.6-SNAPSHOT + ${http_proxy.version} war runtime @@ -474,7 +478,7 @@ org.mapfish.print print-lib - 2.4-SNAPSHOT + ${print-lib.version} commons-codec