diff --git a/SPRING6_MIGRATION.md b/SPRING6_MIGRATION.md new file mode 100644 index 000000000..dfc0f0ef6 --- /dev/null +++ b/SPRING6_MIGRATION.md @@ -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) \ No newline at end of file diff --git a/src/pom.xml b/src/pom.xml index c6ce6d2da..b7c6ca5f7 100644 --- a/src/pom.xml +++ b/src/pom.xml @@ -4,7 +4,7 @@ 4.0.0 de.terrestris shogun-core - 5.3.13-SNAPSHOT + 6.0.0-SNAPSHOT pom SHOGun-Core SHOGun-Core is the core framework used in SHOGun @@ -121,20 +121,20 @@ shogun-core-webapp-archetype/src/main/resources/archetype-resources/pom.xml - 9.0.30 + 10.1.17 - 5.3.26 - 5.5.7 + 6.1.2 + 6.2.0 2.3.2.RELEASE 2.17.0 1.7.28 - 2.13.4.2 + 2.16.0 4.6 3.8.1 - 5.4.24.Final + 5.6.15.Final 3.4.2 1.4.200 @@ -145,7 +145,8 @@ 1.3 2.28.2 1.2.0 - 1.5.11 + 2.0.1 + 2.0.2 4.3.0 @@ -167,10 +168,10 @@ 7.0.0.CR1 - 3.3.1 + 3.6.3 3.0.0-M1 3.0.1 - 3.0.0-M4 + 3.0.1 1.5.3 1.12.0 4.4.1 @@ -185,13 +186,14 @@ 1.3.11 - 1.6.2 + 2.0.1 + 2.1.2 1.1 - 4.0.1 + 6.0.0 4.5.11 @@ -216,7 +218,8 @@ 0.12-2.5-1 2.3.1 - 2.3.0.1 + 2.3.0.1 + 2.3.9 3.1.0 3.8.1 3.0.0-M5 @@ -906,7 +909,7 @@ org.hibernate - hibernate-core + hibernate-core-jakarta ${hibernate.version} @@ -1024,22 +1027,22 @@ - javax.servlet - javax.servlet-api - ${javax-servlet-api.version} + jakarta.servlet + jakarta.servlet-api + ${jakarta-servlet-api.version} - javax.mail - javax.mail-api - ${javax-mail-api.version} + jakarta.mail + jakarta.mail-api + ${jakarta-mail-api.version} com.sun.mail - javax.mail - ${javax-mail-api.version} + jakarta.mail + ${jakarta-mail.version} @@ -1048,6 +1051,13 @@ ${greenmail.version} + + + org.eclipse.angus + angus-mail + ${angus-mail.version} + + javax.xml.parsers jaxp-api @@ -1099,12 +1109,12 @@ com.sun.xml.bind jaxb-core - ${jaxb-sun.version} + ${jaxb-core-sun.version} com.sun.xml.bind jaxb-impl - ${jaxb-sun.version} + ${jaxb-impl-sun.version} diff --git a/src/shogun-core-main/pom.xml b/src/shogun-core-main/pom.xml index 3b776e726..76f5cd643 100644 --- a/src/shogun-core-main/pom.xml +++ b/src/shogun-core-main/pom.xml @@ -6,7 +6,7 @@ de.terrestris shogun-core - 5.3.13-SNAPSHOT + 6.0.0-SNAPSHOT shogun-core-main @@ -16,12 +16,14 @@ - + - javax - javaee-api - 8.0 + jakarta.platform + jakarta.jakartaee-api + 10.0.0 + provided + javax.transaction javax.transaction-api @@ -32,7 +34,7 @@ org.hibernate - hibernate-core + hibernate-core-jakarta @@ -232,19 +234,20 @@ - - javax.mail - javax.mail-api - com.sun.mail - javax.mail + jakarta.mail com.icegreen greenmail + + org.eclipse.angus + angus-mail + + org.apache.httpcomponents @@ -267,8 +270,8 @@ jta - javax.servlet - javax.servlet-api + jakarta.servlet + jakarta.servlet-api diff --git a/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/converter/PropertyValueConverter.java b/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/converter/PropertyValueConverter.java index 96966994f..36a41b7db 100644 --- a/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/converter/PropertyValueConverter.java +++ b/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/converter/PropertyValueConverter.java @@ -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. diff --git a/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/hibernate/SimpleJsonbConverter.java b/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/hibernate/SimpleJsonbConverter.java index d739e7527..8be2d3787 100644 --- a/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/hibernate/SimpleJsonbConverter.java +++ b/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/hibernate/SimpleJsonbConverter.java @@ -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; diff --git a/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/Application.java b/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/Application.java index d29f6a179..513c06cf6 100644 --- a/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/Application.java +++ b/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/Application.java @@ -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; diff --git a/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/File.java b/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/File.java index b83baf70a..26d4ec075 100644 --- a/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/File.java +++ b/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/File.java @@ -10,7 +10,7 @@ import org.hibernate.annotations.Cache; import org.hibernate.annotations.CacheConcurrencyStrategy; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.Arrays; /** diff --git a/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/ImageFile.java b/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/ImageFile.java index a17b63bc6..34e6be56b 100644 --- a/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/ImageFile.java +++ b/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/ImageFile.java @@ -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; /** diff --git a/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/PersistentObject.java b/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/PersistentObject.java index 524400de5..09c792284 100644 --- a/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/PersistentObject.java +++ b/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/PersistentObject.java @@ -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; diff --git a/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/Person.java b/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/Person.java index 226d68c3b..bf1ceb1f3 100644 --- a/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/Person.java +++ b/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/Person.java @@ -8,7 +8,7 @@ import org.hibernate.annotations.Type; import org.joda.time.LocalDate; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.Locale; /** diff --git a/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/Plugin.java b/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/Plugin.java index ce903f490..1a9e69de6 100644 --- a/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/Plugin.java +++ b/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/Plugin.java @@ -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; diff --git a/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/Role.java b/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/Role.java index eafc58e9d..42f719c7c 100644 --- a/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/Role.java +++ b/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/Role.java @@ -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 diff --git a/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/Territory.java b/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/Territory.java index e82cf690b..28db2b149 100644 --- a/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/Territory.java +++ b/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/Territory.java @@ -6,7 +6,7 @@ import org.hibernate.annotations.CacheConcurrencyStrategy; import org.locationtech.jts.geom.MultiPolygon; -import javax.persistence.*; +import jakarta.persistence.*; /** diff --git a/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/User.java b/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/User.java index cbd077ae6..0953b5e5f 100644 --- a/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/User.java +++ b/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/User.java @@ -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; diff --git a/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/UserGroup.java b/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/UserGroup.java index 9c004bf03..ff3ede46a 100644 --- a/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/UserGroup.java +++ b/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/UserGroup.java @@ -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; diff --git a/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/interceptor/InterceptorRule.java b/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/interceptor/InterceptorRule.java index 23d5fb98e..1f56213f8 100644 --- a/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/interceptor/InterceptorRule.java +++ b/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/interceptor/InterceptorRule.java @@ -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. diff --git a/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/layer/Layer.java b/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/layer/Layer.java index 9727e0ada..1ba3dd160 100644 --- a/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/layer/Layer.java +++ b/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/layer/Layer.java @@ -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 diff --git a/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/layer/appearance/LayerAppearance.java b/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/layer/appearance/LayerAppearance.java index 494053ff7..bee344457 100644 --- a/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/layer/appearance/LayerAppearance.java +++ b/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/layer/appearance/LayerAppearance.java @@ -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; diff --git a/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/layer/source/ImageWmsLayerDataSource.java b/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/layer/source/ImageWmsLayerDataSource.java index 4d5f6c46a..b3b86cbd1 100644 --- a/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/layer/source/ImageWmsLayerDataSource.java +++ b/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/layer/source/ImageWmsLayerDataSource.java @@ -3,10 +3,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; /** * Class representing a layer data source for WMS servers providing single, diff --git a/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/layer/source/LayerDataSource.java b/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/layer/source/LayerDataSource.java index 3abda02ce..890b237c8 100644 --- a/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/layer/source/LayerDataSource.java +++ b/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/layer/source/LayerDataSource.java @@ -6,10 +6,10 @@ import org.hibernate.annotations.Cache; import org.hibernate.annotations.CacheConcurrencyStrategy; -import javax.persistence.Cacheable; -import javax.persistence.Entity; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; +import jakarta.persistence.Cacheable; +import jakarta.persistence.Entity; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; /** * Base class for all layer datasources diff --git a/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/layer/source/TileWmsLayerDataSource.java b/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/layer/source/TileWmsLayerDataSource.java index 10f6c5643..b1dae92a5 100644 --- a/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/layer/source/TileWmsLayerDataSource.java +++ b/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/layer/source/TileWmsLayerDataSource.java @@ -7,9 +7,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.*; /** * Data source of layers for tile data from WMS servers. diff --git a/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/layer/source/WfsLayerDataSource.java b/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/layer/source/WfsLayerDataSource.java index f4b3f794e..139db31fe 100644 --- a/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/layer/source/WfsLayerDataSource.java +++ b/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/layer/source/WfsLayerDataSource.java @@ -3,10 +3,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; /** * Class representing a layer data source for WFS layers diff --git a/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/layer/source/WmtsLayerDataSource.java b/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/layer/source/WmtsLayerDataSource.java index 98384aa2d..07ae71056 100644 --- a/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/layer/source/WmtsLayerDataSource.java +++ b/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/layer/source/WmtsLayerDataSource.java @@ -6,7 +6,7 @@ import org.hibernate.annotations.Cache; import org.hibernate.annotations.CacheConcurrencyStrategy; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; /** diff --git a/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/layer/source/XyzLayerDataSource.java b/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/layer/source/XyzLayerDataSource.java index 50c9da169..123af7c9f 100644 --- a/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/layer/source/XyzLayerDataSource.java +++ b/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/layer/source/XyzLayerDataSource.java @@ -8,7 +8,7 @@ import org.hibernate.annotations.Fetch; import org.hibernate.annotations.FetchMode; -import javax.persistence.*; +import jakarta.persistence.*; import java.awt.geom.Point2D; import java.awt.geom.Point2D.Double; import java.util.ArrayList; diff --git a/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/layer/util/Extent.java b/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/layer/util/Extent.java index fb3c4efc2..46577df67 100644 --- a/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/layer/util/Extent.java +++ b/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/layer/util/Extent.java @@ -9,7 +9,7 @@ import org.hibernate.annotations.Cache; import org.hibernate.annotations.CacheConcurrencyStrategy; -import javax.persistence.*; +import jakarta.persistence.*; import java.awt.geom.Point2D; import java.awt.geom.Point2D.Double; diff --git a/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/layer/util/TileGrid.java b/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/layer/util/TileGrid.java index de233314b..0d579047e 100644 --- a/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/layer/util/TileGrid.java +++ b/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/layer/util/TileGrid.java @@ -10,9 +10,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.*; import java.awt.geom.Point2D; import java.util.List; diff --git a/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/layer/util/WmtsTileGrid.java b/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/layer/util/WmtsTileGrid.java index fb52b2ebb..a841a846c 100644 --- a/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/layer/util/WmtsTileGrid.java +++ b/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/layer/util/WmtsTileGrid.java @@ -5,9 +5,9 @@ import org.hibernate.annotations.Cache; import org.hibernate.annotations.CacheConcurrencyStrategy; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; import java.util.List; /** diff --git a/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/layout/AbsoluteLayout.java b/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/layout/AbsoluteLayout.java index 418fb6fad..bbb3ebc30 100644 --- a/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/layout/AbsoluteLayout.java +++ b/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/layout/AbsoluteLayout.java @@ -11,7 +11,7 @@ import org.hibernate.annotations.Fetch; import org.hibernate.annotations.FetchMode; -import javax.persistence.*; +import jakarta.persistence.*; import java.awt.*; import java.util.ArrayList; import java.util.List; diff --git a/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/layout/BorderLayout.java b/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/layout/BorderLayout.java index 88478ef8a..f22a75f81 100644 --- a/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/layout/BorderLayout.java +++ b/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/layout/BorderLayout.java @@ -11,7 +11,7 @@ import org.hibernate.annotations.Fetch; import org.hibernate.annotations.FetchMode; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.ArrayList; import java.util.List; diff --git a/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/layout/Layout.java b/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/layout/Layout.java index 33d1fb024..794fdecad 100644 --- a/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/layout/Layout.java +++ b/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/layout/Layout.java @@ -13,7 +13,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; diff --git a/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/map/MapConfig.java b/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/map/MapConfig.java index 4ac8249f0..f9e4dcc8c 100644 --- a/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/map/MapConfig.java +++ b/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/map/MapConfig.java @@ -9,7 +9,7 @@ import org.hibernate.annotations.Fetch; import org.hibernate.annotations.FetchMode; -import javax.persistence.*; +import jakarta.persistence.*; import java.awt.geom.Point2D; import java.util.List; diff --git a/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/map/MapControl.java b/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/map/MapControl.java index ada98a1b3..7cc29f63d 100644 --- a/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/map/MapControl.java +++ b/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/map/MapControl.java @@ -9,7 +9,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; diff --git a/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/module/AccordionPanel.java b/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/module/AccordionPanel.java index 3ca35670a..f77a13056 100644 --- a/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/module/AccordionPanel.java +++ b/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/module/AccordionPanel.java @@ -6,9 +6,9 @@ import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.commons.lang3.builder.HashCodeBuilder; -import javax.persistence.Cacheable; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Cacheable; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; /** * This class represents the an Panel with an accordion layout. diff --git a/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/module/Button.java b/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/module/Button.java index 77d612c31..45bd7d4ed 100644 --- a/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/module/Button.java +++ b/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/module/Button.java @@ -7,9 +7,9 @@ import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.commons.lang3.builder.HashCodeBuilder; -import javax.persistence.Cacheable; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Cacheable; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; /** * The Image Module is the Ext JS representation of an HTML img element. diff --git a/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/module/CompositeModule.java b/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/module/CompositeModule.java index ba926fba1..f2ebfb458 100644 --- a/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/module/CompositeModule.java +++ b/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/module/CompositeModule.java @@ -11,7 +11,7 @@ import org.hibernate.annotations.Fetch; import org.hibernate.annotations.FetchMode; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.ArrayList; import java.util.List; diff --git a/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/module/CoordinateTransformation.java b/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/module/CoordinateTransformation.java index a62d08f32..a30e86499 100644 --- a/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/module/CoordinateTransformation.java +++ b/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/module/CoordinateTransformation.java @@ -10,7 +10,7 @@ import org.hibernate.annotations.Fetch; import org.hibernate.annotations.FetchMode; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.ArrayList; import java.util.List; diff --git a/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/module/Image.java b/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/module/Image.java index ccbb5d121..8ce45dded 100644 --- a/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/module/Image.java +++ b/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/module/Image.java @@ -6,9 +6,9 @@ import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.commons.lang3.builder.HashCodeBuilder; -import javax.persistence.Cacheable; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Cacheable; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; /** * The Image Module is the Ext JS representation of an HTML img element. diff --git a/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/module/Map.java b/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/module/Map.java index 890924373..9ac885854 100644 --- a/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/module/Map.java +++ b/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/module/Map.java @@ -13,7 +13,7 @@ import org.hibernate.annotations.Fetch; import org.hibernate.annotations.FetchMode; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.ArrayList; import java.util.HashSet; import java.util.List; diff --git a/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/module/Module.java b/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/module/Module.java index fd0b4d289..fe707e9d7 100644 --- a/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/module/Module.java +++ b/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/module/Module.java @@ -13,7 +13,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; diff --git a/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/module/NominatimSearch.java b/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/module/NominatimSearch.java index 311be3cdb..45bb76d32 100644 --- a/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/module/NominatimSearch.java +++ b/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/module/NominatimSearch.java @@ -12,7 +12,7 @@ import org.hibernate.annotations.Fetch; import org.hibernate.annotations.FetchMode; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.ArrayList; import java.util.List; diff --git a/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/module/OverpassSearch.java b/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/module/OverpassSearch.java index 06dc6a3ac..a0b2d7552 100644 --- a/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/module/OverpassSearch.java +++ b/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/module/OverpassSearch.java @@ -12,7 +12,7 @@ import org.hibernate.annotations.Fetch; import org.hibernate.annotations.FetchMode; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.ArrayList; import java.util.List; diff --git a/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/module/OverviewMap.java b/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/module/OverviewMap.java index 97aa87aa1..70ff81aec 100644 --- a/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/module/OverviewMap.java +++ b/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/module/OverviewMap.java @@ -14,7 +14,7 @@ import org.hibernate.annotations.Fetch; import org.hibernate.annotations.FetchMode; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.ArrayList; import java.util.List; diff --git a/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/module/Print.java b/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/module/Print.java index b97ad9f47..33a7436e9 100644 --- a/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/module/Print.java +++ b/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/module/Print.java @@ -6,9 +6,9 @@ import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.commons.lang3.builder.HashCodeBuilder; -import javax.persistence.Cacheable; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Cacheable; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; /** * A module which contains a formular to print the map with the mapfish print v3. diff --git a/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/module/WfsSearch.java b/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/module/WfsSearch.java index 01d64c768..6460ee7e2 100644 --- a/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/module/WfsSearch.java +++ b/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/module/WfsSearch.java @@ -15,7 +15,7 @@ import org.hibernate.annotations.Fetch; import org.hibernate.annotations.FetchMode; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.ArrayList; import java.util.List; diff --git a/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/security/PermissionCollection.java b/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/security/PermissionCollection.java index e735bb9d3..676ccda54 100644 --- a/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/security/PermissionCollection.java +++ b/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/security/PermissionCollection.java @@ -6,7 +6,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; diff --git a/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/token/PasswordResetToken.java b/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/token/PasswordResetToken.java index 73a9e27d1..0c8c4619a 100644 --- a/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/token/PasswordResetToken.java +++ b/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/token/PasswordResetToken.java @@ -2,9 +2,9 @@ import de.terrestris.shoguncore.model.User; -import javax.persistence.Cacheable; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Cacheable; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; /** * A {@link Token} instance that has a one-to-one relation to a {@link User} diff --git a/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/token/RegistrationToken.java b/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/token/RegistrationToken.java index 3d7e3e692..d9ece3a59 100644 --- a/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/token/RegistrationToken.java +++ b/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/token/RegistrationToken.java @@ -2,9 +2,9 @@ import de.terrestris.shoguncore.model.User; -import javax.persistence.Cacheable; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Cacheable; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; /** * A {@link Token} instance that has a one-to-one relation to a {@link User} diff --git a/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/token/Token.java b/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/token/Token.java index ab79c0c25..b549d828e 100644 --- a/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/token/Token.java +++ b/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/token/Token.java @@ -9,7 +9,7 @@ import org.joda.time.DateTime; import org.joda.time.ReadableDateTime; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.UUID; /** diff --git a/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/token/UserToken.java b/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/token/UserToken.java index 1b24d97bb..b620d4ef6 100644 --- a/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/token/UserToken.java +++ b/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/token/UserToken.java @@ -8,10 +8,10 @@ import org.hibernate.annotations.Fetch; import org.hibernate.annotations.FetchMode; -import javax.persistence.Cacheable; -import javax.persistence.Entity; -import javax.persistence.JoinColumn; -import javax.persistence.OneToOne; +import jakarta.persistence.Cacheable; +import jakarta.persistence.Entity; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToOne; /** * A {@link UserToken} instance that has a one-to-one relation to a {@link User} diff --git a/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/tree/TreeFolder.java b/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/tree/TreeFolder.java index bee0da7ed..5ecf57794 100644 --- a/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/tree/TreeFolder.java +++ b/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/tree/TreeFolder.java @@ -5,11 +5,11 @@ import java.util.ArrayList; import java.util.List; -import javax.persistence.Cacheable; -import javax.persistence.Entity; -import javax.persistence.OneToMany; -import javax.persistence.OrderBy; -import javax.persistence.Table; +import jakarta.persistence.Cacheable; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OrderBy; +import jakarta.persistence.Table; import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.commons.lang3.builder.HashCodeBuilder; diff --git a/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/tree/TreeNode.java b/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/tree/TreeNode.java index f188fd77b..979b35022 100644 --- a/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/tree/TreeNode.java +++ b/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/tree/TreeNode.java @@ -12,13 +12,13 @@ import com.fasterxml.jackson.annotation.ObjectIdGenerators; import de.terrestris.shoguncore.converter.TreeFolderIdResolver; import de.terrestris.shoguncore.model.PersistentObject; -import javax.persistence.Cacheable; -import javax.persistence.Entity; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Cacheable; +import jakarta.persistence.Entity; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.commons.lang3.builder.HashCodeBuilder; import org.hibernate.annotations.Cache; diff --git a/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/wps/WpsParameter.java b/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/wps/WpsParameter.java index 5ed7e8c94..cc7caf610 100644 --- a/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/wps/WpsParameter.java +++ b/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/wps/WpsParameter.java @@ -11,7 +11,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; diff --git a/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/wps/WpsPlugin.java b/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/wps/WpsPlugin.java index 4ff788428..667347e8f 100644 --- a/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/wps/WpsPlugin.java +++ b/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/wps/WpsPlugin.java @@ -14,10 +14,10 @@ import org.hibernate.annotations.Fetch; import org.hibernate.annotations.FetchMode; -import javax.persistence.Cacheable; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Cacheable; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; /** * diff --git a/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/wps/WpsPrimitive.java b/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/wps/WpsPrimitive.java index 659fa623f..511729260 100644 --- a/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/wps/WpsPrimitive.java +++ b/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/wps/WpsPrimitive.java @@ -10,10 +10,10 @@ import org.hibernate.annotations.Fetch; import org.hibernate.annotations.FetchMode; -import javax.persistence.Cacheable; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Cacheable; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; /** * diff --git a/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/wps/WpsProcessExecute.java b/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/wps/WpsProcessExecute.java index f52ea616c..c69e88ebb 100644 --- a/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/wps/WpsProcessExecute.java +++ b/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/wps/WpsProcessExecute.java @@ -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; diff --git a/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/wps/WpsReference.java b/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/wps/WpsReference.java index 05f67e835..3f093a43d 100644 --- a/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/wps/WpsReference.java +++ b/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/model/wps/WpsReference.java @@ -9,10 +9,10 @@ import org.hibernate.annotations.Fetch; import org.hibernate.annotations.FetchMode; -import javax.persistence.Cacheable; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Cacheable; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; /** * diff --git a/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/rest/AbstractRestController.java b/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/rest/AbstractRestController.java index a796a9874..580dc96f3 100644 --- a/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/rest/AbstractRestController.java +++ b/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/rest/AbstractRestController.java @@ -16,7 +16,7 @@ import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.io.BufferedReader; import java.io.IOException; import java.io.Reader; diff --git a/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/service/GeoServerInterceptorService.java b/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/service/GeoServerInterceptorService.java index b5c1853b6..b47436f4d 100644 --- a/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/service/GeoServerInterceptorService.java +++ b/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/service/GeoServerInterceptorService.java @@ -27,7 +27,7 @@ import org.springframework.http.HttpStatus; import org.springframework.stereotype.Service; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import javax.transaction.Transactional; import java.io.IOException; import java.io.UnsupportedEncodingException; diff --git a/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/service/HttpProxyService.java b/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/service/HttpProxyService.java index 57ae06f17..11288afdb 100644 --- a/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/service/HttpProxyService.java +++ b/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/service/HttpProxyService.java @@ -13,8 +13,8 @@ import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Service; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; import java.io.IOException; import java.net.MalformedURLException; import java.net.URI; diff --git a/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/service/PasswordResetTokenService.java b/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/service/PasswordResetTokenService.java index a3ea7a1f3..d67a62fdd 100644 --- a/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/service/PasswordResetTokenService.java +++ b/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/service/PasswordResetTokenService.java @@ -16,7 +16,7 @@ import org.springframework.stereotype.Service; import org.springframework.web.util.UriUtils; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.io.UnsupportedEncodingException; import java.lang.reflect.InvocationTargetException; import java.net.URI; diff --git a/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/service/RegistrationTokenService.java b/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/service/RegistrationTokenService.java index 4e3b0e06d..2fad8d511 100644 --- a/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/service/RegistrationTokenService.java +++ b/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/service/RegistrationTokenService.java @@ -15,7 +15,7 @@ import org.springframework.stereotype.Service; import org.springframework.web.util.UriUtils; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.io.UnsupportedEncodingException; import java.lang.reflect.InvocationTargetException; import java.net.URI; diff --git a/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/service/UserService.java b/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/service/UserService.java index b4a71573c..f301c31df 100644 --- a/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/service/UserService.java +++ b/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/service/UserService.java @@ -16,7 +16,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.util.Set; /** diff --git a/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/util/application/ShogunCoreContextUtil.java b/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/util/application/ShogunCoreContextUtil.java index afef8b2d7..1cb1661a4 100644 --- a/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/util/application/ShogunCoreContextUtil.java +++ b/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/util/application/ShogunCoreContextUtil.java @@ -2,7 +2,7 @@ import org.apache.http.client.utils.URIBuilder; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.net.URI; import java.net.URISyntaxException; diff --git a/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/util/http/HttpUtil.java b/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/util/http/HttpUtil.java index 2d0c09900..3e586396f 100644 --- a/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/util/http/HttpUtil.java +++ b/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/util/http/HttpUtil.java @@ -34,9 +34,9 @@ import org.springframework.http.HttpStatus; import org.springframework.stereotype.Component; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.Part; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.Part; import java.io.BufferedReader; import java.io.File; import java.io.IOException; diff --git a/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/util/interceptor/CachedServletInputStream.java b/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/util/interceptor/CachedServletInputStream.java index 5af6b9ed8..2dae8ff68 100644 --- a/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/util/interceptor/CachedServletInputStream.java +++ b/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/util/interceptor/CachedServletInputStream.java @@ -1,7 +1,7 @@ package de.terrestris.shoguncore.util.interceptor; -import javax.servlet.ReadListener; -import javax.servlet.ServletInputStream; +import jakarta.servlet.ReadListener; +import jakarta.servlet.ServletInputStream; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/util/interceptor/GeoserverAuthHeaderRequest.java b/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/util/interceptor/GeoserverAuthHeaderRequest.java index 353cea3c0..01c802261 100644 --- a/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/util/interceptor/GeoserverAuthHeaderRequest.java +++ b/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/util/interceptor/GeoserverAuthHeaderRequest.java @@ -2,7 +2,7 @@ import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.util.*; /** diff --git a/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/util/interceptor/MutableHttpServletRequest.java b/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/util/interceptor/MutableHttpServletRequest.java index 5cf60646e..e7c98bf2d 100644 --- a/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/util/interceptor/MutableHttpServletRequest.java +++ b/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/util/interceptor/MutableHttpServletRequest.java @@ -10,9 +10,8 @@ import org.w3c.dom.NodeList; import org.w3c.dom.Element; -import javax.servlet.ServletInputStream; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletRequestWrapper; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequestWrapper; import java.io.*; import java.net.URI; import java.util.Arrays; @@ -309,17 +308,6 @@ public String getHeader(String name) { return ((HttpServletRequest) getRequest()).getHeader(name); } - /** - * - */ - @Override - public ServletInputStream getInputStream() throws IOException { - if (cachedInputStream == null) { - cacheInputStream(); - } - return new CachedServletInputStream(cachedInputStream); - } - /** * Set the cachedInputStream as a copy of UTF-8 encoded {@link ByteArrayInputStream} * diff --git a/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/util/interceptor/OgcMessage.java b/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/util/interceptor/OgcMessage.java index 3005f2ef6..d831f438d 100644 --- a/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/util/interceptor/OgcMessage.java +++ b/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/util/interceptor/OgcMessage.java @@ -6,8 +6,8 @@ import org.apache.commons.lang3.builder.HashCodeBuilder; import org.apache.commons.lang3.builder.ToStringBuilder; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; /** * @author Daniel Koch diff --git a/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/util/interceptor/OgcXmlUtil.java b/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/util/interceptor/OgcXmlUtil.java index 7cb1363de..5812ec5df 100644 --- a/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/util/interceptor/OgcXmlUtil.java +++ b/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/util/interceptor/OgcXmlUtil.java @@ -10,8 +10,8 @@ import org.xml.sax.InputSource; import org.xml.sax.SAXException; -import javax.servlet.ServletInputStream; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.ServletInputStream; +import jakarta.servlet.http.HttpServletRequest; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; diff --git a/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/util/mail/MailPublisher.java b/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/util/mail/MailPublisher.java index b168a2d0e..dbd8dc849 100644 --- a/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/util/mail/MailPublisher.java +++ b/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/util/mail/MailPublisher.java @@ -10,8 +10,8 @@ import org.springframework.mail.javamail.MimeMessageHelper; import org.springframework.stereotype.Component; -import javax.mail.MessagingException; -import javax.mail.internet.MimeMessage; +import jakarta.mail.MessagingException; +import jakarta.mail.internet.MimeMessage; import java.io.File; import static org.apache.logging.log4j.LogManager.getLogger; diff --git a/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/web/GeoServerInterceptorController.java b/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/web/GeoServerInterceptorController.java index 45ac18e58..223a3f823 100644 --- a/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/web/GeoServerInterceptorController.java +++ b/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/web/GeoServerInterceptorController.java @@ -17,7 +17,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.io.IOException; import java.io.UnsupportedEncodingException; import java.net.URISyntaxException; diff --git a/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/web/HttpProxyController.java b/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/web/HttpProxyController.java index 17d1ffb8a..59a0e8073 100644 --- a/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/web/HttpProxyController.java +++ b/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/web/HttpProxyController.java @@ -9,7 +9,7 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.util.Map; /** diff --git a/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/web/UserController.java b/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/web/UserController.java index 233f01321..794c43b8c 100644 --- a/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/web/UserController.java +++ b/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/web/UserController.java @@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.util.Map; /** diff --git a/src/shogun-core-main/src/test/java/de/terrestris/shoguncore/service/HttpProxyServiceTest.java b/src/shogun-core-main/src/test/java/de/terrestris/shoguncore/service/HttpProxyServiceTest.java index 0ac882b18..44f52f694 100644 --- a/src/shogun-core-main/src/test/java/de/terrestris/shoguncore/service/HttpProxyServiceTest.java +++ b/src/shogun-core-main/src/test/java/de/terrestris/shoguncore/service/HttpProxyServiceTest.java @@ -20,8 +20,8 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; import java.io.IOException; import java.net.URI; import java.net.URISyntaxException; diff --git a/src/shogun-core-main/src/test/java/de/terrestris/shoguncore/service/UserServiceTest.java b/src/shogun-core-main/src/test/java/de/terrestris/shoguncore/service/UserServiceTest.java index 052b9f4d7..e265353fd 100644 --- a/src/shogun-core-main/src/test/java/de/terrestris/shoguncore/service/UserServiceTest.java +++ b/src/shogun-core-main/src/test/java/de/terrestris/shoguncore/service/UserServiceTest.java @@ -13,7 +13,7 @@ import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import org.hibernate.HibernateException; diff --git a/src/shogun-core-main/src/test/java/de/terrestris/shoguncore/util/http/HttpUtilTest.java b/src/shogun-core-main/src/test/java/de/terrestris/shoguncore/util/http/HttpUtilTest.java index a592927a5..55b6b6a4a 100644 --- a/src/shogun-core-main/src/test/java/de/terrestris/shoguncore/util/http/HttpUtilTest.java +++ b/src/shogun-core-main/src/test/java/de/terrestris/shoguncore/util/http/HttpUtilTest.java @@ -35,9 +35,9 @@ import org.mockito.Mockito; import org.springframework.http.HttpMethod; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.Part; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.Part; /** * @author danielkoch diff --git a/src/shogun-core-main/src/test/java/de/terrestris/shoguncore/util/interceptor/MutableHttpServletRequestTest.java b/src/shogun-core-main/src/test/java/de/terrestris/shoguncore/util/interceptor/MutableHttpServletRequestTest.java index bc6cdf574..bd8379e38 100644 --- a/src/shogun-core-main/src/test/java/de/terrestris/shoguncore/util/interceptor/MutableHttpServletRequestTest.java +++ b/src/shogun-core-main/src/test/java/de/terrestris/shoguncore/util/interceptor/MutableHttpServletRequestTest.java @@ -6,7 +6,7 @@ import org.junit.Test; import org.springframework.mock.web.MockHttpServletRequest; -import javax.servlet.ServletInputStream; +import jakarta.servlet.ServletInputStream; import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; diff --git a/src/shogun-core-main/src/test/java/de/terrestris/shoguncore/util/mail/MailPublisherTest.java b/src/shogun-core-main/src/test/java/de/terrestris/shoguncore/util/mail/MailPublisherTest.java index 85112ee46..eb02f20e7 100644 --- a/src/shogun-core-main/src/test/java/de/terrestris/shoguncore/util/mail/MailPublisherTest.java +++ b/src/shogun-core-main/src/test/java/de/terrestris/shoguncore/util/mail/MailPublisherTest.java @@ -7,9 +7,9 @@ import java.io.File; import java.io.IOException; -import javax.mail.Message; -import javax.mail.MessagingException; -import javax.mail.Multipart; +import jakarta.mail.Message; +import jakarta.mail.MessagingException; +import jakarta.mail.Multipart; import com.icegreen.greenmail.configuration.GreenMailConfiguration; import org.junit.After; diff --git a/src/shogun-core-main/src/test/java/de/terrestris/shoguncore/web/FileControllerTest.java b/src/shogun-core-main/src/test/java/de/terrestris/shoguncore/web/FileControllerTest.java index 1ca4abad2..17ce7e7c9 100644 --- a/src/shogun-core-main/src/test/java/de/terrestris/shoguncore/web/FileControllerTest.java +++ b/src/shogun-core-main/src/test/java/de/terrestris/shoguncore/web/FileControllerTest.java @@ -85,7 +85,7 @@ public void uploadFile_shouldWorkAsExpected() // Perform and test the GET-Request mockMvc.perform( - MockMvcRequestBuilders.fileUpload("/file/upload.action").file(mockMultipartFile)) + MockMvcRequestBuilders.multipart("/file/upload.action").file(mockMultipartFile)) .andExpect(status().isOk()) .andExpect(content().contentType(MediaType.APPLICATION_JSON_UTF8)) .andExpect(jsonPath("$.*", hasSize(3))) @@ -115,7 +115,7 @@ public void uploadFile_shouldReturnErrorMessageIfUploadIsEmpty() // Perform and test the GET-Request mockMvc.perform( - MockMvcRequestBuilders.fileUpload("/file/upload.action").file(file)) + MockMvcRequestBuilders.multipart("/file/upload.action").file(file)) .andExpect(status().isOk()) .andExpect(content().contentType(MediaType.APPLICATION_JSON_UTF8)) .andExpect(jsonPath("$.*", hasSize(2))) diff --git a/src/shogun-core-main/src/test/java/de/terrestris/shoguncore/web/GeoServerInterceptorControllerTest.java b/src/shogun-core-main/src/test/java/de/terrestris/shoguncore/web/GeoServerInterceptorControllerTest.java index 9ea016a3b..d45e864e7 100644 --- a/src/shogun-core-main/src/test/java/de/terrestris/shoguncore/web/GeoServerInterceptorControllerTest.java +++ b/src/shogun-core-main/src/test/java/de/terrestris/shoguncore/web/GeoServerInterceptorControllerTest.java @@ -18,7 +18,7 @@ import org.springframework.test.web.servlet.request.MockMvcRequestBuilders; import org.springframework.test.web.servlet.setup.MockMvcBuilders; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.util.Optional; diff --git a/src/shogun-core-main/src/test/java/de/terrestris/shoguncore/web/HttpProxyControllerTest.java b/src/shogun-core-main/src/test/java/de/terrestris/shoguncore/web/HttpProxyControllerTest.java index 2272940b6..599d15f64 100644 --- a/src/shogun-core-main/src/test/java/de/terrestris/shoguncore/web/HttpProxyControllerTest.java +++ b/src/shogun-core-main/src/test/java/de/terrestris/shoguncore/web/HttpProxyControllerTest.java @@ -17,7 +17,7 @@ import org.springframework.test.web.servlet.result.MockMvcResultMatchers; import org.springframework.test.web.servlet.setup.MockMvcBuilders; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.util.Map; diff --git a/src/shogun-core-main/src/test/java/de/terrestris/shoguncore/web/UserControllerTest.java b/src/shogun-core-main/src/test/java/de/terrestris/shoguncore/web/UserControllerTest.java index b9d81d04c..5685714e6 100644 --- a/src/shogun-core-main/src/test/java/de/terrestris/shoguncore/web/UserControllerTest.java +++ b/src/shogun-core-main/src/test/java/de/terrestris/shoguncore/web/UserControllerTest.java @@ -16,7 +16,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.junit.Before; import org.junit.Test; diff --git a/src/shogun-core-webapp-archetype/pom.xml b/src/shogun-core-webapp-archetype/pom.xml index 262be396f..a02457c33 100644 --- a/src/shogun-core-webapp-archetype/pom.xml +++ b/src/shogun-core-webapp-archetype/pom.xml @@ -6,7 +6,7 @@ de.terrestris shogun-core - 5.3.13-SNAPSHOT + 6.0.0-SNAPSHOT shogun-core-webapp-archetype diff --git a/src/shogun-core-webapp-archetype/src/main/resources/archetype-resources/pom.xml b/src/shogun-core-webapp-archetype/src/main/resources/archetype-resources/pom.xml index e4ae421ee..89575dbd8 100644 --- a/src/shogun-core-webapp-archetype/src/main/resources/archetype-resources/pom.xml +++ b/src/shogun-core-webapp-archetype/src/main/resources/archetype-resources/pom.xml @@ -16,7 +16,7 @@ UTF-8 - 5.3.13-SNAPSHOT + 6.0.0-SNAPSHOT 2.10.3 3.5.1 @@ -172,8 +172,8 @@ - javax.servlet - javax.servlet-api + jakarta.servlet + jakarta.servlet-api provided diff --git a/src/shogun-core-webapp-archetype/src/main/resources/archetype-resources/src/main/java/model/ProjectApplication.java b/src/shogun-core-webapp-archetype/src/main/resources/archetype-resources/src/main/java/model/ProjectApplication.java index 294ab6efe..6e76f11c8 100644 --- a/src/shogun-core-webapp-archetype/src/main/resources/archetype-resources/src/main/java/model/ProjectApplication.java +++ b/src/shogun-core-webapp-archetype/src/main/resources/archetype-resources/src/main/java/model/ProjectApplication.java @@ -3,8 +3,8 @@ #set( $symbol_escape = '\' ) package ${package}.model; -import javax.persistence.Column; -import javax.persistence.Entity; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; import de.terrestris.shoguncore.model.Application;