Skip to content

Commit

Permalink
#128 JDK11 compatibility (#266)
Browse files Browse the repository at this point in the history 
* #127: changes to build w/o tests

* #128: jdk11: major changes in persistence - WIP

# Conflicts:
#	src/services/core/persistence/pom.xml
#	src/services/core/persistence/src/main/java/org/geoserver/geofence/core/dao/impl/GFUserDAOImpl.java
#	src/services/core/persistence/src/main/java/org/geoserver/geofence/core/dao/impl/GSInstanceDAOImpl.java
#	src/services/core/persistence/src/main/java/org/geoserver/geofence/core/dao/impl/GSUserDAOImpl.java
#	src/services/core/persistence/src/main/java/org/geoserver/geofence/core/dao/impl/LayerDetailsDAOImpl.java
#	src/services/core/persistence/src/main/java/org/geoserver/geofence/core/dao/impl/UserGroupDAOImpl.java
#	src/services/core/persistence/src/test/java/org/geoserver/geofence/core/dao/RuleDAOTest.java
#	src/services/core/services-impl/src/main/java/org/geoserver/geofence/services/RuleReaderServiceImpl.java
#	src/services/core/services-impl/src/main/java/org/geoserver/geofence/services/util/FilterUtils.java
#	src/services/core/webtest/pom.xml
#	src/services/modules/ldap/pom.xml
#	src/services/modules/rest/impl/src/main/java/org/geoserver/geofence/services/rest/utils/MultiPolygonUtils.java
#	src/services/modules/rest/test/pom.xml
#	src/services/pom.xml

* #128: jdk11: first set of fixes in services - WIP

# Conflicts:
#	src/services/core/services-impl/src/main/java/org/geoserver/geofence/services/util/FilterUtils.java

* #128: jdk11: services-impl modules builds - WIP

# Conflicts:
#	src/services/core/services-impl/src/main/java/org/geoserver/geofence/services/RuleReaderServiceImpl.java
#	src/services/pom.xml

* #128: jdk11: ldap refactoring

# Conflicts:
#	src/services/modules/ldap/pom.xml
#	src/services/modules/ldap/src/main/java/org/geoserver/geofence/ldap/utils/LdapUtils.java

* #128: jdk11: various fixes (webtest, rest, ...)

# Conflicts:
#	src/services/core/webtest/pom.xml
#	src/services/core/webtest/src/main/resources/log4j.xml
#	src/services/core/webtest/src/main/webapp/WEB-INF/web.xml
#	src/services/modules/rest/test/pom.xml

* #128: jdk11: fixes to make modules build

* Version 3.8-SNAPSHOT

* jdk11: many library updates and code alignment

- library update: hibernate spatial
- hibernate -> jpa annotation
- align dep versions to geoserver main
- created script to export DDL
- removed javaassist
- many fixes for deprecation warnings

* jdk11: many library updates and code alignment - missing file

* jdk11: deps cleanup

* jdk11: deps cleanup (cglib)

* jdk11: fix pg tests
  • Loading branch information
@etj
etj authored Feb 14, 2025
1 parent 6852d44 commit 8128259
Show file tree
Hide file tree
Showing 96 changed files with 2,501 additions and 1,977 deletions.
270 changes: 141 additions & 129 deletions src/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,146 +6,158 @@
*/
-->
<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">
<modelVersion>4.0.0</modelVersion>
<modelVersion>4.0.0</modelVersion>

<groupId>org.geoserver.geofence</groupId>
<artifactId>geofence</artifactId>
<version>3.7-SNAPSHOT</version>
<packaging>pom</packaging>

<properties>
<!-- Building with Java 11, but with Java 8 compatible jars,
to have some mercy on the old java bytecode processing libraries
used in GeoFence -->
<maven.compiler.source>8</maven.compiler.source>
<maven.compiler.target>8</maven.compiler.target>
<geofence-version>3.7-SNAPSHOT</geofence-version>
<hibernate-version>3.6.9.Final</hibernate-version>
<hibernate-generic-dao-version>1.1.0</hibernate-generic-dao-version>
<hibernate-spatial-version>1.1.3.2</hibernate-spatial-version>
<postgresql.jdbc.version>42.2.18</postgresql.jdbc.version>
<postgis.jdbc.version>1.3.3</postgis.jdbc.version>
<jts.version>1.19.0</jts.version>
</properties>
<groupId>org.geoserver.geofence</groupId>
<artifactId>geofence</artifactId>
<version>3.8-SNAPSHOT</version>
<packaging>pom</packaging>

<name>Master GeoFence POM</name>
<description>GeoFence is a java web application that handles authorization rules, integrating with GeoServer using the interface described in GSIP 57.</description>
<name>Master GeoFence POM</name>
<description>GeoFence is a java web application that handles authorization rules, integrating with GeoServer using the interface described in GSIP 57.</description>

<url>https://github.com/geoserver/geofence</url>
<inceptionYear>2011</inceptionYear>
<url>https://github.com/geoserver/geofence</url>
<inceptionYear>2011</inceptionYear>

<organization>
<name>GeoSolutions</name>
<url>http://www.geo-solutions.it</url>
</organization>
<organization>
<name>GeoSolutions</name>
<url>https://www.geosolutionsgroup.com</url>
</organization>

<developers>
<developer>
<id>etj</id>
<name>Emanuele Tajariol</name>
<organization>GeoSolutions</organization>
<roles>
<role>architect</role>
<role>developer</role>
</roles>
<timezone>+2</timezone>
</developer>
<developer>
<id>afabiani</id>
<name>Alessio Fabiani</name>
<organization>GeoSolutions</organization>
<roles>
<role>developer</role>
</roles>
<timezone>+2</timezone>
</developer>
</developers>
<developers>
<developer>
<id>etj</id>
<name>Emanuele Tajariol</name>
<organization>GeoSolutions</organization>
<roles>
<role>architect</role>
<role>developer</role>
</roles>
<timezone>+1</timezone>
</developer>
<developer>
<id>afabiani</id>
<name>Alessio Fabiani</name>
<organization>GeoSolutions</organization>
<roles>
<role>developer</role>
</roles>
<timezone>+1</timezone>
</developer>
</developers>

<issueManagement>
<system>github</system>
<url>https://github.com/geoserver/geofence/issues</url>
</issueManagement>
<issueManagement>
<system>github</system>
<url>https://github.com/geoserver/geofence/issues</url>
</issueManagement>

<scm>
<connection>scm:git:[email protected]:geoserver/geofence.git</connection>
<tag>main</tag>
<url>https://github.com/geoserver/geofence</url>
</scm>
<scm>
<connection>scm:git:[email protected]:geoserver/geofence.git</connection>
<tag>main</tag>
<url>https://github.com/geoserver/geofence</url>
</scm>

<ciManagement>
<system>jenkins</system>
<url>https://build.geoserver.org</url>
</ciManagement>
<ciManagement>
<system>jenkins</system>
<url>https://build.geoserver.org</url>
</ciManagement>

<repositories>
<repository>
<id>osgeo-releases</id>
<name>OSGeo Nexus Release Repository</name>
<url>https://repo.osgeo.org/repository/release/</url>
<snapshots>
<enabled>false</enabled>
</snapshots>
<releases>
<enabled>true</enabled>
</releases>
</repository>
<repositories>
<repository>
<id>osgeo-releases</id>
<name>OSGeo Nexus Release Repository</name>
<url>https://repo.osgeo.org/repository/release/</url>
<snapshots>
<enabled>false</enabled>
</snapshots>
<releases>
<enabled>true</enabled>
</releases>
</repository>

<repository>
<id>osgeo-snapshots</id>
<name>OSGeo Nexus Snapshot Repository</name>
<url>https://repo.osgeo.org/repository/snapshot/</url>
<snapshots>
<enabled>true</enabled>
</snapshots>
<releases>
<enabled>false</enabled>
</releases>
</repository>
<repository>
<id>osgeo-snapshots</id>
<name>OSGeo Nexus Snapshot Repository</name>
<url>https://repo.osgeo.org/repository/snapshot/</url>
<snapshots>
<enabled>true</enabled>
</snapshots>
<releases>
<enabled>false</enabled>
</releases>
</repository>

<repository>
<id>geosolutions</id>
<name>GeoSolutions Repository</name>
<url>https://maven.geo-solutions.it/</url>
<snapshots>
<enabled>true</enabled>
</snapshots>
<releases>
<enabled>true</enabled>
</releases>
</repository>
</repositories>
<repository>
<id>geosolutions</id>
<name>GeoSolutions Repository</name>
<url>https://maven.geo-solutions.it/</url>
<snapshots>
<enabled>true</enabled>
</snapshots>
<releases>
<enabled>true</enabled>
</releases>
</repository>
</repositories>

<distributionManagement>
<repository>
<id>nexus</id>
<name>OSGeo Release Repository</name>
<url>https://repo.osgeo.org/repository/Geoserver-releases/</url>
<uniqueVersion>false</uniqueVersion>
</repository>
<snapshotRepository>
<id>nexus</id>
<uniqueVersion>false</uniqueVersion>
<name>OSGeo Snapshot Repository</name>
<url>https://repo.osgeo.org/repository/geoserver-snapshots/</url>
</snapshotRepository>
</distributionManagement>
<distributionManagement>
<repository>
<id>nexus</id>
<name>OSGeo Release Repository</name>
<url>https://repo.osgeo.org/repository/Geoserver-releases/</url>
<uniqueVersion>false</uniqueVersion>
</repository>
<snapshotRepository>
<id>nexus</id>
<uniqueVersion>false</uniqueVersion>
<name>OSGeo Snapshot Repository</name>
<url>https://repo.osgeo.org/repository/geoserver-snapshots/</url>
</snapshotRepository>
</distributionManagement>

<modules>
<module>services</module>
</modules>

<build>
<!-- ======================================================== -->
<!-- Extensions settings for Deployment -->
<!-- ======================================================== -->
<extensions>
<extension>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-webdav</artifactId>
<version>1.0-beta-2</version>
<!-- artifactId>wagon-ftp</artifactId>
<version>2.6</version -->
</extension>
</extensions>
</build>
<modules>
<module>services</module>
</modules>

<profiles>
<profile>
<id>libyear</id>
<build>
<plugins>

<plugin>
<groupId>io.github.mfoo</groupId>
<artifactId>libyear-maven-plugin</artifactId>
<version>1.1.0</version>
<executions>
<execution>
<id>libyear-analysis</id>
<goals>
<goal>analyze</goal>
</goals>
</execution>
</executions>
</plugin>

</plugins>

</build>
</profile>
</profiles>

<build>

<!-- ======================================================== -->
<!-- Extensions settings for Deployment -->
<!-- ======================================================== -->
<extensions>
<extension>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-webdav</artifactId>
<version>1.0-beta-2</version>
<!-- artifactId>wagon-ftp</artifactId>
<version>2.6</version -->
</extension>
</extensions>
</build>
</project>
2 changes: 1 addition & 1 deletion src/samples/csv2geofence/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

<groupId>org.geoserver.geofence.sample</groupId>
<artifactId>csv2geofence</artifactId>
<version>3.7-SNAPSHOT</version>
<version>3.8-SNAPSHOT</version>
<packaging>jar</packaging>

<name>csv2geofence</name>
Expand Down
Loading

0 comments on commit 8128259

Please sign in to comment.