diff --git a/pom.xml b/pom.xml index 22baa519..3b841656 100644 --- a/pom.xml +++ b/pom.xml @@ -1,5 +1,6 @@ - + 4.0.0 it.geosolutions @@ -63,8 +64,8 @@ https://github.com/geosolutions-it/geostore scm:git:git@github.com:geosolutions-it/geostore.git - HEAD - + HEAD + jenkins @@ -95,10 +96,20 @@ 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 @@ -166,6 +177,23 @@ + + org.owasp + dependency-check-maven + 9.0.9 + + true + + + + + + check + + + + + @@ -192,16 +220,9 @@ - - - org.codehaus.mojo - cobertura-maven-plugin - 2.7 - - src diff --git a/src/cli/pom.xml b/src/cli/pom.xml index 251e8d6b..e7617763 100644 --- a/src/cli/pom.xml +++ b/src/cli/pom.xml @@ -18,7 +18,8 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . --> - + 4.0.0 @@ -37,10 +38,9 @@ com.h2database h2 - 1.3.175 - + commons-beanutils commons-beanutils @@ -50,11 +50,10 @@ jdom jdom - + info.picocli picocli - 4.6.1 commons-lang @@ -93,26 +92,26 @@ 2.2 H2ToPgSQLExport - false + false it.geosolutions.geostore.cli.H2ToPgSQLExportCLI - jar-with-dependencies + jar-with-dependencies - make-assembly - package - - single - + make-assembly + package + + single + - + diff --git a/src/core/model/pom.xml b/src/core/model/pom.xml index cfa28798..1248e6d0 100644 --- a/src/core/model/pom.xml +++ b/src/core/model/pom.xml @@ -80,7 +80,6 @@ jdom - junit junit @@ -108,7 +107,6 @@ - diff --git a/src/core/persistence/pom.xml b/src/core/persistence/pom.xml index 3d17eb78..5ba28734 100644 --- a/src/core/persistence/pom.xml +++ b/src/core/persistence/pom.xml @@ -18,7 +18,8 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . --> - + 4.0.0 @@ -41,14 +42,14 @@ it.geosolutions.geostore geostore-model - + it.geosolutions.geostore geostore-security - + commons-lang @@ -102,21 +103,21 @@ - org.springframework.security - spring-security-ldap - - - - - - + org.springframework.security + spring-security-ldap + + + + + + @@ -125,33 +126,32 @@ - + com.googlecode.genericdao dao-hibernate - + com.googlecode.genericdao search-jpa-hibernate - + - + - com.h2database - h2 - 1.3.175 - - - - - + com.h2database + h2 + + + + + org.hibernate hibernate-core @@ -175,7 +175,7 @@ hibernate-ehcache - + asm asm @@ -185,11 +185,11 @@ cglib-nodep - - + + org.aspectj aspectjrt @@ -199,13 +199,13 @@ aspectjweaver - + - + junit junit @@ -215,32 +215,31 @@ - - - - - postgres - - - - org.postgresql - postgresql - - - - - - oracle - - - - com.oracle - ojdbc6 - 11.2.0 - - - - + + + + + postgres + + + + org.postgresql + postgresql + + + + + + oracle + + + + com.oracle + ojdbc6 + + + + diff --git a/src/core/persistence/src/main/java/it/geosolutions/geostore/core/dao/ldap/impl/UserGroupDAOImpl.java b/src/core/persistence/src/main/java/it/geosolutions/geostore/core/dao/ldap/impl/UserGroupDAOImpl.java index d6a864c3..07b113f1 100644 --- a/src/core/persistence/src/main/java/it/geosolutions/geostore/core/dao/ldap/impl/UserGroupDAOImpl.java +++ b/src/core/persistence/src/main/java/it/geosolutions/geostore/core/dao/ldap/impl/UserGroupDAOImpl.java @@ -173,7 +173,7 @@ public Map getPropertyMapper() { return mapper; } - protected List ldapSearch(String filter, DirContextProcessor processor, ISearch search) { + protected List ldapSearch(String filter, DirContextProcessor processor, final ISearch search) { SearchControls controls = new SearchControls(); controls.setSearchScope(SearchControls.SUBTREE_SCOPE); return template.search(searchBase, filter, controls, new AbstractContextMapper() { diff --git a/src/core/persistence/src/test/java/it/geosolutions/geostore/core/dao/ldap/UserDAOTest.java b/src/core/persistence/src/test/java/it/geosolutions/geostore/core/dao/ldap/UserDAOTest.java index 1119e7d0..ee906735 100644 --- a/src/core/persistence/src/test/java/it/geosolutions/geostore/core/dao/ldap/UserDAOTest.java +++ b/src/core/persistence/src/test/java/it/geosolutions/geostore/core/dao/ldap/UserDAOTest.java @@ -19,33 +19,21 @@ */ package it.geosolutions.geostore.core.dao.ldap; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - -import java.util.Arrays; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import javax.naming.NamingEnumeration; -import javax.naming.NamingException; -import javax.naming.directory.BasicAttributes; -import javax.naming.directory.DirContext; -import javax.naming.directory.SearchControls; -import javax.naming.directory.SearchResult; - -import it.geosolutions.geostore.core.model.UserGroup; -import org.junit.Test; -import org.springframework.ldap.core.DirContextAdapter; import com.googlecode.genericdao.search.Filter; import com.googlecode.genericdao.search.Search; import it.geosolutions.geostore.core.dao.ldap.impl.UserDAOImpl; import it.geosolutions.geostore.core.dao.ldap.impl.UserGroupDAOImpl; -import it.geosolutions.geostore.core.ldap.IterableNamingEnumeration; import it.geosolutions.geostore.core.ldap.MockContextSource; -import it.geosolutions.geostore.core.ldap.MockDirContextOperations; import it.geosolutions.geostore.core.model.User; +import it.geosolutions.geostore.core.model.UserGroup; import it.geosolutions.geostore.core.model.enums.Role; +import org.junit.Test; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import static org.junit.Assert.*; public class UserDAOTest extends BaseDAOTest { @@ -61,7 +49,7 @@ public void testFindAll() { } @Test - public void testSearchByname() { + public void testSearchByName() { UserDAOImpl userDAO = new UserDAOImpl(new MockContextSource(buildContextForUsers())); userDAO.setSearchBase("ou=users"); Search search = new Search(User.class); @@ -111,7 +99,7 @@ public void testRolesAreAssigned() { @Test public void testAttributesMapper() { UserDAOImpl userDAO = new UserDAOImpl(new MockContextSource(buildContextForUsers())); - Map mapper = new HashMap(); + Map mapper = new HashMap<>(); mapper.put("mail", "email"); userDAO.setAttributesMapper(mapper); userDAO.setSearchBase("ou=users"); @@ -172,12 +160,12 @@ public void testGroupsAreFetchedWithoutNestedUsers() { assertTrue(group.getUsers().isEmpty()); } - // but yes the group with groupName group actually jas user assigned to it. + // but yes, the group with groupName group actually jas user assigned to it. Search search1=new Search(); Filter filter=Filter.equal("groupName","group"); search1.addFilter(filter); List groups=userGroupDAO.search(search1); - assertTrue(groups.get(0).getUsers().size()>0); + assertFalse(groups.get(0).getUsers().isEmpty()); } } diff --git a/src/core/security/pom.xml b/src/core/security/pom.xml index 6112fc28..48f013bc 100644 --- a/src/core/security/pom.xml +++ b/src/core/security/pom.xml @@ -18,10 +18,11 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . --> - + 4.0.0 - + it.geosolutions.geostore geostore-core 2.1-SNAPSHOT @@ -34,7 +35,7 @@ - + commons-lang @@ -55,9 +56,9 @@ commons-dbcp - commons-io - commons-io - + commons-io + commons-io + @@ -82,32 +83,32 @@ spring-context - - - + + + - - org.springframework.security - spring-security-core - - - org.springframework.security - spring-security-crypto - - - org.jasypt - jasypt - - + + org.springframework.security + spring-security-core + + + org.springframework.security + spring-security-crypto + + + org.jasypt + jasypt-acegisecurity + + org.acegisecurity acegi-security-tiger - - org.springframework.security - spring-security-ldap - + + org.springframework.security + spring-security-ldap + - + commons-beanutils commons-beanutils @@ -117,25 +118,24 @@ jdom jdom - + junit junit test - - - net.sf.json-lib - json-lib - 2.4 - jdk15 - - - - it.geosolutions.geostore - geostore-model - - + + + net.sf.json-lib + json-lib + + + + it.geosolutions.geostore + geostore-model + + + diff --git a/src/core/security/src/main/java/it/geosolutions/geostore/core/security/JSONExpressionUserMapper.java b/src/core/security/src/main/java/it/geosolutions/geostore/core/security/JSONExpressionUserMapper.java index 73ea9135..28a35999 100644 --- a/src/core/security/src/main/java/it/geosolutions/geostore/core/security/JSONExpressionUserMapper.java +++ b/src/core/security/src/main/java/it/geosolutions/geostore/core/security/JSONExpressionUserMapper.java @@ -29,14 +29,12 @@ import java.util.Map; +import net.sf.json.JSONObject; import org.springframework.expression.AccessException; import org.springframework.expression.EvaluationContext; import org.springframework.expression.PropertyAccessor; import org.springframework.expression.TypedValue; -import net.sf.json.JSONObject; - - /** * Maps user attributes for a JSON object. * @@ -48,7 +46,7 @@ public class JSONExpressionUserMapper extends ExpressionUserMapper { public JSONExpressionUserMapper(Map attributeMappings) { super(attributeMappings); - // property accessor for JSONObject attributes (read only) + // property accessor for JSONObject attributes (read-only) evaluationContext.addPropertyAccessor(new PropertyAccessor() { @Override @@ -89,11 +87,9 @@ public boolean canRead(EvaluationContext ctx, Object target, String name) @Override protected Object preProcessDetails(Object details) { if(details instanceof String) { - details = JSONObject.fromObject((String)details); + details = JSONObject.fromObject(details); } return super.preProcessDetails(details); } - - } diff --git a/src/core/security/src/main/java/it/geosolutions/geostore/core/security/password/GeoStoreDigestPasswordEncoder.java b/src/core/security/src/main/java/it/geosolutions/geostore/core/security/password/GeoStoreDigestPasswordEncoder.java index 1157916c..2cd5ae42 100644 --- a/src/core/security/src/main/java/it/geosolutions/geostore/core/security/password/GeoStoreDigestPasswordEncoder.java +++ b/src/core/security/src/main/java/it/geosolutions/geostore/core/security/password/GeoStoreDigestPasswordEncoder.java @@ -26,7 +26,7 @@ import static it.geosolutions.geostore.core.security.password.SecurityUtils.toBytes; /** - * This Encoder provide encription and check of password using a digest + * This Encoder provides encryption and check of password using a digest * @author Lorenzo Natali (lorenzo.natali at geo-solutions.it) * */ diff --git a/src/core/security/src/main/java/it/geosolutions/geostore/core/security/password/GeoStorePBEPasswordEncoder.java b/src/core/security/src/main/java/it/geosolutions/geostore/core/security/password/GeoStorePBEPasswordEncoder.java index cba1b70c..af3dbfb1 100644 --- a/src/core/security/src/main/java/it/geosolutions/geostore/core/security/password/GeoStorePBEPasswordEncoder.java +++ b/src/core/security/src/main/java/it/geosolutions/geostore/core/security/password/GeoStorePBEPasswordEncoder.java @@ -28,9 +28,10 @@ import java.util.Arrays; import java.util.Base64; import org.acegisecurity.providers.encoding.PasswordEncoder; +import org.jasypt.acegisecurity.PBEPasswordEncoder; import org.jasypt.encryption.pbe.StandardPBEByteEncryptor; import org.jasypt.encryption.pbe.StandardPBEStringEncryptor; -import org.jasypt.spring.security.PBEPasswordEncoder; + /** * Password Encoder using symmetric encryption * diff --git a/src/core/services-api/pom.xml b/src/core/services-api/pom.xml index 3e51439b..7bd79ea2 100644 --- a/src/core/services-api/pom.xml +++ b/src/core/services-api/pom.xml @@ -138,28 +138,6 @@ org.springframework.security spring-security-core - - - - - - - - diff --git a/src/core/services-impl/pom.xml b/src/core/services-impl/pom.xml index cdf7406a..eaaef2c5 100644 --- a/src/core/services-impl/pom.xml +++ b/src/core/services-impl/pom.xml @@ -56,7 +56,6 @@ - commons-lang commons-lang @@ -98,27 +97,15 @@ - org.apache.logging.log4j log4j-core - - - + + com.googlecode.genericdao - dao-hibernate @@ -126,39 +113,7 @@ slf4j-api - - - - - - - org.aspectj aspectjrt @@ -174,17 +129,6 @@ provided - - - - - @@ -217,7 +161,6 @@ - src/main/resources @@ -238,7 +181,7 @@ org.codehaus.mojo cobertura-maven-plugin - 2.4 + 2.7 diff --git a/src/modules/rest/api/pom.xml b/src/modules/rest/api/pom.xml index b3269304..7d126e54 100644 --- a/src/modules/rest/api/pom.xml +++ b/src/modules/rest/api/pom.xml @@ -114,7 +114,6 @@ javax.xml.ws jaxws-api - 2.3.1 @@ -132,17 +131,6 @@ - - org.apache.maven.plugins - maven-compiler-plugin - - 1.8 - 1.8 - - - - - true @@ -163,5 +151,4 @@ - diff --git a/src/modules/rest/auditing/pom.xml b/src/modules/rest/auditing/pom.xml index 4546592c..17f20741 100644 --- a/src/modules/rest/auditing/pom.xml +++ b/src/modules/rest/auditing/pom.xml @@ -43,7 +43,6 @@ org.freemarker freemarker - 2.3.20 junit diff --git a/src/modules/rest/client/pom.xml b/src/modules/rest/client/pom.xml index 93a02c89..2840fae6 100644 --- a/src/modules/rest/client/pom.xml +++ b/src/modules/rest/client/pom.xml @@ -59,13 +59,11 @@ com.sun.jersey.contribs jersey-apache-client - 1.12 com.sun.jersey jersey-client - 1.12 @@ -80,18 +78,7 @@ - - org.apache.maven.plugins - maven-compiler-plugin - - utf8 - 1.8 - 1.8 - - - - true org.apache.maven.plugins diff --git a/src/modules/rest/extjs/pom.xml b/src/modules/rest/extjs/pom.xml index f4035b1d..546f043b 100644 --- a/src/modules/rest/extjs/pom.xml +++ b/src/modules/rest/extjs/pom.xml @@ -18,7 +18,8 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . --> - + 4.0.0 @@ -30,7 +31,7 @@ geostore-rest-extjs jar - GeoStore - Modules - REST EXTJS services + GeoStore - Modules - REST EXT-JS services @@ -42,7 +43,7 @@ geostore-services-api - + it.geosolutions.geostore geostore-rest-impl @@ -84,11 +85,8 @@ net.sf.json-lib json-lib - 2.4 - - jdk15 - + junit junit @@ -97,7 +95,6 @@ org.hamcrest hamcrest-core - 1.3 test @@ -112,32 +109,27 @@ org.apache.maven.plugins maven-compiler-plugin - - utf8 - 1.8 - 1.8 - - + org.apache.maven.plugins maven-surefire-plugin diff --git a/src/modules/rest/impl/pom.xml b/src/modules/rest/impl/pom.xml index cf4c0b18..3dae2c89 100644 --- a/src/modules/rest/impl/pom.xml +++ b/src/modules/rest/impl/pom.xml @@ -71,7 +71,7 @@ it.geosolutions.geostore geostore-security - ${geostore-version} + ${project.version} test-jar test @@ -88,7 +88,6 @@ org.springframework.security.oauth spring-security-oauth2 - 2.0.16.RELEASE org.springframework @@ -106,48 +105,44 @@ org.springframework spring-beans + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-mapper-asl + org.keycloak keycloak-spring-security-adapter - 18.0.0 org.keycloak keycloak-authz-client - 18.0.0 org.keycloak keycloak-admin-client - 18.0.0 org.springframework.security spring-security-jwt - 1.0.11.RELEASE com.auth0 java-jwt - 3.18.3 - - - org.mockito - mockito-core - test - - com.google.guava guava @@ -217,7 +212,6 @@ jackson-annotations - junit @@ -241,7 +235,6 @@ com.github.tomakehurst wiremock-standalone - 2.1.12 test @@ -270,16 +263,6 @@ - - org.apache.maven.plugins - maven-compiler-plugin - - utf8 - 1.8 - 1.8 - - - - + 4.0.0 @@ -65,61 +66,44 @@ 2.1-SNAPSHOT geostore - - 3.4.4 + 3.5.7 5.3.0.4-fuse - 2.5.1 5.3.18 - - - 5.3.10.RELEASE + + 5.6.12 1.6.1.2-fuse - 1.6.2 1.4 - 1.0 - 2.7.0 2.8.1 1.3.03 2.3.1 - 1.1.1 2.3 3.2.2 1.7.0 1.2.2 1.4 - 1.1 4.0 - 2.1 2.1.2 - 2.19.0 - 2.2-beta-5 - 3.1.0.2-fuse - 2.0.8 1.0.1 1.5.4 2.0 - 6.1.0.1-fuse + 6.1H.22 1.4.0 - - - - 1.0 5.4.33.Final geosolutions-1.3.0 @@ -127,12 +111,45 @@ 2.1_3 18.0 3.8.0 - 3.8.0.GA - 2.3-M1 2.7-RC2 - 2.13.1 + 2.16.1 + 2.9.0 + 1.5.2 + 1.0 + 2.1 + 4.5.13 + 1.0.7 + 1.0.2.Final + 3.0.1 + 4.13.2 + geosolutions-1.3.0 + 1.0-beta-2 + 1.1.1 + 1.1 + 1.1.3 + 1.1.1 + 1.3.3 + 42.3.9 + 1.10 + 1.3.175 + 4.6.1 + 11.2.0 + 2.0.17.RELEASE + 1.9.3 + 18.0.0 + 1.0.11.RELEASE + 3.18.3 + 2.1.12 + 1.3 + 1.12 + 2.3.20 + 1.5.5 + 0.9.16 + 6.1.14 + 1.2 + 2.4.2-geoserver @@ -141,24 +158,24 @@ - - - false - geosolutions - ftp://maven.geo-solutions.it/ - - - - false - geosolutions - ftp://maven.geo-solutions.it/ - + + + false + geosolutions + ftp://maven.geo-solutions.it/ + + + + false + geosolutions + ftp://maven.geo-solutions.it/ + - + @@ -171,37 +188,37 @@ it.geosolutions.geostore geostore-core - ${geostore-version} + ${project.version} it.geosolutions.geostore geostore-model - ${geostore-version} + ${project.version} it.geosolutions.geostore geostore-security - ${geostore-version} + ${project.version} it.geosolutions.geostore geostore-persistence - ${geostore-version} + ${project.version} it.geosolutions.geostore geostore-services-api - ${geostore-version} + ${project.version} it.geosolutions.geostore geostore-services-impl - ${geostore-version} + ${project.version} @@ -210,73 +227,73 @@ it.geosolutions.geostore geostore-generic-api - ${geostore-version} + ${project.version} it.geosolutions.geostore geostore-login-parent - ${geostore-version} + ${project.version} it.geosolutions.geostore geostore-login-api - ${geostore-version} + ${project.version} it.geosolutions.geostore geostore-login-impl - ${geostore-version} + ${project.version} it.geosolutions.geostore geostore-webgis - ${geostore-version} + ${project.version} it.geosolutions.geostore geostore-rest-root - ${geostore-version} + ${project.version} it.geosolutions.geostore geostore-rest-api - ${geostore-version} + ${project.version} it.geosolutions.geostore geostore-rest-impl - ${geostore-version} + ${project.version} it.geosolutions.geostore geostore-rest-test - ${geostore-version} + ${project.version} it.geosolutions.geostore geostore-rest-extjs - ${geostore-version} + ${project.version} it.geosolutions.geostore geostore-rest-auditing - ${geostore-version} + ${project.version} com.google.code.gson gson - 2.9.0 + ${gson.version} @@ -285,18 +302,18 @@ it.geosolutions.geostore geostore-services-impl - ${geostore-version} + ${project.version} test-jar test - - - + + + quartz quartz - 1.5.2 + ${quartz.version} javassist @@ -305,9 +322,9 @@ runtime - - - + + + org.apache.logging.log4j log4j-core @@ -329,22 +346,17 @@ ${log4j-version} - + jdom jdom - 1.0 + ${jdom.version} - - - - + + + commons-lang commons-lang @@ -353,12 +365,12 @@ commons-io commons-io - 2.1 + ${commons-io.version} org.apache.httpcomponents httpclient - 4.5.13 + ${httpclient.version} commons-dbcp @@ -379,7 +391,6 @@ commons-codec commons-codec ${commons-codec-version} - @@ -387,40 +398,60 @@ guava ${guava-version} - org.mockito mockito-core ${mockito-version} test - org.mockito mockito-inline ${mockito-version} test + + com.github.tomakehurst + wiremock-standalone + ${wiremock-standalone.version} + test + + + org.hamcrest + hamcrest-core + ${hamcrest-core.version} + test + - - - - + + + org.glassfish.jersey.containers jersey-container-servlet ${jersey-version} - - org.glassfish.jersey.ext - jersey-spring3 - ${jersey-version} - + + org.glassfish.jersey.ext + jersey-spring3 + ${jersey-version} + + + + com.sun.jersey.contribs + jersey-apache-client + ${jersey-apache-client.version} + - - - + + com.sun.jersey + jersey-client + ${jersey-apache-client.version} + + + + javax.xml.ws jaxws-api @@ -511,11 +542,11 @@ cxf-rt-core ${cxf-version} - - com.google.code.cxf-spring-security - cxf-spring-security - ${cxf-version} - + + com.google.code.cxf-spring-security + cxf-spring-security + ${cxf-version} + @@ -532,9 +563,9 @@ ${javax-mail-version} - - - + + + javax.xml.bind jaxb-api @@ -546,9 +577,9 @@ ${jaxb-impl-version} - - - + + + org.springframework spring-framework-bom @@ -572,19 +603,16 @@ log4j - org.springframework spring-beans ${spring-version} - org.springframework spring-context ${spring-version} - org.springframework @@ -600,7 +628,6 @@ org.springframework spring-jdbc ${spring-version} - @@ -647,10 +674,9 @@ ${jackson-version} - - - + + org.springframework.security spring-security-core @@ -677,7 +703,37 @@ spring-security-config ${spring-security-version} - + + org.springframework.security.oauth + spring-security-oauth2 + ${spring-security-oauth2.version} + + + org.springframework + spring-context + + + org.springframework + spring-core + + + org.springframework + spring-webmvc + + + org.springframework + spring-beans + + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-mapper-asl + + + org.springframework.security spring-security-ldap @@ -690,25 +746,54 @@ ${spring-security-version} - org.jasypt - jasypt - 1.8 + org.jasypt + jasypt-acegisecurity + ${jasypt.version} org.acegisecurity acegi-security-tiger - 1.0.7 + ${acegi-security-tiger.version} log4j log4j + + org.springframework + spring-support + + + org.keycloak + keycloak-spring-security-adapter + ${keycloak-spring-security-adapter.version} + + + org.keycloak + keycloak-authz-client + ${keycloak-spring-security-adapter.version} + + + org.keycloak + keycloak-admin-client + ${keycloak-spring-security-adapter.version} + + + org.springframework.security + spring-security-jwt + ${spring-security-jwt.version} + + + com.auth0 + java-jwt + ${java-jwt.version} + - - - + + + - - + + + javax.servlet javax.servlet-api - 3.0.1 + ${javax.servlet-api.version} provided - - - + + + asm asm @@ -754,9 +837,9 @@ ${cglib-version} - - - + + + org.codehaus.jettison jettison @@ -774,42 +857,35 @@ ${aspectj-version} - - - + + + junit junit - 4.12 + ${junit.version} test - - - + + + com.googlecode.genericdao dao-hibernate - geosolutions-1.3.0 + ${dao-hibernate.version} - com.googlecode.genericdao search-jpa-hibernate - geosolutions-1.3.0 - + ${dao-hibernate.version} - - - + + + + org.hibernate hibernate-core @@ -822,70 +898,63 @@ ${hibernate-version} - - - - - + + + org.hibernatespatial hibernate-spatial-postgis - 1.1.1 + ${hibernate-spatial-postgis.version} - - - + + + org.postgis postgis-jdbc - 1.3.3 + ${postgis-jdbc.version} org.postgresql postgresql - 42.2.23 + ${postgresql.version} com.vividsolutions jts - 1.10 + ${jts.version} - - - - + + + javax.media jai_core - 1.1.3 + ${jai_codec.version} javax.media jai_codec - 1.1.3 + ${jai_codec.version} javax.media jai_imageio - 1.1 + ${jai_imageio.version} com.googlecode.jaitools jt-utils - 1.1.1 + ${jt-utils.version} net.java.dev.jsr-275 jsr-275 - 1.0-beta-2 + ${jsr-275.version} @@ -894,9 +963,9 @@ ${javax-annotation-version} - - - + + + org.opengis geoapi @@ -973,6 +1042,65 @@ ${gt-version} + + + com.h2database + h2 + ${h2.version} + + + + + com.oracle + ojdbc6 + ${ojdbc6.version} + + + + + net.sf.json-lib + json-lib + ${json-lib.version} + + + + info.picocli + picocli + ${picocli.version} + + + + + org.freemarker + freemarker + ${freemarker.version} + + + + + org.apache.directory.server + apacheds-all + ${apacheds-all.version} + test + + + org.apache.directory.shared + shared-ldap + ${shared-ldap.version} + test + + + org.mortbay.jetty + jetty + ${jetty.version} + test + + + jstl + jstl + ${jstl.version} + test + @@ -982,20 +1110,6 @@ org.apache.maven.plugins maven-compiler-plugin - 3.5.1 - - 1.8 - 1.8 - true - UTF-8 - - true - 128M - 1512M - @@ -1015,12 +1129,10 @@ see http://jira.codehaus.org/browse/SUREFIRE-121 --> 2.4.2 - -Dfile.encoding=UTF-8 - + -Dfile.encoding=UTF-8 -noverify + - - @@ -1033,8 +1145,8 @@ maven2-repository.maven - Repository for Maven2 - https://repo.maven.apache.org/maven2 + Repository for Maven2 + https://repo1.maven.org/maven2/ default @@ -1042,7 +1154,7 @@ maven2-repository.dev.java.net Java.net Repository for Maven - http://download.java.net/maven/2/ + https://download.java.net/maven/2/ default false @@ -1084,10 +1196,10 @@ true + - repo1.maven.org-maven2 repo1.maven.org-maven2 @@ -1099,7 +1211,6 @@ true - diff --git a/src/web/app/pom.xml b/src/web/app/pom.xml index bc1de9d0..a701b64f 100644 --- a/src/web/app/pom.xml +++ b/src/web/app/pom.xml @@ -96,13 +96,11 @@ org.apache.directory.server apacheds-all - 1.5.5 test org.apache.directory.shared shared-ldap - 0.9.16 test @@ -118,7 +116,6 @@ org.mortbay.jetty jetty - 6.1.14 test @@ -132,7 +129,6 @@ jstl jstl - 1.2 test @@ -234,7 +230,6 @@ com.oracle ojdbc6 - 11.2.0 @@ -263,16 +258,6 @@ geostore - - org.apache.maven.plugins - maven-compiler-plugin - - utf8 - 1.8 - 1.8 - - - org.apache.maven.plugins maven-war-plugin