* fixed #288 create Branch JSF_Version from Release 2.3.26

* fixed #291 Evaluate Joinfaces
* fixed #292 app starts with joinfaces
* fixed #293 app run with joinfaces but with MVC Templates
* fixed #294 Logging with logback only

Author: thomaswoehlke

pom.xml

@@ -141,16 +141,20 @@
 
         <spring-data-releasetrain.version>Neumann-SR4</spring-data-releasetrain.version>
         <spring-session-bom.version>Dragonfruit-SR1</spring-session-bom.version>
+        <!--
         <spring-framework.version>5.2.9.RELEASE</spring-framework.version>
         <spring-security.version>5.3.4.RELEASE</spring-security.version>
+        -->
 
         <!-- Unit and Integration Testing -->
         <junit-jupiter.version>5.6.2</junit-jupiter.version>
         <xmlunit2.version>2.6.4</xmlunit2.version>
         <xmlunit.version>2.6.4</xmlunit.version>
         <htmlunit.version>2.43.0</htmlunit.version>
         <hamcrest.version>2.2</hamcrest.version>
+        <!--
         <lombok.version>1.18.12</lombok.version>
+        -->
         <jsoup.version>1.13.1</jsoup.version>
 
         <skipTests>true</skipTests>
@@ -291,6 +295,13 @@
 
     <dependencyManagement>
         <dependencies>
+            <dependency>
+                <groupId>org.joinfaces</groupId>
+                <artifactId>joinfaces-dependencies</artifactId>
+                <version>${joinfaces.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
             <dependency>
                 <groupId>org.junit</groupId>
                 <artifactId>junit-bom</artifactId>
@@ -305,6 +316,13 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
+            <dependency>
+                <groupId>org.springframework.security</groupId>
+                <artifactId>spring-security-bom</artifactId>
+                <version>${spring-security.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
             <!-- webjars -->
             <dependency>
                 <groupId>org.webjars</groupId>
@@ -344,6 +362,7 @@
                 <artifactId>lombok</artifactId>
                 <version>${lombok.version}</version>
                 <optional>false</optional>
+                <scope>provided</scope>
             </dependency>
 
             <dependency>
@@ -489,13 +508,7 @@
             <artifactId>primefaces</artifactId>
             <version>8.0</version>
         </dependency>
-        <dependency>
-            <groupId>org.joinfaces</groupId>
-            <artifactId>joinfaces-dependencies</artifactId>
-            <version>${joinfaces.version}</version>
-            <type>pom</type>
-            <scope>import</scope>
-        </dependency>
+
         </dependencies>
     </dependencyManagement>
 
@@ -557,6 +570,10 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-security</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-logging</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.springframework.security</groupId>
             <artifactId>spring-security-core</artifactId>
@@ -594,7 +611,18 @@
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
             <optional>false</optional>
+            <scope>provided</scope>
         </dependency>
+        <!--
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-access</artifactId>
+        </dependency>
+        -->
         <dependency>
             <groupId>org.webjars</groupId>
             <artifactId>font-awesome</artifactId>
@@ -1403,6 +1431,13 @@
                     </compilerArgs>
                     <showWarnings>true</showWarnings>
                     <showDeprecation>true</showDeprecation>
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>org.projectlombok</groupId>
+                            <artifactId>lombok</artifactId>
+                            <version>${lombok.version}</version>
+                        </path>
+                    </annotationProcessorPaths>
                 </configuration>
             </plugin>
             <plugin>

src/main/java/org/woehlke/simpleworklist/application/breadcrumb/services/BreadcrumbServiceImpl.java

@@ -15,7 +15,7 @@
 import java.util.Locale;
 import java.util.Stack;
 
-@Log
+@Slf4j
 @Service
 @Transactional(propagation = Propagation.REQUIRED, readOnly = true)
 public class BreadcrumbServiceImpl implements BreadcrumbService {

src/main/java/org/woehlke/simpleworklist/application/error/MyErrorController.java

@@ -14,7 +14,7 @@
 import static org.springframework.web.bind.annotation.RequestMethod.*;
 
 
-@Log
+@Slf4j
 @Controller
 @RequestMapping(path="/fehler")
 public class MyErrorController implements ErrorController {

src/main/java/org/woehlke/simpleworklist/application/testdata/TestDataController.java

@@ -10,7 +10,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.woehlke.simpleworklist.user.services.UserAccountLoginSuccessService;
 
-@Log
+@Slf4j
 @Controller
 @RequestMapping(path = "/testdata")
 public class TestDataController {

src/main/java/org/woehlke/simpleworklist/application/testdata/services/TestDataServiceImpl.java

@@ -19,7 +19,7 @@
 import java.util.Date;
 import java.util.UUID;
 
-@Log
+@Slf4j
 @Service
 public class TestDataServiceImpl implements TestDataService {
 

src/main/java/org/woehlke/simpleworklist/domain/context/ContextController.java

@@ -16,7 +16,7 @@
 /**
  * Created by tw on 13.03.16.
  */
-@Log
+@Slf4j
 @Controller
 @RequestMapping(path = "/context")
 public class ContextController extends AbstractController {

src/main/java/org/woehlke/simpleworklist/domain/project/ProjectIdController.java

@@ -34,7 +34,7 @@
 /**
  * Created by tw on 14.02.16.
  */
-@Log
+@Slf4j
 @Controller
 @RequestMapping(path = "/project/{projectId}")
 public class ProjectIdController extends AbstractController {

src/main/java/org/woehlke/simpleworklist/domain/project/ProjectRootController.java

@@ -32,7 +32,7 @@
 
 import static org.woehlke.simpleworklist.domain.project.Project.rootProjectId;
 
-@Log
+@Slf4j
 @Controller
 @RequestMapping(path = "/project/root")
 public class ProjectRootController extends AbstractController {

src/main/java/org/woehlke/simpleworklist/domain/search/SearchController.java

@@ -20,7 +20,7 @@
 /**
  * Created by tw on 14.02.16.
  */
-@Log
+@Slf4j
 @Controller
 @RequestMapping(path = "/search")
 public class SearchController extends AbstractController {

src/main/java/org/woehlke/simpleworklist/domain/task/TaskStateTabController.java

@@ -14,10 +14,11 @@
 import org.woehlke.simpleworklist.services.TaskStateControllerService;
 import org.woehlke.simpleworklist.user.session.UserSessionBean;
 
+import lombok.extern.slf4j.Slf4j;
 import javax.validation.constraints.NotNull;
 import java.util.Locale;
 
-@Log
+@Slf4j
 @Controller
 @RequestMapping(path = "/taskstate")
 public class TaskStateTabController extends AbstractController {

src/main/java/org/woehlke/simpleworklist/domain/task/TaskStateTaskController.java

@@ -19,6 +19,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.woehlke.simpleworklist.user.account.UserAccount;
 
+import lombok.extern.slf4j.Slf4j;
 import javax.validation.Valid;
 import javax.validation.constraints.NotNull;
 import java.util.List;
@@ -27,7 +28,7 @@
 /**
  * Created by tw on 21.02.16.
  */
-@Log
+@Slf4j
 @Controller
 @RequestMapping(path = "/taskstate/task")
 public class TaskStateTaskController extends AbstractController {

src/main/java/org/woehlke/simpleworklist/services/ContextServiceImpl.java

@@ -17,7 +17,7 @@
 /**
  * Created by tw on 13.03.16.
  */
-@Log
+@Slf4j
 @Service
 @Transactional(propagation = Propagation.REQUIRED, readOnly = true)
 public class ContextServiceImpl implements ContextService {

src/main/java/org/woehlke/simpleworklist/services/ProjectControllerServiceImpl.java

@@ -21,7 +21,7 @@
 
 import static org.woehlke.simpleworklist.domain.project.Project.rootProjectId;
 
-@Log
+@Slf4j
 @Service
 public class ProjectControllerServiceImpl implements ProjectControllerService {
 

src/main/java/org/woehlke/simpleworklist/services/ProjectServiceImpl.java

@@ -21,7 +21,7 @@
 import javax.validation.constraints.Min;
 import javax.validation.constraints.NotNull;
 
-@Log
+@Slf4j
 @Service
 @Transactional(propagation = Propagation.REQUIRED, readOnly = true)
 public class ProjectServiceImpl implements ProjectService {

src/main/java/org/woehlke/simpleworklist/services/SearchRequestServiceImpl.java

@@ -10,7 +10,7 @@
 
 import java.util.UUID;
 
-@Log
+@Slf4j
 @Service
 public class SearchRequestServiceImpl implements SearchRequestService {
 

src/main/java/org/woehlke/simpleworklist/services/SearchResultServiceImpl.java

@@ -10,7 +10,7 @@
 
 import java.util.UUID;
 
-@Log
+@Slf4j
 @Service
 public class SearchResultServiceImpl implements SearchResultService {
 

src/main/java/org/woehlke/simpleworklist/services/SearchServiceImpl.java

@@ -12,7 +12,7 @@
 /**
  * Created by tw on 14.02.16.
  */
-@Log
+@Slf4j
 @Service
 public class SearchServiceImpl implements SearchService {
 

src/main/java/org/woehlke/simpleworklist/services/TaskProjektServiceImpl.java

@@ -11,7 +11,7 @@
 
 import javax.validation.constraints.NotNull;
 
-@Log
+@Slf4j
 @Service
 public class TaskProjektServiceImpl implements TaskProjektService {
 

src/main/java/org/woehlke/simpleworklist/services/TaskServiceImpl.java

@@ -20,7 +20,7 @@
 import java.util.List;
 import java.util.UUID;
 
-@Log
+@Slf4j
 @Service
 public class TaskServiceImpl implements TaskService {
 

src/main/java/org/woehlke/simpleworklist/services/TaskStateControllerServiceImpl.java

@@ -18,7 +18,7 @@
 import javax.validation.constraints.NotNull;
 import java.util.Locale;
 
-@Log
+@Slf4j
 @Service
 public class TaskStateControllerServiceImpl implements TaskStateControllerService {
 

src/main/java/org/woehlke/simpleworklist/user/account/UserSelfserviceController.java

@@ -32,7 +32,7 @@
 /**
  * Created by Fert on 14.03.2016.
  */
-@Log
+@Slf4j
 @Controller
 @RequestMapping(path = "/user/selfservice")
 public class UserSelfserviceController extends AbstractController {

src/main/java/org/woehlke/simpleworklist/user/chat/User2UserMessageController.java

@@ -26,7 +26,7 @@
  * Created by
  * on 16.02.2016.
  */
-@Log
+@Slf4j
 @Controller
 @RequestMapping(path = "/user/messages/")
 public class User2UserMessageController extends AbstractController {

src/main/java/org/woehlke/simpleworklist/user/login/LoginSuccessHandler.java

@@ -20,7 +20,7 @@
 /**
  * Created by tw on 19.02.16.
  */
-@Log
+@Slf4j
 @Component
 public class LoginSuccessHandler extends SavedRequestAwareAuthenticationSuccessHandler
     implements AuthenticationSuccessHandler {

src/main/java/org/woehlke/simpleworklist/user/login/UserLoginController.java

@@ -20,7 +20,7 @@
 import org.woehlke.simpleworklist.user.services.UserAccountAccessService;
 import org.woehlke.simpleworklist.user.services.UserAccountLoginSuccessService;
 
-@Log
+@Slf4j
 @Controller
 @RequestMapping(path = "/user")
 public class UserLoginController {

src/main/java/org/woehlke/simpleworklist/user/register/UserRegistrationController.java

@@ -15,7 +15,7 @@
 
 import javax.validation.Valid;
 
-@Log
+@Slf4j
 @Controller
 @RequestMapping(path = "/user/register")
 public class UserRegistrationController {

src/main/java/org/woehlke/simpleworklist/user/resetpassword/UserPasswordRecoveryController.java

@@ -18,7 +18,7 @@
 
 import javax.validation.Valid;
 
-@Log
+@Slf4j
 @Controller
 @RequestMapping(path = "/user")
 public class UserPasswordRecoveryController {

src/main/java/org/woehlke/simpleworklist/user/services/User2UserMessageServiceImpl.java

@@ -19,7 +19,7 @@
 /**
  * Created by tw on 16.02.2016.
  */
-@Log
+@Slf4j
 @Service
 @Transactional(propagation = Propagation.REQUIRED, readOnly = true)
 public class User2UserMessageServiceImpl implements User2UserMessageService {

src/main/java/org/woehlke/simpleworklist/user/services/UserAccountAccessServiceImpl.java

@@ -15,7 +15,7 @@
 import org.woehlke.simpleworklist.user.login.LoginForm;
 import org.woehlke.simpleworklist.user.account.UserChangePasswordForm;
 
-@Log
+@Slf4j
 @Service
 @Transactional(propagation = Propagation.REQUIRED, readOnly = true)
 public class UserAccountAccessServiceImpl implements UserAccountAccessService {

src/main/java/org/woehlke/simpleworklist/user/services/UserAccountLoginSuccessServiceImpl.java

@@ -15,7 +15,7 @@
 
 import java.util.Date;
 
-@Log
+@Slf4j
 @Service
 @Transactional(propagation = Propagation.REQUIRED, readOnly = true)
 public class UserAccountLoginSuccessServiceImpl implements UserAccountLoginSuccessService {

src/main/java/org/woehlke/simpleworklist/user/services/UserAccountSecurityPasswordServiceImpl.java

@@ -1,6 +1,6 @@
 package org.woehlke.simpleworklist.user.services;
 
-
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.authentication.AuthenticationManager;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
@@ -16,7 +16,7 @@
 import org.woehlke.simpleworklist.user.account.UserAccountRepository;
 import org.woehlke.simpleworklist.user.services.UserAccountSecurityPasswordService;
 
-@Log
+@Slf4j
 @Service
 @Transactional(propagation = Propagation.REQUIRED, readOnly = true)
 public class UserAccountSecurityPasswordServiceImpl implements UserAccountSecurityPasswordService {