Merge pull request #200 from DropSnorz/chore/spring-boot-3

Upgrade to spring boot 3
DropSnorz · Jul 30, 2023 · 11f7aba · 11f7aba
2 parents 330e947 + f67db7e
commit 11f7aba
Show file tree

Hide file tree

Showing 32 changed files with 126 additions and 116 deletions.
diff --git a/owlplug-client/pom.xml b/owlplug-client/pom.xml
@@ -33,7 +33,7 @@
 			<dependency>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-dependencies</artifactId>
-				<version>2.7.7</version>
+				<version>3.1.2</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
@@ -74,8 +74,6 @@
 		<dependency>
 			<groupId>com.h2database</groupId>
 			<artifactId>h2</artifactId>
-			<!-- Override sb managed version. Major performance degradation since 1.4.198-->
-			<version>1.4.197</version>
 			<scope>runtime</scope>
 		</dependency>
 
@@ -135,14 +133,19 @@
 		</dependency>
 
 		<dependency>
-			<groupId>javax.xml.bind</groupId>
-			<artifactId>jaxb-api</artifactId>
+			<groupId>jakarta.servlet</groupId>
+			<artifactId>jakarta.servlet-api</artifactId>
 		</dependency>
 
 		<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>javax.servlet-api</artifactId>
-			<scope>provided</scope>
+			<groupId>jakarta.xml.bind</groupId>
+			<artifactId>jakarta.xml.bind-api</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>org.apache.httpcomponents.client5</groupId>
+			<artifactId>httpclient5</artifactId>
+			<version>5.2</version>
 		</dependency>
 
 		<dependency>
@@ -198,6 +201,7 @@
 		<dependency>
 			<groupId>org.ehcache</groupId>
 			<artifactId>ehcache</artifactId>
+			<classifier>jakarta</classifier>
 		</dependency>
 
 		<dependency>

diff --git a/owlplug-client/src/main/java/com/owlplug/PreloaderProgressMessage.java b/owlplug-client/src/main/java/com/owlplug/PreloaderProgressMessage.java
@@ -19,7 +19,6 @@
 package com.owlplug;
 
 import java.util.Objects;
-
 import javafx.application.Preloader.PreloaderNotification;
 
 public class PreloaderProgressMessage implements PreloaderNotification {

diff --git a/owlplug-client/src/main/java/com/owlplug/auth/model/GoogleCredential.java b/owlplug-client/src/main/java/com/owlplug/auth/model/GoogleCredential.java
@@ -19,12 +19,12 @@
 package com.owlplug.auth.model;
 
 import com.google.api.client.auth.oauth2.StoredCredential;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
 import java.time.Instant;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
 import org.springframework.data.annotation.CreatedDate;
 import org.springframework.data.annotation.LastModifiedDate;
 

diff --git a/owlplug-client/src/main/java/com/owlplug/auth/model/UserAccount.java b/owlplug-client/src/main/java/com/owlplug/auth/model/UserAccount.java
@@ -19,12 +19,12 @@
 package com.owlplug.auth.model;
 
 import com.owlplug.auth.ui.AccountItem;
-import javax.persistence.CascadeType;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.OneToOne;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.OneToOne;
 
 /**
  * OwlPlug JPA Entity class to handle users accounts information.

diff --git a/owlplug-client/src/main/java/com/owlplug/auth/services/AuthenticationService.java b/owlplug-client/src/main/java/com/owlplug/auth/services/AuthenticationService.java
@@ -40,11 +40,11 @@
 import com.owlplug.core.components.ApplicationDefaults;
 import com.owlplug.core.controllers.MainController;
 import com.owlplug.core.services.BaseService;
+import jakarta.transaction.Transactional;
 import java.io.IOException;
 import java.security.GeneralSecurityException;
 import java.util.ArrayList;
 import java.util.Optional;
-import javax.transaction.Transactional;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;

diff --git a/owlplug-client/src/main/java/com/owlplug/core/components/ApplicationMonitor.java b/owlplug-client/src/main/java/com/owlplug/core/components/ApplicationMonitor.java
@@ -19,8 +19,8 @@
 package com.owlplug.core.components;
 
 import com.owlplug.core.model.ApplicationState;
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;

diff --git a/owlplug-client/src/main/java/com/owlplug/core/components/BaseTaskFactory.java b/owlplug-client/src/main/java/com/owlplug/core/components/BaseTaskFactory.java
@@ -19,8 +19,8 @@
 package com.owlplug.core.components;
 
 import com.owlplug.core.tasks.AbstractTask;
-import com.owlplug.core.tasks.TaskExecutionContext;
 import com.owlplug.core.tasks.SimpleEventListener;
+import com.owlplug.core.tasks.TaskExecutionContext;
 import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
 

diff --git a/owlplug-client/src/main/java/com/owlplug/core/components/CoreTaskFactory.java b/owlplug-client/src/main/java/com/owlplug/core/components/CoreTaskFactory.java
@@ -25,10 +25,10 @@
 import com.owlplug.core.services.NativeHostService;
 import com.owlplug.core.tasks.PluginRemoveTask;
 import com.owlplug.core.tasks.PluginSyncTask;
+import com.owlplug.core.tasks.SimpleEventListener;
 import com.owlplug.core.tasks.TaskExecutionContext;
 import com.owlplug.core.tasks.plugins.discovery.PluginSyncTaskParameters;
 import com.owlplug.core.utils.FileUtils;
-import com.owlplug.core.tasks.SimpleEventListener;
 import java.util.ArrayList;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

diff --git a/owlplug-client/src/main/java/com/owlplug/core/components/WorkspaceDirectoryInitializer.java b/owlplug-client/src/main/java/com/owlplug/core/components/WorkspaceDirectoryInitializer.java
@@ -21,13 +21,13 @@
 import ch.qos.logback.classic.Level;
 import ch.qos.logback.classic.LoggerContext;
 import com.vdurmont.semver4j.Semver;
+import jakarta.annotation.PostConstruct;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Properties;
-import javax.annotation.PostConstruct;
 import org.apache.commons.io.FileUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/owlplug-client/src/main/java/com/owlplug/core/controllers/MainController.java b/owlplug-client/src/main/java/com/owlplug/core/controllers/MainController.java
@@ -41,6 +41,7 @@
 import com.owlplug.core.utils.PlatformUtils;
 import com.owlplug.explore.controllers.ExploreController;
 import com.owlplug.explore.services.ExploreService;
+import jakarta.annotation.PreDestroy;
 import java.util.ArrayList;
 import java.util.Optional;
 import javafx.application.Platform;
@@ -52,7 +53,6 @@
 import javafx.scene.layout.Pane;
 import javafx.scene.layout.StackPane;
 import javafx.scene.layout.VBox;
-import javax.annotation.PreDestroy;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;

diff --git a/owlplug-client/src/main/java/com/owlplug/core/model/Plugin.java b/owlplug-client/src/main/java/com/owlplug/core/model/Plugin.java
@@ -18,20 +18,20 @@
 
 package com.owlplug.core.model;
 
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Index;
+import jakarta.persistence.Inheritance;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.OneToOne;
+import jakarta.persistence.Table;
 import java.util.HashSet;
 import java.util.Set;
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Index;
-import javax.persistence.Inheritance;
-import javax.persistence.OneToMany;
-import javax.persistence.OneToOne;
-import javax.persistence.Table;
 
 @Entity
 @Inheritance

diff --git a/owlplug-client/src/main/java/com/owlplug/core/model/PluginComponent.java b/owlplug-client/src/main/java/com/owlplug/core/model/PluginComponent.java
@@ -19,13 +19,13 @@
 package com.owlplug.core.model;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Index;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Index;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
 
 @Entity
 @Table(indexes = { @Index(name = "IDX_PLUGIN_COMPONENT_ID", columnList = "id") })

diff --git a/owlplug-client/src/main/java/com/owlplug/core/model/PluginFootprint.java b/owlplug-client/src/main/java/com/owlplug/core/model/PluginFootprint.java
@@ -18,12 +18,12 @@
 
 package com.owlplug.core.model;
 
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Index;
-import javax.persistence.Table;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Index;
+import jakarta.persistence.Table;
 
 @Entity
 @Table(indexes = { @Index(name = "IDX_PLUGIN_FOOTPRINT_ID", columnList = "id"),

diff --git a/owlplug-client/src/main/java/com/owlplug/core/model/Symlink.java b/owlplug-client/src/main/java/com/owlplug/core/model/Symlink.java
@@ -18,12 +18,12 @@
 
 package com.owlplug.core.model;
 
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Transient;
 import java.util.List;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Transient;
 
 @Entity
 public class Symlink implements IDirectory {

diff --git a/owlplug-client/src/main/java/com/owlplug/core/services/AnalyticsService.java b/owlplug-client/src/main/java/com/owlplug/core/services/AnalyticsService.java
@@ -19,7 +19,7 @@
 package com.owlplug.core.services;
 
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 import org.springframework.stereotype.Service;
 
 @Service

diff --git a/owlplug-client/src/main/java/com/owlplug/core/services/BaseService.java b/owlplug-client/src/main/java/com/owlplug/core/services/BaseService.java
@@ -19,7 +19,6 @@
 package com.owlplug.core.services;
 
 import com.owlplug.core.components.ApplicationDefaults;
-
 import com.owlplug.core.components.ApplicationPreferences;
 import org.springframework.beans.factory.annotation.Autowired;
 

diff --git a/owlplug-client/src/main/java/com/owlplug/core/services/NativeHostService.java b/owlplug-client/src/main/java/com/owlplug/core/services/NativeHostService.java
@@ -24,10 +24,10 @@
 import com.owlplug.host.loaders.EmbeddedScannerPluginLoader;
 import com.owlplug.host.loaders.NativePluginLoader;
 import com.owlplug.host.loaders.jni.JNINativePluginLoader;
+import jakarta.annotation.PostConstruct;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
-import javax.annotation.PostConstruct;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;

diff --git a/owlplug-client/src/main/java/com/owlplug/core/services/OptionsService.java b/owlplug-client/src/main/java/com/owlplug/core/services/OptionsService.java
@@ -28,8 +28,8 @@
 import com.owlplug.core.model.platform.OperatingSystem;
 import com.owlplug.explore.dao.RemotePackageDAO;
 import com.owlplug.explore.dao.RemoteSourceDAO;
+import jakarta.annotation.PostConstruct;
 import java.util.prefs.BackingStoreException;
-import javax.annotation.PostConstruct;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;

diff --git a/owlplug-client/src/main/java/com/owlplug/core/tasks/DirectoryRemoveTask.java b/owlplug-client/src/main/java/com/owlplug/core/tasks/DirectoryRemoveTask.java
@@ -20,7 +20,6 @@
 
 import com.owlplug.core.model.PluginDirectory;
 import java.io.File;
-
 import org.apache.commons.io.FileUtils;
 
 public class DirectoryRemoveTask extends AbstractTask {

diff --git a/owlplug-client/src/main/java/com/owlplug/core/ui/skins/OwlPlugProgressBarSkin.java b/owlplug-client/src/main/java/com/owlplug/core/ui/skins/OwlPlugProgressBarSkin.java
@@ -22,12 +22,20 @@
 import com.jfoenix.utils.JFXNodeUtils;
 import com.sun.javafx.scene.NodeHelper;
 import com.sun.javafx.scene.TreeShowingExpression;
-import javafx.animation.*;
+import javafx.animation.Animation;
+import javafx.animation.Interpolator;
+import javafx.animation.KeyFrame;
+import javafx.animation.KeyValue;
+import javafx.animation.Timeline;
 import javafx.geometry.Insets;
 import javafx.scene.Node;
 import javafx.scene.control.ProgressIndicator;
 import javafx.scene.control.skin.ProgressIndicatorSkin;
-import javafx.scene.layout.*;
+import javafx.scene.layout.Background;
+import javafx.scene.layout.BackgroundFill;
+import javafx.scene.layout.CornerRadii;
+import javafx.scene.layout.Region;
+import javafx.scene.layout.StackPane;
 import javafx.scene.paint.Color;
 import javafx.util.Duration;
 

diff --git a/owlplug-client/src/main/java/com/owlplug/explore/components/ExploreTaskFactory.java b/owlplug-client/src/main/java/com/owlplug/explore/components/ExploreTaskFactory.java
@@ -21,9 +21,9 @@
 import com.owlplug.core.components.ApplicationDefaults;
 import com.owlplug.core.components.BaseTaskFactory;
 import com.owlplug.core.components.CoreTaskFactory;
+import com.owlplug.core.tasks.SimpleEventListener;
 import com.owlplug.core.tasks.TaskExecutionContext;
 import com.owlplug.core.utils.FileUtils;
-import com.owlplug.core.tasks.SimpleEventListener;
 import com.owlplug.explore.dao.RemotePackageDAO;
 import com.owlplug.explore.dao.RemoteSourceDAO;
 import com.owlplug.explore.model.PackageBundle;

diff --git a/owlplug-client/src/main/java/com/owlplug/explore/dao/RemotePackageDAO.java b/owlplug-client/src/main/java/com/owlplug/explore/dao/RemotePackageDAO.java
@@ -20,11 +20,11 @@
 
 import com.owlplug.core.model.PluginType;
 import com.owlplug.explore.model.RemotePackage;
+import jakarta.persistence.criteria.Join;
+import jakarta.persistence.criteria.JoinType;
+import jakarta.persistence.criteria.Predicate;
 import java.util.ArrayList;
 import java.util.List;
-import javax.persistence.criteria.Join;
-import javax.persistence.criteria.JoinType;
-import javax.persistence.criteria.Predicate;
 import org.springframework.data.jpa.domain.Specification;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.Query;

diff --git a/owlplug-client/src/main/java/com/owlplug/explore/model/PackageBundle.java b/owlplug-client/src/main/java/com/owlplug/explore/model/PackageBundle.java
@@ -19,14 +19,14 @@
 package com.owlplug.explore.model;
 
 import com.owlplug.core.model.PluginFormat;
+import jakarta.persistence.ElementCollection;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.ManyToOne;
 import java.util.List;
-import javax.persistence.ElementCollection;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.ManyToOne;
 
 @Entity
 public class PackageBundle {

diff --git a/owlplug-client/src/main/java/com/owlplug/explore/model/PackageTag.java b/owlplug-client/src/main/java/com/owlplug/explore/model/PackageTag.java
@@ -18,11 +18,11 @@
 
 package com.owlplug.explore.model;
 
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.ManyToOne;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.ManyToOne;
 
 @Entity
 public class PackageTag {