From 580d3edcf59a5623d71ba601f93bdefde975c931 Mon Sep 17 00:00:00 2001
From: William Welling <8352733+wwelling@users.noreply.github.com>
Date: Wed, 6 Apr 2022 07:48:13 -0500
Subject: [PATCH] upgrade spring and other dependencies
---
data/pom.xml | 2 +-
.../java/edu/tamu/weaver/data/model/ApiPage.java | 8 ++++----
.../data/model/repo/impl/AbstractWeaverRepoImpl.java | 4 ++--
.../edu/tamu/weaver/data/utility/EntityUtility.java | 4 ++--
email/pom.xml | 5 ++---
pom.xml | 7 ++++---
.../controller/WeaverMockTokenController.java | 5 +++--
token/pom.xml | 12 ++++++------
wro/pom.xml | 6 +++---
.../weaver/wro/config/WeaverWroConfiguration.java | 2 +-
.../wro/model/repo/impl/CoreThemeRepoImpl.java | 2 +-
.../weaver/wro/service/RepoThemeManagerService.java | 2 +-
12 files changed, 30 insertions(+), 29 deletions(-)
diff --git a/data/pom.xml b/data/pom.xml
index 9938289b..63d868bb 100644
--- a/data/pom.xml
+++ b/data/pom.xml
@@ -36,7 +36,7 @@
org.postgresql
postgresql
- 9.4-1206-jdbc42
+ 42.3.3
diff --git a/data/src/main/java/edu/tamu/weaver/data/model/ApiPage.java b/data/src/main/java/edu/tamu/weaver/data/model/ApiPage.java
index b5f09a7e..6f4c6662 100644
--- a/data/src/main/java/edu/tamu/weaver/data/model/ApiPage.java
+++ b/data/src/main/java/edu/tamu/weaver/data/model/ApiPage.java
@@ -2,14 +2,14 @@
import java.util.Iterator;
import java.util.List;
+import java.util.function.Function;
+
+import com.fasterxml.jackson.annotation.JsonView;
-import org.springframework.core.convert.converter.Converter;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import org.springframework.data.domain.Sort;
-import com.fasterxml.jackson.annotation.JsonView;
-
import edu.tamu.weaver.response.ApiView;
public class ApiPage implements Page {
@@ -104,7 +104,7 @@ public int getTotalPages() {
}
@Override
- public Page map(Converter super M, ? extends S> converter) {
+ public Page map(Function super M, ? extends S> converter) {
return page.map(converter);
}
diff --git a/data/src/main/java/edu/tamu/weaver/data/model/repo/impl/AbstractWeaverRepoImpl.java b/data/src/main/java/edu/tamu/weaver/data/model/repo/impl/AbstractWeaverRepoImpl.java
index dea8f46c..d73a9907 100644
--- a/data/src/main/java/edu/tamu/weaver/data/model/repo/impl/AbstractWeaverRepoImpl.java
+++ b/data/src/main/java/edu/tamu/weaver/data/model/repo/impl/AbstractWeaverRepoImpl.java
@@ -38,7 +38,7 @@ public M create(M model) {
@Override
public M read(Long id) {
- return weaverRepo.findOne(id);
+ return weaverRepo.getById(id);
}
@Override
@@ -51,7 +51,7 @@ public M update(M model) {
@Override
public void delete(M model) {
Long id = model.getId();
- weaverRepo.delete(id);
+ weaverRepo.deleteById(id);
simpMessagingTemplate.convertAndSend(getChannel(), new ApiResponse(SUCCESS, DELETE, model));
}
diff --git a/data/src/main/java/edu/tamu/weaver/data/utility/EntityUtility.java b/data/src/main/java/edu/tamu/weaver/data/utility/EntityUtility.java
index 88f20974..4a554f98 100644
--- a/data/src/main/java/edu/tamu/weaver/data/utility/EntityUtility.java
+++ b/data/src/main/java/edu/tamu/weaver/data/utility/EntityUtility.java
@@ -15,10 +15,10 @@
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Root;
-import org.hibernate.jpa.criteria.path.PluralAttributePath;
-
import com.fasterxml.jackson.annotation.JsonIdentityReference;
+import org.hibernate.query.criteria.internal.path.PluralAttributePath;
+
import edu.tamu.weaver.context.SpringContext;
public class EntityUtility {
diff --git a/email/pom.xml b/email/pom.xml
index 0e86fd38..2d9fa69e 100644
--- a/email/pom.xml
+++ b/email/pom.xml
@@ -27,10 +27,9 @@
spring-context-support
-
- com.sun.mail
- javax.mail
+ org.springframework.boot
+ spring-boot-starter-mail
diff --git a/pom.xml b/pom.xml
index bc2fe635..c61203f8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,6 +38,7 @@
${java.version}
${java.version}
UTF-8
+ 2.6.6
@@ -45,14 +46,14 @@
org.springframework.boot
spring-boot-dependencies
- 1.5.22.RELEASE
+ ${spring.boot.version}
pom
import
org.springframework.cloud
spring-cloud-dependencies
- Brixton.SR7
+ 2021.0.1
pom
import
@@ -77,7 +78,7 @@
org.springframework.boot
spring-boot-maven-plugin
- 1.5.22.RELEASE
+ ${spring.boot.version}
false
diff --git a/token-provider/src/main/java/edu/tamu/weaver/token/provider/controller/WeaverMockTokenController.java b/token-provider/src/main/java/edu/tamu/weaver/token/provider/controller/WeaverMockTokenController.java
index ac4c5752..b0563730 100644
--- a/token-provider/src/main/java/edu/tamu/weaver/token/provider/controller/WeaverMockTokenController.java
+++ b/token-provider/src/main/java/edu/tamu/weaver/token/provider/controller/WeaverMockTokenController.java
@@ -13,7 +13,8 @@
import javax.crypto.NoSuchPaddingException;
import org.apache.http.client.utils.URIBuilder;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.web.bind.annotation.RequestHeader;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
@@ -23,7 +24,7 @@
public abstract class WeaverMockTokenController extends TokenController {
- private static final Logger LOG = Logger.getLogger(WeaverMockTokenController.class);
+ private static final Logger LOG = LoggerFactory.getLogger(WeaverMockTokenController.class);
private static final Map> MOCK_CLAIMS = new HashMap>();
diff --git a/token/pom.xml b/token/pom.xml
index e317e04a..eec9ca5b 100644
--- a/token/pom.xml
+++ b/token/pom.xml
@@ -25,18 +25,18 @@
org.springframework.security
spring-security-jwt
+ 1.1.1.RELEASE
- commons-codec
- commons-codec
- 1.10
+ io.jsonwebtoken
+ jjwt
+ 0.9.1
- io.jsonwebtoken
- jjwt
- 0.7.0
+ commons-codec
+ commons-codec
diff --git a/wro/pom.xml b/wro/pom.xml
index d235eb3c..55bd58a2 100644
--- a/wro/pom.xml
+++ b/wro/pom.xml
@@ -28,13 +28,13 @@
ro.isdc.wro4j
wro4j-core
- 1.8.0
+ 1.10.1
ro.isdc.wro4j
wro4j-extensions
- 1.8.0
+ 1.10.1
org.codehaus.gmaven.runtime
@@ -50,7 +50,7 @@
org.webjars
webjars-locator-core
- 0.35
+ 0.50
diff --git a/wro/src/main/java/edu/tamu/weaver/wro/config/WeaverWroConfiguration.java b/wro/src/main/java/edu/tamu/weaver/wro/config/WeaverWroConfiguration.java
index bd6b3556..fda56e88 100644
--- a/wro/src/main/java/edu/tamu/weaver/wro/config/WeaverWroConfiguration.java
+++ b/wro/src/main/java/edu/tamu/weaver/wro/config/WeaverWroConfiguration.java
@@ -17,7 +17,7 @@
import edu.tamu.weaver.wro.manager.factory.WeaverConfigurableWroManagerFactory;
import edu.tamu.weaver.wro.service.ThemeManager;
-import ro.isdc.wro.config.jmx.ConfigConstants;
+import ro.isdc.wro.config.support.ConfigConstants;
import ro.isdc.wro.http.ConfigurableWroFilter;
import ro.isdc.wro.http.handler.RequestHandler;
import ro.isdc.wro.http.handler.factory.SimpleRequestHandlerFactory;
diff --git a/wro/src/main/java/edu/tamu/weaver/wro/model/repo/impl/CoreThemeRepoImpl.java b/wro/src/main/java/edu/tamu/weaver/wro/model/repo/impl/CoreThemeRepoImpl.java
index f29a2144..f689e415 100644
--- a/wro/src/main/java/edu/tamu/weaver/wro/model/repo/impl/CoreThemeRepoImpl.java
+++ b/wro/src/main/java/edu/tamu/weaver/wro/model/repo/impl/CoreThemeRepoImpl.java
@@ -86,7 +86,7 @@ public void delete(CoreTheme theme) {
themePropertyRepo.update(themeProperty);
- ThemePropertyName themePropertyName = themePropertyNameRepo.findOne(themePropertyId);
+ ThemePropertyName themePropertyName = themePropertyNameRepo.getById(themePropertyId);
if (themePropertyRepo.findThemePropertyByThemePropertyName(themePropertyName).isEmpty()) {
themPropertyNamesToDelete.add(themePropertyName);
}
diff --git a/wro/src/main/java/edu/tamu/weaver/wro/service/RepoThemeManagerService.java b/wro/src/main/java/edu/tamu/weaver/wro/service/RepoThemeManagerService.java
index cbfc14b3..56039233 100644
--- a/wro/src/main/java/edu/tamu/weaver/wro/service/RepoThemeManagerService.java
+++ b/wro/src/main/java/edu/tamu/weaver/wro/service/RepoThemeManagerService.java
@@ -99,7 +99,7 @@ public void setUp() {
}
}
}
- CoreTheme defaultTheme = coreThemeRepo.findOne(activateId);
+ CoreTheme defaultTheme = coreThemeRepo.getById(activateId);
this.setCurrentTheme(defaultTheme);
} else {
this.setCurrentTheme(coreThemeRepo.findByActiveTrue());