Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

WIP: Try to migrate to spring 6 #451

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

WIP: Try to migrate to spring 6 #451

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b05c599
Update versions
buehner Dec 18, 2023
71f4f02
WIP WIP
buehner Dec 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions SPRING6_MIGRATION.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
When trying to update to spring 6, use OpenJDK 17 and this command to build: `mvn clean install -DskipTests -Dmaven.javadoc.skip=true -DskipCodeQualityChecks` (be sure that maven uses your java 17)
56 changes: 33 additions & 23 deletions src/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>de.terrestris</groupId>
<artifactId>shogun-core</artifactId>
<version>5.3.13-SNAPSHOT</version>
<version>6.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>SHOGun-Core</name>
<description>SHOGun-Core is the core framework used in SHOGun</description>
Expand Down Expand Up @@ -121,20 +121,20 @@

<webapp-archetype-resource-pom>shogun-core-webapp-archetype/src/main/resources/archetype-resources/pom.xml</webapp-archetype-resource-pom>

<tomcat.version>9.0.30</tomcat.version>
<tomcat.version>10.1.17</tomcat.version>

<!-- Core -->
<spring.version>5.3.26</spring.version>
<spring-security.version>5.5.7</spring-security.version>
<spring.version>6.1.2</spring.version>
<spring-security.version>6.2.0</spring-security.version>
<spring-ldap.version>2.3.2.RELEASE</spring-ldap.version>
<log4j.version>2.17.0</log4j.version>
<slf4j.version>1.7.28</slf4j.version>
<jackson.version>2.13.4.2</jackson.version>
<jackson.version>2.16.0</jackson.version>
<opencsv.version>4.6</opencsv.version>
<ehcache.version>3.8.1</ehcache.version>

<!-- Persistence -->
<hibernate.version>5.4.24.Final</hibernate.version>
<hibernate.version>5.6.15.Final</hibernate.version>
<hikari.version>3.4.2</hikari.version>
<h2.version>1.4.200</h2.version>

Expand All @@ -145,7 +145,8 @@
<hamcrest.version>1.3</hamcrest.version>
<mockito.version>2.28.2</mockito.version>
<jsonpath.version>1.2.0</jsonpath.version>
<greenmail.version>1.5.11</greenmail.version>
<greenmail.version>2.0.1</greenmail.version>
<angus-mail.version>2.0.2</angus-mail.version>

<!-- Code Coverage -->
<coveralls-maven-plugin.version>4.3.0</coveralls-maven-plugin.version>
Expand All @@ -167,10 +168,10 @@
<jadira-usertype-jodatime.version>7.0.0.CR1</jadira-usertype-jodatime.version>

<!-- Maven Plugins -->
<maven-javadoc-plugin.version>3.3.1</maven-javadoc-plugin.version>
<maven-javadoc-plugin.version>3.6.3</maven-javadoc-plugin.version>
<maven-deploy-plugin.version>3.0.0-M1</maven-deploy-plugin.version>
<maven-gpg-plugin.version>3.0.1</maven-gpg-plugin.version>
<maven-release-plugin.version>3.0.0-M4</maven-release-plugin.version>
<maven-release-plugin.version>3.0.1</maven-release-plugin.version>
<maven-replacer-plugin.version>1.5.3</maven-replacer-plugin.version>
<maven-scm-plugin.version>1.12.0</maven-scm-plugin.version>
<spotbugs-maven-plugin.version>4.4.1</spotbugs-maven-plugin.version>
Expand All @@ -185,13 +186,14 @@
<structured-content-tools.version>1.3.11</structured-content-tools.version>

<!-- Java Mail API -->
<javax-mail-api.version>1.6.2</javax-mail-api.version>
<jakarta-mail.version>2.0.1</jakarta-mail.version>
<jakarta-mail-api.version>2.1.2</jakarta-mail-api.version>

<!-- Java Transaction API -->
<jta.version>1.1</jta.version>

<!-- Java Servlet API -->
<javax-servlet-api.version>4.0.1</javax-servlet-api.version>
<jakarta-servlet-api.version>6.0.0</jakarta-servlet-api.version>

<!-- Apache HTTP Client -->
<apache-httpclient.version>4.5.11</apache-httpclient.version>
Expand All @@ -216,7 +218,8 @@
<jackson-datatype-jts.version>0.12-2.5-1</jackson-datatype-jts.version>

<jaxb-javax.version>2.3.1</jaxb-javax.version>
<jaxb-sun.version>2.3.0.1</jaxb-sun.version>
<jaxb-core-sun.version>2.3.0.1</jaxb-core-sun.version>
<jaxb-impl-sun.version>2.3.9</jaxb-impl-sun.version>
<clean-plugin.version>3.1.0</clean-plugin.version>
<compiler-plugin.version>3.8.1</compiler-plugin.version>
<surefire-plugin.version>3.0.0-M5</surefire-plugin.version>
Expand Down Expand Up @@ -906,7 +909,7 @@
<!-- Hibernate -->
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-core</artifactId>
<artifactId>hibernate-core-jakarta</artifactId>
<version>${hibernate.version}</version>
<exclusions>
<exclusion>
Expand Down Expand Up @@ -1024,22 +1027,22 @@
</dependency>

<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>${javax-servlet-api.version}</version>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<version>${jakarta-servlet-api.version}</version>
</dependency>

<!-- Mail -->
<dependency>
<groupId>javax.mail</groupId>
<artifactId>javax.mail-api</artifactId>
<version>${javax-mail-api.version}</version>
<groupId>jakarta.mail</groupId>
<artifactId>jakarta.mail-api</artifactId>
<version>${jakarta-mail-api.version}</version>
</dependency>

<dependency>
<groupId>com.sun.mail</groupId>
<artifactId>javax.mail</artifactId>
<version>${javax-mail-api.version}</version>
<artifactId>jakarta.mail</artifactId>
<version>${jakarta-mail.version}</version>
</dependency>

<dependency>
Expand All @@ -1048,6 +1051,13 @@
<version>${greenmail.version}</version>
</dependency>

<!-- https://mvnrepository.com/artifact/org.eclipse.angus/angus-mail -->
<dependency>
<groupId>org.eclipse.angus</groupId>
<artifactId>angus-mail</artifactId>
<version>${angus-mail.version}</version>
</dependency>

<dependency>
<groupId>javax.xml.parsers</groupId>
<artifactId>jaxp-api</artifactId>
Expand Down Expand Up @@ -1099,12 +1109,12 @@
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-core</artifactId>
<version>${jaxb-sun.version}</version>
<version>${jaxb-core-sun.version}</version>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
<version>${jaxb-sun.version}</version>
<version>${jaxb-impl-sun.version}</version>
</dependency>

<dependency>
Expand Down
29 changes: 16 additions & 13 deletions src/shogun-core-main/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>de.terrestris</groupId>
<artifactId>shogun-core</artifactId>
<version>5.3.13-SNAPSHOT</version>
<version>6.0.0-SNAPSHOT</version>
</parent>

<artifactId>shogun-core-main</artifactId>
Expand All @@ -16,12 +16,14 @@

<dependencies>

<!-- https://mvnrepository.com/artifact/javax/javaee-api -->
<!-- https://mvnrepository.com/artifact/jakarta.platform/jakarta.jakartaee-api -->
<dependency>
<groupId>javax</groupId>
<artifactId>javaee-api</artifactId>
<version>8.0</version>
<groupId>jakarta.platform</groupId>
<artifactId>jakarta.jakartaee-api</artifactId>
<version>10.0.0</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>javax.transaction</groupId>
<artifactId>javax.transaction-api</artifactId>
Expand All @@ -32,7 +34,7 @@
<!-- Hibernate -->
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-core</artifactId>
<artifactId>hibernate-core-jakarta</artifactId>
</dependency>

<!-- Spring -->
Expand Down Expand Up @@ -232,19 +234,20 @@
</dependency>

<!-- Mailing -->
<dependency>
<groupId>javax.mail</groupId>
<artifactId>javax.mail-api</artifactId>
</dependency>
<dependency>
<groupId>com.sun.mail</groupId>
<artifactId>javax.mail</artifactId>
<artifactId>jakarta.mail</artifactId>
</dependency>
<dependency>
<groupId>com.icegreen</groupId>
<artifactId>greenmail</artifactId>
</dependency>

<dependency>
<groupId>org.eclipse.angus</groupId>
<artifactId>angus-mail</artifactId>
</dependency>

<!-- Apache HTTP -->
<dependency>
<groupId>org.apache.httpcomponents</groupId>
Expand All @@ -267,8 +270,8 @@
<artifactId>jta</artifactId>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
</dependency>

<!-- Tomcat -->
Expand Down
2 changes: 1 addition & 1 deletion ...un-core-main/src/main/java/de/terrestris/shoguncore/converter/PropertyValueConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

import org.apache.commons.lang3.math.NumberUtils;

import javax.persistence.AttributeConverter;
import jakarta.persistence.AttributeConverter;

/**
* This converter can be used for the values of the type Map<String, Object>.
Expand Down
4 changes: 2 additions & 2 deletions ...ogun-core-main/src/main/java/de/terrestris/shoguncore/hibernate/SimpleJsonbConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
import de.terrestris.shoguncore.util.json.ShogunCoreJsonObjectMapper;
import org.apache.logging.log4j.Logger;

import javax.persistence.AttributeConverter;
import javax.persistence.Converter;
import jakarta.persistence.AttributeConverter;
import jakarta.persistence.Converter;
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
Expand Down
2 changes: 1 addition & 1 deletion src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/Application.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
import org.hibernate.annotations.FetchMode;
import org.joda.time.ReadableDateTime;

import javax.persistence.*;
import jakarta.persistence.*;
import java.util.ArrayList;
import java.util.List;
import java.util.Locale;
Expand Down
2 changes: 1 addition & 1 deletion src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/File.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
import org.hibernate.annotations.Cache;
import org.hibernate.annotations.CacheConcurrencyStrategy;

import javax.persistence.*;
import jakarta.persistence.*;
import java.util.Arrays;

/**
Expand Down
8 changes: 4 additions & 4 deletions src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/ImageFile.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
import org.apache.commons.lang3.builder.EqualsBuilder;
import org.apache.commons.lang3.builder.HashCodeBuilder;

import javax.persistence.Cacheable;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import jakarta.persistence.Cacheable;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.Table;
import java.util.Arrays;

/**
Expand Down
2 changes: 1 addition & 1 deletion src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/PersistentObject.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
import org.joda.time.DateTime;
import org.joda.time.ReadableDateTime;

import javax.persistence.*;
import jakarta.persistence.*;
import java.io.Serializable;
import java.util.HashMap;
import java.util.Map;
Expand Down
2 changes: 1 addition & 1 deletion src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/Person.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import org.hibernate.annotations.Type;
import org.joda.time.LocalDate;

import javax.persistence.*;
import jakarta.persistence.*;
import java.util.Locale;

/**
Expand Down
6 changes: 3 additions & 3 deletions src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/Plugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
import org.hibernate.annotations.Cache;
import org.hibernate.annotations.*;

import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.*;
import jakarta.persistence.Entity;
import jakarta.persistence.Table;
import jakarta.persistence.*;
import java.util.HashSet;
import java.util.Set;

Expand Down
8 changes: 4 additions & 4 deletions src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/Role.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
import org.hibernate.annotations.Cache;
import org.hibernate.annotations.CacheConcurrencyStrategy;

import javax.persistence.Cacheable;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import jakarta.persistence.Cacheable;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.Table;

/**
* @author Nils Bühner
Expand Down
2 changes: 1 addition & 1 deletion src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/Territory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import org.hibernate.annotations.CacheConcurrencyStrategy;
import org.locationtech.jts.geom.MultiPolygon;

import javax.persistence.*;
import jakarta.persistence.*;


/**
Expand Down
2 changes: 1 addition & 1 deletion src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/User.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
import org.hibernate.annotations.Fetch;
import org.hibernate.annotations.FetchMode;

import javax.persistence.*;
import jakarta.persistence.*;
import java.util.HashSet;
import java.util.Set;

Expand Down
2 changes: 1 addition & 1 deletion src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/UserGroup.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import org.hibernate.annotations.Fetch;
import org.hibernate.annotations.FetchMode;

import javax.persistence.*;
import jakarta.persistence.*;
import java.util.HashSet;
import java.util.Set;

Expand Down
2 changes: 1 addition & 1 deletion ...n-core-main/src/main/java/de/terrestris/shoguncore/model/interceptor/InterceptorRule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
import org.hibernate.annotations.Cache;
import org.hibernate.annotations.CacheConcurrencyStrategy;

import javax.persistence.*;
import jakarta.persistence.*;

/**
* The model representing the rules for the GeoServer Interceptor class.
Expand Down
6 changes: 3 additions & 3 deletions src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/layer/Layer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
import org.hibernate.annotations.CascadeType;
import org.hibernate.annotations.*;

import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.*;
import jakarta.persistence.Entity;
import jakarta.persistence.Table;
import jakarta.persistence.*;

/**
* Representation of a layer which consists a corresponding data source
Expand Down
2 changes: 1 addition & 1 deletion ...e-main/src/main/java/de/terrestris/shoguncore/model/layer/appearance/LayerAppearance.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
import org.hibernate.annotations.Fetch;
import org.hibernate.annotations.FetchMode;

import javax.persistence.*;
import jakarta.persistence.*;
import java.util.HashMap;
import java.util.Map;

Expand Down
Loading