Skip to content

Commit

Permalink
updated Para client to 1.43.1, switched to Java 11
Browse files Browse the repository at this point in the history
  • Loading branch information
@albogdano
albogdano committed Dec 21, 2021
1 parent 773b97f commit c503bef
Show file tree
Hide file tree
Showing 37 changed files with 904 additions and 891 deletions.
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ Here's an overview of the architecture:

### Quick Start with a managed Para backend (easier)

[JDK 1.8 or higher](https://openjdk.java.net/) is required to build and run the project. All major operating systems are supported.
[JDK 11 or higher](https://openjdk.java.net/) is required to build and run the project. All major operating systems are supported.

1. Create a new app on [ParaIO.com](https://paraio.com) and copy your access keys to a file
2. Create Scoold's configuration file named `application.conf` and add the following properties to it:
Expand Down
2 changes: 1 addition & 1 deletion docs/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,7 @@ <h5 class="white pam" style="line-height: 1.5em;">
</div>
<div>
<small>
<a href="https://github.com/Erudika/scoold/releases/tag/1.47.0" title="Release notes"><b>v1.47.0</b></a>, Requires Java 8+
<a href="https://github.com/Erudika/scoold/releases/tag/1.47.0" title="Release notes"><b>v1.47.0</b></a>, Requires Java 11+
</small>
</div>
</div>
Expand Down
19 changes: 15 additions & 4 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
<dependency>
<groupId>com.erudika</groupId>
<artifactId>para-client</artifactId>
<version>1.42.0</version>
<version>1.43.1</version>
</dependency>

<!-- VELOCITY -->
Expand All @@ -89,6 +89,10 @@
<groupId>org.hibernate</groupId>
<artifactId>hibernate-validator</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-to-slf4j</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
Expand Down Expand Up @@ -184,8 +188,7 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
<release>11</release>
<showDeprecation>true</showDeprecation>
<encoding>${project.build.sourceEncoding}</encoding>
<showWarnings>true</showWarnings>
Expand All @@ -199,7 +202,14 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>3.1.0</version>
<version>3.1.2</version>
<dependencies>
<dependency>
<groupId>com.puppycrawl.tools</groupId>
<artifactId>checkstyle</artifactId>
<version>9.2</version>
</dependency>
</dependencies>
<executions>
<execution>
<id>validate-core</id>
Expand All @@ -210,6 +220,7 @@
<consoleOutput>true</consoleOutput>
<failsOnError>true</failsOnError>
<linkXRef>false</linkXRef>
<excludes>**/module-info.java</excludes>
</configuration>
<goals>
<goal>check</goal>
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/erudika/scoold/ScooldServer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@

import com.erudika.para.client.ParaClient;
import com.erudika.para.core.App;
import com.erudika.para.email.Emailer;
import com.erudika.para.utils.Config;
import com.erudika.para.core.email.Emailer;
import com.erudika.para.core.utils.Config;
import com.erudika.scoold.utils.ScooldRequestInterceptor;
import com.erudika.scoold.utils.ScooldEmailer;
import com.erudika.scoold.utils.ScooldUtils;
Expand Down
10 changes: 5 additions & 5 deletions src/main/java/com/erudika/scoold/api/ApiController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,18 @@
*/
package com.erudika.scoold.api;

import com.erudika.para.annotations.Locked;
import com.erudika.para.core.annotations.Locked;
import com.erudika.para.client.ParaClient;
import com.erudika.para.core.ParaObject;
import com.erudika.para.core.Sysprop;
import com.erudika.para.core.Tag;
import com.erudika.para.core.User;
import com.erudika.para.core.Webhook;
import com.erudika.para.core.utils.ParaObjectUtils;
import com.erudika.para.utils.Config;
import com.erudika.para.utils.Pager;
import com.erudika.para.utils.Utils;
import com.erudika.para.validation.ValidationUtils;
import com.erudika.para.core.utils.Config;
import com.erudika.para.core.utils.Pager;
import com.erudika.para.core.utils.Utils;
import com.erudika.para.core.validation.ValidationUtils;
import com.erudika.scoold.ScooldServer;
import static com.erudika.scoold.ScooldServer.AUTH_USER_ATTRIBUTE;
import static com.erudika.scoold.ScooldServer.CONTEXT_PATH;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/erudika/scoold/controllers/AboutController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
package com.erudika.scoold.controllers;

import com.erudika.para.core.Sysprop;
import com.erudika.para.utils.Config;
import com.erudika.para.core.utils.Config;
import static com.erudika.scoold.ScooldServer.ABOUTLINK;
import com.erudika.scoold.core.Profile;
import com.erudika.scoold.utils.ScooldUtils;
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/com/erudika/scoold/controllers/AdminController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@
import com.erudika.para.core.User;
import com.erudika.para.core.Webhook;
import com.erudika.para.core.utils.ParaObjectUtils;
import com.erudika.para.utils.Config;
import com.erudika.para.utils.Pager;
import com.erudika.para.utils.Utils;
import com.erudika.para.core.utils.Config;
import com.erudika.para.core.utils.Pager;
import com.erudika.para.core.utils.Utils;
import static com.erudika.scoold.ScooldServer.ADMINLINK;
import static com.erudika.scoold.ScooldServer.HOMEPAGE;
import static com.erudika.scoold.ScooldServer.SIGNINLINK;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/erudika/scoold/controllers/ApiDocsController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
package com.erudika.scoold.controllers;

import com.erudika.para.core.utils.ParaObjectUtils;
import com.erudika.para.utils.Utils;
import com.erudika.para.core.utils.Utils;
import com.erudika.scoold.ScooldServer;
import com.erudika.scoold.utils.ScooldUtils;
import com.fasterxml.jackson.core.JsonProcessingException;
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/erudika/scoold/controllers/CommentController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@

import com.erudika.para.client.ParaClient;
import com.erudika.para.core.utils.ParaObjectUtils;
import com.erudika.para.utils.Config;
import com.erudika.para.utils.Utils;
import com.erudika.para.core.utils.Config;
import com.erudika.para.core.utils.Utils;
import static com.erudika.scoold.ScooldServer.COMMENTATOR_IFHAS;
import static com.erudika.scoold.ScooldServer.HOMEPAGE;
import com.erudika.scoold.core.Comment;
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/com/erudika/scoold/controllers/FeedbackController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@
package com.erudika.scoold.controllers;

import com.erudika.para.client.ParaClient;
import com.erudika.para.utils.Config;
import com.erudika.para.utils.Pager;
import com.erudika.para.utils.Utils;
import com.erudika.para.core.utils.Config;
import com.erudika.para.core.utils.Pager;
import com.erudika.para.core.utils.Utils;
import static com.erudika.scoold.ScooldServer.MAX_REPLIES_PER_POST;

import com.erudika.scoold.core.Feedback;
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/com/erudika/scoold/controllers/PeopleController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@

import com.erudika.para.client.ParaClient;
import com.erudika.para.core.ParaObject;
import com.erudika.para.utils.Config;
import com.erudika.para.utils.Pager;
import com.erudika.para.utils.Utils;
import com.erudika.para.core.utils.Config;
import com.erudika.para.core.utils.Pager;
import com.erudika.para.core.utils.Utils;
import static com.erudika.scoold.ScooldServer.PEOPLELINK;
import static com.erudika.scoold.ScooldServer.SIGNINLINK;
import com.erudika.scoold.core.Profile;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/erudika/scoold/controllers/PrivacyController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
package com.erudika.scoold.controllers;

import com.erudika.para.core.Sysprop;
import com.erudika.para.utils.Config;
import com.erudika.para.core.utils.Config;
import static com.erudika.scoold.ScooldServer.PRIVACYLINK;
import com.erudika.scoold.utils.ScooldUtils;
import javax.inject.Inject;
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/com/erudika/scoold/controllers/ProfileController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@
import static com.erudika.para.core.User.Groups.MODS;
import static com.erudika.para.core.User.Groups.USERS;
import com.erudika.para.core.utils.ParaObjectUtils;
import com.erudika.para.utils.Config;
import com.erudika.para.utils.Pager;
import com.erudika.para.utils.Utils;
import com.erudika.para.core.utils.Config;
import com.erudika.para.core.utils.Pager;
import com.erudika.para.core.utils.Utils;
import static com.erudika.scoold.ScooldServer.PEOPLELINK;
import com.erudika.scoold.core.Post;
import com.erudika.scoold.core.Profile;
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/com/erudika/scoold/controllers/QuestionController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@
import com.erudika.para.core.ParaObject;
import com.erudika.para.core.User;
import com.erudika.para.core.utils.ParaObjectUtils;
import com.erudika.para.utils.Config;
import com.erudika.para.utils.Pager;
import com.erudika.para.utils.Utils;
import com.erudika.para.core.utils.Config;
import com.erudika.para.core.utils.Pager;
import com.erudika.para.core.utils.Utils;
import static com.erudika.scoold.ScooldServer.ANSWER_APPROVE_REWARD_AUTHOR;
import static com.erudika.scoold.ScooldServer.ANSWER_APPROVE_REWARD_VOTER;
import static com.erudika.scoold.ScooldServer.MAX_REPLIES_PER_POST;
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/com/erudika/scoold/controllers/QuestionsController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@
import com.erudika.para.core.Sysprop;
import com.erudika.para.core.Tag;
import com.erudika.para.core.utils.ParaObjectUtils;
import com.erudika.para.utils.Config;
import com.erudika.para.utils.Pager;
import com.erudika.para.utils.Utils;
import com.erudika.para.core.utils.Config;
import com.erudika.para.core.utils.Pager;
import com.erudika.para.core.utils.Utils;
import com.erudika.scoold.core.Post;
import com.erudika.scoold.core.Profile;
import com.erudika.scoold.core.Question;
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/com/erudika/scoold/controllers/ReportsController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@

import com.erudika.para.client.ParaClient;
import com.erudika.para.core.utils.ParaObjectUtils;
import com.erudika.para.utils.Config;
import com.erudika.para.utils.Pager;
import com.erudika.para.utils.Utils;
import com.erudika.para.core.utils.Config;
import com.erudika.para.core.utils.Pager;
import com.erudika.para.core.utils.Utils;
import com.erudika.scoold.core.Profile;
import static com.erudika.scoold.core.Profile.Badge.REPORTER;
import com.erudika.scoold.core.Report;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/erudika/scoold/controllers/RevisionsController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
*/
package com.erudika.scoold.controllers;

import com.erudika.para.utils.Pager;
import com.erudika.para.core.utils.Pager;
import com.erudika.scoold.core.Post;
import com.erudika.scoold.core.Revision;
import com.erudika.scoold.utils.ScooldUtils;
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/com/erudika/scoold/controllers/SearchController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@
package com.erudika.scoold.controllers;

import com.erudika.para.client.ParaClient;
import com.erudika.para.utils.Config;
import com.erudika.para.utils.Pager;
import com.erudika.para.utils.Utils;
import com.erudika.para.core.utils.Config;
import com.erudika.para.core.utils.Pager;
import com.erudika.para.core.utils.Utils;
import com.erudika.scoold.ScooldServer;
import static com.erudika.scoold.ScooldServer.CONTEXT_PATH;
import static com.erudika.scoold.ScooldServer.SEARCHLINK;
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/erudika/scoold/controllers/SettingsController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@

import com.erudika.para.core.Sysprop;
import com.erudika.para.core.User;
import com.erudika.para.utils.Config;
import com.erudika.para.utils.Utils;
import com.erudika.para.core.utils.Config;
import com.erudika.para.core.utils.Utils;
import static com.erudika.scoold.ScooldServer.MAX_FAV_TAGS;
import com.erudika.scoold.core.Profile;
import com.erudika.scoold.utils.ScooldUtils;
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/com/erudika/scoold/controllers/SigninController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@
*/
package com.erudika.scoold.controllers;

import com.erudika.para.annotations.Email;
import com.erudika.para.core.annotations.Email;
import com.erudika.para.client.ParaClient;
import com.erudika.para.core.Sysprop;
import com.erudika.para.core.User;
import com.erudika.para.utils.Config;
import com.erudika.para.utils.Utils;
import com.erudika.para.core.utils.Config;
import com.erudika.para.core.utils.Utils;
import static com.erudika.scoold.ScooldServer.HOMEPAGE;
import static com.erudika.scoold.ScooldServer.MIN_PASS_LENGTH;
import static com.erudika.scoold.ScooldServer.MIN_PASS_STRENGTH;
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/com/erudika/scoold/controllers/TagsController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@

import com.erudika.para.client.ParaClient;
import com.erudika.para.core.Tag;
import com.erudika.para.utils.Config;
import com.erudika.para.utils.Pager;
import com.erudika.para.utils.Utils;
import com.erudika.para.core.utils.Config;
import com.erudika.para.core.utils.Pager;
import com.erudika.para.core.utils.Utils;
import static com.erudika.scoold.ScooldServer.SIGNINLINK;
import static com.erudika.scoold.ScooldServer.TAGSLINK;
import com.erudika.scoold.core.Profile;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/erudika/scoold/controllers/TermsController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
package com.erudika.scoold.controllers;

import com.erudika.para.core.Sysprop;
import com.erudika.para.utils.Config;
import com.erudika.para.core.utils.Config;
import static com.erudika.scoold.ScooldServer.TERMSLINK;
import com.erudika.scoold.utils.ScooldUtils;
import javax.inject.Inject;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/erudika/scoold/controllers/VoteController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
import com.erudika.para.core.ParaObject;
import com.erudika.para.core.Votable;
import com.erudika.para.core.Vote;
import com.erudika.para.utils.Config;
import com.erudika.para.core.utils.Config;
import static com.erudika.scoold.ScooldServer.ANSWER_VOTEUP_REWARD_AUTHOR;
import static com.erudika.scoold.ScooldServer.CRITIC_IFHAS;
import static com.erudika.scoold.ScooldServer.GOODANSWER_IFHAS;
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/com/erudika/scoold/core/Comment.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@
package com.erudika.scoold.core;

import com.erudika.para.core.Sysprop;
import com.erudika.para.annotations.Stored;
import com.erudika.para.core.annotations.Stored;
import com.erudika.para.client.ParaClient;
import com.erudika.para.utils.Config;
import com.erudika.para.utils.Utils;
import com.erudika.para.core.utils.Config;
import com.erudika.para.core.utils.Utils;
import com.erudika.scoold.utils.ScooldUtils;
import java.util.Collections;
import java.util.Objects;
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/com/erudika/scoold/core/Post.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,14 @@
package com.erudika.scoold.core;

import com.erudika.para.core.Tag;
import com.erudika.para.annotations.Stored;
import com.erudika.para.core.annotations.Stored;
import com.erudika.para.client.ParaClient;
import com.erudika.para.core.ParaObject;
import com.erudika.para.core.Sysprop;
import com.erudika.para.core.User;
import com.erudika.para.utils.Config;
import com.erudika.para.utils.Pager;
import com.erudika.para.utils.Utils;
import com.erudika.para.core.utils.Config;
import com.erudika.para.core.utils.Pager;
import com.erudika.para.core.utils.Utils;
import com.erudika.scoold.ScooldServer;
import com.erudika.scoold.utils.ScooldUtils;
import com.fasterxml.jackson.annotation.JsonIgnore;
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/com/erudika/scoold/core/Profile.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@
*/
package com.erudika.scoold.core;

import com.erudika.para.annotations.Stored;
import com.erudika.para.core.annotations.Stored;
import com.erudika.para.client.ParaClient;
import com.erudika.para.core.Sysprop;
import com.erudika.para.core.User;
import com.erudika.para.utils.Config;
import com.erudika.para.utils.Pager;
import com.erudika.para.utils.Utils;
import com.erudika.para.core.utils.Config;
import com.erudika.para.core.utils.Pager;
import com.erudika.para.core.utils.Utils;
import com.erudika.scoold.utils.ScooldUtils;
import com.fasterxml.jackson.annotation.JsonIgnore;
import java.time.Instant;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/erudika/scoold/core/Report.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
package com.erudika.scoold.core;

import com.erudika.para.core.Sysprop;
import com.erudika.para.annotations.Stored;
import com.erudika.para.core.annotations.Stored;
import com.erudika.para.client.ParaClient;
import com.erudika.scoold.utils.ScooldUtils;
import java.util.Objects;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/erudika/scoold/core/Revision.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
package com.erudika.scoold.core;

import com.erudika.para.core.Sysprop;
import com.erudika.para.annotations.Stored;
import com.erudika.para.core.annotations.Stored;
import com.erudika.para.client.ParaClient;
import com.erudika.scoold.utils.ScooldUtils;
import com.fasterxml.jackson.annotation.JsonIgnore;
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/erudika/scoold/utils/HttpUtils.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
*/
package com.erudika.scoold.utils;

import com.erudika.para.utils.Config;
import com.erudika.para.utils.Utils;
import com.erudika.para.core.utils.Config;
import com.erudika.para.core.utils.Utils;
import com.erudika.scoold.ScooldServer;
import static com.erudika.scoold.ScooldServer.AUTH_COOKIE;
import static com.erudika.scoold.ScooldServer.CONTEXT_PATH;
Expand Down
Loading

0 comments on commit c503bef

Please sign in to comment.