diff --git a/owlplug-client/pom.xml b/owlplug-client/pom.xml index 39a93eac..cb0ae03d 100644 --- a/owlplug-client/pom.xml +++ b/owlplug-client/pom.xml @@ -33,7 +33,7 @@ org.springframework.boot spring-boot-dependencies - 2.7.7 + 3.1.2 pom import @@ -74,8 +74,6 @@ com.h2database h2 - - 1.4.197 runtime @@ -135,14 +133,19 @@ - javax.xml.bind - jaxb-api + jakarta.servlet + jakarta.servlet-api - javax.servlet - javax.servlet-api - provided + jakarta.xml.bind + jakarta.xml.bind-api + + + + org.apache.httpcomponents.client5 + httpclient5 + 5.2 @@ -198,6 +201,7 @@ org.ehcache ehcache + jakarta diff --git a/owlplug-client/src/main/java/com/owlplug/PreloaderProgressMessage.java b/owlplug-client/src/main/java/com/owlplug/PreloaderProgressMessage.java index 0e893534..549b646d 100644 --- 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 index 7ee8de33..730fbbb3 100644 --- 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 index 8c22f5a0..4a71f0c9 100644 --- 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 index 304390c8..ed97befe 100644 --- 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 index dcce85f0..93c0b5e2 100644 --- 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 index 275c1217..3cdafe2f 100644 --- 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 index 1c20990f..fde6e9e4 100644 --- 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 index 1ddb78bd..ca6d76c3 100644 --- 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 index 6c8572d3..ffd5f0c2 100644 --- 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 index ba8f448e..25a96469 100644 --- 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 index 954c126b..dba05aab 100644 --- 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 index e1c86fd5..97b3dbb3 100644 --- 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 index daa663e0..998b7a6d 100644 --- 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 index 6ca658f6..caa0b09a 100644 --- 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 index 3686a7c9..91091fac 100644 --- 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 index 599e378b..84115312 100644 --- 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 index 28e54f24..c1767fcd 100644 --- 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 index 529bde26..c55f9ea3 100644 --- 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 index df8c3f0c..2f947391 100644 --- 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 index 54e99476..39406a87 100644 --- 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 index d4695cce..1989a7a5 100644 --- 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 index 715b9ab7..77223532 100644 --- 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 index eeef35e8..4065c9ff 100644 --- 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 { diff --git a/owlplug-client/src/main/java/com/owlplug/explore/model/RemotePackage.java b/owlplug-client/src/main/java/com/owlplug/explore/model/RemotePackage.java index cec34a83..60ccf96b 100644 --- a/owlplug-client/src/main/java/com/owlplug/explore/model/RemotePackage.java +++ b/owlplug-client/src/main/java/com/owlplug/explore/model/RemotePackage.java @@ -20,19 +20,19 @@ import com.owlplug.core.model.PluginStage; import com.owlplug.core.model.PluginType; +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.ManyToOne; +import jakarta.persistence.OneToMany; +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.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; @Entity @Table(indexes = { @Index(name = "IDX_PACKAGE_ID", columnList = "id"), diff --git a/owlplug-client/src/main/java/com/owlplug/explore/model/RemoteSource.java b/owlplug-client/src/main/java/com/owlplug/explore/model/RemoteSource.java index 6d8b6905..046b3e6c 100644 --- a/owlplug-client/src/main/java/com/owlplug/explore/model/RemoteSource.java +++ b/owlplug-client/src/main/java/com/owlplug/explore/model/RemoteSource.java @@ -18,12 +18,12 @@ package com.owlplug.explore.model; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.OneToMany; @Entity public class RemoteSource { diff --git a/owlplug-client/src/main/java/com/owlplug/explore/services/ExploreService.java b/owlplug-client/src/main/java/com/owlplug/explore/services/ExploreService.java index 081b2724..300b39b9 100644 --- a/owlplug-client/src/main/java/com/owlplug/explore/services/ExploreService.java +++ b/owlplug-client/src/main/java/com/owlplug/explore/services/ExploreService.java @@ -38,16 +38,16 @@ import com.owlplug.explore.model.json.legacy.StoreModelAdapter; import com.owlplug.explore.model.search.StoreCriteriaAdapter; import com.owlplug.explore.model.search.StoreFilterCriteria; +import jakarta.annotation.PostConstruct; import java.io.IOException; import java.nio.charset.StandardCharsets; import java.util.List; -import javax.annotation.PostConstruct; -import org.apache.http.HttpEntity; -import org.apache.http.client.methods.CloseableHttpResponse; -import org.apache.http.client.methods.HttpGet; -import org.apache.http.impl.client.CloseableHttpClient; -import org.apache.http.impl.client.HttpClients; -import org.apache.http.util.EntityUtils; +import org.apache.hc.client5.http.classic.methods.HttpGet; +import org.apache.hc.client5.http.impl.classic.CloseableHttpClient; +import org.apache.hc.client5.http.impl.classic.CloseableHttpResponse; +import org.apache.hc.client5.http.impl.classic.HttpClients; +import org.apache.hc.core5.http.HttpEntity; +import org.apache.hc.core5.http.io.entity.EntityUtils; 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/explore/tasks/SourceSyncTask.java b/owlplug-client/src/main/java/com/owlplug/explore/tasks/SourceSyncTask.java index 495df8d3..f73a4993 100644 --- a/owlplug-client/src/main/java/com/owlplug/explore/tasks/SourceSyncTask.java +++ b/owlplug-client/src/main/java/com/owlplug/explore/tasks/SourceSyncTask.java @@ -40,12 +40,12 @@ import java.io.IOException; import java.util.ArrayList; import java.util.List; -import org.apache.http.HttpEntity; -import org.apache.http.client.methods.CloseableHttpResponse; -import org.apache.http.client.methods.HttpGet; -import org.apache.http.impl.client.CloseableHttpClient; -import org.apache.http.impl.client.HttpClients; -import org.apache.http.util.EntityUtils; +import org.apache.hc.client5.http.classic.methods.HttpGet; +import org.apache.hc.client5.http.impl.classic.CloseableHttpClient; +import org.apache.hc.client5.http.impl.classic.CloseableHttpResponse; +import org.apache.hc.client5.http.impl.classic.HttpClients; +import org.apache.hc.core5.http.HttpEntity; +import org.apache.hc.core5.http.io.entity.EntityUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/owlplug-client/src/main/resources/application.properties b/owlplug-client/src/main/resources/application.properties index d43c7814..193583a4 100644 --- a/owlplug-client/src/main/resources/application.properties +++ b/owlplug-client/src/main/resources/application.properties @@ -1,6 +1,6 @@ #OwlPlug owlplug.version=@project.version@ -owlplug.workspace.min-version = 0.13.0 +owlplug.workspace.min-version = 1.24.0 #OwlPlug Central owlplugcentral.url=https://central.owlplug.com diff --git a/owlplug-host/pom.xml b/owlplug-host/pom.xml index b1bbc5c2..7b5f5c31 100644 --- a/owlplug-host/pom.xml +++ b/owlplug-host/pom.xml @@ -26,7 +26,7 @@ jakarta.xml.bind jakarta.xml.bind-api - 2.3.3 + 4.0.0 diff --git a/owlplug-host/src/main/java/com/owlplug/host/JuceXMLPlugin.java b/owlplug-host/src/main/java/com/owlplug/host/JuceXMLPlugin.java index ce4798d8..b6d18fd7 100644 --- a/owlplug-host/src/main/java/com/owlplug/host/JuceXMLPlugin.java +++ b/owlplug-host/src/main/java/com/owlplug/host/JuceXMLPlugin.java @@ -18,8 +18,9 @@ package com.owlplug.host; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlRootElement; + +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlRootElement; @XmlRootElement(name = "PLUGIN") public class JuceXMLPlugin { diff --git a/owlplug-host/src/main/java/com/owlplug/host/loaders/EmbeddedScannerPluginLoader.java b/owlplug-host/src/main/java/com/owlplug/host/loaders/EmbeddedScannerPluginLoader.java index d95d33d0..076b9212 100644 --- a/owlplug-host/src/main/java/com/owlplug/host/loaders/EmbeddedScannerPluginLoader.java +++ b/owlplug-host/src/main/java/com/owlplug/host/loaders/EmbeddedScannerPluginLoader.java @@ -27,6 +27,9 @@ import com.owlplug.host.io.LibraryLoader; import com.owlplug.host.model.OS; import com.owlplug.host.utils.FileSystemUtils; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.Unmarshaller; import java.io.File; import java.io.IOException; import java.io.StringReader; @@ -36,9 +39,6 @@ import java.util.ArrayList; import java.util.List; import java.util.Set; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Unmarshaller; import org.slf4j.Logger; import org.slf4j.LoggerFactory;