From 388e2ec6f0bb5ed3b68bc9a1614b16542069ce51 Mon Sep 17 00:00:00 2001 From: Lorenzo Natali Date: Wed, 6 Mar 2024 17:03:28 +0100 Subject: [PATCH] Fixed project pom --- project/standard/templates/backend/pom.xml | 64 ------------------- .../backend/src/main/java/placeholder | 0 .../backend/src/main/resources/placeholder | 0 .../backend/src/test/java/placeholder | 0 .../backend/src/test/resources/placeholder | 0 project/standard/templates/pom.xml | 1 - project/standard/templates/web/pom.xml | 47 +++++++++++++- 7 files changed, 45 insertions(+), 67 deletions(-) delete mode 100644 project/standard/templates/backend/pom.xml delete mode 100644 project/standard/templates/backend/src/main/java/placeholder delete mode 100644 project/standard/templates/backend/src/main/resources/placeholder delete mode 100644 project/standard/templates/backend/src/test/java/placeholder delete mode 100644 project/standard/templates/backend/src/test/resources/placeholder diff --git a/project/standard/templates/backend/pom.xml b/project/standard/templates/backend/pom.xml deleted file mode 100644 index 0f20ee7ead..0000000000 --- a/project/standard/templates/backend/pom.xml +++ /dev/null @@ -1,64 +0,0 @@ - - 4.0.0 - - it.geosolutions.__PROJECTNAME__ - __PROJECTNAME__-root - 1.0-SNAPSHOT - - __PROJECTNAME__-backend - jar - __PROJECTDESCRIPTION__ - Backend Services - http://www.geo-solutions.it - - - UTF-8 - - - - - - - - org.springframework - spring-core - - - org.springframework - spring-context - - - - - - - org.springframework - spring-web - - - org.springframework - spring-webmvc - - - - - - org.apache.logging.log4j - log4j-core - - - org.apache.logging.log4j - log4j-api - - - org.apache.logging.log4j - log4j-slf4j-impl - - - - junit - junit - - - - diff --git a/project/standard/templates/backend/src/main/java/placeholder b/project/standard/templates/backend/src/main/java/placeholder deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/project/standard/templates/backend/src/main/resources/placeholder b/project/standard/templates/backend/src/main/resources/placeholder deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/project/standard/templates/backend/src/test/java/placeholder b/project/standard/templates/backend/src/test/java/placeholder deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/project/standard/templates/backend/src/test/resources/placeholder b/project/standard/templates/backend/src/test/resources/placeholder deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/project/standard/templates/pom.xml b/project/standard/templates/pom.xml index fa7dcf035f..0b9cd512f6 100644 --- a/project/standard/templates/pom.xml +++ b/project/standard/templates/pom.xml @@ -18,7 +18,6 @@ web - MapStore2/java/services diff --git a/project/standard/templates/web/pom.xml b/project/standard/templates/web/pom.xml index c271139993..ee2a7243dd 100644 --- a/project/standard/templates/web/pom.xml +++ b/project/standard/templates/web/pom.xml @@ -18,7 +18,14 @@ 1.8-SNAPSHOT 2.1-SNAPSHOT 1.6-SNAPSHOT - 1.4-SNAPSHOT + 2.4-SNAPSHOT + 4.5.13 + 4.13.1 + 1.9.5 + 3.0.1 + 2.0.4 + 1.5.4 + 2.3.1 @@ -469,7 +476,43 @@ org.apache.httpcomponents httpclient - 4.5.13 + ${httpclient.version} + + + + junit + junit + test + ${junit.version} + + + + org.mockito + mockito-all + ${mockito-all.version} + + + + javax.servlet + javax.servlet-api + ${javax.servlet-api.version} + + + + net.sf.ehcache + ehcache-web + ${ehcache-web.version} + + + + commons-pool + commons-pool + ${commons-pool.version} + + + javax.xml.ws + jaxws-api + ${jaxws-api.version}