Merge 580d3ed into 921ae90

data/pom.xml

@@ -36,7 +36,7 @@
     <dependency>
       <groupId>org.postgresql</groupId>
       <artifactId>postgresql</artifactId>
-      <version>9.4-1206-jdbc42</version><!--$NO-MVN-MAN-VER$ -->
+      <version>42.3.3</version>
     </dependency>
 
     <dependency>

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<M extends BaseEntity> implements Page<M> {
@@ -104,7 +104,7 @@ public int getTotalPages() {
     }
 
     @Override
-    public <S> Page<S> map(Converter<? super M, ? extends S> converter) {
+    public <S> Page<S> map(Function<? super M, ? extends S> converter) {
         return page.map(converter);
     }
 

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));
     }
 

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 {

email/pom.xml

@@ -27,10 +27,9 @@
       <artifactId>spring-context-support</artifactId>
     </dependency>
 
-
     <dependency>
-      <groupId>com.sun.mail</groupId>
-      <artifactId>javax.mail</artifactId>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-mail</artifactId>
     </dependency>
 
   </dependencies>

pom.xml

@@ -38,21 +38,22 @@
     <maven.compiler.source>${java.version}</maven.compiler.source>
     <maven.compiler.target>${java.version}</maven.compiler.target>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <spring.boot.version>2.6.6</spring.boot.version>
   </properties>
 
   <dependencyManagement>
     <dependencies>
       <dependency>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-dependencies</artifactId>
-        <version>1.5.22.RELEASE</version>
+        <version>${spring.boot.version}</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
       <dependency>
         <groupId>org.springframework.cloud</groupId>
         <artifactId>spring-cloud-dependencies</artifactId>
-        <version>Brixton.SR7</version>
+        <version>2021.0.1</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
@@ -77,7 +78,7 @@
         <plugin>
           <groupId>org.springframework.boot</groupId>
           <artifactId>spring-boot-maven-plugin</artifactId>
-          <version>1.5.22.RELEASE</version>
+          <version>${spring.boot.version}</version>
           <configuration>
             <addResources>false</addResources>
           </configuration>

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<String, Map<String, String>> MOCK_CLAIMS = new HashMap<String, Map<String, String>>();
 

token/pom.xml

@@ -25,18 +25,18 @@
     <dependency>
       <groupId>org.springframework.security</groupId>
       <artifactId>spring-security-jwt</artifactId>
+      <version>1.1.1.RELEASE</version>
     </dependency>
 
     <dependency>
-      <groupId>commons-codec</groupId>
-      <artifactId>commons-codec</artifactId>
-      <version>1.10</version><!--$NO-MVN-MAN-VER$ -->
+      <groupId>io.jsonwebtoken</groupId>
+      <artifactId>jjwt</artifactId>
+      <version>0.9.1</version>
     </dependency>
 
     <dependency>
-      <groupId>io.jsonwebtoken</groupId>
-      <artifactId>jjwt</artifactId>
-      <version>0.7.0</version>
+      <groupId>commons-codec</groupId>
+      <artifactId>commons-codec</artifactId>
     </dependency>
 
   </dependencies>

wro/pom.xml

@@ -28,13 +28,13 @@
     <dependency>
       <groupId>ro.isdc.wro4j</groupId>
       <artifactId>wro4j-core</artifactId>
-      <version>1.8.0</version>
+      <version>1.10.1</version>
     </dependency>
 
     <dependency>
       <groupId>ro.isdc.wro4j</groupId>
       <artifactId>wro4j-extensions</artifactId>
-      <version>1.8.0</version>
+      <version>1.10.1</version>
       <exclusions>
         <exclusion>
           <groupId>org.codehaus.gmaven.runtime</groupId>
@@ -50,7 +50,7 @@
     <dependency>
       <groupId>org.webjars</groupId>
       <artifactId>webjars-locator-core</artifactId>
-      <version>0.35</version>
+      <version>0.50</version>
     </dependency>
 
   </dependencies>

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;

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);
             }

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());