Skip to content

Commit

Permalink
[Backport 2.1.x] Dependency updates and NVD skip (#340) (#345) (#343)
Browse files Browse the repository at this point in the history
  • Loading branch information
@offtherailz
offtherailz authored Mar 21, 2024
1 parent e96492f commit 7d95ab6
Show file tree
Hide file tree
Showing 20 changed files with 525 additions and 571 deletions.
47 changes: 34 additions & 13 deletions pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>

<groupId>it.geosolutions</groupId>
Expand Down Expand Up @@ -63,8 +64,8 @@
<scm>
<url>https://github.com/geosolutions-it/geostore</url>
<connection>scm:git:[email protected]:geosolutions-it/geostore.git</connection>
<tag>HEAD</tag>
</scm>
<tag>HEAD</tag>
</scm>

<ciManagement>
<system>jenkins</system>
Expand Down Expand Up @@ -95,10 +96,20 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.0.2</version>
<version>3.10.1</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
<encoding>utf8</encoding>
<source>8</source>
<target>8</target>
<debug>true</debug>
<encoding>UTF-8</encoding>
<!--
On the win32 build box the compiler oom's due to the compiler accumulating
too many classes in the permanent generation, similar to GEOT-2462
-->
<fork>true</fork>
<meminitial>128M</meminitial>
<maxmem>1512M</maxmem>
</configuration>
</plugin>

Expand Down Expand Up @@ -166,6 +177,23 @@
</configuration>
</plugin>

<plugin>
<groupId>org.owasp</groupId>
<artifactId>dependency-check-maven</artifactId>
<version>9.0.9</version>
<configuration>
<skip>true</skip>
<!-- <nvdApiKey>******-****-****-****-*********</nvdApiKey> -->
</configuration>
<executions>
<execution>
<goals>
<goal>check</goal>
</goals>
</execution>
</executions>
</plugin>

</plugins>

<extensions>
Expand All @@ -192,16 +220,9 @@
</links>
</configuration>
</plugin>

<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
<version>2.7</version>
</plugin>
</plugins>
</reporting>


<modules>
<module>src</module>
</modules>
Expand Down
25 changes: 12 additions & 13 deletions src/cli/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses />.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
Expand All @@ -37,10 +38,9 @@
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
<version>1.3.175</version>
</dependency>

<!-- Apache Commons -->
<!-- Apache Commons -->
<dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
Expand All @@ -50,11 +50,10 @@
<groupId>jdom</groupId>
<artifactId>jdom</artifactId>
</dependency>

<dependency>
<groupId>info.picocli</groupId>
<artifactId>picocli</artifactId>
<version>4.6.1</version>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
Expand Down Expand Up @@ -93,26 +92,26 @@
<version>2.2</version>
<configuration>
<finalName>H2ToPgSQLExport</finalName>
<appendAssemblyId>false</appendAssemblyId>
<appendAssemblyId>false</appendAssemblyId>
<archive>
<manifest>
<mainClass>it.geosolutions.geostore.cli.H2ToPgSQLExportCLI</mainClass>
</manifest>
</archive>
<descriptorRefs>
<descriptorRef>jar-with-dependencies</descriptorRef>
<descriptorRef>jar-with-dependencies</descriptorRef>
</descriptorRefs>
</configuration>
<executions>
<execution>
<id>make-assembly</id> <!-- this is used for inheritance merges -->
<phase>package</phase> <!-- bind to the packaging phase -->
<goals>
<goal>single</goal>
</goals>
<id>make-assembly</id> <!-- this is used for inheritance merges -->
<phase>package</phase> <!-- bind to the packaging phase -->
<goals>
<goal>single</goal>
</goals>
</execution>
</executions>
</plugin>
</plugin>
</plugins>
</build>

Expand Down
2 changes: 0 additions & 2 deletions src/core/model/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,6 @@
<artifactId>jdom</artifactId>
</dependency>


<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
Expand Down Expand Up @@ -108,7 +107,6 @@
</execution>
</executions>
</plugin>

</plugins>
</build>

Expand Down
145 changes: 72 additions & 73 deletions src/core/persistence/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses />.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">

<modelVersion>4.0.0</modelVersion>

Expand All @@ -41,14 +42,14 @@
<groupId>it.geosolutions.geostore</groupId>
<artifactId>geostore-model</artifactId>
</dependency>
<dependency>
<dependency>
<groupId>it.geosolutions.geostore</groupId>
<artifactId>geostore-security</artifactId>
</dependency>


<!-- ================================================================-->
<!-- APACHE COMMONS -->
<!-- APACHE COMMONS -->
<!-- ================================================================-->
<dependency>
<groupId>commons-lang</groupId>
Expand Down Expand Up @@ -102,21 +103,21 @@
</dependency>

<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-ldap</artifactId>
</dependency>

<!-- =========================================================== -->
<!-- SPRING SECURITY -->
<!-- =========================================================== -->
<!-- <dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-core</artifactId>
</dependency>
<dependency>
<groupId>javax.persistence</groupId>
<artifactId>persistence-api</artifactId>
</dependency>-->
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-ldap</artifactId>
</dependency>

<!-- =========================================================== -->
<!-- SPRING SECURITY -->
<!-- =========================================================== -->
<!-- <dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-core</artifactId>
</dependency>
<dependency>
<groupId>javax.persistence</groupId>
<artifactId>persistence-api</artifactId>
</dependency>-->

<!-- https://mvnrepository.com/artifact/org.hibernate.javax.persistence/hibernate-jpa-2.1-api -->
<dependency>
Expand All @@ -125,33 +126,32 @@
</dependency>


<!-- HIBERNATE-GENERIC-DAO -->
<!-- HIBERNATE-GENERIC-DAO -->
<dependency>
<groupId>com.googlecode.genericdao</groupId>
<artifactId>dao-hibernate</artifactId>
<!-- <groupId>com.trg</groupId>
<artifactId>trg-dao</artifactId>-->
<!-- <groupId>com.trg</groupId>
<artifactId>trg-dao</artifactId>-->
</dependency>
<dependency>
<groupId>com.googlecode.genericdao</groupId>
<artifactId>search-jpa-hibernate</artifactId>
<!-- <groupId>com.trg</groupId>
<artifactId>trg-search-jpa-hibernate</artifactId>-->
<!-- <groupId>com.trg</groupId>
<artifactId>trg-search-jpa-hibernate</artifactId>-->
</dependency>

<!-- H2 -->
<!-- H2 -->
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
<version>1.3.175</version>
</dependency>

<!-- HIBERNATE -->

<!-- <dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-validator</artifactId>
</dependency>-->
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
</dependency>

<!-- HIBERNATE -->

<!-- <dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-validator</artifactId>
</dependency>-->
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-core</artifactId>
Expand All @@ -175,7 +175,7 @@
<artifactId>hibernate-ehcache</artifactId>
</dependency>

<!-- CGLIB -->
<!-- CGLIB -->
<dependency>
<groupId>asm</groupId>
<artifactId>asm</artifactId>
Expand All @@ -185,11 +185,11 @@
<artifactId>cglib-nodep</artifactId>
</dependency>

<!-- HTTP UTILS -->
<!-- <dependency>
<groupId>org.codehaus.jettison</groupId>
<artifactId>jettison</artifactId>
</dependency> -->
<!-- HTTP UTILS -->
<!-- <dependency>
<groupId>org.codehaus.jettison</groupId>
<artifactId>jettison</artifactId>
</dependency> -->
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjrt</artifactId>
Expand All @@ -199,13 +199,13 @@
<artifactId>aspectjweaver</artifactId>
</dependency>

<!-- <dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<scope>provided</scope>
</dependency>-->
<!-- <dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<scope>provided</scope>
</dependency>-->

<!-- JUnit -->
<!-- JUnit -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
Expand All @@ -215,32 +215,31 @@
</dependencies>

<!-- if you want to create a new profile for support another DB create a profile including -->
<!-- JDBC dependency and right esclusion/inclusion rule for load the right override file -->
<!-- Profile for supporting Postgres -->
<profiles>
<profile>
<id>postgres</id>
<dependencies>
<!-- POSTGRESQL database driver -->
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
</dependency>
</dependencies>
</profile>

<profile>
<id>oracle</id>
<dependencies>
<!-- ORACLE database driver -->
<dependency>
<groupId>com.oracle</groupId>
<artifactId>ojdbc6</artifactId>
<version>11.2.0</version>
</dependency>
</dependencies>
</profile>
</profiles>
<!-- JDBC dependency and right esclusion/inclusion rule for load the right override file -->
<!-- Profile for supporting Postgres -->
<profiles>
<profile>
<id>postgres</id>
<dependencies>
<!-- POSTGRESQL database driver -->
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
</dependency>
</dependencies>
</profile>

<profile>
<id>oracle</id>
<dependencies>
<!-- ORACLE database driver -->
<dependency>
<groupId>com.oracle</groupId>
<artifactId>ojdbc6</artifactId>
</dependency>
</dependencies>
</profile>
</profiles>

<build>

Expand Down
2 changes: 1 addition & 1 deletion ...rsistence/src/main/java/it/geosolutions/geostore/core/dao/ldap/impl/UserGroupDAOImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ public Map<String, Object> getPropertyMapper() {
return mapper;
}

protected List<UserGroup> ldapSearch(String filter, DirContextProcessor processor, ISearch search) {
protected List<UserGroup> 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() {
Expand Down
Loading

0 comments on commit 7d95ab6

Please sign in to comment.